[Erp5-report] r21339 - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/erp5_web_...

nobody at svn.erp5.org nobody at svn.erp5.org
Thu Jun 5 10:30:35 CEST 2008


Author: ivan
Date: Thu Jun  5 10:30:33 2008
New Revision: 21339

URL: http://svn.erp5.org?rev=21339&view=rev
Log:
Update Relation gadget to show a message if no documents  or wikis are found.

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewImplicitRelationListWidget.xml
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewRelationListWidget.xml
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewImplicitRelationListWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewImplicitRelationListWidget.xml?rev=21339&r1=21338&r2=21339&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewImplicitRelationListWidget.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewImplicitRelationListWidget.xml Thu Jun  5 10:30:33 2008
@@ -45,25 +45,54 @@
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-<tal:block tal:define="doc_list python:here.Document_getRelatedDocumentList(relation_id=\'wiki_successor\')">\n
-  <div class="related_docs" tal:condition="doc_list">\n
-    <div class="title" i18n:translate="" i18n:domain="ui">Wiki successors</div>\n
-    <ul>\n
-      <li tal:repeat="doc doc_list">\n
-        <a tal:content="doc/getTitleOrId" tal:attributes="href python:doc.absolute_url()+\'/view\'"/>\n
-      </li>\n
-    </ul>\n
-  </div>\n
-</tal:block>\n
-<tal:block tal:define="doc_list python:here.Document_getRelatedDocumentList(relation_id=\'wiki_predecessor\')">\n
-  <div class="related_docs" tal:condition="doc_list">\n
-    <div class="title" i18n:translate="" i18n:domain="ui">Wiki predecessors</div>\n
-    <ul tal:define="doc_list python:here.Document_getRelatedDocumentList(relation_id=\'wiki_predecessor\')">\n
-      <li tal:repeat="doc doc_list">\n
-        <a tal:content="doc/getTitleOrId" tal:attributes="href python:doc.absolute_url()+\'/view\'"/>\n
-      </li>\n
-    </ul>\n
-  </div>\n
+<tal:block tal:define="default_section_document python: here.getDefaultDocumentValue() or here">  \n
+\n
+  <tal:block tal:condition="default_section_document">\n
+    <tal:block tal:define="related_wiki_successor_document_list python:\n
+                             default_section_document.Document_getRelatedDocumentList(\n
+                                     relation_id=\'wiki_successor\');\n
+                           related_wiki_predecessor_document_list python:\n
+                             default_section_document.Document_getRelatedDocumentList(\n
+                                     relation_id=\'wiki_predecessor\');\n
+                           all_wiki_related_document_list python:\n
+                             list(related_wiki_successor_document_list) +\n
+                             list(related_wiki_predecessor_document_list)">\n
+\n
+      <div class="related_docs" tal:condition="related_wiki_successor_document_list">\n
+        <div class="title" i18n:translate="" i18n:domain="ui">Wiki successors</div>\n
+        <ul>\n
+          <li tal:repeat="doc related_wiki_successor_document_list">\n
+            <a tal:content="doc/getTitleOrId" \n
+                tal:attributes="href python:doc.absolute_url()+\'/view\'"/>\n
+          </li>\n
+        </ul>\n
+      </div>\n
+\n
+      <div class="related_docs" tal:condition="related_wiki_predecessor_document_list">\n
+        <div class="title" i18n:translate="" i18n:domain="ui">Wiki predecessors</div>\n
+        <ul>\n
+          <li tal:repeat="doc related_wiki_predecessor_document_list">\n
+            <a tal:content="doc/getTitleOrId" \n
+                tal:attributes="href python:doc.absolute_url()+\'/view\'"/>\n
+          </li>\n
+        </ul>\n
+      </div>\n
+\n
+      <div class="related_docs" tal:condition="not: all_wiki_related_document_list">\n
+        <div class="title" i18n:translate="" i18n:domain="ui">\n
+          No related wiki documents found.\n
+        </div>\n
+      </div>\n
+\n
+    </tal:block>\n
+  </tal:block>\n
+\n
+  <tal:block tal:condition="not: default_section_document">\n
+    <div class="title" i18n:translate="" i18n:domain="ui">\n
+      No related wiki documents found.\n
+    </div>\n
+  </tal:block>\n
+\n
 </tal:block>
 
 ]]></string> </value>

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewRelationListWidget.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewRelationListWidget.xml?rev=21339&r1=21338&r2=21339&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewRelationListWidget.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewRelationListWidget.xml Thu Jun  5 10:30:33 2008
@@ -45,36 +45,71 @@
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-<tal:block tal:define="doc_list python:here.Document_getRelatedDocumentList(relation_id=\'related_successor\')">\n
-  <div class="related_docs" tal:condition="doc_list">\n
-    <div class="title" i18n:translate="" i18n:domain="ui">Related</div>\n
-    <ul>\n
-      <li tal:repeat="doc doc_list">\n
-        <a tal:content="doc/getTitleOrId" tal:attributes="href python:doc.absolute_url()+\'/view\'"/>\n
-      </li>\n
-    </ul>\n
-  </div>\n
+<tal:block tal:define="default_section_document python: here.getDefaultDocumentValue() or here">\n
+\n
+  <tal:block tal:condition="default_section_document">\n
+    <tal:block\n
+      tal:define="related_successor_document_list  python:\n
+                    default_section_document.Document_getRelatedDocumentList(\n
+                             relation_id=\'related_successor\');\n
+                  related_similar_document_list  python:\n
+                    default_section_document.Document_getRelatedDocumentList(\n
+                             relation_id=\'related_similar\');\n
+                  related_predecessor_document_list python:\n
+                    default_section_document.Document_getRelatedDocumentList(\n
+                             relation_id=\'related_predecessor\');\n
+                  all_related_document_list python: \n
+                    related_successor_document_list +\n
+                    related_similar_document_list +\n
+                    related_predecessor_document_list">\n
+\n
+      <div class="related_docs" tal:condition="related_successor_document_list">\n
+        <div class="title" i18n:translate="" i18n:domain="ui">Related</div>\n
+        <ul>\n
+          <li tal:repeat="doc related_successor_document_list">\n
+            <a tal:content="doc/getTitleOrId" \n
+                tal:attributes="href python:doc.absolute_url()+\'/view\'"/>\n
+          </li>\n
+        </ul>\n
+      </div>\n
+\n
+      <div class="related_docs" tal:condition="related_similar_document_list">\n
+        <div class="title" i18n:translate="" i18n:domain="ui">Similar</div>\n
+        <ul>\n
+          <li tal:repeat="doc related_similar_document_list">\n
+            <a tal:content="doc/getTitleOrId" \n
+                tal:attributes="href python:doc.absolute_url()+\'/view\'"/>\n
+          </li>\n
+        </ul>\n
+      </div>\n
+\n
+      <div class="related_docs" tal:condition="related_predecessor_document_list">\n
+        <div class="title" i18n:translate="" i18n:domain="ui">Reference</div>\n
+        <ul>\n
+          <li tal:repeat="doc doc_list">\n
+            <a tal:content="doc/getTitleOrId" \n
+                tal:attributes="href python:doc.absolute_url()+\'/view\'"/>\n
+          </li>\n
+        </ul>\n
+      </div>\n
+\n
+      <div class="related_docs" tal:condition="not: all_related_document_list">\n
+        <div class="title" i18n:translate="" i18n:domain="ui">\n
+          No related documents found.\n
+        </div>\n
+      </div>\n
+\n
+    </tal:block>\n
+  </tal:block>\n
+\n
+  <tal:block tal:condition="not: default_section_document">\n
+    <div class="title" i18n:translate="" i18n:domain="ui">\n
+      No related documents found.\n
+    </div>\n
+  </tal:block>\n
+\n
 </tal:block>\n
-<tal:block tal:define="doc_list python:here.Document_getRelatedDocumentList(relation_id=\'related_similar\')">\n
-  <div class="related_docs" tal:condition="doc_list">\n
-    <div class="title" i18n:translate="" i18n:domain="ui">Similar</div>\n
-    <ul>\n
-      <li tal:repeat="doc doc_list">\n
-        <a tal:content="doc/getTitleOrId" tal:attributes="href python:doc.absolute_url()+\'/view\'"/>\n
-      </li>\n
-    </ul>\n
-  </div>\n
-</tal:block>\n
-<tal:block tal:define="doc_list python:here.Document_getRelatedDocumentList(relation_id=\'related_predecessor\')">\n
-  <div class="related_docs" tal:condition="doc_list">\n
-    <div class="title" i18n:translate="" i18n:domain="ui">Reference</div>\n
-    <ul>\n
-      <li tal:repeat="doc doc_list">\n
-        <a tal:content="doc/getTitleOrId" tal:attributes="href python:doc.absolute_url()+\'/view\'"/>\n
-      </li>\n
-    </ul>\n
-  </div>\n
-</tal:block>
+
 
 ]]></string> </value>
         </item>

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=21339&r1=21338&r2=21339&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision Thu Jun  5 10:30:33 2008
@@ -1,1 +1,1 @@
-631
+633




More information about the Erp5-report mailing list