--- a/buildout.cfg Mon Jun 11 15:26:26 2018 +0200
+++ b/buildout.cfg Mon Jun 11 17:40:01 2018 +0200
@@ -20,16 +20,27 @@
src = src
develop =
.
- ../ext/lingua
+ ../pyams_catalog
../pyams_catalog
+ ../pyams_content
../pyams_file
../pyams_form
../pyams_i18n
+ ../pyams_mail
+ ../pyams_media
../pyams_pagelet
+ ../pyams_portal
+ ../pyams_security
+ ../pyams_sequence
../pyams_skin
../pyams_template
+ ../pyams_thesaurus
../pyams_utils
../pyams_viewlet
+ ../pyams_workflow
+ ../pyams_zmi
+ ../pyams_zmq
+ ../ext/lingua
parts =
package
--- a/docs/HISTORY.txt Mon Jun 11 15:26:26 2018 +0200
+++ b/docs/HISTORY.txt Mon Jun 11 17:40:01 2018 +0200
@@ -1,6 +1,12 @@
History
=======
+0.1.5
+-----
+ - added header and footer content providers
+ - reorganized PyAMS_content features modules
+ - don't make PyAMS default theme use MyAMS CSS
+
0.1.4
-----
- renamed factories to use snake_case on functions
--- a/src/pyams_default_theme.egg-info/PKG-INFO Mon Jun 11 15:26:26 2018 +0200
+++ b/src/pyams_default_theme.egg-info/PKG-INFO Mon Jun 11 17:40:01 2018 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: pyams-default-theme
-Version: 0.1.4
+Version: 0.1.5
Summary: PyAMS default theme
Home-page: http://hg.ztfy.org/pyams/pyams_default_theme
Author: Thierry Florac
@@ -12,6 +12,12 @@
History
=======
+ 0.1.5
+ -----
+ - added header and footer content providers
+ - reorganized PyAMS_content features modules
+ - don't make PyAMS default theme use MyAMS CSS
+
0.1.4
-----
- renamed factories to use snake_case on functions
--- a/src/pyams_default_theme.egg-info/SOURCES.txt Mon Jun 11 15:26:26 2018 +0200
+++ b/src/pyams_default_theme.egg-info/SOURCES.txt Mon Jun 11 17:40:01 2018 +0200
@@ -30,6 +30,7 @@
src/pyams_default_theme/component/paragraph/contact.py
src/pyams_default_theme/component/paragraph/frame.py
src/pyams_default_theme/component/paragraph/header.py
+src/pyams_default_theme/component/paragraph/html.py
src/pyams_default_theme/component/paragraph/keypoint.py
src/pyams_default_theme/component/paragraph/verbatim.py
src/pyams_default_theme/component/paragraph/video.py
@@ -42,12 +43,19 @@
src/pyams_default_theme/component/paragraph/templates/frame-left.pt
src/pyams_default_theme/component/paragraph/templates/frame-right.pt
src/pyams_default_theme/component/paragraph/templates/header-default.pt
+src/pyams_default_theme/component/paragraph/templates/html-default.pt
src/pyams_default_theme/component/paragraph/templates/keypoints-default.pt
+src/pyams_default_theme/component/paragraph/templates/raw-default.pt
src/pyams_default_theme/component/paragraph/templates/verbatim-default.pt
src/pyams_default_theme/component/paragraph/templates/verbatim-left.pt
src/pyams_default_theme/component/paragraph/templates/verbatim-right.pt
src/pyams_default_theme/component/paragraph/templates/video-default.pt
+src/pyams_default_theme/component/video/__init__.py
+src/pyams_default_theme/component/video/templates/video-default.pt
src/pyams_default_theme/doctests/README.txt
+src/pyams_default_theme/features/__init__.py
+src/pyams_default_theme/features/footer/__init__.py
+src/pyams_default_theme/features/header/__init__.py
src/pyams_default_theme/locales/pyams_default_theme.pot
src/pyams_default_theme/locales/fr/LC_MESSAGES/pyams_default_theme.mo
src/pyams_default_theme/locales/fr/LC_MESSAGES/pyams_default_theme.po
@@ -59,9 +67,15 @@
src/pyams_default_theme/resources/less/pyams-default.less
src/pyams_default_theme/shared/__init__.py
src/pyams_default_theme/shared/common.py
+src/pyams_default_theme/shared/imagemap/__init__.py
+src/pyams_default_theme/shared/imagemap/templates/imagemap-default.pt
+src/pyams_default_theme/shared/imagemap/templates/render.pt
src/pyams_default_theme/shared/logo/__init__.py
src/pyams_default_theme/shared/logo/templates/logos-default.pt
src/pyams_default_theme/shared/templates/content-header.pt
+src/pyams_default_theme/shared/view/__init__.py
+src/pyams_default_theme/shared/view/portlet/__init__.py
+src/pyams_default_theme/shared/view/portlet/templates/view-items-list.pt
src/pyams_default_theme/templates/index.pt
src/pyams_default_theme/templates/layout.pt
src/pyams_default_theme/tests/__init__.py
--- a/src/pyams_default_theme.egg-info/requires.txt Mon Jun 11 15:26:26 2018 +0200
+++ b/src/pyams_default_theme.egg-info/requires.txt Mon Jun 11 17:40:01 2018 +0200
@@ -1,4 +1,5 @@
setuptools
+pyams_content
pyams_skin
pyramid
zope.component
Binary file src/pyams_default_theme/locales/fr/LC_MESSAGES/pyams_default_theme.mo has changed
--- a/src/pyams_default_theme/locales/fr/LC_MESSAGES/pyams_default_theme.po Mon Jun 11 15:26:26 2018 +0200
+++ b/src/pyams_default_theme/locales/fr/LC_MESSAGES/pyams_default_theme.po Mon Jun 11 17:40:01 2018 +0200
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2018-03-07 11:35+0100\n"
+"POT-Creation-Date: 2018-05-24 09:42+0200\n"
"PO-Revision-Date: 2017-06-07 12:41+0200\n"
"Last-Translator: Thierry Florac <tflorac@ulthar.net>\n"
"Language-Team: French\n"
@@ -16,11 +16,6 @@
"Generated-By: Lingua 4.13\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/pyams_default_theme/configuration.py:44
-#: src/pyams_default_theme/configuration.py:47
-msgid "Search..."
-msgstr "Chercher..."
-
#: src/pyams_default_theme/skin.py:35
msgid "PyAMS default skin"
msgstr "Skin par défaut PyAMS"
@@ -29,15 +24,15 @@
msgid "Default gallery renderer"
msgstr "Par défaut"
-#: src/pyams_default_theme/component/illustration/__init__.py:78
+#: src/pyams_default_theme/component/illustration/__init__.py:72
msgid "Centered illustration"
-msgstr "Par défaut (illustration centrée)"
+msgstr "Illustration centrée (par défaut)"
-#: src/pyams_default_theme/component/illustration/__init__.py:87
+#: src/pyams_default_theme/component/illustration/__init__.py:81
msgid "Small illustration on the left"
msgstr "Illustration sur la gauche"
-#: src/pyams_default_theme/component/illustration/__init__.py:98
+#: src/pyams_default_theme/component/illustration/__init__.py:92
msgid "Small illustration on the right"
msgstr "Illustration sur la droite"
@@ -56,28 +51,37 @@
msgstr "Par défaut"
#: src/pyams_default_theme/component/paragraph/video.py:40
+#: src/pyams_default_theme/component/video/__init__.py:41
msgid "Default video renderer"
msgstr "Par défaut"
-#: src/pyams_default_theme/component/paragraph/frame.py:132
+#: src/pyams_default_theme/component/paragraph/frame.py:123
msgid "Default frame renderer"
msgstr "Encadré en pleine largeur (par défaut)"
-#: src/pyams_default_theme/component/paragraph/frame.py:143
-#: src/pyams_default_theme/component/paragraph/verbatim.py:137
+#: src/pyams_default_theme/component/paragraph/frame.py:134
+#: src/pyams_default_theme/component/paragraph/verbatim.py:126
msgid "Small frame on the left"
msgstr "Encadré placé sur la gauche"
-#: src/pyams_default_theme/component/paragraph/frame.py:154
-#: src/pyams_default_theme/component/paragraph/verbatim.py:148
+#: src/pyams_default_theme/component/paragraph/frame.py:145
+#: src/pyams_default_theme/component/paragraph/verbatim.py:137
msgid "Small frame on the right"
msgstr "Encadré placé sur la droite"
-#: src/pyams_default_theme/component/paragraph/verbatim.py:126
+#: src/pyams_default_theme/component/paragraph/verbatim.py:115
msgid "Default verbatim renderer"
msgstr "Encadré en pleine largeur (par défaut)"
-#: src/pyams_default_theme/component/paragraph/contact.py:86
+#: src/pyams_default_theme/component/paragraph/html.py:41
+msgid "Default raw HTML renderer"
+msgstr "Par défaut"
+
+#: src/pyams_default_theme/component/paragraph/html.py:55
+msgid "Default rich text renderer"
+msgstr "Par défaut"
+
+#: src/pyams_default_theme/component/paragraph/contact.py:85
msgid "Default contact renderer"
msgstr "Encadré en pleine largeur (par défaut)"
@@ -160,17 +164,17 @@
msgid "Photo position"
msgstr "Position de la photo"
-#: src/pyams_default_theme/component/paragraph/interfaces/contact.py:53
+#: src/pyams_default_theme/component/paragraph/interfaces/contact.py:52
msgid "Show location map?"
msgstr "Afficher la carte ?"
-#: src/pyams_default_theme/component/paragraph/interfaces/contact.py:54
+#: src/pyams_default_theme/component/paragraph/interfaces/contact.py:53
msgid "If 'no', location map will not be displayed"
msgstr ""
"Si 'non', la carte de situation ne sera pas affichée même si des coordonnées "
"GPS ont été indiquées"
-#: src/pyams_default_theme/component/paragraph/interfaces/contact.py:58
+#: src/pyams_default_theme/component/paragraph/interfaces/contact.py:57
msgid "Map position"
msgstr "Position de la carte"
@@ -178,33 +182,40 @@
msgid "Default associations renderer"
msgstr "Par défaut"
+#: src/pyams_default_theme/shared/view/portlet/__init__.py:37
+msgid "Simple list view"
+msgstr "Liste simple"
+
+#: src/pyams_default_theme/shared/imagemap/__init__.py:56
+msgid "Default imagemap renderer"
+msgstr "Par défaut"
+
#: src/pyams_default_theme/shared/logo/__init__.py:39
msgid "Default logos renderer"
msgstr "Par défaut"
-#: src/pyams_default_theme/templates/layout.pt:61
-msgid "Hide menu"
-msgstr "Masquer le menu"
+#~ msgid "Search..."
+#~ msgstr "Chercher..."
-#: src/pyams_default_theme/templates/layout.pt:78
-msgid "Update your profile to select an avatar..."
-msgstr "Mettez à jour votre profil pour choisir un avatar..."
+#~ msgid "Hide menu"
+#~ msgstr "Masquer le menu"
-#: src/pyams_default_theme/templates/layout.pt:93
-msgid "My shortcuts"
-msgstr "Mes raccourcis"
+#~ msgid "Update your profile to select an avatar..."
+#~ msgstr "Mettez à jour votre profil pour choisir un avatar..."
-#: src/pyams_default_theme/templates/layout.pt:112
-msgid "Notifications"
-msgstr "Notifications"
+#~ msgid "My shortcuts"
+#~ msgstr "Mes raccourcis"
+
+#~ msgid "Notifications"
+#~ msgstr "Notifications"
-#: src/pyams_default_theme/templates/layout.pt:168
-msgid ""
-"<span><i class='text-warning fa fa-warning'></i> "
-"WARNING: this will reset all your widgets status!</span>"
-msgstr ""
-"<span><i class='text-warning fa fa-warning'></i> "
-"ATTENTION: ceci va réinitialiser le statut de tous vos widgets!</span>"
+#~ msgid ""
+#~ "<span><i class='text-warning fa fa-warning'></"
+#~ "i> WARNING: this will reset all your widgets status!</span>"
+#~ msgstr ""
+#~ "<span><i class='text-warning fa fa-warning'></"
+#~ "i> ATTENTION: ceci va réinitialiser le statut de tous vos widgets!</"
+#~ "span>"
#~ msgid "Frame position"
#~ msgstr "Position de l'encadré"
--- a/src/pyams_default_theme/locales/pyams_default_theme.pot Mon Jun 11 15:26:26 2018 +0200
+++ b/src/pyams_default_theme/locales/pyams_default_theme.pot Mon Jun 11 17:40:01 2018 +0200
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2018-03-07 11:35+0100\n"
+"POT-Creation-Date: 2018-05-24 09:42+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,11 +16,6 @@
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Lingua 3.10.dev0\n"
-#: ./src/pyams_default_theme/configuration.py:44
-#: ./src/pyams_default_theme/configuration.py:47
-msgid "Search..."
-msgstr ""
-
#: ./src/pyams_default_theme/skin.py:35
msgid "PyAMS default skin"
msgstr ""
@@ -29,15 +24,15 @@
msgid "Default gallery renderer"
msgstr ""
-#: ./src/pyams_default_theme/component/illustration/__init__.py:78
+#: ./src/pyams_default_theme/component/illustration/__init__.py:72
msgid "Centered illustration"
msgstr ""
-#: ./src/pyams_default_theme/component/illustration/__init__.py:87
+#: ./src/pyams_default_theme/component/illustration/__init__.py:81
msgid "Small illustration on the left"
msgstr ""
-#: ./src/pyams_default_theme/component/illustration/__init__.py:98
+#: ./src/pyams_default_theme/component/illustration/__init__.py:92
msgid "Small illustration on the right"
msgstr ""
@@ -54,28 +49,37 @@
msgstr ""
#: ./src/pyams_default_theme/component/paragraph/video.py:40
+#: ./src/pyams_default_theme/component/video/__init__.py:41
msgid "Default video renderer"
msgstr ""
-#: ./src/pyams_default_theme/component/paragraph/frame.py:132
+#: ./src/pyams_default_theme/component/paragraph/frame.py:123
msgid "Default frame renderer"
msgstr ""
-#: ./src/pyams_default_theme/component/paragraph/frame.py:143
-#: ./src/pyams_default_theme/component/paragraph/verbatim.py:137
+#: ./src/pyams_default_theme/component/paragraph/frame.py:134
+#: ./src/pyams_default_theme/component/paragraph/verbatim.py:126
msgid "Small frame on the left"
msgstr ""
-#: ./src/pyams_default_theme/component/paragraph/frame.py:154
-#: ./src/pyams_default_theme/component/paragraph/verbatim.py:148
+#: ./src/pyams_default_theme/component/paragraph/frame.py:145
+#: ./src/pyams_default_theme/component/paragraph/verbatim.py:137
msgid "Small frame on the right"
msgstr ""
-#: ./src/pyams_default_theme/component/paragraph/verbatim.py:126
+#: ./src/pyams_default_theme/component/paragraph/verbatim.py:115
msgid "Default verbatim renderer"
msgstr ""
-#: ./src/pyams_default_theme/component/paragraph/contact.py:86
+#: ./src/pyams_default_theme/component/paragraph/html.py:41
+msgid "Default raw HTML renderer"
+msgstr ""
+
+#: ./src/pyams_default_theme/component/paragraph/html.py:55
+msgid "Default rich text renderer"
+msgstr ""
+
+#: ./src/pyams_default_theme/component/paragraph/contact.py:85
msgid "Default contact renderer"
msgstr ""
@@ -147,15 +151,15 @@
msgid "Photo position"
msgstr ""
-#: ./src/pyams_default_theme/component/paragraph/interfaces/contact.py:53
+#: ./src/pyams_default_theme/component/paragraph/interfaces/contact.py:52
msgid "Show location map?"
msgstr ""
-#: ./src/pyams_default_theme/component/paragraph/interfaces/contact.py:54
+#: ./src/pyams_default_theme/component/paragraph/interfaces/contact.py:53
msgid "If 'no', location map will not be displayed"
msgstr ""
-#: ./src/pyams_default_theme/component/paragraph/interfaces/contact.py:58
+#: ./src/pyams_default_theme/component/paragraph/interfaces/contact.py:57
msgid "Map position"
msgstr ""
@@ -163,28 +167,14 @@
msgid "Default associations renderer"
msgstr ""
+#: ./src/pyams_default_theme/shared/view/portlet/__init__.py:37
+msgid "Simple list view"
+msgstr ""
+
+#: ./src/pyams_default_theme/shared/imagemap/__init__.py:56
+msgid "Default imagemap renderer"
+msgstr ""
+
#: ./src/pyams_default_theme/shared/logo/__init__.py:39
msgid "Default logos renderer"
msgstr ""
-
-#: ./src/pyams_default_theme/templates/layout.pt:61
-msgid "Hide menu"
-msgstr ""
-
-#: ./src/pyams_default_theme/templates/layout.pt:78
-msgid "Update your profile to select an avatar..."
-msgstr ""
-
-#: ./src/pyams_default_theme/templates/layout.pt:93
-msgid "My shortcuts"
-msgstr ""
-
-#: ./src/pyams_default_theme/templates/layout.pt:112
-msgid "Notifications"
-msgstr ""
-
-#: ./src/pyams_default_theme/templates/layout.pt:168
-msgid ""
-"<span><i class='text-warning fa fa-warning'></i> "
-"WARNING: this will reset all your widgets status!</span>"
-msgstr ""