# HG changeset patch
# User Thierry Florac <thierry.florac@onf.fr>
# Date 1532013657 -7200
# Node ID 9e70ec7ccaa830f183abd437f9cfbaf34cd30747
# Parent  9821ede236b11ff7a36ce8941530394af737c451# Parent  a050abf1a69c8a2c67b19bbe8af18a50cdab49b1
Merge dev-dc

diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme.egg-info/PKG-INFO
--- a/src/pyams_default_theme.egg-info/PKG-INFO	Wed Jul 18 15:51:05 2018 +0200
+++ b/src/pyams_default_theme.egg-info/PKG-INFO	Thu Jul 19 17:20:57 2018 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyams-default-theme
-Version: 0.1.6
+Version: 0.1.7
 Summary: PyAMS default theme
 Home-page: http://hg.ztfy.org/pyams/pyams_default_theme
 Author: Thierry Florac
diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme.egg-info/SOURCES.txt
--- a/src/pyams_default_theme.egg-info/SOURCES.txt	Wed Jul 18 15:51:05 2018 +0200
+++ b/src/pyams_default_theme.egg-info/SOURCES.txt	Thu Jul 19 17:20:57 2018 +0200
@@ -8,7 +8,6 @@
 src/pyams_default_theme/page.py
 src/pyams_default_theme/skin.py
 src/pyams_default_theme.egg-info/PKG-INFO
-src/pyams_default_theme.egg-info/SOURCES (Copie en conflit de xsup98-004 2018-03-10).txt
 src/pyams_default_theme.egg-info/SOURCES.txt
 src/pyams_default_theme.egg-info/dependency_links.txt
 src/pyams_default_theme.egg-info/entry_points.txt
@@ -22,6 +21,7 @@
 src/pyams_default_theme/component/gallery/__init__.py
 src/pyams_default_theme/component/gallery/templates/renderer-default.pt
 src/pyams_default_theme/component/illustration/__init__.py
+src/pyams_default_theme/component/illustration/__init__.py.orig
 src/pyams_default_theme/component/illustration/interfaces/__init__.py
 src/pyams_default_theme/component/illustration/templates/illustration-default.pt
 src/pyams_default_theme/component/illustration/templates/illustration-left.pt
@@ -43,6 +43,7 @@
 src/pyams_default_theme/component/paragraph/interfaces/frame.py
 src/pyams_default_theme/component/paragraph/interfaces/verbatim.py
 src/pyams_default_theme/component/paragraph/templates/contact-default.pt
+src/pyams_default_theme/component/paragraph/templates/contact-default.pt.orig
 src/pyams_default_theme/component/paragraph/templates/frame-default.pt
 src/pyams_default_theme/component/paragraph/templates/frame-left.pt
 src/pyams_default_theme/component/paragraph/templates/frame-right.pt
@@ -60,18 +61,26 @@
 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/features/header/interfaces.py
+src/pyams_default_theme/features/header/skin/__init__.py
+src/pyams_default_theme/features/header/skin/templates/simple-header.pt
+src/pyams_default_theme/features/header/zmi/__init__.py
 src/pyams_default_theme/features/menu/__init__.py
 src/pyams_default_theme/features/menu/portlet/__init__.py
 src/pyams_default_theme/features/menu/portlet/navigation/__init__.py
 src/pyams_default_theme/features/menu/portlet/navigation/interfaces.py
 src/pyams_default_theme/features/menu/portlet/navigation/templates/double-select.pt
 src/pyams_default_theme/features/menu/portlet/navigation/templates/double-vertical.pt
+src/pyams_default_theme/features/menu/portlet/navigation/templates/onf.pt
 src/pyams_default_theme/features/menu/portlet/navigation/templates/simple-horizontal-tabs.pt
 src/pyams_default_theme/features/menu/portlet/navigation/templates/simple-horizontal.pt
+src/pyams_default_theme/interfaces/__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.mo.orig
 src/pyams_default_theme/locales/fr/LC_MESSAGES/pyams_default_theme.po
 src/pyams_default_theme/resources/css/pyams-default.css
+src/pyams_default_theme/resources/css/pyams-default.css.map
 src/pyams_default_theme/resources/css/pyams-default.min.css
 src/pyams_default_theme/resources/img/dot.png
 src/pyams_default_theme/resources/js/pyams-default.js
@@ -79,6 +88,7 @@
 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/common/__init__.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
@@ -94,4 +104,9 @@
 src/pyams_default_theme/templates/preview-layout.pt
 src/pyams_default_theme/tests/__init__.py
 src/pyams_default_theme/tests/test_utilsdocs.py
-src/pyams_default_theme/tests/test_utilsdocstrings.py
\ No newline at end of file
+src/pyams_default_theme/tests/test_utilsdocstrings.py
+src/pyams_default_theme/viewlet/__init__.py
+src/pyams_default_theme/viewlet/banner/__init__.py
+src/pyams_default_theme/viewlet/banner/templates/banner.pt
+src/pyams_default_theme/viewlet/logo/__init__.py
+src/pyams_default_theme/viewlet/logo/templates/logo.pt
\ No newline at end of file
diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme/component/paragraph/audio.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pyams_default_theme/component/paragraph/audio.py	Thu Jul 19 17:20:57 2018 +0200
@@ -0,0 +1,41 @@
+#
+# Copyright (c) 2008-2015 Thierry Florac <tflorac AT ulthar.net>
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+
+
+__docformat__ = 'restructuredtext'
+
+# import standard library
+
+# import interfaces
+from pyams_content.component.paragraph.interfaces.audio import IAudioParagraph
+from pyams_content.features.renderer.interfaces import IContentRenderer
+from pyams_skin.layer import IPyAMSLayer
+
+# import packages
+from pyams_content.features.renderer.skin import BaseContentRenderer
+from pyams_template.template import template_config
+from pyams_utils.adapter import adapter_config
+
+from pyams_default_theme import _
+
+
+#
+#  Audio paragraph default renderer
+#
+
+@adapter_config(name='default', context=(IAudioParagraph, IPyAMSLayer), provides=IContentRenderer)
+@template_config(template='templates/audio-default.pt', layer=IPyAMSLayer)
+class DefaultAudioParagraphRenderer(BaseContentRenderer):
+    """Default Key Numbers renderer"""
+
+    label = _("Default audio renderer")
+    weight = 1
diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme/component/paragraph/keynumber.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pyams_default_theme/component/paragraph/keynumber.py	Thu Jul 19 17:20:57 2018 +0200
@@ -0,0 +1,51 @@
+#
+# Copyright (c) 2008-2015 Thierry Florac <tflorac AT ulthar.net>
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+
+__docformat__ = 'restructuredtext'
+
+
+# import standard library
+
+# import interfaces
+from pyams_content.component.paragraph.interfaces.keynumber import IKeyNumberParagraph
+from pyams_content.features.renderer.interfaces import IContentRenderer
+from pyams_skin.layer import IPyAMSLayer
+
+# import packages
+from pyams_content.features.renderer.skin import BaseContentRenderer
+from pyams_template.template import template_config
+from pyams_utils.adapter import adapter_config
+
+from pyams_default_theme import _
+
+
+#
+#  Base Key numbers paragraph renderer
+#
+
+class BaseKeyNumberRenderer(BaseContentRenderer):
+    """Default Key Numbers renderer"""
+
+    i18n_context_attrs = ('title',)
+
+
+#
+#  Key numbers paragraph default renderer
+#
+
+@adapter_config(name='default', context=(IKeyNumberParagraph, IPyAMSLayer), provides=IContentRenderer)
+@template_config(template='templates/keynumber-default.pt', layer=IPyAMSLayer)
+class DefaultKeyNumberParagraphRenderer(BaseKeyNumberRenderer):
+    """Default Key Numbers renderer"""
+
+    label = _("Default key numbers renderer")
+    weight = 1
diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme/component/paragraph/milestone.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pyams_default_theme/component/paragraph/milestone.py	Thu Jul 19 17:20:57 2018 +0200
@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2008-2015 Thierry Florac <tflorac AT ulthar.net>
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+
+__docformat__ = 'restructuredtext'
+
+
+# import standard library
+
+# import interfaces
+from pyams_content.component.paragraph.interfaces.milestone import IMilestoneParagraph
+from pyams_content.features.renderer.interfaces import IContentRenderer
+from pyams_skin.layer import IPyAMSLayer
+
+# import packages
+from pyams_content.features.renderer.skin import BaseContentRenderer
+from pyams_template.template import template_config
+from pyams_utils.adapter import adapter_config
+
+from pyams_default_theme import _
+
+
+#
+# Milestone paragraph default renderer
+#
+
+@adapter_config(name='default', context=(IMilestoneParagraph, IPyAMSLayer), provides=IContentRenderer)
+@template_config(template='templates/milestone-default.pt', layer=IPyAMSLayer)
+class DefaultMilestoneParagraphRenderer(BaseContentRenderer):
+    """Default Pictogram renderer"""
+
+    label = _("Default milestones renderer")
+    weight = 1
+
+    i18n_context_attrs = ('title',)
diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme/component/paragraph/pictogram.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pyams_default_theme/component/paragraph/pictogram.py	Thu Jul 19 17:20:57 2018 +0200
@@ -0,0 +1,41 @@
+#
+# Copyright (c) 2008-2015 Thierry Florac <tflorac AT ulthar.net>
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+
+__docformat__ = 'restructuredtext'
+
+
+# import standard library
+
+# import interfaces
+from pyams_content.component.paragraph.interfaces.pictogram import IPictogramParagraph
+from pyams_content.features.renderer.interfaces import IContentRenderer
+from pyams_skin.layer import IPyAMSLayer
+
+# import packages
+from pyams_content.features.renderer.skin import BaseContentRenderer
+from pyams_template.template import template_config
+from pyams_utils.adapter import adapter_config
+
+from pyams_default_theme import _
+
+
+#
+#  Pictogram paragraph default renderer
+#
+
+@adapter_config(name='default', context=(IPictogramParagraph, IPyAMSLayer), provides=IContentRenderer)
+@template_config(template='templates/pictogram-default.pt', layer=IPyAMSLayer)
+class DefaultPictogramParagraphRenderer(BaseContentRenderer):
+    """Default Pictogram renderer"""
+
+    label = _("Default pictograms renderer")
+    weight = 1
diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme/component/paragraph/templates/audio-default.pt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pyams_default_theme/component/paragraph/templates/audio-default.pt	Thu Jul 19 17:20:57 2018 +0200
@@ -0,0 +1,1 @@
+
diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme/component/paragraph/templates/keynumber-default.pt
diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme/component/paragraph/templates/milestone-default.pt
diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme/component/paragraph/templates/pictogram-default.pt
diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme/component/video/__init__.py
--- a/src/pyams_default_theme/component/video/__init__.py	Wed Jul 18 15:51:05 2018 +0200
+++ b/src/pyams_default_theme/component/video/__init__.py	Thu Jul 19 17:20:57 2018 +0200
@@ -34,7 +34,7 @@
 #
 
 @adapter_config(name='default', context=(IExternalVideoParagraph, IPyAMSLayer), provides=IContentRenderer)
-@template_config(template='templates/video-default.pt', layer=IPyAMSLayer)
+@template_config(template='templates/external-video-default.pt', layer=IPyAMSLayer)
 class ExternalVideoParagraphDefaultRenderer(BaseContentRenderer):
     """external video paragraph default renderer"""
 
diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme/component/video/templates/external-video-default.pt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pyams_default_theme/component/video/templates/external-video-default.pt	Thu Jul 19 17:20:57 2018 +0200
@@ -0,0 +1,5 @@
+<h3 tal:condition="view.title"
+	tal:content="view.title">title</h3>
+<div tal:condition="view.description"
+	 tal:content="structure tales:html(view.description)">Description</div>
+<tal:var replace="structure view.render_video()" />
diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme/component/video/templates/video-default.pt
--- a/src/pyams_default_theme/component/video/templates/video-default.pt	Wed Jul 18 15:51:05 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<h3 tal:condition="view.title"
-	tal:content="view.title">title</h3>
-<div tal:condition="view.description"
-	 tal:content="structure tales:html(view.description)">Description</div>
-<tal:var replace="structure view.render_video()" />
diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme/locales/fr/LC_MESSAGES/pyams_default_theme.mo
Binary file src/pyams_default_theme/locales/fr/LC_MESSAGES/pyams_default_theme.mo has changed
diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme/locales/fr/LC_MESSAGES/pyams_default_theme.po
--- a/src/pyams_default_theme/locales/fr/LC_MESSAGES/pyams_default_theme.po	Wed Jul 18 15:51:05 2018 +0200
+++ b/src/pyams_default_theme/locales/fr/LC_MESSAGES/pyams_default_theme.po	Thu Jul 19 17:20:57 2018 +0200
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2018-07-18 14:48+0200\n"
+"POT-Creation-Date: 2018-07-19 17:00+0200\n"
 "PO-Revision-Date: 2017-06-07 12:41+0200\n"
 "Last-Translator: Thierry Florac <tflorac@ulthar.net>\n"
 "Language-Team: French\n"
@@ -54,6 +54,10 @@
 "Si 'oui', un clic sur la vignette de l'illustration est nécessaire pour "
 "zoomer sur l'image"
 
+#: src/pyams_default_theme/component/paragraph/milestone.py:40
+msgid "Default milestones renderer"
+msgstr "Par défaut"
+
 #: src/pyams_default_theme/component/paragraph/keypoint.py:40
 msgid "Default key points renderer"
 msgstr "Par défaut"
@@ -67,6 +71,18 @@
 msgid "Default video renderer"
 msgstr "Par défaut"
 
+#: src/pyams_default_theme/component/paragraph/pictogram.py:40
+msgid "Default pictograms renderer"
+msgstr "Par défaut"
+
+#: src/pyams_default_theme/component/paragraph/audio.py:40
+msgid "Default audio renderer"
+msgstr "Par défaut"
+
+#: src/pyams_default_theme/component/paragraph/keynumber.py:50
+msgid "Default key numbers renderer"
+msgstr "Par défaut"
+
 #: src/pyams_default_theme/component/paragraph/frame.py:123
 msgid "Default frame renderer"
 msgstr "Encadré en pleine largeur (par défaut)"
diff -r 9821ede236b1 -r 9e70ec7ccaa8 src/pyams_default_theme/locales/pyams_default_theme.pot
--- a/src/pyams_default_theme/locales/pyams_default_theme.pot	Wed Jul 18 15:51:05 2018 +0200
+++ b/src/pyams_default_theme/locales/pyams_default_theme.pot	Thu Jul 19 17:20:57 2018 +0200
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2018-07-18 14:48+0200\n"
+"POT-Creation-Date: 2018-07-19 17:00+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"
@@ -52,6 +52,10 @@
 msgid "If 'yes', a click on illustration thumbnail is required to zoom"
 msgstr ""
 
+#: ./src/pyams_default_theme/component/paragraph/milestone.py:40
+msgid "Default milestones renderer"
+msgstr ""
+
 #: ./src/pyams_default_theme/component/paragraph/keypoint.py:40
 msgid "Default key points renderer"
 msgstr ""
@@ -65,6 +69,18 @@
 msgid "Default video renderer"
 msgstr ""
 
+#: ./src/pyams_default_theme/component/paragraph/pictogram.py:40
+msgid "Default pictograms renderer"
+msgstr ""
+
+#: ./src/pyams_default_theme/component/paragraph/audio.py:40
+msgid "Default audio renderer"
+msgstr ""
+
+#: ./src/pyams_default_theme/component/paragraph/keynumber.py:50
+msgid "Default key numbers renderer"
+msgstr ""
+
 #: ./src/pyams_default_theme/component/paragraph/frame.py:123
 msgid "Default frame renderer"
 msgstr ""