Merge b602537 into 58a32c8

.travis.yml

@@ -1,28 +1,30 @@
 language: python
-
-python:
-  - 2.7
-
+sudo: false
 cache:
-  pip: true
   directories:
-    - buildout-cache/downloads
-    - buildout-cache/eggs
-
+    - eggs
+    - downloads
+python:
+  - 2.7
+env:
+  - PLONE_VERSION=4.3
+  - PLONE_VERSION=5.0
+  - PLONE_VERSION=5.1
 install:
-  - mkdir -p buildout-cache/{eggs,downloads}
-  - python bootstrap-buildout.py --version=2.10.0 -c travis.cfg
-  - bin/buildout -Nc travis.cfg
-
+  - sed -ie "s#5-latest#$PLONE_VERSION-latest#" buildout.cfg
+  - python bootstrap-buildout.py --version=2.5.3
+  - bin/buildout -N buildout:download-cache=downloads code-analysis:return-status-codes=True annotate
+  - bin/buildout -N buildout:download-cache=downloads code-analysis:return-status-codes=True
+before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - firefox -v
 script:
   - bin/test
-  - bin/coverage run bin/test
-
 after_success:
-  - bin/coverage run bin/test
+  - bin/createcoverage --output-dir htmlcov
   - pip install coveralls==0.5
   - coveralls
-
 notifications:
   email:
     - devs@imio.be

CHANGES.rst

@@ -5,7 +5,12 @@ Changelog
 0.15 (unreleased)
 -----------------
 
-- Nothing changed yet.
+- Call JS on portal_url so it can be cached by the browser.
+  [gbastien]
+- Tests on Plone5 and Plone4.
+  [bsuttor]
+- Manage profiles differently
+  [sgeulette]
 
 
 0.14 (2018-07-23)
@@ -17,8 +22,6 @@ Changelog
 0.13 (2018-06-13)
 -----------------
 
-- Call JS on portal_url so it can be cached by the browser.
-  [gbastien]
 - Add <span> around cross <img> to ease override.
   [mgennart]
 

buildout.cfg

@@ -1,33 +1,35 @@
 [buildout]
 extends =
-    https://raw.github.com/collective/buildout.plonetest/master/test-4.x.cfg
+    https://raw.github.com/collective/buildout.plonetest/master/test-5.x.cfg
     versions.cfg
 
 extensions = mr.developer
+
 parts =
     instance
-    omelette
     test
-    robot
-    coverage
-    report
     code-analysis
+    createcoverage
     releaser
+    i18ndude
+    omelette
+    robot
+    resources
+
 develop = .
 show-picked-versions = true
 
 always-checkout = force
 auto-checkout +=
 
+test-eggs = collective.messagesviewlet [test]
 
 [remotes]
 coll = https://github.com/collective
 coll_push = git@github.com:collective
 
-
 [sources]
 
-
 [instance]
 recipe = plone.recipe.zope2instance
 user = admin:admin
@@ -49,7 +51,7 @@ environment-vars =
 
 
 [code-analysis]
-recipe = plone.recipe.codeanalysis
+recipe = plone.recipe.codeanalysis[recommended]
 directory = ${buildout:directory}/src/collective
 flake8-exclude = bootstrap.py,bootstrap-buildout.py,docs,*.egg.,omelette
 flake8-ignore = W391
@@ -59,7 +61,7 @@ flake8-extensions =
     flake8-blind-except
     flake8-debugger
     flake8-coding
-
+return-status-codes = False
 
 [omelette]
 recipe = collective.recipe.omelette
@@ -70,7 +72,7 @@ eggs = ${instance:eggs}
 recipe = zc.recipe.testrunner
 eggs =
     ${instance:eggs}
-    collective.messagesviewlet [test]
+    ${buildout:test-eggs}
     robotframework-selenium2screenshots
 defaults = ['-s', 'collective.messagesviewlet', '--auto-color', '--auto-progress']
 environment = testenv
@@ -87,20 +89,9 @@ eggs =
     plone.app.robotframework[debug,ride,reload]
 
 
-[coverage]
+[createcoverage]
 recipe = zc.recipe.egg
-eggs = coverage
-initialization =
-    include = '--source=${buildout:directory}/src/collective/messagesviewlet'
-    sys.argv = sys.argv[:] + ['run', include, 'bin/test', '--all', '-s', 'collective.messagesviewlet']
-
-
-[report]
-recipe = zc.recipe.egg
-eggs = coverage
-scripts = coverage=report
-initialization =
-    sys.argv = sys.argv[:] + ['html', '-i']
+eggs = createcoverage
 
 
 [releaser]
@@ -112,3 +103,8 @@ eggs = zest.releaser
 recipe = zc.recipe.egg
 eggs = i18ndude
 
+
+[resources]
+recipe = zc.recipe.egg
+eggs = Products.CMFPlone
+scripts = plone-compile-resources

src/collective/messagesviewlet/browser/configure.zcml

@@ -5,9 +5,10 @@
     i18n_domain="collective.messagesviewlet">
 
   <!-- Publish static files -->
-  <browser:resourceDirectory
+  <plone:static
       name="collective.messagesviewlet"
       directory="static"
+      type="plone"
       />
 
     <browser:viewlet

src/collective/messagesviewlet/browser/messagesviewlet.py

@@ -34,12 +34,12 @@ def getAllMessages(self):
                                                    sort_on='getObjPositionInParent')
         messages = []
         for brain in brains:
-            if brain.location == 'homepage':
+            obj = brain._unrestrictedGetObject()
+            if obj.location == 'homepage':
                 # Test if context is PloneSite or its default page
                 if not INavigationRoot.providedBy(self.context) and \
                         not isDefaultPage(self.portal, self.context):
                     continue
-            obj = brain._unrestrictedGetObject()
             # check in the cookie if message is marked as read
             if obj.can_hide:
                 m_uids = self.request.get('messagesviewlet', '')

src/collective/messagesviewlet/browser/static/messagesviewlet.less

@@ -0,0 +1,75 @@
+.warning-formHelp {
+    color: orange;
+}
+.portaltype-messagesconfig #contentview-folderContents,.portaltype-messagesconfig #contentview-edit,.portaltype-messagesconfig #contentview-local_roles {
+    display: none;
+}
+dl.messagesviewlet-info,dl.messagesviewlet-warning,dl.messagesviewlet-significant {
+    border: 1px solid #996;
+    clear: both;
+    font-size: 80%;
+    margin: 1em 0;
+}
+dl.messagesviewlet-info {
+    background-color: #ffffe3;
+    dt {
+        background-color: #996;
+    }
+}
+dl.messagesviewlet-significant {
+    background-color: #fd7;
+    dt {
+        background-color: #d80;
+    }
+}
+dl.messagesviewlet-warning {
+    background-color: #fdc;
+    dt {
+        background-color: #d00;
+    }
+}
+dl.messagesviewlet-info dt,dl.messagesviewlet-warning dt,dl.messagesviewlet-significant dt {
+    width: 85px;
+    color: White;
+    float: left;
+    font-weight: bold;
+    line-height: 1.25em;
+    margin: 0 0.5em 0 0;
+    padding: 0.5em 0.75em;
+}
+dl.messagesviewlet-info dd,dl.messagesviewlet-warning dd,dl.messagesviewlet-significant dd {
+    line-height: 1.25em;
+    margin: 0 25px 0 110px;
+    padding: 0.5em;
+}
+.close-button {
+    float: right;
+    margin-top: -28px;
+}
+.state-inactive {
+    color: red !important;
+}
+#plone-contentmenu-workflow {
+    .state-inactive {
+        border-radius: 0.5em 0.5em 0.5em 0.5em;
+        background-color: red;
+        padding: 0 0.5em;
+        color: white !important;
+        border: 2px solid red;
+    }
+    .state-activated {
+        border-radius: 0.5em 0.5em 0.5em 0.5em;
+        background-color: blue;
+        padding: 0 0.5em;
+        color: white !important;
+        border: 2px solid blue;
+    }
+}
+.state-activated {
+    color: blue !important;
+}
+
+.icon-controlpanel-messagesviewlet_settings:before {
+    font-family: 'fontello';
+    content: '\E83B';
+}

src/collective/messagesviewlet/configure.zcml

@@ -10,6 +10,7 @@
     <i18n:registerTranslations directory="locales" />
 
     <include package=".browser" />
+    <include file="profiles.zcml" />
 
     <permission
     id="collective.messagesviewlet.addMessage"
@@ -25,20 +26,6 @@
         handler=".subscribers.change_hidden_uid"
         />
 
-    <genericsetup:registerProfile
-        name="default"
-        title="collective.messagesviewlet installation"
-        directory="profiles/default"
-        description="Installs the collective.messagesviewlet add-on."
-        provides="Products.GenericSetup.interfaces.EXTENSION"
-        />
 
-    <genericsetup:registerProfile
-        name="messages"
-        title="collective.messagesviewlet examples"
-        directory="profiles/messages"
-        description="Add default messages for collective.messagesviewlet."
-        provides="Products.GenericSetup.interfaces.EXTENSION"
-        />
 
 </configure>

src/collective/messagesviewlet/profiles.zcml

@@ -0,0 +1,45 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
+    xmlns:five="http://namespaces.zope.org/five"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+    xmlns:i18n="http://namespaces.zope.org/i18n"
+    i18n_domain="collective.messagesviewlet">
+
+<genericsetup:registerProfile
+    name="install-base"
+    title="collective.messagesviewlet installation"
+    directory="profiles/base"
+    description="Installs the collective.messagesviewlet add-on."
+    provides="Products.GenericSetup.interfaces.EXTENSION"
+    />
+
+<genericsetup:registerProfile
+    name="messages"
+    title="collective.messagesviewlet examples"
+    directory="profiles/messages"
+    description="Add default messages for collective.messagesviewlet."
+    provides="Products.GenericSetup.interfaces.EXTENSION"
+    />
+
+  <genericsetup:registerProfile
+      zcml:condition="have plone-5"
+      name="default"
+      title="collective.messagesviewlet plone5 installation"
+      directory="profiles/plone5"
+      description="Installs the collective.messagesviewlet add-on on Plone 5."
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
+  <genericsetup:registerProfile
+      zcml:condition="not-have plone-5"
+      name="default"
+      title="collective.messagesviewlet plone4 installation"
+      directory="profiles/plone4"
+      description="Installs the collective.messagesviewlet add-on on Plone 4."
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
+  <utility factory=".setuphandlers.HiddenProfiles" name="collective.messagesviewlet" />
+
+</configure>

src/collective/messagesviewlet/profiles/plone4/metadata.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<metadata>
+  <version>1000</version>
+  <dependencies>
+    <dependency>profile-collective.messagesviewlet:install-base</dependency>
+  </dependencies>
+</metadata>

src/collective/messagesviewlet/profiles/plone5/metadata.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<metadata>
+  <version>1000</version>
+  <dependencies>
+    <dependency>profile-collective.messagesviewlet:install-base</dependency>
+  </dependencies>
+</metadata>

src/collective/messagesviewlet/profiles/plone5/registry.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<registry>
+
+  <records prefix="plone.resources/messagesviewlet"
+           interface='Products.CMFPlone.interfaces.IResourceRegistry'>
+    <value key="js">++plone++collective.messagesviewlet/hidemessageviewlet.js</value>
+    <value key="deps">jquery.cookie</value>
+    <value key="css">
+      <element>++plone++collective.messagesviewlet/messagesviewlet.less</element>
+    </value>
+  </records>
+
+  <records prefix="plone.bundles/messagesviewlet"
+           interface='Products.CMFPlone.interfaces.IBundleRegistry'>
+    <value key="resources" purge="false">
+      <element>messagesviewlet</element>
+    </value>
+    <value key="enabled">True</value>
+    <value key="csscompilation">++plone++collective.messagesviewlet/messagesviewlet.min.css</value>
+    <value key="last_compilation">2018-09-11 10:00:00</value>
+  </records>
+</registry>