# HG changeset patch # User Thierry Florac # Date 1528273552 -7200 # Node ID a3df1b69616bffc5cd967df5f4dbdbdebaa4b290 # Parent e735477895715d84f772538ded99b0a8ca5438bb Added properties to site folders diff -r e73547789571 -r a3df1b69616b 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 e73547789571 -r a3df1b69616b src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.po --- a/src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.po Tue Jun 05 17:35:02 2018 +0200 +++ b/src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.po Wed Jun 06 10:25:52 2018 +0200 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2018-06-05 16:32+0200\n" +"POT-Creation-Date: 2018-06-06 10:19+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:66 +#: src/pyams_content/shared/site/zmi/folder.py:68 #: 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 @@ -399,7 +399,7 @@ #: src/pyams_content/component/extfile/interfaces/__init__.py:36 #: src/pyams_content/component/links/interfaces/__init__.py:33 #: src/pyams_content/shared/imagemap/interfaces/__init__.py:54 -#: src/pyams_content/shared/site/interfaces/__init__.py:105 +#: src/pyams_content/shared/site/interfaces/__init__.py:113 msgid "Alternate title" msgstr "Titre de substitution" @@ -968,7 +968,7 @@ #: src/pyams_content/component/paragraph/interfaces/keynumber.py:40 #: src/pyams_content/component/association/interfaces/__init__.py:42 #: src/pyams_content/shared/form/interfaces/__init__.py:86 -#: src/pyams_content/shared/site/interfaces/__init__.py:109 +#: src/pyams_content/shared/site/interfaces/__init__.py:117 #: src/pyams_content/features/alert/interfaces.py:54 msgid "Visible?" msgstr "Visible ?" @@ -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:95 +#: src/pyams_content/shared/common/zmi/manager.py:97 msgid "Properties" msgstr "Propriétés" @@ -2067,15 +2067,15 @@ msgid "{state} since {date}, by {principal}" msgstr "{state} depuis {date} par {principal}" -#: src/pyams_content/shared/common/zmi/manager.py:105 +#: src/pyams_content/shared/common/zmi/manager.py:107 msgid "Shared tool properties" msgstr "Propriétés de l'outil" -#: src/pyams_content/shared/common/zmi/manager.py:125 +#: src/pyams_content/shared/common/zmi/manager.py:132 msgid "WARNING" msgstr "ATTENTION" -#: src/pyams_content/shared/common/zmi/manager.py:127 +#: src/pyams_content/shared/common/zmi/manager.py:134 msgid "" "Workflow shouldn't be modified if this tool already contains any shared " "content!" @@ -2083,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:150 +#: src/pyams_content/shared/common/zmi/manager.py:157 msgid "Languages" msgstr "Langues" -#: src/pyams_content/shared/common/zmi/manager.py:161 +#: src/pyams_content/shared/common/zmi/manager.py:168 msgid "Content languages" msgstr "Langues pour la traduction de cet outil" -#: src/pyams_content/shared/common/zmi/manager.py:178 +#: src/pyams_content/shared/common/zmi/manager.py:185 msgid "" "Tool languages are used to translate own tool properties, and newly created " "contents will propose these languages by default" @@ -2100,11 +2100,11 @@ "\n" "Les nouveaux contenus proposeront également ces langues par défaut." -#: src/pyams_content/shared/common/zmi/manager.py:79 +#: src/pyams_content/shared/common/zmi/manager.py:81 msgid "Content management" msgstr "Gérer ce gabarit" -#: src/pyams_content/shared/common/zmi/manager.py:81 +#: src/pyams_content/shared/common/zmi/manager.py:83 msgid "Tool management" msgstr "Gérer l'outil partagé" @@ -3013,14 +3013,14 @@ 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:74 -#: src/pyams_content/shared/site/interfaces/__init__.py:58 +#: src/pyams_content/shared/site/zmi/folder.py:76 +#: src/pyams_content/shared/site/interfaces/__init__.py:66 msgid "Notepad" msgstr "Bloc-notes" #: src/pyams_content/shared/common/interfaces/__init__.py:156 -#: src/pyams_content/shared/site/zmi/folder.py:75 -#: src/pyams_content/shared/site/interfaces/__init__.py:59 +#: src/pyams_content/shared/site/zmi/folder.py:77 +#: src/pyams_content/shared/site/interfaces/__init__.py:67 msgid "Internal information to be known about this content" msgstr "" "Pour prendre note d'informations internes utiles ou importantes à propos de " @@ -3682,7 +3682,7 @@ msgid "Image map template" msgstr "Mode de rendu" -#: src/pyams_content/shared/site/folder.py:56 +#: src/pyams_content/shared/site/folder.py:58 msgid "Site folder" msgstr "Rubrique" @@ -3690,35 +3690,39 @@ msgid "Content link" msgstr "Contenu lié" -#: src/pyams_content/shared/site/zmi/folder.py:57 +#: src/pyams_content/shared/site/zmi/folder.py:59 msgid "Add site folder..." msgstr "Ajouter une rubrique" -#: src/pyams_content/shared/site/zmi/folder.py:88 +#: src/pyams_content/shared/site/zmi/folder.py:90 msgid "Add site folder" msgstr "Ajout d'une rubrique" -#: src/pyams_content/shared/site/zmi/folder.py:164 +#: src/pyams_content/shared/site/zmi/folder.py:166 msgid "Site folder management" msgstr "Gérer cette rubrique" -#: src/pyams_content/shared/site/zmi/folder.py:67 +#: src/pyams_content/shared/site/zmi/folder.py:177 +msgid "Site folder properties" +msgstr "Propriétés de la rubrique" + +#: src/pyams_content/shared/site/zmi/folder.py:69 #: 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:70 +#: src/pyams_content/shared/site/zmi/folder.py:72 #: 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:71 +#: src/pyams_content/shared/site/zmi/folder.py:73 #: 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:148 +#: src/pyams_content/shared/site/zmi/folder.py:150 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 " @@ -3752,55 +3756,55 @@ msgid "Edit content link properties" msgstr "Propriétés du lien" -#: src/pyams_content/shared/site/zmi/container.py:103 -#: src/pyams_content/shared/site/zmi/container.py:115 -#: src/pyams_content/shared/blog/zmi/manager.py:158 -#: src/pyams_content/shared/blog/zmi/manager.py:170 +#: src/pyams_content/shared/site/zmi/container.py:106 +#: src/pyams_content/shared/site/zmi/container.py:118 +#: src/pyams_content/shared/blog/zmi/manager.py:160 +#: src/pyams_content/shared/blog/zmi/manager.py:172 msgid "Publication dates..." msgstr "Dates de publication" -#: src/pyams_content/shared/site/zmi/container.py:128 -#: src/pyams_content/shared/blog/zmi/manager.py:183 +#: src/pyams_content/shared/site/zmi/container.py:131 +#: src/pyams_content/shared/blog/zmi/manager.py:185 msgid "Update publication dates" msgstr "Dates de publication" -#: src/pyams_content/shared/site/zmi/container.py:173 #: src/pyams_content/shared/site/zmi/container.py:183 +#: src/pyams_content/shared/site/zmi/container.py:193 #: src/pyams_content/root/zmi/sites.py:68 msgid "Site tree" msgstr "Arborescence du site" -#: src/pyams_content/shared/site/zmi/container.py:302 -#: src/pyams_content/shared/site/zmi/container.py:152 +#: src/pyams_content/shared/site/zmi/container.py:312 +#: src/pyams_content/shared/site/zmi/container.py:162 msgid "Visible element?" msgstr "Élément visible ?" -#: src/pyams_content/shared/site/zmi/container.py:303 +#: src/pyams_content/shared/site/zmi/container.py:313 msgid "Switch element visibility" msgstr "Cliquez pour rendre l'élément visible ou non" -#: src/pyams_content/shared/site/zmi/container.py:364 +#: src/pyams_content/shared/site/zmi/container.py:374 msgid "Folders and topics" msgstr "Rubriquage" -#: src/pyams_content/shared/site/zmi/container.py:400 +#: src/pyams_content/shared/site/zmi/container.py:410 #: src/pyams_content/root/zmi/__init__.py:798 msgid "Content" msgstr "Contenu" -#: src/pyams_content/shared/site/zmi/container.py:496 +#: src/pyams_content/shared/site/zmi/container.py:506 msgid "Delete site item" msgstr "Supprimer ce contenu" -#: src/pyams_content/shared/site/zmi/container.py:373 +#: src/pyams_content/shared/site/zmi/container.py:383 msgid "Click to open/close all folders" msgstr "Afficher/masquer toutes les rubriques" -#: src/pyams_content/shared/site/zmi/container.py:389 +#: src/pyams_content/shared/site/zmi/container.py:399 msgid "Click to show/hide inner folders" msgstr "Cliquer pour afficher ou cache les sous-niveaux" -#: src/pyams_content/shared/site/zmi/container.py:259 +#: src/pyams_content/shared/site/zmi/container.py:269 msgid "Can't reparent object to one of it's children. Reloading..." msgstr "" "Impossible de déplacer une rubrique dans l'une de ses sous-rubriques ou " @@ -3820,7 +3824,7 @@ msgstr "Site" #: src/pyams_content/shared/site/zmi/manager.py:131 -#: src/pyams_content/shared/blog/zmi/manager.py:124 +#: src/pyams_content/shared/blog/zmi/manager.py:126 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 !" @@ -3832,15 +3836,33 @@ msgid "A site manager is already registered with this name!!" msgstr "Un site est déjà inscrit dans le registre avec ce nom !" -#: src/pyams_content/shared/site/interfaces/__init__.py:87 +#: src/pyams_content/shared/site/interfaces/__init__.py:95 msgid "Topic" msgstr "Article" -#: src/pyams_content/shared/site/interfaces/__init__.py:106 +#: src/pyams_content/shared/site/interfaces/__init__.py:58 +msgid "Heading" +msgstr "Chapô" + +#: src/pyams_content/shared/site/interfaces/__init__.py:59 +msgid "Heading displayed according to presentation template" +msgstr "Ce chapô pourra être affiché ou non en fonction du modèle de présentation retenu" + +#: src/pyams_content/shared/site/interfaces/__init__.py:62 +msgid "Navigation title" +msgstr "Titre de navigation" + +#: src/pyams_content/shared/site/interfaces/__init__.py:63 +msgid "Title displayed in navigation items" +msgstr "" +"Libellé utilisé en lieu et place du titre dans les blocs de navigation, " +"notamment dans les pages carrefours" + +#: src/pyams_content/shared/site/interfaces/__init__.py:114 msgid "Content title, as shown in front-office" msgstr "Titre présenté aux internautes" -#: src/pyams_content/shared/site/interfaces/__init__.py:110 +#: src/pyams_content/shared/site/interfaces/__init__.py:118 msgid "If 'no', link is not visible" msgstr "Si 'non', le lien ne sera pas visible" @@ -3927,24 +3949,24 @@ msgid "Blog post « {title} »" msgstr "Article de blog « {title} »" -#: src/pyams_content/shared/blog/zmi/manager.py:58 +#: src/pyams_content/shared/blog/zmi/manager.py:60 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 +#: src/pyams_content/shared/blog/zmi/manager.py:83 +#: src/pyams_content/shared/blog/zmi/manager.py:95 msgid "Add blog manager" msgstr "Ajouter un blog" -#: src/pyams_content/shared/blog/zmi/manager.py:92 +#: src/pyams_content/shared/blog/zmi/manager.py:94 msgid "Blog manager" msgstr "Blog" -#: src/pyams_content/shared/blog/zmi/manager.py:128 +#: src/pyams_content/shared/blog/zmi/manager.py:130 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:132 +#: src/pyams_content/shared/blog/zmi/manager.py:134 msgid "A blog manager is already registered with this name!!" msgstr "Un blog est déjà inscrit dans le registre avec ce nom !" diff -r e73547789571 -r a3df1b69616b src/pyams_content/locales/pyams_content.pot --- a/src/pyams_content/locales/pyams_content.pot Tue Jun 05 17:35:02 2018 +0200 +++ b/src/pyams_content/locales/pyams_content.pot Wed Jun 06 10:25:52 2018 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2018-06-05 16:32+0200\n" +"POT-Creation-Date: 2018-06-06 10:19+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:66 +#: ./src/pyams_content/shared/site/zmi/folder.py:68 #: ./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 @@ -386,7 +386,7 @@ #: ./src/pyams_content/component/extfile/interfaces/__init__.py:36 #: ./src/pyams_content/component/links/interfaces/__init__.py:33 #: ./src/pyams_content/shared/imagemap/interfaces/__init__.py:54 -#: ./src/pyams_content/shared/site/interfaces/__init__.py:105 +#: ./src/pyams_content/shared/site/interfaces/__init__.py:113 msgid "Alternate title" msgstr "" @@ -929,7 +929,7 @@ #: ./src/pyams_content/component/paragraph/interfaces/keynumber.py:40 #: ./src/pyams_content/component/association/interfaces/__init__.py:42 #: ./src/pyams_content/shared/form/interfaces/__init__.py:86 -#: ./src/pyams_content/shared/site/interfaces/__init__.py:109 +#: ./src/pyams_content/shared/site/interfaces/__init__.py:117 #: ./src/pyams_content/features/alert/interfaces.py:54 msgid "Visible?" msgstr "" @@ -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:95 +#: ./src/pyams_content/shared/common/zmi/manager.py:97 msgid "Properties" msgstr "" @@ -1981,39 +1981,39 @@ msgid "{state} since {date}, by {principal}" msgstr "" -#: ./src/pyams_content/shared/common/zmi/manager.py:105 +#: ./src/pyams_content/shared/common/zmi/manager.py:107 msgid "Shared tool properties" msgstr "" -#: ./src/pyams_content/shared/common/zmi/manager.py:125 +#: ./src/pyams_content/shared/common/zmi/manager.py:132 msgid "WARNING" msgstr "" -#: ./src/pyams_content/shared/common/zmi/manager.py:127 +#: ./src/pyams_content/shared/common/zmi/manager.py:134 msgid "" "Workflow shouldn't be modified if this tool already contains any shared " "content!" msgstr "" -#: ./src/pyams_content/shared/common/zmi/manager.py:150 +#: ./src/pyams_content/shared/common/zmi/manager.py:157 msgid "Languages" msgstr "" -#: ./src/pyams_content/shared/common/zmi/manager.py:161 +#: ./src/pyams_content/shared/common/zmi/manager.py:168 msgid "Content languages" msgstr "" -#: ./src/pyams_content/shared/common/zmi/manager.py:178 +#: ./src/pyams_content/shared/common/zmi/manager.py:185 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 +#: ./src/pyams_content/shared/common/zmi/manager.py:81 msgid "Content management" msgstr "" -#: ./src/pyams_content/shared/common/zmi/manager.py:81 +#: ./src/pyams_content/shared/common/zmi/manager.py:83 msgid "Tool management" msgstr "" @@ -2845,14 +2845,14 @@ msgstr "" #: ./src/pyams_content/shared/common/interfaces/__init__.py:155 -#: ./src/pyams_content/shared/site/zmi/folder.py:74 -#: ./src/pyams_content/shared/site/interfaces/__init__.py:58 +#: ./src/pyams_content/shared/site/zmi/folder.py:76 +#: ./src/pyams_content/shared/site/interfaces/__init__.py:66 msgid "Notepad" msgstr "" #: ./src/pyams_content/shared/common/interfaces/__init__.py:156 -#: ./src/pyams_content/shared/site/zmi/folder.py:75 -#: ./src/pyams_content/shared/site/interfaces/__init__.py:59 +#: ./src/pyams_content/shared/site/zmi/folder.py:77 +#: ./src/pyams_content/shared/site/interfaces/__init__.py:67 msgid "Internal information to be known about this content" msgstr "" @@ -3469,7 +3469,7 @@ msgid "Image map template" msgstr "" -#: ./src/pyams_content/shared/site/folder.py:56 +#: ./src/pyams_content/shared/site/folder.py:58 msgid "Site folder" msgstr "" @@ -3477,35 +3477,39 @@ msgid "Content link" msgstr "" -#: ./src/pyams_content/shared/site/zmi/folder.py:57 +#: ./src/pyams_content/shared/site/zmi/folder.py:59 msgid "Add site folder..." msgstr "" -#: ./src/pyams_content/shared/site/zmi/folder.py:88 +#: ./src/pyams_content/shared/site/zmi/folder.py:90 msgid "Add site folder" msgstr "" -#: ./src/pyams_content/shared/site/zmi/folder.py:164 +#: ./src/pyams_content/shared/site/zmi/folder.py:166 msgid "Site folder management" msgstr "" -#: ./src/pyams_content/shared/site/zmi/folder.py:67 +#: ./src/pyams_content/shared/site/zmi/folder.py:177 +msgid "Site folder properties" +msgstr "" + +#: ./src/pyams_content/shared/site/zmi/folder.py:69 #: ./src/pyams_content/interfaces/__init__.py:100 msgid "Visible label used to display content" msgstr "" -#: ./src/pyams_content/shared/site/zmi/folder.py:70 +#: ./src/pyams_content/shared/site/zmi/folder.py:72 #: ./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:71 +#: ./src/pyams_content/shared/site/zmi/folder.py:73 #: ./src/pyams_content/shared/site/zmi/link.py:68 msgid "Folder's parent" msgstr "" -#: ./src/pyams_content/shared/site/zmi/folder.py:148 +#: ./src/pyams_content/shared/site/zmi/folder.py:150 msgid "You must provide a folder name for default server language!" msgstr "" @@ -3537,55 +3541,55 @@ msgid "Edit content link properties" msgstr "" -#: ./src/pyams_content/shared/site/zmi/container.py:103 -#: ./src/pyams_content/shared/site/zmi/container.py:115 -#: ./src/pyams_content/shared/blog/zmi/manager.py:158 -#: ./src/pyams_content/shared/blog/zmi/manager.py:170 +#: ./src/pyams_content/shared/site/zmi/container.py:106 +#: ./src/pyams_content/shared/site/zmi/container.py:118 +#: ./src/pyams_content/shared/blog/zmi/manager.py:160 +#: ./src/pyams_content/shared/blog/zmi/manager.py:172 msgid "Publication dates..." msgstr "" -#: ./src/pyams_content/shared/site/zmi/container.py:128 -#: ./src/pyams_content/shared/blog/zmi/manager.py:183 +#: ./src/pyams_content/shared/site/zmi/container.py:131 +#: ./src/pyams_content/shared/blog/zmi/manager.py:185 msgid "Update publication dates" msgstr "" -#: ./src/pyams_content/shared/site/zmi/container.py:173 #: ./src/pyams_content/shared/site/zmi/container.py:183 +#: ./src/pyams_content/shared/site/zmi/container.py:193 #: ./src/pyams_content/root/zmi/sites.py:68 msgid "Site tree" msgstr "" -#: ./src/pyams_content/shared/site/zmi/container.py:302 -#: ./src/pyams_content/shared/site/zmi/container.py:152 +#: ./src/pyams_content/shared/site/zmi/container.py:312 +#: ./src/pyams_content/shared/site/zmi/container.py:162 msgid "Visible element?" msgstr "" -#: ./src/pyams_content/shared/site/zmi/container.py:303 +#: ./src/pyams_content/shared/site/zmi/container.py:313 msgid "Switch element visibility" msgstr "" -#: ./src/pyams_content/shared/site/zmi/container.py:364 +#: ./src/pyams_content/shared/site/zmi/container.py:374 msgid "Folders and topics" msgstr "" -#: ./src/pyams_content/shared/site/zmi/container.py:400 +#: ./src/pyams_content/shared/site/zmi/container.py:410 #: ./src/pyams_content/root/zmi/__init__.py:798 msgid "Content" msgstr "" -#: ./src/pyams_content/shared/site/zmi/container.py:496 +#: ./src/pyams_content/shared/site/zmi/container.py:506 msgid "Delete site item" msgstr "" -#: ./src/pyams_content/shared/site/zmi/container.py:373 +#: ./src/pyams_content/shared/site/zmi/container.py:383 msgid "Click to open/close all folders" msgstr "" -#: ./src/pyams_content/shared/site/zmi/container.py:389 +#: ./src/pyams_content/shared/site/zmi/container.py:399 msgid "Click to show/hide inner folders" msgstr "" -#: ./src/pyams_content/shared/site/zmi/container.py:259 +#: ./src/pyams_content/shared/site/zmi/container.py:269 msgid "Can't reparent object to one of it's children. Reloading..." msgstr "" @@ -3603,7 +3607,7 @@ msgstr "" #: ./src/pyams_content/shared/site/zmi/manager.py:131 -#: ./src/pyams_content/shared/blog/zmi/manager.py:124 +#: ./src/pyams_content/shared/blog/zmi/manager.py:126 msgid "You must provide a short name for default server language!" msgstr "" @@ -3615,15 +3619,31 @@ msgid "A site manager is already registered with this name!!" msgstr "" -#: ./src/pyams_content/shared/site/interfaces/__init__.py:87 +#: ./src/pyams_content/shared/site/interfaces/__init__.py:95 msgid "Topic" msgstr "" -#: ./src/pyams_content/shared/site/interfaces/__init__.py:106 +#: ./src/pyams_content/shared/site/interfaces/__init__.py:58 +msgid "Heading" +msgstr "" + +#: ./src/pyams_content/shared/site/interfaces/__init__.py:59 +msgid "Heading displayed according to presentation template" +msgstr "" + +#: ./src/pyams_content/shared/site/interfaces/__init__.py:62 +msgid "Navigation title" +msgstr "" + +#: ./src/pyams_content/shared/site/interfaces/__init__.py:63 +msgid "Title displayed in navigation items" +msgstr "" + +#: ./src/pyams_content/shared/site/interfaces/__init__.py:114 msgid "Content title, as shown in front-office" msgstr "" -#: ./src/pyams_content/shared/site/interfaces/__init__.py:110 +#: ./src/pyams_content/shared/site/interfaces/__init__.py:118 msgid "If 'no', link is not visible" msgstr "" @@ -3710,24 +3730,24 @@ msgid "Blog post « {title} »" msgstr "" -#: ./src/pyams_content/shared/blog/zmi/manager.py:58 +#: ./src/pyams_content/shared/blog/zmi/manager.py:60 msgid "Blog management" msgstr "" -#: ./src/pyams_content/shared/blog/zmi/manager.py:81 -#: ./src/pyams_content/shared/blog/zmi/manager.py:93 +#: ./src/pyams_content/shared/blog/zmi/manager.py:83 +#: ./src/pyams_content/shared/blog/zmi/manager.py:95 msgid "Add blog manager" msgstr "" -#: ./src/pyams_content/shared/blog/zmi/manager.py:92 +#: ./src/pyams_content/shared/blog/zmi/manager.py:94 msgid "Blog manager" msgstr "" -#: ./src/pyams_content/shared/blog/zmi/manager.py:128 +#: ./src/pyams_content/shared/blog/zmi/manager.py:130 msgid "Specified blog manager name is already used!" msgstr "" -#: ./src/pyams_content/shared/blog/zmi/manager.py:132 +#: ./src/pyams_content/shared/blog/zmi/manager.py:134 msgid "A blog manager is already registered with this name!!" msgstr "" diff -r e73547789571 -r a3df1b69616b src/pyams_content/shared/site/folder.py --- a/src/pyams_content/shared/site/folder.py Tue Jun 05 17:35:02 2018 +0200 +++ b/src/pyams_content/shared/site/folder.py Wed Jun 06 10:25:52 2018 +0200 @@ -51,6 +51,8 @@ roles_interface = ISiteFolderRoles + heading = FieldProperty(ISiteFolder['heading']) + navigation_title = FieldProperty(ISiteFolder['navigation_title']) notepad = FieldProperty(ISiteFolder['notepad']) content_name = _("Site folder") diff -r e73547789571 -r a3df1b69616b src/pyams_content/shared/site/interfaces/__init__.py --- a/src/pyams_content/shared/site/interfaces/__init__.py Tue Jun 05 17:35:02 2018 +0200 +++ b/src/pyams_content/shared/site/interfaces/__init__.py Wed Jun 06 10:25:52 2018 +0200 @@ -24,7 +24,7 @@ # import packages from pyams_content.shared.common.interfaces import ISharedSite, IWfSharedContent, ISharedContent, \ IBaseContentManagerRoles, IBaseSharedTool, IDeletableElement -from pyams_i18n.schema import I18nTextLineField +from pyams_i18n.schema import I18nTextLineField, I18nTextField from zope.container.constraints import containers, contains from zope.interface import Interface, Attribute from zope.schema import Text, Bool @@ -55,6 +55,14 @@ A site folder is made to contain sub-folders and topics """ + heading = I18nTextField(title=_("Heading"), + description=_("Heading displayed according to presentation template"), + required=False) + + navigation_title = I18nTextLineField(title=_("Navigation title"), + description=_("Title displayed in navigation items"), + required=False) + notepad = Text(title=_("Notepad"), description=_("Internal information to be known about this content"), required=False) diff -r e73547789571 -r a3df1b69616b src/pyams_content/shared/site/zmi/folder.py --- a/src/pyams_content/shared/site/zmi/folder.py Tue Jun 05 17:35:02 2018 +0200 +++ b/src/pyams_content/shared/site/zmi/folder.py Wed Jun 06 10:25:52 2018 +0200 @@ -9,6 +9,8 @@ # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS # FOR A PARTICULAR PURPOSE. # +from pyams_content.shared.common import IBaseSharedTool +from pyams_content.shared.common.zmi.manager import SharedToolPropertiesEditForm from pyams_utils.adapter import adapter_config, ContextRequestAdapter from pyams_zmi.interfaces.menu import ISiteManagementMenu @@ -18,7 +20,7 @@ # import standard library # import interfaces -from pyams_content.interfaces import MANAGE_SITE_PERMISSION +from pyams_content.interfaces import MANAGE_SITE_PERMISSION, MANAGE_TOOL_PERMISSION from pyams_content.shared.site.interfaces import ISiteContainer, ISiteManager, ISiteFolder from pyams_i18n.interfaces import INegotiator, II18n from pyams_skin.interfaces.viewlet import IToolbarAddingMenu, IMenuHeader @@ -29,7 +31,7 @@ # import packages from pyams_content.shared.site.zmi.widget import SiteManagerFoldersSelectorFieldWidget -from pyams_form.form import AJAXAddForm +from pyams_form.form import AJAXAddForm, AJAXEditForm from pyams_i18n.schema import I18nTextLineField from pyams_pagelet.pagelet import pagelet_config from pyams_skin.viewlet.toolbar import ToolbarMenuItem @@ -162,3 +164,30 @@ """Site folder site management menu header adapter""" header = _("Site folder management") + + +# +# Site folder edit form +# + +@pagelet_config(name='properties.html', context=ISiteFolder, layer=IPyAMSLayer, permission=MANAGE_TOOL_PERMISSION) +class SiteFolderPropertiesEditForm(SharedToolPropertiesEditForm): + """Site folder properties edit form""" + + legend = _("Site folder properties") + + fields = field.Fields(ISiteFolder).select('title', 'short_name', 'heading', 'navigation_title', 'notepad') + \ + field.Fields(IBaseSharedTool).select('shared_content_workflow') + + def updateWidgets(self, prefix=None): + super(SiteFolderPropertiesEditForm, self).updateWidgets(prefix) + if 'heading' in self.widgets: + self.widgets['heading'].widget_css_class = 'textarea' + if 'notepad' in self.widgets: + self.widgets['notepad'].widget_css_class = 'textarea' + + +@view_config(name='properties.json', context=ISiteFolder, request_type=IPyAMSLayer, + permission=MANAGE_TOOL_PERMISSION, renderer='json', xhr=True) +class SiteFolderPropertiesAJAXEditForm(AJAXEditForm, SiteFolderPropertiesEditForm): + """Site folder properties edit form, JSON renderer"""