[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/ - added viewThreadsAtBottom structure to content_macros

[Yvo Schubbe]

Log message for revision 130236:
  - added viewThreadsAtBottom structure to content_macros

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/TODO.rst
  D   Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/threads.pt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/TODO.rst
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/content_macros.pt

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/TODO.rst
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/TODO.rst	2013-05-11 21:26:58 UTC (rev 130235)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/TODO.rst	2013-05-13 06:42:04 UTC (rev 130236)
@@ -3,7 +3,6 @@
 
 Discussions
 
-- [?] viewThreadsAtBottom.pt (structure)
 - [?] talkback_tree.pt (macros)
 - [?] setup_talkback_tree.py
 - [?] discitem_delete.py

Deleted: Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/threads.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/threads.pt	2013-05-11 21:26:58 UTC (rev 130235)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/discussion/threads.pt	2013-05-13 06:42:04 UTC (rev 130236)
@@ -1,6 +0,0 @@
-<div tal:condition="context/talkback|nothing" i18n:domain="cmf_default">
- <div tal:condition="python: context.talkback.hasReplies(context)">
-  <h4 i18n:translate="">Comments:</h4>
-  <metal:macro metal:use-macro="context/talkback_tree/macros/tree" />
- </div>
-</div>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/TODO.rst
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/TODO.rst	2013-05-11 21:26:58 UTC (rev 130235)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/TODO.rst	2013-05-13 06:42:04 UTC (rev 130236)
@@ -17,3 +17,4 @@
 --------------------------------
 - [x] getBaseTag.pt (structure) -> content_macros.pt
 - [x] content_byline.pt (macros) -> content_macros.pt
+- [x] viewThreadsAtBottom.pt (structure) -> content_macros.pt

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/content_macros.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/content_macros.pt	2013-05-11 21:26:58 UTC (rev 130235)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/content_macros.pt	2013-05-13 06:42:04 UTC (rev 130236)
@@ -39,8 +39,11 @@
 
 <metal:slot metal:define-slot="main" />
 
-<div class="Discussion" tal:condition="context/viewThreadsAtBottom|nothing">
- <tal:span tal:replace="structure context/viewThreadsAtBottom" />
+<div class="Discussion" tal:condition="context/talkback|nothing">
+ <div tal:condition="python: context.talkback.hasReplies(context)">
+  <h4 i18n:translate="">Comments:</h4>
+  <metal:macro metal:use-macro="context/talkback_tree/macros/tree" />
+ </div>
 </div>
 </metal:slot>