[Testbot] Plone 5.0 - Python 2.7 - Build # 3318 - Fixed! - 0 failure(s)
jenkins at plone.org
jenkins at plone.org
Thu Oct 9 13:51:48 UTC 2014
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 3318 - Fixed!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/3318/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: plone.app.contentmenu
Branch: refs/heads/master
Date: 2014-10-09T13:28:23+02:00
Author: Victor Fernandez de Alba (sneridagh) <sneridagh at gmail.com>
Commit: https://github.com/plone/plone.app.contentmenu/commit/cc9db0013ad166f6897c92fe8159b8a1aedfd79c
Update markup of the toolbar elements.
Files changed:
M plone/app/contentmenu/contentmenu.pt
diff --git a/plone/app/contentmenu/contentmenu.pt b/plone/app/contentmenu/contentmenu.pt
index 95b19f2..42403c5 100644
--- a/plone/app/contentmenu/contentmenu.pt
+++ b/plone/app/contentmenu/contentmenu.pt
@@ -1,222 +1,148 @@
-<ul id="contentActionMenus"
- xmlns:i18n="http://xml.zope.org/namespaces/i18n"
- xmlns:tal="http://xml.zope.org/namespaces/tal"
- tal:define="menu_dict view/menu;
- level0 python:menu_dict['level0'];
- level1 python:menu_dict['level1']"
- tal:condition="view/available"
- i18n:domain="plone">
- <tal:elements repeat="menuItem level0">
- <li class="actionMenu deactivated dropdown"
- tal:attributes="id menuItem/extra/id"
- tal:define="submenu menuItem/submenu;
- identifier menuItem/extra/id">
- <a href="#"
- data-toggle="dropdown"
- tal:omit-tag="not:menuItem/action"
- tal:define="state_class menuItem/extra/class | nothing;
- state_class python:state_class and state_class or ''"
- tal:attributes="href menuItem/action;
- title menuItem/description;
- class string:actionMenuHeader dropdown-toggle label-${state_class}"
- i18n:attributes="title;">
- <span tal:omit-tag="menuItem/action"
- class="noMenuAction">
- <span tal:condition="menuItem/extra/stateTitle | nothing"
- class="" aria-hidden="true"
+<tal:contentactionmenus define="menu_dict view/menu;
+ level0 python:menu_dict['level0'];
+ level1 python:menu_dict['level1']"
+ condition="view/available"
+ i18n:domain="plone">
- tal:attributes="class string:icon-${identifier} ${menuItem/extra/class}">
- </span>
+ <tal:menus repeat="menuItem level0">
+ <li tal:define="submenu menuItem/submenu;
+ identifier menuItem/extra/id"
+ tal:attributes="id menuItem/extra/id">
- <span tal:condition="not: menuItem/extra/stateTitle | nothing"
- class="" aria-hidden="true"
- tal:attributes="class string:icon-${identifier}">
- </span>
+ <a href="#"
+ tal:omit-tag="not:menuItem/action"
+ tal:define="state_class menuItem/extra/class | nothing;
+ state_class python:state_class and state_class or ''"
+ tal:attributes="href menuItem/action;
+ title menuItem/description;
+ class string:${state_class}"
+ i18n:attributes="title;">
+ <span tal:condition="menuItem/extra/stateTitle | nothing"
+ class="" aria-hidden="true"
+ tal:attributes="class string:icon-${identifier} ${menuItem/extra/class}">
+ </span>
- <span class="text-toolbar" tal:content="menuItem/title"
- i18n:translate="">
- Title
- </span>
+ <span tal:condition="not: menuItem/extra/stateTitle | nothing"
+ class="" aria-hidden="true"
+ tal:attributes="class string:icon-${identifier}">
+ </span>
- <span tal:condition="menuItem/extra/stateTitle | nothing"
- tal:attributes="class string:${menuItem/extra/class} text-toolbar"
- tal:content="menuItem/extra/stateTitle"
- i18n:translate="">
- State title
- </span>
- <span class="caret"
- tal:condition="not:menuItem/extra/hideChildren | not:submenu | nothing"></span>
- </span>
- </a>
- <ul class="actionMenuContent dropdown-menu"
- tal:condition="not:menuItem/extra/hideChildren | not:submenu | nothing">
- <li class="dropdown-header">
- <span tal:content="menuItem/title"
- i18n:translate="">
- Title
- </span>
+ <span tal:omit-tag="not: menuItem/extra/stateTitle | nothing">
- <span tal:condition="menuItem/extra/stateTitle | nothing"
- tal:attributes="class string:${menuItem/extra/class}"
- tal:content="menuItem/extra/stateTitle"
- i18n:translate="">
- State title
- </span>
- </li>
- <tal:block repeat="subMenuItem submenu">
- <li tal:attributes="class subMenuItem/extra/separator">
- <a href="#"
- tal:condition="subMenuItem/action"
- tal:attributes="href subMenuItem/action;
- title subMenuItem/description;
- id subMenuItem/extra/id | nothing;
- class subMenuItem/extra/class | nothing;
- data-pat-modal subMenuItem/extra/modal | nothing;
- "
- i18n:attributes="title">
- <img width="16"
- height="16"
- alt=""
- tal:condition="subMenuItem/icon"
- tal:attributes="src subMenuItem/icon;
- title subMenuItem/description;
- width subMenuItem/width|string:16;
- height subMenuItem/height|string:16;"
- i18n:attributes="alt;"/>
- <span tal:content="structure subMenuItem/title"
- i18n:translate=""
- class="subMenuTitle">
- Title
- </span>
- </a>
- <div tal:condition="not:subMenuItem/action"
- tal:attributes="id subMenuItem/extra/id | nothing;
- class subMenuItem/extra/class | nothing">
- <img width="16"
- height="16"
- alt=""
- tal:condition="subMenuItem/icon"
- tal:attributes="src subMenuItem/icon;
- title subMenuItem/description"
- i18n:attributes="alt;"/>
- <span tal:content="structure subMenuItem/title"
- i18n:translate=""
- class="subMenuTitle">
- Title
- </span>
- </div>
- </li>
- </tal:block>
- </ul>
- </li>
-
- </tal:elements>
+ <span tal:content="menuItem/title"
+ i18n:translate="">
+ Menu Title
+ </span>
- <!-- More options element -->
- <li class="actionMenu deactivated dropdown" id="plone-contentmenu-moreoptions" tal:condition="level1">
- <a href="#"
- data-toggle="dropdown"
- title="More options"
- i18n:attributes="title;">
- <span class="noMenuAction">
- <span class="icon-ellipsis" aria-hidden="true">
+ <span tal:condition="menuItem/extra/stateTitle | nothing"
+ tal:attributes="class string:${menuItem/extra/class | nothing}"
+ tal:content="menuItem/extra/stateTitle"
+ i18n:translate="">
+ State title
</span>
+ </span>
+ <span class="plone-toolbar-caret"
+ tal:condition="not:menuItem/extra/hideChildren | not:submenu | nothing">
+ </span>
+ </a>
- <span class="text-toolbar" i18n:translate="">
- More options
+ <ul tal:condition="not:menuItem/extra/hideChildren | not:submenu | nothing">
+ <li class="plone-toolbar-submenu-header">
+ <span tal:omit-tag="not:menuItem/extra/stateTitle | nothing">
+ <span tal:content="menuItem/title">Menu Title</span>
+ <span tal:condition="menuItem/extra/stateTitle | nothing"
+ tal:attributes="class string:${menuItem/extra/class}"
+ tal:content="menuItem/extra/stateTitle"
+ i18n:translate="">
+ State title
</span>
+ </span>
+ </li>
+ <li tal:repeat="subMenuItem submenu"
+ tal:attributes="class string:${menuItem/extra/li_class | nothing} ${subMenuItem/extra/separator}">
+ <a href="#"
+ tal:condition="subMenuItem/action"
+ tal:attributes="href subMenuItem/action;
+ title subMenuItem/description;
+ id subMenuItem/extra/id | nothing;
+ class subMenuItem/extra/class | nothing;
+ data-pat-modal subMenuItem/extra/modal | nothing;"
+ i18n:attributes="title">
+
+ <tal:title content="structure subMenuItem/title"
+ i18n:translate="">
+ Title
+ </tal:title>
+ </a>
+ <div tal:condition="not:subMenuItem/action"
+ tal:attributes="id subMenuItem/extra/id | nothing;
+ class subMenuItem/extra/class | nothing">
+
+ <span tal:content="structure subMenuItem/title"
+ i18n:translate="">
+ Title
+ </span>
+ </div>
+ </li>
+ </ul>
+ </li>
+ </tal:menus>
- <span class="caret"></span>
- </span>
+ <tal:moreoptions tal:condition="level1">
+ <li id="plone-contentmenu-moreoptions">
+ <a href="#"
+ title="More options"
+ i18n:attributes="title;">
+ <span class="icon-moreOptions" aria-hidden="true"></span>
+ <span i18n:translate="">More options</span>
+ <span class="plone-toolbar-caret"></span>
</a>
- <ul class="actionMenuContent dropdown-menu">
+ <ul>
<tal:elements repeat="menuItem level1">
- <li
- tal:attributes="id menuItem/extra/id"
- tal:define="submenu menuItem/submenu;
- identifier menuItem/extra/id">
- <ul class="actionMenuContent"
- tal:condition="not:menuItem/extra/hideChildren | not:submenu | nothing">
- <li class="dropdown-header">
- <a href="#"
- tal:omit-tag="not:menuItem/action"
- tal:define="state_class menuItem/extra/class | nothing;
- state_class python:state_class and state_class or ''"
- tal:attributes="href menuItem/action;
- title menuItem/description;
- class string:actionMenuHeader dropdown-toggle label-${state_class}"
+ <tal:menulevel1 define="submenu menuItem/submenu;
+ identifier menuItem/extra/id">
+ <li class="plone-toolbar-submenu-header"
+ tal:attributes="id menuItem/extra/id">
+ <a tal:attributes="href menuItem/action;
+ title menuItem/description;"
i18n:attributes="title;">
- <span tal:omit-tag="menuItem/action"
- class="noMenuAction">
- <span tal:condition="menuItem/extra/stateTitle | nothing"
- class="" aria-hidden="true"
-
- tal:attributes="class string:icon-${identifier} ${menuItem/extra/class}">
- </span>
-
-
- <span tal:content="menuItem/title"
+ <tal:title tal:content="menuItem/title"
+ i18n:translate="">
+ SubMenu title
+ </tal:title>
+ </a>
+ </li>
+ <tal:block repeat="subMenuItem submenu">
+ <li tal:attributes="class string:${menuItem/extra/li_class | nothing} ${subMenuItem/extra/separator}">
+ <a href="#"
+ tal:condition="subMenuItem/action"
+ tal:attributes="href subMenuItem/action;
+ title subMenuItem/description;
+ id subMenuItem/extra/id | nothing;
+ data-pat-modal subMenuItem/extra/modal | nothing;
+ class subMenuItem/extra/class | nothing"
+ i18n:attributes="title">
+ <tal:title tal:content="structure subMenuItem/title"
i18n:translate="">
Title
- </span>
+ </tal:title>
+ </a>
+ <div tal:condition="not:subMenuItem/action"
+ tal:attributes="id subMenuItem/extra/id | nothing;
+ class subMenuItem/extra/class | nothing">
- <span tal:condition="menuItem/extra/stateTitle | nothing"
- tal:attributes="class string:${menuItem/extra/class} text-toolbar"
- tal:content="menuItem/extra/stateTitle"
+ <tal:title tal:content="structure subMenuItem/title"
i18n:translate="">
- State title
- </span>
-
- </a>
- </li>
- <tal:block repeat="subMenuItem submenu">
- <li tal:attributes="class subMenuItem/extra/separator">
- <a href="#"
- tal:condition="subMenuItem/action"
- tal:attributes="href subMenuItem/action;
- title subMenuItem/description;
- id subMenuItem/extra/id | nothing;
- data-pat-modal subMenuItem/extra/modal | nothing;
- class subMenuItem/extra/class | nothing"
- i18n:attributes="title">
- <img width="16"
- height="16"
- alt=""
- tal:condition="subMenuItem/icon"
- tal:attributes="src subMenuItem/icon;
- title subMenuItem/description;
- width subMenuItem/width|string:16;
- height subMenuItem/height|string:16;"
- i18n:attributes="alt;"/>
- <span tal:content="structure subMenuItem/title"
- i18n:translate=""
- class="subMenuTitle">
- Title
- </span>
- </a>
- <div tal:condition="not:subMenuItem/action"
- tal:attributes="id subMenuItem/extra/id | nothing;
- class subMenuItem/extra/class | nothing">
- <img width="16"
- height="16"
- alt=""
- tal:condition="subMenuItem/icon"
- tal:attributes="src subMenuItem/icon;
- title subMenuItem/description"
- i18n:attributes="alt;"/>
- <span tal:content="structure subMenuItem/title"
- i18n:translate=""
- class="subMenuTitle">
- Title
- </span>
- </div>
- </li>
- </tal:block>
- </ul>
- </li>
- </tal:elements>
- </ul>
- </li>
-
-</ul>
+ Title
+ </tal:title>
+ </div>
+ </li>
+ </tal:block>
+ </tal:menulevel1>
+ </tal:elements>
+ </ul>
+ </li>
+ </tal:moreoptions>
+
+</tal:contentactionmenus>
\ No newline at end of file
Repository: plone.app.contentmenu
Branch: refs/heads/master
Date: 2014-10-09T13:28:23+02:00
Author: Victor Fernandez de Alba (sneridagh) <sneridagh at gmail.com>
Commit: https://github.com/plone/plone.app.contentmenu/commit/87823f0af5091d483c061c4201c65f8336da3734
Get rid of duplicated span
Files changed:
M plone/app/contentmenu/contentmenu.pt
diff --git a/plone/app/contentmenu/contentmenu.pt b/plone/app/contentmenu/contentmenu.pt
index 42403c5..f8c57cf 100644
--- a/plone/app/contentmenu/contentmenu.pt
+++ b/plone/app/contentmenu/contentmenu.pt
@@ -145,4 +145,4 @@
</li>
</tal:moreoptions>
-</tal:contentactionmenus>
\ No newline at end of file
+</tal:contentactionmenus>
Repository: plone.app.contentmenu
Branch: refs/heads/master
Date: 2014-10-09T13:28:40+02:00
Author: Victor Fernandez de Alba (sneridagh) <sneridagh at gmail.com>
Commit: https://github.com/plone/plone.app.contentmenu/commit/212930d73bdd5d9c2bf22f65d992bf8585e91747
Fixes to the markup of the toolbar
Files changed:
M plone/app/contentmenu/contentmenu.pt
diff --git a/plone/app/contentmenu/contentmenu.pt b/plone/app/contentmenu/contentmenu.pt
index f8c57cf..42403c5 100644
--- a/plone/app/contentmenu/contentmenu.pt
+++ b/plone/app/contentmenu/contentmenu.pt
@@ -145,4 +145,4 @@
</li>
</tal:moreoptions>
-</tal:contentactionmenus>
+</tal:contentactionmenus>
\ No newline at end of file
Repository: plone.app.contentmenu
Branch: refs/heads/master
Date: 2014-10-09T13:29:01+02:00
Author: Victor Fernandez de Alba (sneridagh) <sneridagh at gmail.com>
Commit: https://github.com/plone/plone.app.contentmenu/commit/f2c1166ee1fa2e5b36283384aee0651979619812
Add missing classes and ids for referencing items in new toolbar. Get rid of deprecated kss classes there too.
Files changed:
M plone/app/contentmenu/menu.py
diff --git a/plone/app/contentmenu/menu.py b/plone/app/contentmenu/menu.py
index 98da516..4b22548 100644
--- a/plone/app/contentmenu/menu.py
+++ b/plone/app/contentmenu/menu.py
@@ -59,7 +59,8 @@ class ActionsSubMenuItem(BrowserSubMenuItem):
order = 10
extra = {
'id': 'plone-contentmenu-actions',
- 'level': 1
+ 'level': 1,
+ 'class': 'content-action'
}
def __init__(self, context, request):
@@ -755,7 +756,7 @@ def getMenuItems(self, context, request):
if action['category'] != 'workflow':
continue
- cssClass = 'kssIgnore'
+ cssClass = 'workfow-transition'
actionUrl = action['url']
if actionUrl == "":
actionUrl = '%s/content_status_modify?workflow_action=%s' % (
@@ -803,7 +804,7 @@ def getMenuItems(self, context, request):
'extra': {
'id': 'workflow-transition-advanced',
'separator': 'actionSeparator',
- 'class': 'kssIgnore pat-modal'},
+ 'class': 'pat-modal'},
'submenu': None,
})
@@ -819,7 +820,7 @@ def getMenuItems(self, context, request):
'icon': None,
'extra': {'id': 'workflow-transition-policy',
'separator': None,
- 'class': 'kssIgnore'},
+ 'class': ''},
'submenu': None,
})
@@ -844,7 +845,7 @@ def __init__(self, context, request):
@property
def extra(self):
return {'id': 'plone-contentmenu-portetmanager',
- 'class': 'pat-modal',
+ 'class': 'portlet-manager',
'level': 1}
@property
Repository: plone.app.contentmenu
Branch: refs/heads/master
Date: 2014-10-09T13:29:01+02:00
Author: Victor Fernandez de Alba (sneridagh) <sneridagh at gmail.com>
Commit: https://github.com/plone/plone.app.contentmenu/commit/28d051fb69180ab3f8af44e63ee9fddc64a97560
Fix contentmenu template for add new content types. Added a more sane way to label with a class the li tags in the Plone toolbar. Thi fix last commit errors.
Files changed:
M plone/app/contentmenu/contentmenu.pt
M plone/app/contentmenu/menu.py
diff --git a/plone/app/contentmenu/contentmenu.pt b/plone/app/contentmenu/contentmenu.pt
index 42403c5..f8c57cf 100644
--- a/plone/app/contentmenu/contentmenu.pt
+++ b/plone/app/contentmenu/contentmenu.pt
@@ -145,4 +145,4 @@
</li>
</tal:moreoptions>
-</tal:contentactionmenus>
\ No newline at end of file
+</tal:contentactionmenus>
diff --git a/plone/app/contentmenu/menu.py b/plone/app/contentmenu/menu.py
index 4b22548..a82ddcc 100644
--- a/plone/app/contentmenu/menu.py
+++ b/plone/app/contentmenu/menu.py
@@ -60,7 +60,7 @@ class ActionsSubMenuItem(BrowserSubMenuItem):
extra = {
'id': 'plone-contentmenu-actions',
'level': 1,
- 'class': 'content-action'
+ 'li_class': 'plonetoolbar-content-action'
}
def __init__(self, context, request):
@@ -147,7 +147,8 @@ def extra(self):
return {
'id': 'plone-contentmenu-display',
'disabled': self.disabled(),
- 'level': 1
+ 'level': 1,
+ 'li_class': 'plonetoolbar-display-view'
}
@property
@@ -507,7 +508,9 @@ def __init__(self, context, request):
@property
def extra(self):
- return {'id': 'plone-contentmenu-factories', 'level': 0}
+ return {'id': 'plone-contentmenu-factories',
+ 'level': 0,
+ 'li_class': 'plonetoolbar-contenttype'}
@property
def action(self):
@@ -677,7 +680,8 @@ def extra(self):
'class': 'state-%s' % state,
'state': state,
'stateTitle': stateTitle,
- 'level': 0}
+ 'level': 0,
+ 'li_class': 'plonetoolbar-workfow-transition'}
@property
def description(self):
@@ -756,7 +760,7 @@ def getMenuItems(self, context, request):
if action['category'] != 'workflow':
continue
- cssClass = 'workfow-transition'
+ cssClass = ''
actionUrl = action['url']
if actionUrl == "":
actionUrl = '%s/content_status_modify?workflow_action=%s' % (
@@ -845,7 +849,7 @@ def __init__(self, context, request):
@property
def extra(self):
return {'id': 'plone-contentmenu-portetmanager',
- 'class': 'portlet-manager',
+ 'li_class': 'plonetoolbar-portlet-manager',
'level': 1}
@property
Repository: plone.app.contentmenu
Branch: refs/heads/master
Date: 2014-10-09T13:59:55+02:00
Author: Ramon Navarro Bosch (bloodbare) <ramon.nb at gmail.com>
Commit: https://github.com/plone/plone.app.contentmenu/commit/8e647fd52f04003a9705f9e49c3b7dc7fd5522ec
Merge pull request #5 from plone/barceloneta
Barceloneta
Files changed:
M plone/app/contentmenu/contentmenu.pt
M plone/app/contentmenu/menu.py
diff --git a/plone/app/contentmenu/contentmenu.pt b/plone/app/contentmenu/contentmenu.pt
index 95b19f2..f8c57cf 100644
--- a/plone/app/contentmenu/contentmenu.pt
+++ b/plone/app/contentmenu/contentmenu.pt
@@ -1,222 +1,148 @@
-<ul id="contentActionMenus"
- xmlns:i18n="http://xml.zope.org/namespaces/i18n"
- xmlns:tal="http://xml.zope.org/namespaces/tal"
- tal:define="menu_dict view/menu;
- level0 python:menu_dict['level0'];
- level1 python:menu_dict['level1']"
- tal:condition="view/available"
- i18n:domain="plone">
- <tal:elements repeat="menuItem level0">
- <li class="actionMenu deactivated dropdown"
- tal:attributes="id menuItem/extra/id"
- tal:define="submenu menuItem/submenu;
- identifier menuItem/extra/id">
- <a href="#"
- data-toggle="dropdown"
- tal:omit-tag="not:menuItem/action"
- tal:define="state_class menuItem/extra/class | nothing;
- state_class python:state_class and state_class or ''"
- tal:attributes="href menuItem/action;
- title menuItem/description;
- class string:actionMenuHeader dropdown-toggle label-${state_class}"
- i18n:attributes="title;">
- <span tal:omit-tag="menuItem/action"
- class="noMenuAction">
- <span tal:condition="menuItem/extra/stateTitle | nothing"
- class="" aria-hidden="true"
+<tal:contentactionmenus define="menu_dict view/menu;
+ level0 python:menu_dict['level0'];
+ level1 python:menu_dict['level1']"
+ condition="view/available"
+ i18n:domain="plone">
- tal:attributes="class string:icon-${identifier} ${menuItem/extra/class}">
- </span>
+ <tal:menus repeat="menuItem level0">
+ <li tal:define="submenu menuItem/submenu;
+ identifier menuItem/extra/id"
+ tal:attributes="id menuItem/extra/id">
- <span tal:condition="not: menuItem/extra/stateTitle | nothing"
- class="" aria-hidden="true"
- tal:attributes="class string:icon-${identifier}">
- </span>
+ <a href="#"
+ tal:omit-tag="not:menuItem/action"
+ tal:define="state_class menuItem/extra/class | nothing;
+ state_class python:state_class and state_class or ''"
+ tal:attributes="href menuItem/action;
+ title menuItem/description;
+ class string:${state_class}"
+ i18n:attributes="title;">
+ <span tal:condition="menuItem/extra/stateTitle | nothing"
+ class="" aria-hidden="true"
+ tal:attributes="class string:icon-${identifier} ${menuItem/extra/class}">
+ </span>
- <span class="text-toolbar" tal:content="menuItem/title"
- i18n:translate="">
- Title
- </span>
+ <span tal:condition="not: menuItem/extra/stateTitle | nothing"
+ class="" aria-hidden="true"
+ tal:attributes="class string:icon-${identifier}">
+ </span>
- <span tal:condition="menuItem/extra/stateTitle | nothing"
- tal:attributes="class string:${menuItem/extra/class} text-toolbar"
- tal:content="menuItem/extra/stateTitle"
- i18n:translate="">
- State title
- </span>
- <span class="caret"
- tal:condition="not:menuItem/extra/hideChildren | not:submenu | nothing"></span>
- </span>
- </a>
- <ul class="actionMenuContent dropdown-menu"
- tal:condition="not:menuItem/extra/hideChildren | not:submenu | nothing">
- <li class="dropdown-header">
- <span tal:content="menuItem/title"
- i18n:translate="">
- Title
- </span>
+ <span tal:omit-tag="not: menuItem/extra/stateTitle | nothing">
- <span tal:condition="menuItem/extra/stateTitle | nothing"
- tal:attributes="class string:${menuItem/extra/class}"
- tal:content="menuItem/extra/stateTitle"
- i18n:translate="">
- State title
- </span>
- </li>
- <tal:block repeat="subMenuItem submenu">
- <li tal:attributes="class subMenuItem/extra/separator">
- <a href="#"
- tal:condition="subMenuItem/action"
- tal:attributes="href subMenuItem/action;
- title subMenuItem/description;
- id subMenuItem/extra/id | nothing;
- class subMenuItem/extra/class | nothing;
- data-pat-modal subMenuItem/extra/modal | nothing;
- "
- i18n:attributes="title">
- <img width="16"
- height="16"
- alt=""
- tal:condition="subMenuItem/icon"
- tal:attributes="src subMenuItem/icon;
- title subMenuItem/description;
- width subMenuItem/width|string:16;
- height subMenuItem/height|string:16;"
- i18n:attributes="alt;"/>
- <span tal:content="structure subMenuItem/title"
- i18n:translate=""
- class="subMenuTitle">
- Title
- </span>
- </a>
- <div tal:condition="not:subMenuItem/action"
- tal:attributes="id subMenuItem/extra/id | nothing;
- class subMenuItem/extra/class | nothing">
- <img width="16"
- height="16"
- alt=""
- tal:condition="subMenuItem/icon"
- tal:attributes="src subMenuItem/icon;
- title subMenuItem/description"
- i18n:attributes="alt;"/>
- <span tal:content="structure subMenuItem/title"
- i18n:translate=""
- class="subMenuTitle">
- Title
- </span>
- </div>
- </li>
- </tal:block>
- </ul>
- </li>
-
- </tal:elements>
+ <span tal:content="menuItem/title"
+ i18n:translate="">
+ Menu Title
+ </span>
- <!-- More options element -->
- <li class="actionMenu deactivated dropdown" id="plone-contentmenu-moreoptions" tal:condition="level1">
- <a href="#"
- data-toggle="dropdown"
- title="More options"
- i18n:attributes="title;">
- <span class="noMenuAction">
- <span class="icon-ellipsis" aria-hidden="true">
+ <span tal:condition="menuItem/extra/stateTitle | nothing"
+ tal:attributes="class string:${menuItem/extra/class | nothing}"
+ tal:content="menuItem/extra/stateTitle"
+ i18n:translate="">
+ State title
</span>
+ </span>
+ <span class="plone-toolbar-caret"
+ tal:condition="not:menuItem/extra/hideChildren | not:submenu | nothing">
+ </span>
+ </a>
- <span class="text-toolbar" i18n:translate="">
- More options
+ <ul tal:condition="not:menuItem/extra/hideChildren | not:submenu | nothing">
+ <li class="plone-toolbar-submenu-header">
+ <span tal:omit-tag="not:menuItem/extra/stateTitle | nothing">
+ <span tal:content="menuItem/title">Menu Title</span>
+ <span tal:condition="menuItem/extra/stateTitle | nothing"
+ tal:attributes="class string:${menuItem/extra/class}"
+ tal:content="menuItem/extra/stateTitle"
+ i18n:translate="">
+ State title
</span>
+ </span>
+ </li>
+ <li tal:repeat="subMenuItem submenu"
+ tal:attributes="class string:${menuItem/extra/li_class | nothing} ${subMenuItem/extra/separator}">
+ <a href="#"
+ tal:condition="subMenuItem/action"
+ tal:attributes="href subMenuItem/action;
+ title subMenuItem/description;
+ id subMenuItem/extra/id | nothing;
+ class subMenuItem/extra/class | nothing;
+ data-pat-modal subMenuItem/extra/modal | nothing;"
+ i18n:attributes="title">
+
+ <tal:title content="structure subMenuItem/title"
+ i18n:translate="">
+ Title
+ </tal:title>
+ </a>
+ <div tal:condition="not:subMenuItem/action"
+ tal:attributes="id subMenuItem/extra/id | nothing;
+ class subMenuItem/extra/class | nothing">
+
+ <span tal:content="structure subMenuItem/title"
+ i18n:translate="">
+ Title
+ </span>
+ </div>
+ </li>
+ </ul>
+ </li>
+ </tal:menus>
- <span class="caret"></span>
- </span>
+ <tal:moreoptions tal:condition="level1">
+ <li id="plone-contentmenu-moreoptions">
+ <a href="#"
+ title="More options"
+ i18n:attributes="title;">
+ <span class="icon-moreOptions" aria-hidden="true"></span>
+ <span i18n:translate="">More options</span>
+ <span class="plone-toolbar-caret"></span>
</a>
- <ul class="actionMenuContent dropdown-menu">
+ <ul>
<tal:elements repeat="menuItem level1">
- <li
- tal:attributes="id menuItem/extra/id"
- tal:define="submenu menuItem/submenu;
- identifier menuItem/extra/id">
- <ul class="actionMenuContent"
- tal:condition="not:menuItem/extra/hideChildren | not:submenu | nothing">
- <li class="dropdown-header">
- <a href="#"
- tal:omit-tag="not:menuItem/action"
- tal:define="state_class menuItem/extra/class | nothing;
- state_class python:state_class and state_class or ''"
- tal:attributes="href menuItem/action;
- title menuItem/description;
- class string:actionMenuHeader dropdown-toggle label-${state_class}"
+ <tal:menulevel1 define="submenu menuItem/submenu;
+ identifier menuItem/extra/id">
+ <li class="plone-toolbar-submenu-header"
+ tal:attributes="id menuItem/extra/id">
+ <a tal:attributes="href menuItem/action;
+ title menuItem/description;"
i18n:attributes="title;">
- <span tal:omit-tag="menuItem/action"
- class="noMenuAction">
- <span tal:condition="menuItem/extra/stateTitle | nothing"
- class="" aria-hidden="true"
-
- tal:attributes="class string:icon-${identifier} ${menuItem/extra/class}">
- </span>
-
-
- <span tal:content="menuItem/title"
+ <tal:title tal:content="menuItem/title"
+ i18n:translate="">
+ SubMenu title
+ </tal:title>
+ </a>
+ </li>
+ <tal:block repeat="subMenuItem submenu">
+ <li tal:attributes="class string:${menuItem/extra/li_class | nothing} ${subMenuItem/extra/separator}">
+ <a href="#"
+ tal:condition="subMenuItem/action"
+ tal:attributes="href subMenuItem/action;
+ title subMenuItem/description;
+ id subMenuItem/extra/id | nothing;
+ data-pat-modal subMenuItem/extra/modal | nothing;
+ class subMenuItem/extra/class | nothing"
+ i18n:attributes="title">
+ <tal:title tal:content="structure subMenuItem/title"
i18n:translate="">
Title
- </span>
+ </tal:title>
+ </a>
+ <div tal:condition="not:subMenuItem/action"
+ tal:attributes="id subMenuItem/extra/id | nothing;
+ class subMenuItem/extra/class | nothing">
- <span tal:condition="menuItem/extra/stateTitle | nothing"
- tal:attributes="class string:${menuItem/extra/class} text-toolbar"
- tal:content="menuItem/extra/stateTitle"
+ <tal:title tal:content="structure subMenuItem/title"
i18n:translate="">
- State title
- </span>
-
- </a>
- </li>
- <tal:block repeat="subMenuItem submenu">
- <li tal:attributes="class subMenuItem/extra/separator">
- <a href="#"
- tal:condition="subMenuItem/action"
- tal:attributes="href subMenuItem/action;
- title subMenuItem/description;
- id subMenuItem/extra/id | nothing;
- data-pat-modal subMenuItem/extra/modal | nothing;
- class subMenuItem/extra/class | nothing"
- i18n:attributes="title">
- <img width="16"
- height="16"
- alt=""
- tal:condition="subMenuItem/icon"
- tal:attributes="src subMenuItem/icon;
- title subMenuItem/description;
- width subMenuItem/width|string:16;
- height subMenuItem/height|string:16;"
- i18n:attributes="alt;"/>
- <span tal:content="structure subMenuItem/title"
- i18n:translate=""
- class="subMenuTitle">
- Title
- </span>
- </a>
- <div tal:condition="not:subMenuItem/action"
- tal:attributes="id subMenuItem/extra/id | nothing;
- class subMenuItem/extra/class | nothing">
- <img width="16"
- height="16"
- alt=""
- tal:condition="subMenuItem/icon"
- tal:attributes="src subMenuItem/icon;
- title subMenuItem/description"
- i18n:attributes="alt;"/>
- <span tal:content="structure subMenuItem/title"
- i18n:translate=""
- class="subMenuTitle">
- Title
- </span>
- </div>
- </li>
- </tal:block>
- </ul>
- </li>
- </tal:elements>
- </ul>
- </li>
-
-</ul>
+ Title
+ </tal:title>
+ </div>
+ </li>
+ </tal:block>
+ </tal:menulevel1>
+ </tal:elements>
+ </ul>
+ </li>
+ </tal:moreoptions>
+
+</tal:contentactionmenus>
diff --git a/plone/app/contentmenu/menu.py b/plone/app/contentmenu/menu.py
index 98da516..a82ddcc 100644
--- a/plone/app/contentmenu/menu.py
+++ b/plone/app/contentmenu/menu.py
@@ -59,7 +59,8 @@ class ActionsSubMenuItem(BrowserSubMenuItem):
order = 10
extra = {
'id': 'plone-contentmenu-actions',
- 'level': 1
+ 'level': 1,
+ 'li_class': 'plonetoolbar-content-action'
}
def __init__(self, context, request):
@@ -146,7 +147,8 @@ def extra(self):
return {
'id': 'plone-contentmenu-display',
'disabled': self.disabled(),
- 'level': 1
+ 'level': 1,
+ 'li_class': 'plonetoolbar-display-view'
}
@property
@@ -506,7 +508,9 @@ def __init__(self, context, request):
@property
def extra(self):
- return {'id': 'plone-contentmenu-factories', 'level': 0}
+ return {'id': 'plone-contentmenu-factories',
+ 'level': 0,
+ 'li_class': 'plonetoolbar-contenttype'}
@property
def action(self):
@@ -676,7 +680,8 @@ def extra(self):
'class': 'state-%s' % state,
'state': state,
'stateTitle': stateTitle,
- 'level': 0}
+ 'level': 0,
+ 'li_class': 'plonetoolbar-workfow-transition'}
@property
def description(self):
@@ -755,7 +760,7 @@ def getMenuItems(self, context, request):
if action['category'] != 'workflow':
continue
- cssClass = 'kssIgnore'
+ cssClass = ''
actionUrl = action['url']
if actionUrl == "":
actionUrl = '%s/content_status_modify?workflow_action=%s' % (
@@ -803,7 +808,7 @@ def getMenuItems(self, context, request):
'extra': {
'id': 'workflow-transition-advanced',
'separator': 'actionSeparator',
- 'class': 'kssIgnore pat-modal'},
+ 'class': 'pat-modal'},
'submenu': None,
})
@@ -819,7 +824,7 @@ def getMenuItems(self, context, request):
'icon': None,
'extra': {'id': 'workflow-transition-policy',
'separator': None,
- 'class': 'kssIgnore'},
+ 'class': ''},
'submenu': None,
})
@@ -844,7 +849,7 @@ def __init__(self, context, request):
@property
def extra(self):
return {'id': 'plone-contentmenu-portetmanager',
- 'class': 'pat-modal',
+ 'li_class': 'plonetoolbar-portlet-manager',
'level': 1}
@property
-------------------------------------------------------------------------------
More information about the Testbot
mailing list