diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewImplicitRelationListWidget.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewImplicitRelationListWidget.xml index 1fe16f8919aef1056f73041c6577e80178cd5763..46013701a75408f04330b8f8168180ebf88aae5f 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewImplicitRelationListWidget.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewImplicitRelationListWidget.xml @@ -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> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewRelationListWidget.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewRelationListWidget.xml index 8120193025e76dccbaaa6b44540ef7f03bd8f5b8..e997c168e1ecb2fe95a934db89c5cbdb4af701f0 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewRelationListWidget.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Document_viewRelationListWidget.xml @@ -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> diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index 4793663f9f2f7cbe691c9358f8781ea33ef7fcf4..24c5507b23c0f31b724642a81eefdd7cb9f8af04 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -631 \ No newline at end of file +633 \ No newline at end of file