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.

plone/app/contentmenu/contentmenu.pt

@@ -145,4 +145,4 @@
     </li>
   </tal:moreoptions>
 
-</tal:contentactionmenus>
+</tal:contentactionmenus>

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