--- a/src/pyams_default_theme.egg-info/PKG-INFO	Wed Jul 18 18:50:14 2018 +0200
+++ b/src/pyams_default_theme.egg-info/PKG-INFO	Wed Jul 18 18:51:18 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

--- a/src/pyams_default_theme.egg-info/SOURCES.txt	Wed Jul 18 18:50:14 2018 +0200
+++ b/src/pyams_default_theme.egg-info/SOURCES.txt	Wed Jul 18 18:51:18 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

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pyams_default_theme/component/paragraph/audio.py	Wed Jul 18 18:51:18 2018 +0200
@@ -0,0 +1,40 @@
+#
+# 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 import IContentRenderer
+from pyams_skin.layer import IPyAMSLayer
+
+# import packages
+from pyams_content.features.renderer.skin import BaseContentRenderer
+from pyams_default_theme import _
+from pyams_template.template import template_config
+from pyams_utils.adapter import adapter_config
+
+
+#
+#  Audio paragraph default renderer
+#
+
+@adapter_config(name='default', context=(IAudioParagraph, IPyAMSLayer), provides=IContentRenderer)
+@template_config(template='templates/keynumber-default.pt', layer=IPyAMSLayer)
+class DefaultAudioRenderer(BaseContentRenderer):
+    """Default Key Numbers renderer"""
+
+    label = _("Default audio renderer")
+    weight = 1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pyams_default_theme/component/paragraph/keynumber.py	Wed Jul 18 18:51:18 2018 +0200
@@ -0,0 +1,49 @@
+#
+# 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 import IContentRenderer
+from pyams_skin.layer import IPyAMSLayer
+
+# import packages
+from pyams_content.features.renderer.skin import BaseContentRenderer
+from pyams_default_theme import _
+from pyams_template.template import template_config
+from pyams_utils.adapter import adapter_config
+
+
+
+#
+#  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 DefaultKeyNumberRenderer(BaseKeyNumberRenderer):
+    """Default Key Numbers renderer"""
+
+    label = _("Default key numbers renderer")
+    weight = 1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pyams_default_theme/component/paragraph/milestone.py	Wed Jul 18 18:51:18 2018 +0200
@@ -0,0 +1,40 @@
+#
+# 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 import IContentRenderer
+from pyams_skin.layer import IPyAMSLayer
+
+# import packages
+from pyams_default_theme import _
+from pyams_content.features.renderer.skin import BaseContentRenderer
+from pyams_template.template import template_config
+from pyams_utils.adapter import adapter_config
+
+#
+# Milestone paragraph default renderer
+#
+
+@adapter_config(name='default', context=(IMilestoneParagraph, IPyAMSLayer), provides=IContentRenderer)
+@template_config(template='templates/milestone-default.pt', layer=IPyAMSLayer)
+class DefaultMilestoneRenderer(BaseContentRenderer):
+    """Default Pictogram renderer"""
+
+    label = _("Default milestones renderer")
+    weight = 1
+
+    i18n_context_attrs = ('title',)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pyams_default_theme/component/paragraph/pictogram.py	Wed Jul 18 18:51:18 2018 +0200
@@ -0,0 +1,40 @@
+#
+# 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 import IContentRenderer
+from pyams_skin.layer import IPyAMSLayer
+
+# import packages
+from pyams_content.features.renderer.skin import BaseContentRenderer
+from pyams_default_theme import _
+from pyams_template.template import template_config
+from pyams_utils.adapter import adapter_config
+
+
+#
+#  Pictogram paragraph default renderer
+#
+
+@adapter_config(name='default', context=(IPictogramParagraph, IPyAMSLayer), provides=IContentRenderer)
+@template_config(template='templates/pictogram-default.pt', layer=IPyAMSLayer)
+class DefaultPictogramRenderer(BaseContentRenderer):
+    """Default Pictogram renderer"""
+
+
+    label = _("Default pictograms renderer")
+    weight = 1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pyams_default_theme/component/paragraph/templates/audio-default.pt	Wed Jul 18 18:51:18 2018 +0200
@@ -0,0 +1,1 @@
+

--- a/src/pyams_default_theme/component/video/__init__.py	Wed Jul 18 18:50:14 2018 +0200
+++ b/src/pyams_default_theme/component/video/__init__.py	Wed Jul 18 18:51:18 2018 +0200
@@ -12,7 +12,6 @@
 
 __docformat__ = 'restructuredtext'
 
-
 # import standard library
 
 # import interfaces
@@ -34,7 +33,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"""
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pyams_default_theme/component/video/templates/external-video-default.pt	Wed Jul 18 18:51:18 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()" />

--- a/src/pyams_default_theme/component/video/templates/video-default.pt	Wed Jul 18 18:50:14 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()" />