# HG changeset patch
# User Thierry Florac <thierry.florac@onf.fr>
# Date 1532074380 -7200
# Node ID 0a71298d125aafaf8fd9e9ead7293460907c918c
# Parent  da1f756d71581a3d3321e436ae8cf11fb8de79e3# Parent  a0c0663baf9ead013752c5e5e35e9f9979dd9605
Merge branch dev-dc

diff -r a0c0663baf9e -r 0a71298d125a src/pyams_default_theme/component/paragraph/keynumber.py
--- a/src/pyams_default_theme/component/paragraph/keynumber.py	Thu Jul 19 18:28:28 2018 +0200
+++ b/src/pyams_default_theme/component/paragraph/keynumber.py	Fri Jul 20 10:13:00 2018 +0200
@@ -16,16 +16,16 @@
 
 # import interfaces
 from pyams_content.component.paragraph.interfaces.keynumber import IKeyNumberParagraph
-from pyams_content.component.keynumber import IKeyNumberContainer
-from pyams_content.features.renderer import IContentRenderer
+from pyams_content.component.keynumber.interfaces import IKeyNumberContainer
+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 _
 
 
 #
@@ -35,7 +35,7 @@
 class BaseKeyNumberParagraphRenderer(BaseContentRenderer):
     """Default Key Numbers renderer"""
 
-    i18n_context_attrs = ('title',)
+    i18n_context_attrs = ('title', )
 
     @property
     def keynumbers(self):
diff -r a0c0663baf9e -r 0a71298d125a src/pyams_default_theme/component/paragraph/templates/keynumber-default.pt
--- a/src/pyams_default_theme/component/paragraph/templates/keynumber-default.pt	Thu Jul 19 18:28:28 2018 +0200
+++ b/src/pyams_default_theme/component/paragraph/templates/keynumber-default.pt	Fri Jul 20 10:13:00 2018 +0200
@@ -1,17 +1,18 @@
 <tal:var i18n:domain="pyams_default_theme"
          define="numbers list(view.keynumbers.get_visible_items())">
 	<h3>${i18n:view.title}</h3>
-		<div class="col-md-3 col-lg-3 " tal:repeat="number numbers">
+		<div class="col-md-3 col-lg-3"
+			 tal:repeat="number numbers">
 			<div class="panel panel-default">
 				<div class="panel-heading">
-					<span class="lead" tal:content="i18n:number.label">label</span>
+					<span class="lead">${i18n:number.label}</span>
 				</div>
 				<div class="panel-body text-align-center">
-					<span class="h4 text-success" tal:content="i18n:number.number">Number</span>
-					<span class="h5" tal:content="i18n:number.unit">Unit</span>
+					<span class="h4 text-success">${i18n:number.number}</span>
+					<span class="h5">${i18n:number.unit}</span>
 				</div>
 				<div class="panel-footer">
-					<p tal:content="i18n:number.text">Text</p>
+					<p>${i18n:number.text}</p>
 				</div>
 			</div>
 		</div>
diff -r a0c0663baf9e -r 0a71298d125a src/pyams_default_theme/features/footer/skin/__init__.py
--- a/src/pyams_default_theme/features/footer/skin/__init__.py	Thu Jul 19 18:28:28 2018 +0200
+++ b/src/pyams_default_theme/features/footer/skin/__init__.py	Fri Jul 20 10:13:00 2018 +0200
@@ -31,7 +31,7 @@
 from pyams_default_theme import _
 
 
-SIMPLE_FOOTER_RENDERER_NAME = 'PyAMS simple header'
+SIMPLE_FOOTER_RENDERER_NAME = 'PyAMS simple footer'
 
 
 #
diff -r a0c0663baf9e -r 0a71298d125a src/pyams_default_theme/features/footer/skin/templates/simple-footer.pt
--- a/src/pyams_default_theme/features/footer/skin/templates/simple-footer.pt	Thu Jul 19 18:28:28 2018 +0200
+++ b/src/pyams_default_theme/features/footer/skin/templates/simple-footer.pt	Fri Jul 20 10:13:00 2018 +0200
@@ -10,6 +10,8 @@
 			</li>
 		</tal:loop>
 		<li role="presentation"
-			tal:condition="settings.copyright">${settings.copyright}</li>
+			tal:condition="settings.copyright">
+			<a>${settings.copyright}</a>
+		</li>
 	</ul>
 </div>
diff -r a0c0663baf9e -r 0a71298d125a src/pyams_default_theme/features/header/__init__.py
--- a/src/pyams_default_theme/features/header/__init__.py	Thu Jul 19 18:28:28 2018 +0200
+++ b/src/pyams_default_theme/features/header/__init__.py	Fri Jul 20 10:13:00 2018 +0200
@@ -82,7 +82,7 @@
     return context.tabs
 
 
-@adapter_config(name='links', context=ISimpleHeaderRendererSettings, provides=ISublocations)
+@adapter_config(name='tabs', context=ISimpleHeaderRendererSettings, provides=ISublocations)
 class SimpleHeaderRendererSettingsSublocations(ContextAdapter):
     """Simple header renderer settings sub-locations adapter"""