diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Base_viewKnowledgeManagementMacroLibrary.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Base_viewKnowledgeManagementMacroLibrary.xml index b0d12748100c3c62b4d9192c22112f74511e2402..63a71c8dcdab43f42d70b509c221cb593c63c45f 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Base_viewKnowledgeManagementMacroLibrary.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/Base_viewKnowledgeManagementMacroLibrary.xml @@ -42,22 +42,26 @@ <tal:block metal:define-macro="renderer">\n <ul class="first_level">\n <li>\n - <a tal:content="section/Base_getTitle"\n + <a class="section-link"\n + tal:content="section/Base_getTitle"\n tal:attributes="href section/absolute_url;\n title section/Base_getTitle;"/></li>\n <ul class="second_level">\n \n - <li tal:repeat="root_section python: filter(lambda x:x.isVisible(), section.contentValues(portal_type=\'Web Section\', sort_on=\'int_index\'))">\n + <tal:block tal:repeat="root_section python: filter(lambda x:x.isVisible(), section.contentValues(portal_type=\'Web Section\', sort_on=\'int_index\'))">\n <tal:block \n tal:define="section_dom_id python: root_section.getRelativeUrl().replace(\'/\', \'_\');\n image_dom_id python: \'image_%s\' %section_dom_id;\n - siblings python: filter(lambda x:x.isVisible(), root_section.contentValues(portal_type=\'Web Section\', sort_on=\'int_index\'))">\n -\n - <a tal:content="root_section/Base_getTitle"\n - tal:condition="python:not len(siblings)"\n - tal:attributes="href root_section/absolute_url;\n - title section/Base_getTitle;"/>\n - <tal:block tal:condition="python:len(siblings)">\n + siblings python: filter(lambda x:x.isVisible(), root_section.contentValues(portal_type=\'Web Section\', sort_on=\'int_index\'));\n + exists_siblings python: len(siblings)">\n + <li class="empty-list-node"\n + tal:condition="not: exists_siblings">\n + <a tal:content="root_section/Base_getTitle"\n + tal:attributes="href root_section/absolute_url;\n + title section/Base_getTitle;"/>\n + </li>\n + <li class="non-empty-list-node"\n + tal:condition="exists_siblings">\n <img src="images/tree_closed.png" \n alt=""\n tal:attributes="id image_dom_id"/>\n @@ -74,10 +78,10 @@ </li>\n </ul>\n </div>\n - </tal:block> \n + </li>\n \n </tal:block>\n - </li>\n + </tal:block>\n \n </ul>\n </ul>\n diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/erp5_knowledge_box.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/erp5_knowledge_box.css.xml index aa1d5d0534a925c161cd72121b081b45d81bb448..614304339496a6a5cc7946052a93122570a8047b 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/erp5_knowledge_box.css.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/erp5_knowledge_box.css.xml @@ -15,7 +15,7 @@ </item> <item> <key> <string>_EtagSupport__etag</string> </key> - <value> <string>ts70214048.17</string> </value> + <value> <string>ts72634708.91</string> </value> </item> <item> <key> <string>__name__</string> </key> @@ -492,34 +492,59 @@ div.block div.worklist_list ul li a:hover{\n }\n \n /* Gadget Browser */\n -div.gadget_browser ul {\n +div.gadget-website-browser {\n + margin-top: 0.5em;\n +}\n +div.gadget-website-browser ul {\n margin: 0em;\n padding: 0em;\n }\n \n -div.gadget_browser li {\n +div.gadget-website-browser li {\n padding-left: 0em;\n }\n \n -div.gadget_browser ul.first_level, ul.second_level{\n +div.gadget-website-browser ul.first_level, ul.second_level{\n list-style-type: none!important;\n }\n \n -div.gadget_browser ul.first_level {\n +div.gadget-website-browser ul.first_level {\n padding-bottom: 0.5em;\n }\n -\n -div.gadget_browser ul.second_level{\n - padding-left: 0.3em;\n +div.gadget-website-browser .section-link{\n + font-size: 115%;\n }\n \n -div.gadget_browser ul.third_level{\n +div.gadget-website-browser ul.second_level{\n padding-left: 0.7em;\n }\n \n -div.gadget_browser a {\n - font-weight:normal;\n +div.gadget-website-browser ul.third_level{\n + padding-left: 1.4em;\n +}\n +\n +div.gadget-website-browser a, a:link, a:active, a:visited {\n + font-weight: normal;\n + color: inherit;\n +}\n +div.gadget-website-browser .empty-list-node{\n + list-style-type: square;\n + margin-left: 1.4em;\n +}\n +\n +/* Gadget SubSection */\n +div.gadget-subsection {\n + margin-top: 0.5em;\n }\n +div.gadget-subsection ul{\n + list-style-position: outside!important;\n + list-style-type:square!important;\n + margin: 0.5em;\n + margin-top: 0em;\n + padding: 0.5em;\n +}\n +\n +\n </string> </value> </item> <item> @@ -528,7 +553,7 @@ div.gadget_browser a {\n </item> <item> <key> <string>size</string> </key> - <value> <int>8829</int> </value> + <value> <int>9381</int> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSection_viewSubsectionGadget/subsection_list.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSection_viewSubsectionGadget/subsection_list.xml index 0bfb80450e588257f4c08e8fcf8c4799cd90973e..08ccd1693825685c8c88a66ed61966bc9aeb3d23 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSection_viewSubsectionGadget/subsection_list.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSection_viewSubsectionGadget/subsection_list.xml @@ -77,7 +77,7 @@ <dictionary> <item> <key> <string>css_class</string> </key> - <value> <string>hidden_label subsectionGadget</string> </value> + <value> <string>hidden_label gadget-subsection</string> </value> </item> <item> <key> <string>enabled</string> </key> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_viewWebSiteBrowserGadget.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_viewWebSiteBrowserGadget.xml index 74bbcdde294e10968cb53f5d961ff218373f2b66..55919389c2bbd07eb347f1be646d63e484e694af 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_viewWebSiteBrowserGadget.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/WebSite_viewWebSiteBrowserGadget.xml @@ -43,12 +43,10 @@ <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ -<div class="gadget_browser"\n +<div class="gadget-website-browser"\n tal:define="section_list python:here.contentValues(portal_type=\'Web Section\', sort_on=\'int_index\');\n section_list python:filter(lambda x:x.isVisible(), section_list);\n half_count python:len(section_list) / 2">\n -\n - <h4 value="" i18n:translate="" i18n:domain="ui">Browse Site</h4>\n \n <tal:block tal:repeat="section python:section_list[0:half_count]">\n <tal:block metal:use-macro="container/Base_viewKnowledgeManagementMacroLibrary/macros/renderer">Macro goes here</tal:block> \n diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision index 987afa83193c6123ab5ff73a4f6e4197bf326b61..8fad7c2956a908aa78c21eb5c75a9d487fe3b1ca 100644 --- a/bt5/erp5_km/bt/revision +++ b/bt5/erp5_km/bt/revision @@ -1 +1 @@ -1353 \ No newline at end of file +1354 \ No newline at end of file