# HG changeset patch # User Thierry Florac # Date 1528206086 -7200 # Node ID 5e4875a9f69227a82617cbcbe88b20a436270cdc # Parent a607fdec4d63d6c53969ae1d60829a5f304aba6c Updated menus headers diff -r a607fdec4d63 -r 5e4875a9f692 src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.mo Binary file src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.mo has changed diff -r a607fdec4d63 -r 5e4875a9f692 src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.po --- a/src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.po Tue Jun 05 14:57:59 2018 +0200 +++ b/src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.po Tue Jun 05 15:41:26 2018 +0200 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2018-06-04 16:44+0200\n" +"POT-Creation-Date: 2018-06-05 15:41+0200\n" "PO-Revision-Date: 2015-09-10 10:42+0200\n" "Last-Translator: Thierry Florac \n" "Language-Team: French\n" @@ -277,7 +277,7 @@ #: src/pyams_content/shared/common/zmi/dashboard.py:109 #: src/pyams_content/shared/common/zmi/templates/advanced-search.pt:188 #: src/pyams_content/shared/imagemap/zmi/container.py:123 -#: src/pyams_content/shared/site/zmi/folder.py:64 +#: src/pyams_content/shared/site/zmi/folder.py:66 #: src/pyams_content/root/zmi/templates/advanced-search.pt:188 #: src/pyams_content/interfaces/__init__.py:99 #: src/pyams_content/reference/pictograms/zmi/__init__.py:165 @@ -1748,7 +1748,7 @@ #: src/pyams_content/shared/common/__init__.py:237 #: src/pyams_content/shared/common/zmi/properties.py:72 -#: src/pyams_content/shared/common/zmi/manager.py:90 +#: src/pyams_content/shared/common/zmi/manager.py:95 msgid "Properties" msgstr "Propriétés" @@ -2067,19 +2067,15 @@ msgid "{state} since {date}, by {principal}" msgstr "{state} depuis {date} par {principal}" -#: src/pyams_content/shared/common/zmi/manager.py:76 -msgid "Tool management" -msgstr "Gérer l'outil partagé" - -#: src/pyams_content/shared/common/zmi/manager.py:100 +#: src/pyams_content/shared/common/zmi/manager.py:105 msgid "Shared tool properties" msgstr "Propriétés de l'outil" -#: src/pyams_content/shared/common/zmi/manager.py:120 +#: src/pyams_content/shared/common/zmi/manager.py:125 msgid "WARNING" msgstr "ATTENTION" -#: src/pyams_content/shared/common/zmi/manager.py:122 +#: src/pyams_content/shared/common/zmi/manager.py:127 msgid "" "Workflow shouldn't be modified if this tool already contains any shared " "content!" @@ -2087,15 +2083,15 @@ "Le workflow ne doit pas être modifié si cet outil renferme déjà des contenus " "partagés !" -#: src/pyams_content/shared/common/zmi/manager.py:145 +#: src/pyams_content/shared/common/zmi/manager.py:150 msgid "Languages" msgstr "Langues" -#: src/pyams_content/shared/common/zmi/manager.py:156 +#: src/pyams_content/shared/common/zmi/manager.py:161 msgid "Content languages" msgstr "Langues pour la traduction de cet outil" -#: src/pyams_content/shared/common/zmi/manager.py:173 +#: src/pyams_content/shared/common/zmi/manager.py:178 msgid "" "Tool languages are used to translate own tool properties, and newly created " "contents will propose these languages by default" @@ -2104,6 +2100,14 @@ "\n" "Les nouveaux contenus proposeront également ces langues par défaut." +#: src/pyams_content/shared/common/zmi/manager.py:79 +msgid "Content management" +msgstr "Gérer ce gabarit" + +#: src/pyams_content/shared/common/zmi/manager.py:81 +msgid "Tool management" +msgstr "Gérer l'outil partagé" + #: src/pyams_content/shared/common/zmi/owner.py:51 msgid "Change owner..." msgstr "Changer de propriétaire" @@ -3009,13 +3013,13 @@ msgstr "Ces mots-clés seront intégrés dans les métadonnées des pages HTML" #: src/pyams_content/shared/common/interfaces/__init__.py:155 -#: src/pyams_content/shared/site/zmi/folder.py:72 +#: src/pyams_content/shared/site/zmi/folder.py:74 #: src/pyams_content/shared/site/interfaces/__init__.py:56 msgid "Notepad" msgstr "Bloc-notes" #: src/pyams_content/shared/common/interfaces/__init__.py:156 -#: src/pyams_content/shared/site/zmi/folder.py:73 +#: src/pyams_content/shared/site/zmi/folder.py:75 #: src/pyams_content/shared/site/interfaces/__init__.py:57 msgid "Internal information to be known about this content" msgstr "" @@ -3615,6 +3619,7 @@ msgstr "Aucune zone cliquable n'est actuellement définie." #: src/pyams_content/shared/imagemap/zmi/container.py:175 +#: src/pyams_content/root/zmi/sites.py:170 msgid "No provided object_name argument!" msgstr "Argument 'object_name' non fourni !" @@ -3677,45 +3682,53 @@ msgid "Image map template" msgstr "Mode de rendu" -#: src/pyams_content/shared/site/zmi/folder.py:55 +#: src/pyams_content/shared/site/zmi/folder.py:57 msgid "Add site folder..." msgstr "Ajouter une rubrique" -#: src/pyams_content/shared/site/zmi/folder.py:86 +#: src/pyams_content/shared/site/zmi/folder.py:88 msgid "Add site folder" msgstr "Ajout d'une rubrique" -#: src/pyams_content/shared/site/zmi/folder.py:65 +#: src/pyams_content/shared/site/zmi/folder.py:164 +msgid "Site folder management" +msgstr "Gérer cette rubrique" + +#: src/pyams_content/shared/site/zmi/folder.py:67 #: src/pyams_content/interfaces/__init__.py:100 msgid "Visible label used to display content" msgstr "Le titre présenté aux internautes" -#: src/pyams_content/shared/site/zmi/folder.py:68 -#: src/pyams_content/shared/site/zmi/__init__.py:63 +#: src/pyams_content/shared/site/zmi/folder.py:70 +#: src/pyams_content/shared/site/zmi/__init__.py:72 #: src/pyams_content/shared/site/zmi/link.py:67 msgid "Parent" msgstr "Niveau parent" -#: src/pyams_content/shared/site/zmi/folder.py:69 +#: src/pyams_content/shared/site/zmi/folder.py:71 #: src/pyams_content/shared/site/zmi/link.py:68 msgid "Folder's parent" msgstr "Niveau de rattachement de cette rubrique" -#: src/pyams_content/shared/site/zmi/folder.py:146 +#: src/pyams_content/shared/site/zmi/folder.py:148 msgid "You must provide a folder name for default server language!" msgstr "" "Vous devez fournir un nom pour ce dossier pour la langue par défaut du " "serveur !" -#: src/pyams_content/shared/site/zmi/__init__.py:54 +#: src/pyams_content/shared/site/zmi/__init__.py:55 +msgid "This topic" +msgstr "Cet article" + +#: src/pyams_content/shared/site/zmi/__init__.py:63 msgid "Add topic..." msgstr "Ajouter un article" -#: src/pyams_content/shared/site/zmi/__init__.py:75 +#: src/pyams_content/shared/site/zmi/__init__.py:84 msgid "Add topic" msgstr "Ajout d'un article" -#: src/pyams_content/shared/site/zmi/__init__.py:64 +#: src/pyams_content/shared/site/zmi/__init__.py:73 msgid "Topic's parent" msgstr "Niveau parent" @@ -3733,13 +3746,13 @@ #: src/pyams_content/shared/site/zmi/container.py:102 #: src/pyams_content/shared/site/zmi/container.py:114 -#: src/pyams_content/shared/blog/zmi/manager.py:151 -#: src/pyams_content/shared/blog/zmi/manager.py:163 +#: src/pyams_content/shared/blog/zmi/manager.py:158 +#: src/pyams_content/shared/blog/zmi/manager.py:170 msgid "Publication dates..." msgstr "Dates de publication" #: src/pyams_content/shared/site/zmi/container.py:127 -#: src/pyams_content/shared/blog/zmi/manager.py:176 +#: src/pyams_content/shared/blog/zmi/manager.py:183 msgid "Update publication dates" msgstr "Dates de publication" @@ -3780,25 +3793,29 @@ "Impossible de déplacer une rubrique dans l'une de ses sous-rubriques ou " "contenus ! Rechargement de la page..." -#: src/pyams_content/shared/site/zmi/manager.py:80 -#: src/pyams_content/shared/site/zmi/manager.py:92 +#: src/pyams_content/shared/site/zmi/manager.py:58 +msgid "Site management" +msgstr "Gérer ce site" + +#: src/pyams_content/shared/site/zmi/manager.py:88 +#: src/pyams_content/shared/site/zmi/manager.py:100 msgid "Add site manager" msgstr "Ajouter un site" -#: src/pyams_content/shared/site/zmi/manager.py:91 +#: src/pyams_content/shared/site/zmi/manager.py:99 msgid "Site manager" msgstr "Site" -#: src/pyams_content/shared/site/zmi/manager.py:123 -#: src/pyams_content/shared/blog/zmi/manager.py:117 +#: src/pyams_content/shared/site/zmi/manager.py:131 +#: src/pyams_content/shared/blog/zmi/manager.py:124 msgid "You must provide a short name for default server language!" msgstr "Vous devez fournir un nom court pour la langue par défaut du serveur !" -#: src/pyams_content/shared/site/zmi/manager.py:127 +#: src/pyams_content/shared/site/zmi/manager.py:135 msgid "Specified site manager name is already used!" msgstr "Le nom indiqué pour ce site existe déjà !" -#: src/pyams_content/shared/site/zmi/manager.py:131 +#: src/pyams_content/shared/site/zmi/manager.py:139 msgid "A site manager is already registered with this name!!" msgstr "Un site est déjà inscrit dans le registre avec ce nom !" @@ -3897,20 +3914,24 @@ msgid "Blog post « {title} »" msgstr "Article de blog « {title} »" -#: src/pyams_content/shared/blog/zmi/manager.py:74 -#: src/pyams_content/shared/blog/zmi/manager.py:86 +#: src/pyams_content/shared/blog/zmi/manager.py:58 +msgid "Blog management" +msgstr "Gérer ce blog" + +#: src/pyams_content/shared/blog/zmi/manager.py:81 +#: src/pyams_content/shared/blog/zmi/manager.py:93 msgid "Add blog manager" msgstr "Ajouter un blog" -#: src/pyams_content/shared/blog/zmi/manager.py:85 +#: src/pyams_content/shared/blog/zmi/manager.py:92 msgid "Blog manager" msgstr "Blog" -#: src/pyams_content/shared/blog/zmi/manager.py:121 +#: src/pyams_content/shared/blog/zmi/manager.py:128 msgid "Specified blog manager name is already used!" msgstr "Le nom indiqué pour ce blog existe déjà !" -#: src/pyams_content/shared/blog/zmi/manager.py:125 +#: src/pyams_content/shared/blog/zmi/manager.py:132 msgid "A blog manager is already registered with this name!!" msgstr "Un blog est déjà inscrit dans le registre avec ce nom !" @@ -3954,6 +3975,10 @@ msgid "Delete shared site" msgstr "Supprimer ce site" +#: src/pyams_content/root/zmi/sites.py:179 +msgid "Given element name doesn't exist!" +msgstr "Le nom de l'élément indiqué n'existe pas !" + #: src/pyams_content/root/zmi/search.py:155 msgid "Content types" msgstr "Types de contenus" @@ -4381,6 +4406,10 @@ msgid "Edit table properties" msgstr "Propriétés de la table" +#: src/pyams_content/reference/zmi/table.py:173 +msgid "Table management" +msgstr "Gérer cette table" + #: src/pyams_content/reference/zmi/__init__.py:51 msgid "References" msgstr "Tables de réf." @@ -4870,9 +4899,6 @@ #~ msgid "Given site name doesn't exist!" #~ msgstr "Le nom de site indiqué n'existe pas !" -#~ msgid "Given alert name doesn't exist!" -#~ msgstr "L'alerte indiquée n'existe pas !" - #~ msgid "Switch milestone visibility" #~ msgstr "Cliquez pour rendre le jalon visible ou non" diff -r a607fdec4d63 -r 5e4875a9f692 src/pyams_content/locales/pyams_content.pot --- a/src/pyams_content/locales/pyams_content.pot Tue Jun 05 14:57:59 2018 +0200 +++ b/src/pyams_content/locales/pyams_content.pot Tue Jun 05 15:41:26 2018 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2018-06-04 16:44+0200\n" +"POT-Creation-Date: 2018-06-05 15:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" @@ -267,7 +267,7 @@ #: ./src/pyams_content/shared/common/zmi/dashboard.py:109 #: ./src/pyams_content/shared/common/zmi/templates/advanced-search.pt:188 #: ./src/pyams_content/shared/imagemap/zmi/container.py:123 -#: ./src/pyams_content/shared/site/zmi/folder.py:64 +#: ./src/pyams_content/shared/site/zmi/folder.py:66 #: ./src/pyams_content/root/zmi/templates/advanced-search.pt:188 #: ./src/pyams_content/interfaces/__init__.py:99 #: ./src/pyams_content/reference/pictograms/zmi/__init__.py:165 @@ -1667,7 +1667,7 @@ #: ./src/pyams_content/shared/common/__init__.py:237 #: ./src/pyams_content/shared/common/zmi/properties.py:72 -#: ./src/pyams_content/shared/common/zmi/manager.py:90 +#: ./src/pyams_content/shared/common/zmi/manager.py:95 msgid "Properties" msgstr "" @@ -1981,38 +1981,42 @@ msgid "{state} since {date}, by {principal}" msgstr "" -#: ./src/pyams_content/shared/common/zmi/manager.py:76 -msgid "Tool management" -msgstr "" - -#: ./src/pyams_content/shared/common/zmi/manager.py:100 +#: ./src/pyams_content/shared/common/zmi/manager.py:105 msgid "Shared tool properties" msgstr "" -#: ./src/pyams_content/shared/common/zmi/manager.py:120 +#: ./src/pyams_content/shared/common/zmi/manager.py:125 msgid "WARNING" msgstr "" -#: ./src/pyams_content/shared/common/zmi/manager.py:122 +#: ./src/pyams_content/shared/common/zmi/manager.py:127 msgid "" "Workflow shouldn't be modified if this tool already contains any shared " "content!" msgstr "" -#: ./src/pyams_content/shared/common/zmi/manager.py:145 +#: ./src/pyams_content/shared/common/zmi/manager.py:150 msgid "Languages" msgstr "" -#: ./src/pyams_content/shared/common/zmi/manager.py:156 +#: ./src/pyams_content/shared/common/zmi/manager.py:161 msgid "Content languages" msgstr "" -#: ./src/pyams_content/shared/common/zmi/manager.py:173 +#: ./src/pyams_content/shared/common/zmi/manager.py:178 msgid "" "Tool languages are used to translate own tool properties, and newly created " "contents will propose these languages by default" msgstr "" +#: ./src/pyams_content/shared/common/zmi/manager.py:79 +msgid "Content management" +msgstr "" + +#: ./src/pyams_content/shared/common/zmi/manager.py:81 +msgid "Tool management" +msgstr "" + #: ./src/pyams_content/shared/common/zmi/owner.py:51 msgid "Change owner..." msgstr "" @@ -2841,13 +2845,13 @@ msgstr "" #: ./src/pyams_content/shared/common/interfaces/__init__.py:155 -#: ./src/pyams_content/shared/site/zmi/folder.py:72 +#: ./src/pyams_content/shared/site/zmi/folder.py:74 #: ./src/pyams_content/shared/site/interfaces/__init__.py:56 msgid "Notepad" msgstr "" #: ./src/pyams_content/shared/common/interfaces/__init__.py:156 -#: ./src/pyams_content/shared/site/zmi/folder.py:73 +#: ./src/pyams_content/shared/site/zmi/folder.py:75 #: ./src/pyams_content/shared/site/interfaces/__init__.py:57 msgid "Internal information to be known about this content" msgstr "" @@ -3404,6 +3408,7 @@ msgstr "" #: ./src/pyams_content/shared/imagemap/zmi/container.py:175 +#: ./src/pyams_content/root/zmi/sites.py:170 msgid "No provided object_name argument!" msgstr "" @@ -3464,43 +3469,51 @@ msgid "Image map template" msgstr "" -#: ./src/pyams_content/shared/site/zmi/folder.py:55 +#: ./src/pyams_content/shared/site/zmi/folder.py:57 msgid "Add site folder..." msgstr "" -#: ./src/pyams_content/shared/site/zmi/folder.py:86 +#: ./src/pyams_content/shared/site/zmi/folder.py:88 msgid "Add site folder" msgstr "" -#: ./src/pyams_content/shared/site/zmi/folder.py:65 +#: ./src/pyams_content/shared/site/zmi/folder.py:164 +msgid "Site folder management" +msgstr "" + +#: ./src/pyams_content/shared/site/zmi/folder.py:67 #: ./src/pyams_content/interfaces/__init__.py:100 msgid "Visible label used to display content" msgstr "" -#: ./src/pyams_content/shared/site/zmi/folder.py:68 -#: ./src/pyams_content/shared/site/zmi/__init__.py:63 +#: ./src/pyams_content/shared/site/zmi/folder.py:70 +#: ./src/pyams_content/shared/site/zmi/__init__.py:72 #: ./src/pyams_content/shared/site/zmi/link.py:67 msgid "Parent" msgstr "" -#: ./src/pyams_content/shared/site/zmi/folder.py:69 +#: ./src/pyams_content/shared/site/zmi/folder.py:71 #: ./src/pyams_content/shared/site/zmi/link.py:68 msgid "Folder's parent" msgstr "" -#: ./src/pyams_content/shared/site/zmi/folder.py:146 +#: ./src/pyams_content/shared/site/zmi/folder.py:148 msgid "You must provide a folder name for default server language!" msgstr "" -#: ./src/pyams_content/shared/site/zmi/__init__.py:54 +#: ./src/pyams_content/shared/site/zmi/__init__.py:55 +msgid "This topic" +msgstr "" + +#: ./src/pyams_content/shared/site/zmi/__init__.py:63 msgid "Add topic..." msgstr "" -#: ./src/pyams_content/shared/site/zmi/__init__.py:75 +#: ./src/pyams_content/shared/site/zmi/__init__.py:84 msgid "Add topic" msgstr "" -#: ./src/pyams_content/shared/site/zmi/__init__.py:64 +#: ./src/pyams_content/shared/site/zmi/__init__.py:73 msgid "Topic's parent" msgstr "" @@ -3518,13 +3531,13 @@ #: ./src/pyams_content/shared/site/zmi/container.py:102 #: ./src/pyams_content/shared/site/zmi/container.py:114 -#: ./src/pyams_content/shared/blog/zmi/manager.py:151 -#: ./src/pyams_content/shared/blog/zmi/manager.py:163 +#: ./src/pyams_content/shared/blog/zmi/manager.py:158 +#: ./src/pyams_content/shared/blog/zmi/manager.py:170 msgid "Publication dates..." msgstr "" #: ./src/pyams_content/shared/site/zmi/container.py:127 -#: ./src/pyams_content/shared/blog/zmi/manager.py:176 +#: ./src/pyams_content/shared/blog/zmi/manager.py:183 msgid "Update publication dates" msgstr "" @@ -3563,25 +3576,29 @@ msgid "Can't reparent object to one of it's children. Reloading..." msgstr "" -#: ./src/pyams_content/shared/site/zmi/manager.py:80 -#: ./src/pyams_content/shared/site/zmi/manager.py:92 +#: ./src/pyams_content/shared/site/zmi/manager.py:58 +msgid "Site management" +msgstr "" + +#: ./src/pyams_content/shared/site/zmi/manager.py:88 +#: ./src/pyams_content/shared/site/zmi/manager.py:100 msgid "Add site manager" msgstr "" -#: ./src/pyams_content/shared/site/zmi/manager.py:91 +#: ./src/pyams_content/shared/site/zmi/manager.py:99 msgid "Site manager" msgstr "" -#: ./src/pyams_content/shared/site/zmi/manager.py:123 -#: ./src/pyams_content/shared/blog/zmi/manager.py:117 -msgid "You must provide a short name for default server language!" -msgstr "" - -#: ./src/pyams_content/shared/site/zmi/manager.py:127 -msgid "Specified site manager name is already used!" -msgstr "" - #: ./src/pyams_content/shared/site/zmi/manager.py:131 +#: ./src/pyams_content/shared/blog/zmi/manager.py:124 +msgid "You must provide a short name for default server language!" +msgstr "" + +#: ./src/pyams_content/shared/site/zmi/manager.py:135 +msgid "Specified site manager name is already used!" +msgstr "" + +#: ./src/pyams_content/shared/site/zmi/manager.py:139 msgid "A site manager is already registered with this name!!" msgstr "" @@ -3680,20 +3697,24 @@ msgid "Blog post « {title} »" msgstr "" -#: ./src/pyams_content/shared/blog/zmi/manager.py:74 -#: ./src/pyams_content/shared/blog/zmi/manager.py:86 +#: ./src/pyams_content/shared/blog/zmi/manager.py:58 +msgid "Blog management" +msgstr "" + +#: ./src/pyams_content/shared/blog/zmi/manager.py:81 +#: ./src/pyams_content/shared/blog/zmi/manager.py:93 msgid "Add blog manager" msgstr "" -#: ./src/pyams_content/shared/blog/zmi/manager.py:85 +#: ./src/pyams_content/shared/blog/zmi/manager.py:92 msgid "Blog manager" msgstr "" -#: ./src/pyams_content/shared/blog/zmi/manager.py:121 +#: ./src/pyams_content/shared/blog/zmi/manager.py:128 msgid "Specified blog manager name is already used!" msgstr "" -#: ./src/pyams_content/shared/blog/zmi/manager.py:125 +#: ./src/pyams_content/shared/blog/zmi/manager.py:132 msgid "A blog manager is already registered with this name!!" msgstr "" @@ -3737,6 +3758,10 @@ msgid "Delete shared site" msgstr "" +#: ./src/pyams_content/root/zmi/sites.py:179 +msgid "Given element name doesn't exist!" +msgstr "" + #: ./src/pyams_content/root/zmi/search.py:155 msgid "Content types" msgstr "" @@ -4159,6 +4184,10 @@ msgid "Edit table properties" msgstr "" +#: ./src/pyams_content/reference/zmi/table.py:173 +msgid "Table management" +msgstr "" + #: ./src/pyams_content/reference/zmi/__init__.py:51 msgid "References" msgstr "" diff -r a607fdec4d63 -r 5e4875a9f692 src/pyams_content/reference/zmi/table.py --- a/src/pyams_content/reference/zmi/table.py Tue Jun 05 14:57:59 2018 +0200 +++ b/src/pyams_content/reference/zmi/table.py Tue Jun 05 15:41:26 2018 +0200 @@ -20,7 +20,7 @@ from pyams_content.reference.interfaces import IReferenceTable from pyams_i18n.interfaces import II18n from pyams_skin.interfaces import IInnerPage, IPageHeader -from pyams_skin.interfaces.viewlet import IBreadcrumbItem +from pyams_skin.interfaces.viewlet import IBreadcrumbItem, IMenuHeader from pyams_skin.layer import IPyAMSLayer from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION from pyams_zmi.interfaces.menu import ISiteManagementMenu, IPropertiesMenu @@ -35,7 +35,7 @@ from pyams_skin.table import BaseTable, TrashColumn from pyams_skin.viewlet.breadcrumb import BreadcrumbItem from pyams_skin.viewlet.menu import MenuItem -from pyams_utils.adapter import adapter_config, ContextRequestViewAdapter +from pyams_utils.adapter import adapter_config, ContextRequestViewAdapter, ContextRequestAdapter from pyams_utils.url import absolute_url from pyams_viewlet.manager import viewletmanager_config from pyams_viewlet.viewlet import viewlet_config @@ -164,3 +164,10 @@ permission=MANAGE_SITE_ROOT_PERMISSION, renderer='json', xhr=True) class ReferenceTablePropertiesAJAXEditForm(AJAXEditForm, ReferenceTablePropertiesEditForm): """Reference table properties edit form, JSON renderer""" + + +@adapter_config(context=(IReferenceTable, ISiteManagementMenu), provides=IMenuHeader) +class ReferenceTableSiteManagementMenuHeader(ContextRequestAdapter): + """Reference table site management menu header adapter""" + + header = _("Table management") diff -r a607fdec4d63 -r 5e4875a9f692 src/pyams_content/shared/blog/zmi/manager.py --- a/src/pyams_content/shared/blog/zmi/manager.py Tue Jun 05 14:57:59 2018 +0200 +++ b/src/pyams_content/shared/blog/zmi/manager.py Tue Jun 05 15:41:26 2018 +0200 @@ -20,10 +20,10 @@ from pyams_content.skin.zmi.interfaces import ISiteTreeTable, IUserAddingsMenuLabel from pyams_i18n.interfaces import II18n, INegotiator from pyams_skin.interfaces.container import ITableElementEditor -from pyams_skin.interfaces.viewlet import IToolbarAddingMenu, ITableItemColumnActionsMenu +from pyams_skin.interfaces.viewlet import IToolbarAddingMenu, ITableItemColumnActionsMenu, IMenuHeader from pyams_skin.layer import IPyAMSLayer from pyams_workflow.interfaces import IWorkflowPublicationInfo -from pyams_zmi.interfaces.menu import IPropertiesMenu +from pyams_zmi.interfaces.menu import IPropertiesMenu, ISiteManagementMenu from pyams_zmi.layer import IAdminLayer # import interfaces @@ -51,6 +51,13 @@ from pyams_content import _ +@adapter_config(context=(IBlogManager, ISiteManagementMenu), provides=IMenuHeader) +class BlogManagerSiteManagementMenuHeader(ContextRequestAdapter): + """Blog manager site management menu header adapter""" + + header = _("Blog management") + + # # Blog topic add views # diff -r a607fdec4d63 -r 5e4875a9f692 src/pyams_content/shared/common/zmi/manager.py --- a/src/pyams_content/shared/common/zmi/manager.py Tue Jun 05 14:57:59 2018 +0200 +++ b/src/pyams_content/shared/common/zmi/manager.py Tue Jun 05 15:41:26 2018 +0200 @@ -73,7 +73,12 @@ class SharedToolSiteManagementMenuHeader(ContextRequestAdapter): """Shared tool site management menu header adapter""" - header = _("Tool management") + @property + def header(self): + if self.context.shared_content_menu: + return _("Content management") + else: + return _("Tool management") # diff -r a607fdec4d63 -r 5e4875a9f692 src/pyams_content/shared/site/zmi/__init__.py --- a/src/pyams_content/shared/site/zmi/__init__.py Tue Jun 05 14:57:59 2018 +0200 +++ b/src/pyams_content/shared/site/zmi/__init__.py Tue Jun 05 15:41:26 2018 +0200 @@ -19,11 +19,12 @@ # import interfaces from pyams_content.interfaces import CREATE_CONTENT_PERMISSION from pyams_content.shared.common.interfaces import IWfSharedContent -from pyams_content.shared.site.interfaces import ISiteContainer, ISiteManager +from pyams_content.shared.site.interfaces import ISiteContainer, ISiteManager, IWfTopic from pyams_i18n.interfaces import II18nManager -from pyams_skin.interfaces.viewlet import IToolbarAddingMenu +from pyams_skin.interfaces.viewlet import IToolbarAddingMenu, IMenuHeader from pyams_skin.layer import IPyAMSLayer from pyams_workflow.interfaces import IWorkflowInfo, IWorkflowVersions +from pyams_zmi.interfaces.menu import IContentManagementMenu from pyams_zmi.layer import IAdminLayer from zope.intid.interfaces import IIntIds @@ -32,6 +33,7 @@ from pyams_content.shared.site.zmi.widget import SiteManagerFoldersSelectorFieldWidget from pyams_pagelet.pagelet import pagelet_config from pyams_skin.viewlet.toolbar import ToolbarMenuItem +from pyams_utils.adapter import adapter_config, ContextRequestAdapter from pyams_utils.registry import get_utility from pyams_utils.traversing import get_parent from pyams_utils.url import absolute_url @@ -46,6 +48,13 @@ from pyams_content import _ +@adapter_config(context=(IWfTopic, IContentManagementMenu), provides=IMenuHeader) +class TopicContentMenuHeader(ContextRequestAdapter): + """Topic content menu header adapter""" + + header = _("This topic") + + @viewlet_config(name='add-topic.menu', context=ISiteContainer, layer=IAdminLayer, view=Interface, manager=IToolbarAddingMenu, permission=CREATE_CONTENT_PERMISSION, weight=20) class TopicAddMenu(ToolbarMenuItem): diff -r a607fdec4d63 -r 5e4875a9f692 src/pyams_content/shared/site/zmi/folder.py --- a/src/pyams_content/shared/site/zmi/folder.py Tue Jun 05 14:57:59 2018 +0200 +++ b/src/pyams_content/shared/site/zmi/folder.py Tue Jun 05 15:41:26 2018 +0200 @@ -9,6 +9,8 @@ # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS # FOR A PARTICULAR PURPOSE. # +from pyams_utils.adapter import adapter_config, ContextRequestAdapter +from pyams_zmi.interfaces.menu import ISiteManagementMenu __docformat__ = 'restructuredtext' @@ -17,9 +19,9 @@ # import interfaces from pyams_content.interfaces import MANAGE_SITE_PERMISSION -from pyams_content.shared.site.interfaces import ISiteContainer, ISiteManager +from pyams_content.shared.site.interfaces import ISiteContainer, ISiteManager, ISiteFolder from pyams_i18n.interfaces import INegotiator, II18n -from pyams_skin.interfaces.viewlet import IToolbarAddingMenu +from pyams_skin.interfaces.viewlet import IToolbarAddingMenu, IMenuHeader from pyams_skin.layer import IPyAMSLayer from pyams_zmi.layer import IAdminLayer from z3c.form.interfaces import IDataExtractedEvent @@ -153,3 +155,10 @@ def get_ajax_output(self, changes): return {'status': 'reload'} + + +@adapter_config(context=(ISiteFolder, ISiteManagementMenu), provides=IMenuHeader) +class SiteFolderSiteManagementMenuHeader(ContextRequestAdapter): + """Site folder site management menu header adapter""" + + header = _("Site folder management") diff -r a607fdec4d63 -r 5e4875a9f692 src/pyams_content/shared/site/zmi/manager.py --- a/src/pyams_content/shared/site/zmi/manager.py Tue Jun 05 14:57:59 2018 +0200 +++ b/src/pyams_content/shared/site/zmi/manager.py Tue Jun 05 15:41:26 2018 +0200 @@ -22,8 +22,9 @@ from pyams_content.skin.zmi.interfaces import ISiteTreeTable, IUserAddingsMenuLabel from pyams_i18n.interfaces import II18n, INegotiator from pyams_skin.interfaces.container import ITableElementEditor -from pyams_skin.interfaces.viewlet import IToolbarAddingMenu, IBreadcrumbItem +from pyams_skin.interfaces.viewlet import IToolbarAddingMenu, IBreadcrumbItem, IMenuHeader from pyams_skin.layer import IPyAMSLayer +from pyams_zmi.interfaces.menu import ISiteManagementMenu from pyams_zmi.layer import IAdminLayer from z3c.form.interfaces import IDataExtractedEvent @@ -50,6 +51,13 @@ from pyams_content import _ +@adapter_config(context=(ISiteManager, ISiteManagementMenu), provides=IMenuHeader) +class SiteManagerSiteManagementMenuHeader(ContextRequestAdapter): + """Site manager site management menu header adapter""" + + header = _("Site management") + + @adapter_config(context=(ISiteManager, IPyAMSLayer), provides=IBreadcrumbItem) class SiteManagerBreadcrumbAdapter(BreadcrumbItem): """Site manager breadcrumb adapter"""