[Testbot] Plone 5.0 - Python 2.7 - Build # 3392 - Fixed! - 0 failure(s)

[jenkins at plone.org]

-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 3392 - Fixed!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-5.0-python-2.7/3392/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: plone.app.contentmenu
Branch: refs/heads/master
Date: 2014-10-20T21:06:19+02:00
Author: Victor Fernandez de Alba (sneridagh) <sneridagh at gmail.com>
Commit: https://github.com/plone/plone.app.contentmenu/commit/4eed4a410139d4d720317abd0100b7b7c9c4565b

Add missing changelog entry for changes made in Barceloneta branch.

Files changed:
M CHANGES.rst
M plone/app/contentmenu/contentmenu.pt

diff --git a/CHANGES.rst b/CHANGES.rst
index ee4fe03..4d06e77 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,13 @@ Changelog
 - Fix "Manage Portlets" menus not appearing for "Site Administrators".
   [@rpatterson]
 
+- Integration of the new markup update and CSS for both Plone and Barceloneta
+  theme. This is the work done in the GSOC Barceloneta theme project.
+  [albertcasado, sneridagh]
+
+- New toolbar markup based in ul li tags for the contentActions menus.
+  [albertcasado, sneridagh]
+
 
 2.1.1 (2014-04-13)
 ------------------
diff --git a/plone/app/contentmenu/contentmenu.pt b/plone/app/contentmenu/contentmenu.pt
index f8c57cf..87072ed 100644
--- a/plone/app/contentmenu/contentmenu.pt
+++ b/plone/app/contentmenu/contentmenu.pt
@@ -15,7 +15,7 @@
                      state_class python:state_class and state_class or ''"
          tal:attributes="href menuItem/action;
                          title menuItem/description;
-                         class string:${state_class}"
+                         class string:label-${state_class}"
          i18n:attributes="title;">
 
           <span tal:condition="menuItem/extra/stateTitle | nothing"
@@ -36,7 +36,6 @@
             </span>
 
             <span tal:condition="menuItem/extra/stateTitle | nothing"
-                  tal:attributes="class string:${menuItem/extra/class | nothing}"
                   tal:content="menuItem/extra/stateTitle"
                   i18n:translate="">
                 State title
@@ -75,7 +74,7 @@
                   Title
               </tal:title>
           </a>
-          <div tal:condition="not:subMenuItem/action"
+          <span tal:condition="not:subMenuItem/action"
                tal:attributes="id subMenuItem/extra/id | nothing;
                                class subMenuItem/extra/class | nothing">
 
@@ -83,7 +82,7 @@
                     i18n:translate="">
                   Title
               </span>
-          </div>
+          </span>
         </li>
       </ul>
     </li>
@@ -128,7 +127,7 @@
                         Title
                     </tal:title>
                 </a>
-                <div tal:condition="not:subMenuItem/action"
+                <span tal:condition="not:subMenuItem/action"
                      tal:attributes="id subMenuItem/extra/id | nothing;
                                      class subMenuItem/extra/class | nothing">
 
@@ -136,7 +135,7 @@
                           i18n:translate="">
                         Title
                     </tal:title>
-                </div>
+                </span>
               </li>
             </tal:block>
           </tal:menulevel1>


Repository: plone.app.contentmenu
Branch: refs/heads/master
Date: 2014-10-20T21:06:29+02:00
Author: Victor Fernandez de Alba (sneridagh) <sneridagh at gmail.com>
Commit: https://github.com/plone/plone.app.contentmenu/commit/20be260cac7f38fdcdaa75567aaee74c9aa02533

Merge branch 'master' of git://github.com/plone/plone.app.contentmenu

Files changed:
M plone/app/contentmenu/menu.py

diff --git a/plone/app/contentmenu/menu.py b/plone/app/contentmenu/menu.py
index a82ddcc..76efee5 100644
--- a/plone/app/contentmenu/menu.py
+++ b/plone/app/contentmenu/menu.py
@@ -13,7 +13,7 @@
 
 from Acquisition import aq_base
 from Products.CMFCore.utils import getToolByName, _checkPermission
-from Products.CMFDynamicViewFTI.interface import ISelectableBrowserDefault
+from Products.CMFDynamicViewFTI.interfaces import ISelectableBrowserDefault
 from Products.CMFPlone import utils
 from Products.CMFPlone.interfaces.structure import INonStructuralFolder
 from Products.CMFPlone.interfaces.constrains import IConstrainTypes




-------------------------------------------------------------------------------