--- a/.installed.cfg Fri Nov 30 12:33:19 2018 +0100
+++ b/.installed.cfg Fri Nov 30 14:42:57 2018 +0100
@@ -128,3 +128,38 @@
[buildout]
parts = package i18n pyflakes test
+
+[buildout]
+installed_develop_eggs = /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-media.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-file.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-sequence.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-content.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/lingua.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-template.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-default-theme.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-security.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-workflow.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-skin.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-pagelet.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-viewlet.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-i18n.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-mail.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-thesaurus.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-portal.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-zmi.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-zmq.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-catalog.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-form.egg-link
+ /home/tflorac/Dropbox/src/PyAMS/pyams_portal/develop-eggs/pyams-utils.egg-link
+
+[buildout]
+parts = i18n pyflakes test package
+
+[buildout]
+parts = pyflakes test package i18n
+
+[buildout]
+parts = test package i18n pyflakes
+
+[buildout]
+parts = package i18n pyflakes test
--- a/buildout.cfg Fri Nov 30 12:33:19 2018 +0100
+++ b/buildout.cfg Fri Nov 30 14:42:57 2018 +0100
@@ -79,4 +79,4 @@
eggs = pyams_portal [test]
[versions]
-pyams_portal = 0.1.19.2
+pyams_portal = 0.1.20
--- a/docs/HISTORY.txt Fri Nov 30 12:33:19 2018 +0100
+++ b/docs/HISTORY.txt Fri Nov 30 14:42:57 2018 +0100
@@ -1,6 +1,12 @@
History
=======
+0.1.20
+------
+ - disable portlets cache when request params is not empty
+ - convert "oid://" URLs to relative URLs in HTML portlet renderer
+ - added spacer portlet
+
0.1.19.2
--------
- add check for missing portlets
--- a/setup.py Fri Nov 30 12:33:19 2018 +0100
+++ b/setup.py Fri Nov 30 14:42:57 2018 +0100
@@ -22,7 +22,7 @@
README = os.path.join(DOCS, 'README.txt')
HISTORY = os.path.join(DOCS, 'HISTORY.txt')
-version = '0.1.19.2'
+version = '0.1.20'
long_description = open(README).read() + '\n\n' + open(HISTORY).read()
tests_require = []
--- a/src/pyams_portal.egg-info/PKG-INFO Fri Nov 30 12:33:19 2018 +0100
+++ b/src/pyams_portal.egg-info/PKG-INFO Fri Nov 30 14:42:57 2018 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: pyams-portal
-Version: 0.1.19.2
+Version: 0.1.20
Summary: PyAMS portal and portlets interfaces and classes
Home-page: http://hg.ztfy.org/pyams/pyams_portal
Author: Thierry Florac
@@ -98,6 +98,12 @@
History
=======
+ 0.1.20
+ ------
+ - disable portlets cache when request params is not empty
+ - convert "oid://" URLs to relative URLs in HTML portlet renderer
+ - added spacer portlet
+
0.1.19.2
--------
- add check for missing portlets
--- a/src/pyams_portal.egg-info/SOURCES.txt Fri Nov 30 12:33:19 2018 +0100
+++ b/src/pyams_portal.egg-info/SOURCES.txt Fri Nov 30 14:42:57 2018 +0100
@@ -27,17 +27,26 @@
src/pyams_portal/portlets/html/__init__.py
src/pyams_portal/portlets/html/interfaces.py
src/pyams_portal/portlets/html/skin/__init__.py
-src/pyams_portal/portlets/html/skin/html.pt
-src/pyams_portal/portlets/html/skin/raw.pt
+src/pyams_portal/portlets/html/skin/templates/code.pt
+src/pyams_portal/portlets/html/skin/templates/html.pt
+src/pyams_portal/portlets/html/skin/templates/raw.pt
src/pyams_portal/portlets/html/zmi/__init__.py
-src/pyams_portal/portlets/html/zmi/html-preview.pt
-src/pyams_portal/portlets/html/zmi/raw-preview.pt
+src/pyams_portal/portlets/html/zmi/templates/html-preview.pt
+src/pyams_portal/portlets/html/zmi/templates/raw-preview.pt
src/pyams_portal/portlets/image/__init__.py
src/pyams_portal/portlets/image/interfaces.py
src/pyams_portal/portlets/image/skin/__init__.py
src/pyams_portal/portlets/image/skin/image.pt
src/pyams_portal/portlets/image/zmi/__init__.py
src/pyams_portal/portlets/image/zmi/preview.pt
+src/pyams_portal/portlets/spacer/__init__.py
+src/pyams_portal/portlets/spacer/interfaces.py
+src/pyams_portal/portlets/spacer/skin/__init__.py
+src/pyams_portal/portlets/spacer/skin/templates/spacer-double.pt
+src/pyams_portal/portlets/spacer/skin/templates/spacer-ruler.pt
+src/pyams_portal/portlets/spacer/skin/templates/spacer.pt
+src/pyams_portal/portlets/spacer/zmi/__init__.py
+src/pyams_portal/portlets/spacer/zmi/preview.pt
src/pyams_portal/resources/css/portal.css
src/pyams_portal/resources/css/portal.min.css
src/pyams_portal/resources/js/portal.js
Binary file src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.mo has changed
--- a/src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.po Fri Nov 30 12:33:19 2018 +0100
+++ b/src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.po Fri Nov 30 14:42:57 2018 +0100
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2018-11-16 15:08+0100\n"
+"POT-Creation-Date: 2018-11-30 12:08+0100\n"
"PO-Revision-Date: 2015-05-12 12:10+0200\n"
"Last-Translator: Thierry Florac <tflorac@ulthar.net>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -368,35 +368,53 @@
msgid "Responsive image renderer"
msgstr "Image responsive (par défaut)"
+#: src/pyams_portal/portlets/spacer/__init__.py:39
+msgid "Spacer"
+msgstr "Espace"
+
+#: src/pyams_portal/portlets/spacer/skin/__init__.py:33
+msgid "Default spacer"
+msgstr "Espace simple (par défaut)"
+
+#: src/pyams_portal/portlets/spacer/skin/__init__.py:44
+msgid "Double spacer"
+msgstr "Espace double"
+
+#: src/pyams_portal/portlets/spacer/skin/__init__.py:55
+msgid "Double spacer with horizontal ruler"
+msgstr "Espace double avec trait horizontal"
+
#: src/pyams_portal/portlets/html/__init__.py:52
-msgid "Raw HTML"
-msgstr "Code HTML"
+#: src/pyams_portal/portlets/html/interfaces.py:33
+msgid "Source code"
+msgstr "Code source"
#: src/pyams_portal/portlets/html/__init__.py:79
msgid "Rich text"
msgstr "Texte enrichi"
-#: src/pyams_portal/portlets/html/interfaces.py:33
-msgid "Raw HTML code"
-msgstr "Code HTML"
-
#: src/pyams_portal/portlets/html/interfaces.py:34
msgid ""
-"This HTML code will be used 'as is', without any transformation. Use with "
-"care!!"
+"This code will be used 'as is', without any transformation, if using the "
+"'raw' renderer. Use with care!!"
msgstr ""
-"Ce code HTML sera utilisé 'en l'état', sans aucune vérification ni "
-"transformation. À utiliser donc avec précaution !!"
+"Ce code sera utilisé 'en l'état', sans aucune vérification ni "
+"transformation, si vous utilisez le mode de rendu par défaut. À utiliser "
+"donc avec précaution !!"
#: src/pyams_portal/portlets/html/interfaces.py:42
msgid "Body"
msgstr "Contenu HTML"
-#: src/pyams_portal/portlets/html/skin/__init__.py:37
+#: src/pyams_portal/portlets/html/skin/__init__.py:39
msgid "Default code renderer"
msgstr "Rendu de code HTML (par défaut)"
-#: src/pyams_portal/portlets/html/skin/__init__.py:45
+#: src/pyams_portal/portlets/html/skin/__init__.py:54
+msgid "Formatted source code renderer"
+msgstr "Code source formatté"
+
+#: src/pyams_portal/portlets/html/skin/__init__.py:82
msgid "Default text renderer"
msgstr "Rendu de code HTML (par défaut)"
@@ -578,6 +596,12 @@
msgid "Template used for this page"
msgstr "Modèle de présentation utilisé pour cette page"
+#~ msgid "Raw HTML"
+#~ msgstr "Code HTML"
+
+#~ msgid "Raw HTML code"
+#~ msgstr "Code HTML"
+
#~ msgid "Override parent template"
#~ msgstr "Ne pas hériter du modèle de présentation du parent"
--- a/src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.po~ Fri Nov 30 12:33:19 2018 +0100
+++ b/src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.po~ Fri Nov 30 14:42:57 2018 +0100
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2018-11-16 15:07+0100\n"
+"POT-Creation-Date: 2018-11-30 11:07+0100\n"
"PO-Revision-Date: 2015-05-12 12:10+0200\n"
"Last-Translator: Thierry Florac <tflorac@ulthar.net>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -46,8 +46,7 @@
msgstr "Propriétés"
#: src/pyams_portal/zmi/portlet.py:176
-#: src/pyams_portal/zmi/templates/renderer-input.pt:2
-#: src/pyams_portal/zmi/templates/renderer-input.pt:5
+#: src/pyams_portal/zmi/templates/renderer-input.pt:4
msgid "Edit renderer properties"
msgstr "Propriétés de ce mode de rendu"
@@ -369,6 +368,22 @@
msgid "Responsive image renderer"
msgstr "Image responsive (par défaut)"
+#: src/pyams_portal/portlets/spacer/__init__.py:39
+msgid "Spacer"
+msgstr "Espace"
+
+#: src/pyams_portal/portlets/spacer/skin/__init__.py:33
+msgid "Default spacer"
+msgstr "Espace simple (par défaut)"
+
+#: src/pyams_portal/portlets/spacer/skin/__init__.py:44
+msgid "Double spacer"
+msgstr "Espace double"
+
+#: src/pyams_portal/portlets/spacer/skin/__init__.py:55
+msgid "Double spacer with horizontal ruler"
+msgstr "Espace double avec trait horizontal"
+
#: src/pyams_portal/portlets/html/__init__.py:52
msgid "Raw HTML"
msgstr "Code HTML"
@@ -378,26 +393,31 @@
msgstr "Texte enrichi"
#: src/pyams_portal/portlets/html/interfaces.py:33
-msgid "Raw HTML code"
-msgstr "Code HTML"
+msgid "Source code"
+msgstr "Code source"
#: src/pyams_portal/portlets/html/interfaces.py:34
msgid ""
-"This HTML code will be used 'as is', without any transformation. Use with "
-"care!!"
+"This code will be used 'as is', without any transformation, if using the "
+"'raw' renderer. Use with care!!"
msgstr ""
-"Ce code HTML sera utilisé 'en l'état', sans aucune vérification ni "
-"transformation. À utiliser donc avec précaution !!"
+"Ce code sera utilisé 'en l'état', sans aucune vérification ni "
+"transformation, si vous utilisez le mode de rendu par défaut. "
+"À utiliser donc avec précaution !!"
#: src/pyams_portal/portlets/html/interfaces.py:42
msgid "Body"
msgstr "Contenu HTML"
-#: src/pyams_portal/portlets/html/skin/__init__.py:37
+#: src/pyams_portal/portlets/html/skin/__init__.py:39
msgid "Default code renderer"
msgstr "Rendu de code HTML (par défaut)"
-#: src/pyams_portal/portlets/html/skin/__init__.py:45
+#: src/pyams_portal/portlets/html/skin/__init__.py:54
+msgid "Formatted source code renderer"
+msgstr "Code source formatté"
+
+#: src/pyams_portal/portlets/html/skin/__init__.py:82
msgid "Default text renderer"
msgstr "Rendu de code HTML (par défaut)"
@@ -579,6 +599,9 @@
msgid "Template used for this page"
msgstr "Modèle de présentation utilisé pour cette page"
+#~ msgid "Raw HTML code"
+#~ msgstr "Code HTML"
+
#~ msgid "Override parent template"
#~ msgstr "Ne pas hériter du modèle de présentation du parent"
--- a/src/pyams_portal/locales/pyams_portal.pot Fri Nov 30 12:33:19 2018 +0100
+++ b/src/pyams_portal/locales/pyams_portal.pot Fri Nov 30 14:42:57 2018 +0100
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2018-11-16 15:08+0100\n"
+"POT-Creation-Date: 2018-11-30 12:08+0100\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"
@@ -347,33 +347,50 @@
msgid "Responsive image renderer"
msgstr ""
+#: ./src/pyams_portal/portlets/spacer/__init__.py:39
+msgid "Spacer"
+msgstr ""
+
+#: ./src/pyams_portal/portlets/spacer/skin/__init__.py:33
+msgid "Default spacer"
+msgstr ""
+
+#: ./src/pyams_portal/portlets/spacer/skin/__init__.py:44
+msgid "Double spacer"
+msgstr ""
+
+#: ./src/pyams_portal/portlets/spacer/skin/__init__.py:55
+msgid "Double spacer with horizontal ruler"
+msgstr ""
+
#: ./src/pyams_portal/portlets/html/__init__.py:52
-msgid "Raw HTML"
+#: ./src/pyams_portal/portlets/html/interfaces.py:33
+msgid "Source code"
msgstr ""
#: ./src/pyams_portal/portlets/html/__init__.py:79
msgid "Rich text"
msgstr ""
-#: ./src/pyams_portal/portlets/html/interfaces.py:33
-msgid "Raw HTML code"
-msgstr ""
-
#: ./src/pyams_portal/portlets/html/interfaces.py:34
msgid ""
-"This HTML code will be used 'as is', without any transformation. Use with "
-"care!!"
+"This code will be used 'as is', without any transformation, if using the "
+"'raw' renderer. Use with care!!"
msgstr ""
#: ./src/pyams_portal/portlets/html/interfaces.py:42
msgid "Body"
msgstr ""
-#: ./src/pyams_portal/portlets/html/skin/__init__.py:37
+#: ./src/pyams_portal/portlets/html/skin/__init__.py:39
msgid "Default code renderer"
msgstr ""
-#: ./src/pyams_portal/portlets/html/skin/__init__.py:45
+#: ./src/pyams_portal/portlets/html/skin/__init__.py:54
+msgid "Formatted source code renderer"
+msgstr ""
+
+#: ./src/pyams_portal/portlets/html/skin/__init__.py:82
msgid "Default text renderer"
msgstr ""