# HG changeset patch
# User Thierry Florac <thierry.florac@onf.fr>
# Date 1531843734 -7200
# Node ID 5139e1da058e4a477cc282ea914b83b8a998bd7f
# Parent  0e8c775ca958a948f927a72ff924140a035f6c3d# Parent  1afd36ed6947d2cb4f2ac5e4bda584f1a66cb890
Merge branch dev-dc

diff -r 0e8c775ca958 -r 5139e1da058e src/pyams_content/features/menu/portlet/navigation/double.py
--- a/src/pyams_content/features/menu/portlet/navigation/double.py	Tue Jul 17 18:01:54 2018 +0200
+++ b/src/pyams_content/features/menu/portlet/navigation/double.py	Tue Jul 17 18:08:54 2018 +0200
@@ -46,7 +46,6 @@
     """Double navigation portlet settings"""
 
     title = FieldProperty(IDoubleNavigationPortletSettings['title'])
-    subtitle = FieldProperty(IDoubleNavigationPortletSettings['subtitle'])
 
     @property
     def menus(self):
diff -r 0e8c775ca958 -r 5139e1da058e src/pyams_content/features/menu/portlet/navigation/interfaces/double.py
--- a/src/pyams_content/features/menu/portlet/navigation/interfaces/double.py	Tue Jul 17 18:01:54 2018 +0200
+++ b/src/pyams_content/features/menu/portlet/navigation/interfaces/double.py	Tue Jul 17 18:08:54 2018 +0200
@@ -32,10 +32,6 @@
                               description=_("Portlet main title"),
                               required=False)
 
-    subtitle = I18nTextLineField(title=_("Subtitle"),
-                                 description=_("Portlet subtitle"),
-                                 required=False)
-
     menus = Attribute("Navigation menus")
 
 
diff -r 0e8c775ca958 -r 5139e1da058e src/pyams_content/features/menu/portlet/navigation/interfaces/simple.py
--- a/src/pyams_content/features/menu/portlet/navigation/interfaces/simple.py	Tue Jul 17 18:01:54 2018 +0200
+++ b/src/pyams_content/features/menu/portlet/navigation/interfaces/simple.py	Tue Jul 17 18:08:54 2018 +0200
@@ -32,10 +32,6 @@
                               description=_("Portlet main title"),
                               required=False)
 
-    subtitle = I18nTextLineField(title=_("Subtitle"),
-                                 description=_("Portlet subtitle"),
-                                 required=False)
-
     links = Attribute("Navigation links")
 
 
diff -r 0e8c775ca958 -r 5139e1da058e src/pyams_content/features/menu/portlet/navigation/simple.py
--- a/src/pyams_content/features/menu/portlet/navigation/simple.py	Tue Jul 17 18:01:54 2018 +0200
+++ b/src/pyams_content/features/menu/portlet/navigation/simple.py	Tue Jul 17 18:08:54 2018 +0200
@@ -46,7 +46,6 @@
     """Simple navigation portlet settings"""
 
     title = FieldProperty(ISimpleNavigationPortletSettings['title'])
-    subtitle = FieldProperty(ISimpleNavigationPortletSettings['subtitle'])
 
     @property
     def links(self):
diff -r 0e8c775ca958 -r 5139e1da058e src/pyams_content/features/menu/portlet/navigation/zmi/templates/double-preview.pt
--- a/src/pyams_content/features/menu/portlet/navigation/zmi/templates/double-preview.pt	Tue Jul 17 18:01:54 2018 +0200
+++ b/src/pyams_content/features/menu/portlet/navigation/zmi/templates/double-preview.pt	Tue Jul 17 18:08:54 2018 +0200
@@ -1,6 +1,5 @@
 <div tal:define="settings view.settings" i18n:domain="pyams_content">
 	<strong tal:content="i18n:settings.title">Title</strong>
-	<tal:var define="subtitle i18n:settings.subtitle" condition="subtitle" content="subtitle" />
 	<ul>
 		<li tal:repeat="menu settings.menus.get_visible_items(request)">
 			<span tal:content="i18n:menu.title">Title</span>
diff -r 0e8c775ca958 -r 5139e1da058e src/pyams_content/features/menu/portlet/navigation/zmi/templates/simple-preview.pt
--- a/src/pyams_content/features/menu/portlet/navigation/zmi/templates/simple-preview.pt	Tue Jul 17 18:01:54 2018 +0200
+++ b/src/pyams_content/features/menu/portlet/navigation/zmi/templates/simple-preview.pt	Tue Jul 17 18:08:54 2018 +0200
@@ -1,6 +1,5 @@
 <div tal:define="settings view.settings" i18n:domain="pyams_content">
 	<strong tal:content="i18n:settings.title">Title</strong>
-	<tal:var define="subtitle i18n:settings.subtitle" condition="subtitle" content="subtitle" />
 	<ul>
 		<li tal:repeat="link settings.links.get_visible_items(request)">
 			<i class="fa fa-fw fa-eye-slash text-danger hint opaque align-base"