--- a/src/pyams_content/features/search/zmi/__init__.py Fri Nov 23 13:25:51 2018 +0100
+++ b/src/pyams_content/features/search/zmi/__init__.py Fri Nov 23 14:46:36 2018 +0100
@@ -29,9 +29,10 @@
from pyams_pagelet.pagelet import pagelet_config
from pyams_security.zmi.interfaces import IObjectSecurityMenu
from pyams_skin.interfaces import IContentTitle, IPageHeader
-from pyams_skin.interfaces.viewlet import IMenuHeader, IToolbarAddingMenu, IContextActions
+from pyams_skin.interfaces.viewlet import IContextActions, IMenuHeader, IToolbarAddingMenu
from pyams_skin.layer import IPyAMSLayer
from pyams_skin.page import DefaultPageHeaderAdapter, HeaderContentProvider
+from pyams_skin.viewlet.menu import MenuDivider
from pyams_skin.viewlet.toolbar import ToolbarMenuItem
from pyams_utils.adapter import ContextRequestAdapter, ContextRequestViewAdapter, NullAdapter, adapter_config
from pyams_utils.registry import get_utility
@@ -74,8 +75,14 @@
title=II18n(self.context).query_attribute('title', request=self.request))
+@viewlet_config(name='add-search-folder.divider', context=ISiteContainer, layer=IAdminLayer, view=Interface,
+ manager=IToolbarAddingMenu, permission=MANAGE_SITE_PERMISSION, weight=89)
+class SearchFolderAddMenuDivider(MenuDivider):
+ """Search folder add menu divider"""
+
+
@viewlet_config(name='add-search-folder.menu', context=ISiteContainer, layer=IAdminLayer, view=Interface,
- manager=IToolbarAddingMenu, permission=MANAGE_SITE_PERMISSION, weight=11)
+ manager=IToolbarAddingMenu, permission=MANAGE_SITE_PERMISSION, weight=90)
class SearchFolderAddMenu(ToolbarMenuItem):
"""Search folder add menu"""
--- a/src/pyams_content/shared/site/zmi/__init__.py Fri Nov 23 13:25:51 2018 +0100
+++ b/src/pyams_content/shared/site/zmi/__init__.py Fri Nov 23 14:46:36 2018 +0100
@@ -44,7 +44,7 @@
@viewlet_config(name='add-topic.menu', context=ISiteContainer, layer=IAdminLayer, view=Interface,
- manager=IToolbarAddingMenu, permission=CREATE_CONTENT_PERMISSION, weight=20)
+ manager=IToolbarAddingMenu, permission=CREATE_CONTENT_PERMISSION, weight=10)
class TopicAddMenu(ToolbarMenuItem):
"""Topic add menu"""
--- a/src/pyams_content/shared/site/zmi/folder.py Fri Nov 23 13:25:51 2018 +0100
+++ b/src/pyams_content/shared/site/zmi/folder.py Fri Nov 23 14:46:36 2018 +0100
@@ -50,7 +50,7 @@
@viewlet_config(name='add-site-folder.menu', context=ISiteContainer, layer=IAdminLayer, view=Interface,
- manager=IToolbarAddingMenu, permission=MANAGE_SITE_PERMISSION, weight=10)
+ manager=IToolbarAddingMenu, permission=MANAGE_SITE_PERMISSION, weight=20)
class SiteFolderAddMenu(ToolbarMenuItem):
"""Site folder add menu"""
--- a/src/pyams_content/shared/site/zmi/link.py Fri Nov 23 13:25:51 2018 +0100
+++ b/src/pyams_content/shared/site/zmi/link.py Fri Nov 23 14:46:36 2018 +0100
@@ -47,7 +47,7 @@
@viewlet_config(name='add-link.divider', context=ISiteContainer, layer=IAdminLayer, view=Interface,
- manager=IToolbarAddingMenu, permission=CREATE_CONTENT_PERMISSION, weight=89)
+ manager=IToolbarAddingMenu, permission=CREATE_CONTENT_PERMISSION, weight=49)
class AddLinkMenuDivider(MenuDivider):
"""Add links menu divider"""
@@ -57,7 +57,7 @@
#
@viewlet_config(name='add-content-link.menu', context=ISiteContainer, layer=IAdminLayer, view=Interface,
- manager=IToolbarAddingMenu, permission=CREATE_CONTENT_PERMISSION, weight=90)
+ manager=IToolbarAddingMenu, permission=CREATE_CONTENT_PERMISSION, weight=50)
class ContentLinkAddMenu(ToolbarMenuItem):
"""Content link add menu"""
@@ -172,7 +172,7 @@
#
@viewlet_config(name='add-external-link.menu', context=ISiteContainer, layer=IAdminLayer, view=Interface,
- manager=IToolbarAddingMenu, permission=CREATE_CONTENT_PERMISSION, weight=91)
+ manager=IToolbarAddingMenu, permission=CREATE_CONTENT_PERMISSION, weight=60)
class ExternalContentLinkAddMenu(ToolbarMenuItem):
"""External content link add menu"""