Mercurial Mercurial > pyams > pyams_default_theme / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge default dev-dc
authorDamien Correia
Thu, 19 Jul 2018 18:28:08 +0200
branchdev-dc
changeset 109 2df1cc36531c
parent 104 a050abf1a69c (current diff)
parent 105 9e70ec7ccaa8 (diff)
child 110 a0c0663baf9e
Merge default
--- a/src/pyams_default_theme/component/paragraph/audio.py	Wed Jul 18 18:51:18 2018 +0200
+++ b/src/pyams_default_theme/component/paragraph/audio.py	Thu Jul 19 18:28:08 2018 +0200
@@ -17,23 +17,24 @@
 
 # import interfaces
 from pyams_content.component.paragraph.interfaces.audio import IAudioParagraph
-from pyams_content.features.renderer import IContentRenderer
+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_default_theme import _
 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/keynumber-default.pt', layer=IPyAMSLayer)
-class DefaultAudioRenderer(BaseContentRenderer):
+@template_config(template='templates/audio-default.pt', layer=IPyAMSLayer)
+class DefaultAudioParagraphRenderer(BaseContentRenderer):
     """Default Key Numbers renderer"""
 
     label = _("Default audio renderer")
--- a/src/pyams_default_theme/component/paragraph/keynumber.py	Wed Jul 18 18:51:18 2018 +0200
+++ b/src/pyams_default_theme/component/paragraph/keynumber.py	Thu Jul 19 18:28:08 2018 +0200
@@ -12,19 +12,20 @@
 
 __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_content.features.renderer.interfaces 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
 
+from pyams_default_theme import _
 
 
 #
@@ -36,13 +37,14 @@
 
     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):
+class DefaultKeyNumberParagraphRenderer(BaseKeyNumberRenderer):
     """Default Key Numbers renderer"""
 
     label = _("Default key numbers renderer")
--- a/src/pyams_default_theme/component/paragraph/milestone.py	Wed Jul 18 18:51:18 2018 +0200
+++ b/src/pyams_default_theme/component/paragraph/milestone.py	Thu Jul 19 18:28:08 2018 +0200
@@ -12,26 +12,29 @@
 
 __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_content.features.renderer.interfaces 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
 
+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 DefaultMilestoneRenderer(BaseContentRenderer):
+class DefaultMilestoneParagraphRenderer(BaseContentRenderer):
     """Default Pictogram renderer"""
 
     label = _("Default milestones renderer")
--- a/src/pyams_default_theme/component/paragraph/pictogram.py	Wed Jul 18 18:51:18 2018 +0200
+++ b/src/pyams_default_theme/component/paragraph/pictogram.py	Thu Jul 19 18:28:08 2018 +0200
@@ -12,19 +12,21 @@
 
 __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_content.features.renderer.interfaces 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
 
+from pyams_default_theme import _
+
 
 #
 #  Pictogram paragraph default renderer
@@ -32,9 +34,8 @@
 
 @adapter_config(name='default', context=(IPictogramParagraph, IPyAMSLayer), provides=IContentRenderer)
 @template_config(template='templates/pictogram-default.pt', layer=IPyAMSLayer)
-class DefaultPictogramRenderer(BaseContentRenderer):
+class DefaultPictogramParagraphRenderer(BaseContentRenderer):
     """Default Pictogram renderer"""
 
-
     label = _("Default pictograms renderer")
     weight = 1
--- a/src/pyams_default_theme/component/video/__init__.py	Wed Jul 18 18:51:18 2018 +0200
+++ b/src/pyams_default_theme/component/video/__init__.py	Thu Jul 19 18:28:08 2018 +0200
@@ -12,6 +12,7 @@
 
 __docformat__ = 'restructuredtext'
 
+
 # import standard library
 
 # import interfaces
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	Wed Jul 18 18:51:18 2018 +0200
+++ b/src/pyams_default_theme/locales/fr/LC_MESSAGES/pyams_default_theme.po	Thu Jul 19 18:28:08 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)"
--- a/src/pyams_default_theme/locales/pyams_default_theme.pot	Wed Jul 18 18:51:18 2018 +0200
+++ b/src/pyams_default_theme/locales/pyams_default_theme.pot	Thu Jul 19 18:28:08 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 ""
pyams/pyams_default_theme