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 branch dev-dc
authorThierry Florac <thierry.florac@onf.fr>
Mon, 08 Oct 2018 11:55:14 +0200
changeset 168 71aeef3a5432
parent 165 0dc27358bff1 (diff)
parent 167 83facaf2246a (current diff)
child 169 b7a85fd478c5
Merge branch dev-dc
buildout.cfg file | annotate | diff | comparison | revisions
docs/HISTORY.txt file | annotate | diff | comparison | revisions
setup.py file | annotate | diff | comparison | revisions
src/pyams_default_theme/component/paragraph/pictogram.py file | annotate | diff | comparison | revisions 
--- a/.hgtags	Fri Oct 05 14:13:25 2018 +0200
+++ b/.hgtags	Mon Oct 08 11:55:14 2018 +0200
@@ -8,3 +8,4 @@
 ca0bd32ae2f16385e77d9eb913a8af16e7614464 0.1.7
 85907babe16b8cd8cfb64dadfb7203f23450d493 0.1.8
 461fa3beb4386cf6764d60d59c4854fbba01833b 0.1.9
+d02350fa13e7d76393c414edecef40cd18cbb837 0.1.10
--- a/buildout.cfg	Fri Oct 05 14:13:25 2018 +0200
+++ b/buildout.cfg	Mon Oct 08 11:55:14 2018 +0200
@@ -79,4 +79,4 @@
 eggs = pyams_default_theme [test]
 
 [versions]
-pyams_default_theme = 0.1.10
+pyams_default_theme = 0.1.11
--- a/docs/HISTORY.txt	Fri Oct 05 14:13:25 2018 +0200
+++ b/docs/HISTORY.txt	Mon Oct 08 11:55:14 2018 +0200
@@ -1,6 +1,15 @@
 History
 =======
 
+0.1.11
+------
+ - added method to pictograms paragraph renderer
+
+0.1.10
+------
+ - added base alerts content provider
+ - added and updated illustrations interfaces and adapters
+
 0.1.9
 -----
  - updated templates and renderers
--- a/setup.py	Fri Oct 05 14:13:25 2018 +0200
+++ b/setup.py	Mon Oct 08 11:55:14 2018 +0200
@@ -22,7 +22,7 @@
 README = os.path.join(DOCS, 'README.txt')
 HISTORY = os.path.join(DOCS, 'HISTORY.txt')
 
-version = '0.1.10'
+version = '0.1.11'
 long_description = open(README).read() + '\n\n' + open(HISTORY).read()
 
 tests_require = []
--- a/src/pyams_default_theme.egg-info/PKG-INFO	Fri Oct 05 14:13:25 2018 +0200
+++ b/src/pyams_default_theme.egg-info/PKG-INFO	Mon Oct 08 11:55:14 2018 +0200
@@ -1,17 +1,21 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
 Name: pyams-default-theme
-Version: 0.1.9
+Version: 0.1.10
 Summary: PyAMS default theme
 Home-page: http://hg.ztfy.org/pyams/pyams_default_theme
 Author: Thierry Florac
 Author-email: tflorac@ulthar.net
 License: ZPL
-Description-Content-Type: UNKNOWN
 Description: 
         
         History
         =======
         
+        0.1.10
+        ------
+         - added base alerts content provider
+         - added and updated illustrations interfaces and adapters
+        
         0.1.9
         -----
          - updated templates and renderers
@@ -68,3 +72,4 @@
 Classifier: Programming Language :: Python
 Classifier: Framework :: Pyramid
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Provides-Extra: test
--- a/src/pyams_default_theme.egg-info/SOURCES.txt	Fri Oct 05 14:13:25 2018 +0200
+++ b/src/pyams_default_theme.egg-info/SOURCES.txt	Mon Oct 08 11:55:14 2018 +0200
@@ -74,6 +74,8 @@
 src/pyams_default_theme/component/video/templates/external-video-default.pt
 src/pyams_default_theme/doctests/README.txt
 src/pyams_default_theme/features/__init__.py
+src/pyams_default_theme/features/alert/__init__.py
+src/pyams_default_theme/features/alert/templates/alerts.pt
 src/pyams_default_theme/features/footer/__init__.py
 src/pyams_default_theme/features/footer/interfaces.py
 src/pyams_default_theme/features/footer/skin/__init__.py
--- a/src/pyams_default_theme/component/paragraph/pictogram.py	Fri Oct 05 14:13:25 2018 +0200
+++ b/src/pyams_default_theme/component/paragraph/pictogram.py	Mon Oct 08 11:55:14 2018 +0200
@@ -12,16 +12,10 @@
 
 __docformat__ = 'restructuredtext'
 
-
-# import standard library
-
-# import interfaces
-from pyams_content.component.paragraph.interfaces.pictogram import IPictogramParagraph, IPictogramContainer
+from pyams_content.component.paragraph.interfaces.pictogram import IPictogramContainer, IPictogramParagraph
 from pyams_content.features.renderer.interfaces import IContentRenderer
+from pyams_content.features.renderer.skin import BaseContentRenderer
 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
 
@@ -42,4 +36,4 @@
 
     @property
     def pictograms(self):
-        return IPictogramContainer(self.context)
+        yield from IPictogramContainer(self.context).get_visible_items()
--- a/src/pyams_default_theme/component/paragraph/templates/html-default.pt	Fri Oct 05 14:13:25 2018 +0200
+++ b/src/pyams_default_theme/component/paragraph/templates/html-default.pt	Mon Oct 08 11:55:14 2018 +0200
@@ -2,7 +2,7 @@
 				 position renderer.position if renderer is not None else None;"
 		 switch="position">
 	<tal:var case="'before-title'">${structure:view.render_illustration()}</tal:var>
-	<h2 tal:condition="position != 'before-title'">${view.title}</h2>
+	<h2 tal:condition="view.title and (position != 'before-title')">${view.title}</h2>
 	<tal:var case="'before-body'">${structure:view.render_illustration()}</tal:var>
 	<div>${structure:tales:html(view.body, 'oid_to_href')}</div>
 	<tal:var case="'after-body'">${structure:view.render_illustration()}</tal:var>
pyams/pyams_default_theme