# HG changeset patch # User Thierry Florac # Date 1535616540 -7200 # Node ID 885d64d94aeda89a532021ed5e19eaef0a551269 # Parent c5e34981deac83385c75b0dba3720055929309de# Parent 4a57e6e76d5f0c85cfebb909bbf5a280244d27e0 Merge branch dev-dc diff -r c5e34981deac -r 885d64d94aed src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.mo Binary file src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.mo has changed diff -r c5e34981deac -r 885d64d94aed src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.po --- a/src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.po Tue Aug 28 15:42:39 2018 +0200 +++ b/src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.po Thu Aug 30 10:09:00 2018 +0200 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2018-07-03 15:29+0200\n" +"POT-Creation-Date: 2018-08-30 10:05+0200\n" "PO-Revision-Date: 2015-05-12 12:10+0200\n" "Last-Translator: Thierry Florac \n" "Language-Team: French \n" @@ -239,6 +239,7 @@ msgstr "Sélection des composants" #: src/pyams_portal/zmi/templates/portlet.pt:137 +#: src/pyams_portal/portlets/html/interfaces.py:30 msgid "Title" msgstr "Titre" @@ -263,55 +264,63 @@ "Ajouter un panneau
Faire un glisser/déposer du bouton dans le modèle de " "présentation pour positionner le nouveau panneau." -#: src/pyams_portal/zmi/templates/layout.pt:48 +#: src/pyams_portal/zmi/templates/layout.pt:50 msgid "Add another portlet..." msgstr "Ajouter un composant" -#: src/pyams_portal/zmi/templates/layout.pt:55 +#: src/pyams_portal/zmi/templates/layout.pt:57 msgid "Selected display:" msgstr "Type de périphérique sélectionné :" -#: src/pyams_portal/zmi/templates/layout.pt:60 +#: src/pyams_portal/zmi/templates/layout.pt:62 msgid "Current device" msgstr "Périphérique actuel" -#: src/pyams_portal/zmi/templates/layout.pt:61 +#: src/pyams_portal/zmi/templates/layout.pt:63 msgid "Extra small device (phone)" msgstr "Très petits périphériques (téléphone)" -#: src/pyams_portal/zmi/templates/layout.pt:62 +#: src/pyams_portal/zmi/templates/layout.pt:64 msgid "Small device (tablet)" msgstr "Petits périphériques (tablette)" -#: src/pyams_portal/zmi/templates/layout.pt:63 +#: src/pyams_portal/zmi/templates/layout.pt:65 msgid "Medium desktop device (> 970px)" msgstr "Écrans de taille moyenne (> 970 px)" -#: src/pyams_portal/zmi/templates/layout.pt:64 +#: src/pyams_portal/zmi/templates/layout.pt:66 msgid "Large desktop device (> 1170px)" msgstr "Écrans de grande taille (> 1170 px)" -#: src/pyams_portal/zmi/templates/layout.pt:116 -msgid "Override parent or template settings" -msgstr "Remplacer le paramétrage du parent ou du modèle" +#: src/pyams_portal/zmi/templates/layout.pt:118 +msgid "Reduce/restore portlet" +msgstr "Réduire/restaurer le composant" -#: src/pyams_portal/zmi/templates/layout.pt:135 +#: src/pyams_portal/zmi/templates/layout.pt:123 +msgid "Edit portlet properties" +msgstr "Propriétés" + +#: src/pyams_portal/zmi/templates/layout.pt:125 +msgid "Portlet settings are not those of original template" +msgstr "Les propriétés du composant ne sont pas celles héritées du modèle de présentation" + +#: src/pyams_portal/zmi/templates/layout.pt:143 msgid "Delete row..." msgstr "Supprimer la ligne" -#: src/pyams_portal/zmi/templates/layout.pt:144 +#: src/pyams_portal/zmi/templates/layout.pt:152 msgid "Edit slot properties..." msgstr "Propriétés" -#: src/pyams_portal/zmi/templates/layout.pt:151 +#: src/pyams_portal/zmi/templates/layout.pt:159 msgid "Delete slot..." msgstr "Supprimer le panneau" -#: src/pyams_portal/zmi/templates/layout.pt:159 +#: src/pyams_portal/zmi/templates/layout.pt:167 msgid "Edit portlet properties..." msgstr "Propriétés" -#: src/pyams_portal/zmi/templates/layout.pt:167 +#: src/pyams_portal/zmi/templates/layout.pt:175 msgid "Delete portlet..." msgstr "Supprimer le composant" @@ -327,19 +336,19 @@ msgid "Responsive image renderer" msgstr "Image responsive (par défaut)" -#: src/pyams_portal/portlets/html/__init__.py:51 +#: src/pyams_portal/portlets/html/__init__.py:52 msgid "Raw HTML" msgstr "Code HTML" -#: src/pyams_portal/portlets/html/__init__.py:78 +#: src/pyams_portal/portlets/html/__init__.py:79 msgid "Rich text" msgstr "Texte enrichi" -#: src/pyams_portal/portlets/html/interfaces.py:31 +#: src/pyams_portal/portlets/html/interfaces.py:33 msgid "Raw HTML code" msgstr "Code HTML" -#: src/pyams_portal/portlets/html/interfaces.py:32 +#: src/pyams_portal/portlets/html/interfaces.py:34 msgid "" "This HTML code will be used 'as is', without any transformation. Use with " "care!!" @@ -347,7 +356,7 @@ "Ce code HTML sera utilisé 'en l'état', sans aucune vérification ni " "transformation. À utiliser donc avec précaution !!" -#: src/pyams_portal/portlets/html/interfaces.py:40 +#: src/pyams_portal/portlets/html/interfaces.py:42 msgid "Body" msgstr "Contenu HTML" @@ -368,7 +377,7 @@ msgstr "Composant" #: src/pyams_portal/interfaces/__init__.py:71 -#: src/pyams_portal/interfaces/__init__.py:198 +#: src/pyams_portal/interfaces/__init__.py:203 msgid "Slot name" msgstr "Nom du panneau" @@ -384,11 +393,11 @@ msgid "Name of renderer used to render this portlet" msgstr "Mode de rendu utilisé pour restituer ce composant" -#: src/pyams_portal/interfaces/__init__.py:116 +#: src/pyams_portal/interfaces/__init__.py:119 msgid "Inherit parent configuration?" msgstr "Hériter de la configuration du parent ?" -#: src/pyams_portal/interfaces/__init__.py:117 +#: src/pyams_portal/interfaces/__init__.py:120 msgid "" "This option is only available if context's parent is using the same " "template..." @@ -396,27 +405,27 @@ "Cette option n'est disponible que si le parent utilise le même modèle de " "présentation..." -#: src/pyams_portal/interfaces/__init__.py:199 +#: src/pyams_portal/interfaces/__init__.py:204 msgid "This name must be unique in a given template" msgstr "Ce nom doit être unique au sein d'un modèle de présentation" -#: src/pyams_portal/interfaces/__init__.py:202 +#: src/pyams_portal/interfaces/__init__.py:207 msgid "Row ID" msgstr "ID de la ligne" -#: src/pyams_portal/interfaces/__init__.py:216 +#: src/pyams_portal/interfaces/__init__.py:221 msgid "Visible slot?" msgstr "Panneau visible ?" -#: src/pyams_portal/interfaces/__init__.py:217 +#: src/pyams_portal/interfaces/__init__.py:222 msgid "Select 'no' to hide this slot..." msgstr "Choisir 'non' pour masquer ce panneau..." -#: src/pyams_portal/interfaces/__init__.py:221 +#: src/pyams_portal/interfaces/__init__.py:226 msgid "Extra small device width" msgstr "Largeur sur très petits périphériques" -#: src/pyams_portal/interfaces/__init__.py:222 +#: src/pyams_portal/interfaces/__init__.py:227 msgid "" "Slot width, in columns count, on extra small devices (phones...); set to 0 " "to hide the portlet" @@ -424,11 +433,11 @@ "Largeur du panneau, en nombre de colonnes, sur les très petits périphériques " "(téléphones...) ; indiquez une valeur de 0 pour masquer ce composant" -#: src/pyams_portal/interfaces/__init__.py:228 +#: src/pyams_portal/interfaces/__init__.py:233 msgid "Small device width" msgstr "Largeur sur petits périphériques" -#: src/pyams_portal/interfaces/__init__.py:229 +#: src/pyams_portal/interfaces/__init__.py:234 msgid "" "Slot width, in columns count, on small devices (tablets...); set to 0 to " "hide the portlet" @@ -436,11 +445,11 @@ "Largeur du panneau, en nombre de colonnes, sur les petits périphériques " "(tablettes...) ; indiquez une valeur de 0 pour masquer ce composant" -#: src/pyams_portal/interfaces/__init__.py:235 +#: src/pyams_portal/interfaces/__init__.py:240 msgid "Medium devices width" msgstr "Largeur sur périphériques moyens" -#: src/pyams_portal/interfaces/__init__.py:236 +#: src/pyams_portal/interfaces/__init__.py:241 msgid "" "Slot width, in columns count, on medium desktop devices (>= 992 pixels); set " "to 0 to hide the portlet" @@ -448,11 +457,11 @@ "Largeur du panneau, en nombre de colonnes, sur les périphériques moyens (>= " "992 pixels) ; indiquez une valeur de 0 pour masquer ce composant" -#: src/pyams_portal/interfaces/__init__.py:242 +#: src/pyams_portal/interfaces/__init__.py:247 msgid "Large devices width" msgstr "Largeur sur grands périphériques" -#: src/pyams_portal/interfaces/__init__.py:243 +#: src/pyams_portal/interfaces/__init__.py:248 msgid "" "Slot width, in columns count, on large desktop devices (>= 1200 pixels); set " "to 0 to hide the portlet" @@ -460,27 +469,27 @@ "Largeur du panneau, en nombre de colonnes, sur les grands périphériques (>= " "1200 pixels) ; indiquez une valeur de 0 pour masquer ce composant" -#: src/pyams_portal/interfaces/__init__.py:249 +#: src/pyams_portal/interfaces/__init__.py:254 msgid "CSS class" msgstr "Class CSS" -#: src/pyams_portal/interfaces/__init__.py:250 +#: src/pyams_portal/interfaces/__init__.py:255 msgid "CSS class applied to this slot" msgstr "Classe CSS spécifique appliquée à ce panneau" -#: src/pyams_portal/interfaces/__init__.py:363 +#: src/pyams_portal/interfaces/__init__.py:368 msgid "Template name" msgstr "Nom du modèle" -#: src/pyams_portal/interfaces/__init__.py:364 +#: src/pyams_portal/interfaces/__init__.py:369 msgid "Two registered templates can't share the same name..." msgstr "Deux modèles partagés ne peuvent pas utiliser le même nom..." -#: src/pyams_portal/interfaces/__init__.py:385 +#: src/pyams_portal/interfaces/__init__.py:390 msgid "Toolbar portlets" msgstr "Composants de la barre d'outils" -#: src/pyams_portal/interfaces/__init__.py:386 +#: src/pyams_portal/interfaces/__init__.py:391 msgid "" "These portlets will be directly available in templates configuration page " "toolbar" @@ -488,55 +497,58 @@ "Ces composants seront directement accessibles dans la page de configuration " "des modèles de présentation sous la forme d'une barre d'icônes" -#: src/pyams_portal/interfaces/__init__.py:415 +#: src/pyams_portal/interfaces/__init__.py:420 msgid "Inherit parent template?" msgstr "Hériter du modèle du parent ?" -#: src/pyams_portal/interfaces/__init__.py:416 +#: src/pyams_portal/interfaces/__init__.py:421 msgid "Should we reuse parent template?" msgstr "Doit-on ré-utiliser le modèle du parent ?" -#: src/pyams_portal/interfaces/__init__.py:420 +#: src/pyams_portal/interfaces/__init__.py:425 msgid "Override parent template?" msgstr "Ne pas hériter du modèle du parent ?" -#: src/pyams_portal/interfaces/__init__.py:421 +#: src/pyams_portal/interfaces/__init__.py:426 msgid "Should we override parent template?" msgstr "Doit-on remplacer le modèle de présentation du parent ?" -#: src/pyams_portal/interfaces/__init__.py:425 +#: src/pyams_portal/interfaces/__init__.py:430 msgid "Use local template?" msgstr "Utiliser un modèle local ?" -#: src/pyams_portal/interfaces/__init__.py:426 +#: src/pyams_portal/interfaces/__init__.py:431 msgid "" "If 'yes', you can define a custom local template instead of a shared template" msgstr "" "Si 'oui', vous pouvez définir un modèle de présentation local au lieu d'un " "modèle partagé" -#: src/pyams_portal/interfaces/__init__.py:431 +#: src/pyams_portal/interfaces/__init__.py:436 msgid "Local template" msgstr "Modèle local" -#: src/pyams_portal/interfaces/__init__.py:436 +#: src/pyams_portal/interfaces/__init__.py:441 msgid "Use shared template?" msgstr "Utiliser un modèle partagé" -#: src/pyams_portal/interfaces/__init__.py:437 +#: src/pyams_portal/interfaces/__init__.py:442 msgid "If 'yes', you can select a shared template" msgstr "" "Si 'oui', vous pouvez sélectionner un modèle de présentation partagé au lieu " "d'un modèle local" -#: src/pyams_portal/interfaces/__init__.py:441 +#: src/pyams_portal/interfaces/__init__.py:446 msgid "Page template" msgstr "Modèle de page" -#: src/pyams_portal/interfaces/__init__.py:442 +#: src/pyams_portal/interfaces/__init__.py:447 msgid "Template used for this page" msgstr "Modèle de présentation utilisé pour cette page" +#~ msgid "Override parent or template settings" +#~ msgstr "Remplacer le paramétrage du parent ou du modèle" + #~ msgid "« {0} » portal template - {1} slot" #~ msgstr "Modèle de présentation « {0} » - Panneau {1}" diff -r c5e34981deac -r 885d64d94aed src/pyams_portal/locales/pyams_portal.pot --- a/src/pyams_portal/locales/pyams_portal.pot Tue Aug 28 15:42:39 2018 +0200 +++ b/src/pyams_portal/locales/pyams_portal.pot Thu Aug 30 10:09:00 2018 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2018-07-03 15:29+0200\n" +"POT-Creation-Date: 2018-08-30 10:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" @@ -222,6 +222,7 @@ msgstr "" #: ./src/pyams_portal/zmi/templates/portlet.pt:137 +#: ./src/pyams_portal/portlets/html/interfaces.py:30 msgid "Title" msgstr "" @@ -242,55 +243,63 @@ "Add slot
Drag and drop button to page template to position new slot" msgstr "" -#: ./src/pyams_portal/zmi/templates/layout.pt:48 +#: ./src/pyams_portal/zmi/templates/layout.pt:50 msgid "Add another portlet..." msgstr "" -#: ./src/pyams_portal/zmi/templates/layout.pt:55 +#: ./src/pyams_portal/zmi/templates/layout.pt:57 msgid "Selected display:" msgstr "" -#: ./src/pyams_portal/zmi/templates/layout.pt:60 +#: ./src/pyams_portal/zmi/templates/layout.pt:62 msgid "Current device" msgstr "" -#: ./src/pyams_portal/zmi/templates/layout.pt:61 +#: ./src/pyams_portal/zmi/templates/layout.pt:63 msgid "Extra small device (phone)" msgstr "" -#: ./src/pyams_portal/zmi/templates/layout.pt:62 -msgid "Small device (tablet)" -msgstr "" - -#: ./src/pyams_portal/zmi/templates/layout.pt:63 -msgid "Medium desktop device (> 970px)" -msgstr "" - #: ./src/pyams_portal/zmi/templates/layout.pt:64 +msgid "Small device (tablet)" +msgstr "" + +#: ./src/pyams_portal/zmi/templates/layout.pt:65 +msgid "Medium desktop device (> 970px)" +msgstr "" + +#: ./src/pyams_portal/zmi/templates/layout.pt:66 msgid "Large desktop device (> 1170px)" msgstr "" -#: ./src/pyams_portal/zmi/templates/layout.pt:116 -msgid "Override parent or template settings" +#: ./src/pyams_portal/zmi/templates/layout.pt:118 +msgid "Reduce/restore portlet" msgstr "" -#: ./src/pyams_portal/zmi/templates/layout.pt:135 +#: ./src/pyams_portal/zmi/templates/layout.pt:123 +msgid "Edit portlet properties" +msgstr "" + +#: ./src/pyams_portal/zmi/templates/layout.pt:125 +msgid "Portlet settings are not those of original template" +msgstr "" + +#: ./src/pyams_portal/zmi/templates/layout.pt:143 msgid "Delete row..." msgstr "" -#: ./src/pyams_portal/zmi/templates/layout.pt:144 +#: ./src/pyams_portal/zmi/templates/layout.pt:152 msgid "Edit slot properties..." msgstr "" -#: ./src/pyams_portal/zmi/templates/layout.pt:151 +#: ./src/pyams_portal/zmi/templates/layout.pt:159 msgid "Delete slot..." msgstr "" -#: ./src/pyams_portal/zmi/templates/layout.pt:159 +#: ./src/pyams_portal/zmi/templates/layout.pt:167 msgid "Edit portlet properties..." msgstr "" -#: ./src/pyams_portal/zmi/templates/layout.pt:167 +#: ./src/pyams_portal/zmi/templates/layout.pt:175 msgid "Delete portlet..." msgstr "" @@ -306,25 +315,25 @@ msgid "Responsive image renderer" msgstr "" -#: ./src/pyams_portal/portlets/html/__init__.py:51 +#: ./src/pyams_portal/portlets/html/__init__.py:52 msgid "Raw HTML" msgstr "" -#: ./src/pyams_portal/portlets/html/__init__.py:78 +#: ./src/pyams_portal/portlets/html/__init__.py:79 msgid "Rich text" msgstr "" -#: ./src/pyams_portal/portlets/html/interfaces.py:31 +#: ./src/pyams_portal/portlets/html/interfaces.py:33 msgid "Raw HTML code" msgstr "" -#: ./src/pyams_portal/portlets/html/interfaces.py:32 +#: ./src/pyams_portal/portlets/html/interfaces.py:34 msgid "" "This HTML code will be used 'as is', without any transformation. Use with " "care!!" msgstr "" -#: ./src/pyams_portal/portlets/html/interfaces.py:40 +#: ./src/pyams_portal/portlets/html/interfaces.py:42 msgid "Body" msgstr "" @@ -345,7 +354,7 @@ msgstr "" #: ./src/pyams_portal/interfaces/__init__.py:71 -#: ./src/pyams_portal/interfaces/__init__.py:198 +#: ./src/pyams_portal/interfaces/__init__.py:203 msgid "Slot name" msgstr "" @@ -361,139 +370,139 @@ msgid "Name of renderer used to render this portlet" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:116 +#: ./src/pyams_portal/interfaces/__init__.py:119 msgid "Inherit parent configuration?" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:117 +#: ./src/pyams_portal/interfaces/__init__.py:120 msgid "" "This option is only available if context's parent is using the same " "template..." msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:199 +#: ./src/pyams_portal/interfaces/__init__.py:204 msgid "This name must be unique in a given template" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:202 +#: ./src/pyams_portal/interfaces/__init__.py:207 msgid "Row ID" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:216 +#: ./src/pyams_portal/interfaces/__init__.py:221 msgid "Visible slot?" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:217 +#: ./src/pyams_portal/interfaces/__init__.py:222 msgid "Select 'no' to hide this slot..." msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:221 +#: ./src/pyams_portal/interfaces/__init__.py:226 msgid "Extra small device width" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:222 +#: ./src/pyams_portal/interfaces/__init__.py:227 msgid "" "Slot width, in columns count, on extra small devices (phones...); set to 0 to" " hide the portlet" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:228 +#: ./src/pyams_portal/interfaces/__init__.py:233 msgid "Small device width" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:229 +#: ./src/pyams_portal/interfaces/__init__.py:234 msgid "" "Slot width, in columns count, on small devices (tablets...); set to 0 to hide" " the portlet" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:235 +#: ./src/pyams_portal/interfaces/__init__.py:240 msgid "Medium devices width" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:236 +#: ./src/pyams_portal/interfaces/__init__.py:241 msgid "" "Slot width, in columns count, on medium desktop devices (>= 992 pixels); set " "to 0 to hide the portlet" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:242 +#: ./src/pyams_portal/interfaces/__init__.py:247 msgid "Large devices width" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:243 +#: ./src/pyams_portal/interfaces/__init__.py:248 msgid "" "Slot width, in columns count, on large desktop devices (>= 1200 pixels); set " "to 0 to hide the portlet" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:249 +#: ./src/pyams_portal/interfaces/__init__.py:254 msgid "CSS class" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:250 +#: ./src/pyams_portal/interfaces/__init__.py:255 msgid "CSS class applied to this slot" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:363 +#: ./src/pyams_portal/interfaces/__init__.py:368 msgid "Template name" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:364 +#: ./src/pyams_portal/interfaces/__init__.py:369 msgid "Two registered templates can't share the same name..." msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:385 +#: ./src/pyams_portal/interfaces/__init__.py:390 msgid "Toolbar portlets" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:386 +#: ./src/pyams_portal/interfaces/__init__.py:391 msgid "" "These portlets will be directly available in templates configuration page " "toolbar" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:415 +#: ./src/pyams_portal/interfaces/__init__.py:420 msgid "Inherit parent template?" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:416 +#: ./src/pyams_portal/interfaces/__init__.py:421 msgid "Should we reuse parent template?" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:420 +#: ./src/pyams_portal/interfaces/__init__.py:425 msgid "Override parent template?" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:421 +#: ./src/pyams_portal/interfaces/__init__.py:426 msgid "Should we override parent template?" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:425 +#: ./src/pyams_portal/interfaces/__init__.py:430 msgid "Use local template?" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:426 +#: ./src/pyams_portal/interfaces/__init__.py:431 msgid "" "If 'yes', you can define a custom local template instead of a shared template" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:431 +#: ./src/pyams_portal/interfaces/__init__.py:436 msgid "Local template" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:436 +#: ./src/pyams_portal/interfaces/__init__.py:441 msgid "Use shared template?" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:437 +#: ./src/pyams_portal/interfaces/__init__.py:442 msgid "If 'yes', you can select a shared template" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:441 +#: ./src/pyams_portal/interfaces/__init__.py:446 msgid "Page template" msgstr "" -#: ./src/pyams_portal/interfaces/__init__.py:442 +#: ./src/pyams_portal/interfaces/__init__.py:447 msgid "Template used for this page" msgstr "" diff -r c5e34981deac -r 885d64d94aed src/pyams_portal/portlets/html/__init__.py --- a/src/pyams_portal/portlets/html/__init__.py Tue Aug 28 15:42:39 2018 +0200 +++ b/src/pyams_portal/portlets/html/__init__.py Thu Aug 30 10:09:00 2018 +0200 @@ -40,6 +40,7 @@ class RawPortletSettings(PortletSettings): """Raw HTML code portlet settings""" + title = FieldProperty(IRawPortletSettings['title']) body = FieldProperty(IRawPortletSettings['body']) diff -r c5e34981deac -r 885d64d94aed src/pyams_portal/portlets/html/interfaces.py --- a/src/pyams_portal/portlets/html/interfaces.py Tue Aug 28 15:42:39 2018 +0200 +++ b/src/pyams_portal/portlets/html/interfaces.py Thu Aug 30 10:09:00 2018 +0200 @@ -19,8 +19,7 @@ from pyams_portal.interfaces import IPortletSettings # import packages -from pyams_i18n.schema import I18nTextField, I18nHTMLField - +from pyams_i18n.schema import I18nTextField, I18nHTMLField, I18nTextLineField from pyams_portal import _ @@ -28,6 +27,9 @@ class IRawPortletSettings(IPortletSettings): """Raw HTML code portlet settings interface""" + title = I18nTextLineField(title=_("Title"), + required=False) + body = I18nTextField(title=_("Raw HTML code"), description=_("This HTML code will be used 'as is', without any transformation. Use with " "care!!"), diff -r c5e34981deac -r 885d64d94aed src/pyams_portal/portlets/html/skin/__init__.py --- a/src/pyams_portal/portlets/html/skin/__init__.py Tue Aug 28 15:42:39 2018 +0200 +++ b/src/pyams_portal/portlets/html/skin/__init__.py Thu Aug 30 10:09:00 2018 +0200 @@ -30,7 +30,7 @@ @adapter_config(context=(IPortalContext, IPyAMSLayer, Interface, IRawPortletSettings), provides=IPortletRenderer) -@template_config(template='html.pt', layer=IPyAMSLayer) +@template_config(template='raw.pt', layer=IPyAMSLayer) class RawPortletDefaultRenderer(PortletRenderer): """Raw HTML portlet renderer""" diff -r c5e34981deac -r 885d64d94aed src/pyams_portal/portlets/html/skin/raw.pt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/pyams_portal/portlets/html/skin/raw.pt Thu Aug 30 10:09:00 2018 +0200 @@ -0,0 +1,5 @@ + +

${title}

+ ${structure:i18n:settings.body} + diff -r c5e34981deac -r 885d64d94aed src/pyams_portal/portlets/html/zmi/__init__.py --- a/src/pyams_portal/portlets/html/zmi/__init__.py Tue Aug 28 15:42:39 2018 +0200 +++ b/src/pyams_portal/portlets/html/zmi/__init__.py Thu Aug 30 10:09:00 2018 +0200 @@ -61,7 +61,7 @@ @adapter_config(context=(Interface, IPyAMSLayer, Interface, IRawPortletSettings), provides=IPortletPreviewer) -@template_config(template='preview.pt', layer=IPyAMSLayer) +@template_config(template='raw-preview.pt', layer=IPyAMSLayer) class RawPortletPreviewer(PortletPreviewer): """Raw HTML portlet previewer""" @@ -84,6 +84,6 @@ @adapter_config(context=(Interface, IPyAMSLayer, Interface, IHTMLPortletSettings), provides=IPortletPreviewer) -@template_config(template='preview.pt', layer=IPyAMSLayer) +@template_config(template='html-preview.pt', layer=IPyAMSLayer) class HTMLPortletPreviewer(PortletPreviewer): """Rich text portlet previewer""" diff -r c5e34981deac -r 885d64d94aed src/pyams_portal/portlets/html/zmi/html-preview.pt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/pyams_portal/portlets/html/zmi/html-preview.pt Thu Aug 30 10:09:00 2018 +0200 @@ -0,0 +1,2 @@ +HTML code diff -r c5e34981deac -r 885d64d94aed src/pyams_portal/portlets/html/zmi/preview.pt --- a/src/pyams_portal/portlets/html/zmi/preview.pt Tue Aug 28 15:42:39 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -HTML code diff -r c5e34981deac -r 885d64d94aed src/pyams_portal/portlets/html/zmi/raw-preview.pt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/pyams_portal/portlets/html/zmi/raw-preview.pt Thu Aug 30 10:09:00 2018 +0200 @@ -0,0 +1,5 @@ + +
+ +HTML code