diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml index 1a12488acb26d3576a2ce6758f7788afd6f2e81b..a992e05ff2042c9116306f9e2b993c9779d5e68a 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml @@ -156,95 +156,78 @@ tal:define="is_tabs_visible \n python: int(here.REQUEST.get(\'is_tabs_visible\', 1));">\n \n - <table id="navigation_table">\n - <tr>\n - <td id="tab-switcher-container">\n - <div class="tab"\n - id="tabs_switcher"\n - tal:attributes="class python: test(is_tabs_visible,\n - \'border_bottom1px\',\n - \'border_bottom0px\');">\n - <span i18n:translate="" i18n:domain="ui" id="tab_switcher_hidden"\n - tal:attributes="style python: test(is_tabs_visible, \'display:none\', None)">Show tabs</span>\n - <span i18n:translate="" i18n:domain="ui" id="tab_switcher_visible"\n - tal:attributes="style python: test(is_tabs_visible, None, \'display:none\')">Hide tabs</span>\n - </div>\n - </td>\n - <td id="tab-list-container">\n - <div id="tabs"\n - tal:attributes="style python: \n - \'display: %s\' %test(is_tabs_visible, \'block\', \'none\')">\n - <ul>\n - <tal:block tal:repeat="knowledge_pad knowledge_pads">\n -\n - <tal:block \n - tal:define="knowledge_pad_relative_url knowledge_pad/getRelativeUrl;\n + <div class="tab"\n + id="tabs_switcher">\n + <span i18n:translate="" i18n:domain="ui" id="tab_switcher_hidden"\n + tal:attributes="style python: test(is_tabs_visible, \'display:none\', None)">Show tabs</span>\n + <span i18n:translate="" i18n:domain="ui" id="tab_switcher_visible"\n + tal:attributes="style python: test(is_tabs_visible, None, \'display:none\')">Hide tabs</span>\n + </div>\n +\n + <div id="tabs"\n + tal:attributes="style python: \n + \'display: %s\' %test(is_tabs_visible, \'block\', \'none\')">\n + <ul>\n + <tal:block tal:repeat="knowledge_pad knowledge_pads">\n +\n + <tal:block tal:define="knowledge_pad_relative_url knowledge_pad/getRelativeUrl;\n active_knowledge_pad_relative_url active_knowledge_pad/getRelativeUrl;\n is_active python: knowledge_pad_relative_url==active_knowledge_pad_relative_url;\n dom_id python: \'%s\' %knowledge_pad_relative_url.replace(\'/\', \'_\');\n pad_title_dom_id python: \'%s_title\' %dom_id;"> \n \n - <li tal:attributes="id dom_id;\n - class python: test(is_active, \'tab tab_selected\', \'tab\')">\n -\n - <!-- \n - <a tal:attributes="href string:\n - ERP5Site_toggleActiveKnowledgePad?knowledge_pad_url=${knowledge_pad_relative_url}&mode=${mode}">\n - <span tal:attributes="id pad_title_dom_id;"\n - tal:content="knowledge_pad/getTitle"/>\n - </a>-->\n -\n - <span tal:attributes="id pad_title_dom_id;\n - onclick string:loadPadFromServer(\'${knowledge_pad_relative_url}\', \'${dom_id}\', \'${mode}\')" \n - tal:content="knowledge_pad/getTitle"/>\n -\n - <div class="pad-actions"\n - tal:attributes="style python: test(is_active, \'display:block\', \'display:none\')">\n - <span title="Settings"\n - i18n:attributes="title"\n - i18n:domain="ui"\n - class="clickable_image rename_tab_dialog_image"\n - tal:attributes="onclick string:showRenamePadPopup(\'${knowledge_pad_relative_url}\', \n - \'${pad_title_dom_id}\');"></span>\n - <span title="Remove"\n - i18n:attributes="title"\n - i18n:domain="ui"\n - class="clickable_image remove_tab_dialog_image"\n - tal:attributes="onclick string: removeKnowledgePadFromServer(\n - \'${knowledge_pad_relative_url}\', \'${mode}\')"/>\n - </div>\n -\n - </li>\n -\n - </tal:block>\n - </tal:block>\n - <li class="tab"\n - tal:condition="not: isKnowledgePadTemplateUsed"\n - onclick="showAddNewPadPopup();"\n - i18n:translate="title" i18n:domain="ui"\n - title="Add new tab"\n - id="add_new_tab_dialog_link">Add tab</li>\n - <li class="tab"\n + <li tal:attributes="id dom_id;\n + class python: test(is_active, \'tab tab_selected\', \'tab\')">\n +\n + <!-- \n + <a tal:attributes="href string:\n + ERP5Site_toggleActiveKnowledgePad?knowledge_pad_url=${knowledge_pad_relative_url}&mode=${mode}">\n + <span tal:attributes="id pad_title_dom_id;"\n + tal:content="knowledge_pad/getTitle"/>\n + </a>-->\n +\n + <span tal:attributes="id pad_title_dom_id;\n + onclick string:loadPadFromServer(\'${knowledge_pad_relative_url}\', \'${dom_id}\', \'${mode}\')" \n + tal:content="knowledge_pad/getTitle"/>\n +\n + <div class="pad-actions"\n + tal:attributes="style python: test(is_active, \'display:block\', \'display:none\')">\n + <span title="Settings"\n + i18n:attributes="title"\n + i18n:domain="ui"\n + class="clickable_image rename_tab_dialog_image"\n + tal:attributes="onclick string:showRenamePadPopup(\'${knowledge_pad_relative_url}\', \n + \'${pad_title_dom_id}\');"></span>\n + <span title="Remove"\n + i18n:attributes="title"\n + i18n:domain="ui"\n + class="clickable_image remove_tab_dialog_image"\n + tal:attributes="onclick string: removeKnowledgePadFromServer(\n + \'${knowledge_pad_relative_url}\', \'${mode}\')"/>\n + </div>\n +\n + </li>\n +\n + </tal:block>\n + </tal:block>\n + <li class="tab"\n + tal:condition="not: isKnowledgePadTemplateUsed"\n + onclick="showAddNewPadPopup();"\n + i18n:translate="title" i18n:domain="ui"\n + title="Add new tab"\n + id="add_new_tab_dialog_link">Add tab</li>\n + <li class="tab"\n tal:condition="python: isKnowledgePadTemplateUsed and isUserAllowedToCreateKnowledgePads"\n onclick="showCreateDefaultKnowledgePadWarningMessage();"\n i18n:translate="title" i18n:domain="ui"\n title="Create your own tab"\n id="create_own_pad_dialog_link"></li>\n - </ul>\n - </div>\n - </td>\n - \n - <td id="add-new-gadget-container">\n - <div id="add_new_gadget_link"\n - tal:attributes="class python: test(is_tabs_visible,\n - \'border_bottom1px\',\n - \'border_bottom0px\');">\n - <span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/add_new_gadget"> Add Gadgets</span>\n - </div>\n - </td>\n -\n - </tr>\n - </table>\n + </ul>\n + </div>\n +\n + <div id="add_new_gadget_link">\n + <span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/add_new_gadget"> Add Gadgets</span>\n + </div>\n \n </tal:block>\n \n diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml index 456a5a65fd8e8f2541dde222f67e2d762523cd75..b59c807f5aadd77ac9c831a1d13ff3a7eac4c4b8 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml @@ -12,7 +12,7 @@ </item> <item> <key> <string>_EtagSupport__etag</string> </key> - <value> <string>ts94401374.54</string> </value> + <value> <string>ts95442223.79</string> </value> </item> <item> <key> <string>__name__</string> </key> @@ -165,29 +165,17 @@ div.edit-form {\n }\n \n /* Tabs for Knowledge Pads */ \n -#navigation_table {\n - width: 100%;\n - border-collapse:collapse;\n - margin:0em;\n - border:medium none;\n -}\n -\n -#navigation_table tr{\n - border:medium none;\n -}\n -\n -#navigation_table td{\n - margin: 0em;\n - padding: 0em;\n - border:medium none;\n +#pad-navigation-wrapper{\n + margin-top:10px;\n + border-bottom:1px solid #3D6474;\n + height:25px;\n + width:100%;\n }\n \n #tabs {\n - height: 25px;\n - border-bottom: 1px solid #3D6474;\n padding-left: 0em;\n - width: 100%;\n float: left;\n + width:78%;\n }\n \n #tabs ul {\n @@ -273,20 +261,15 @@ div.toggable_dialog{\n border-style: none;\n }\n \n -#tabs-switcher-container{\n - width: 17.5%;\n -}\n -\n #tabs_switcher{\n cursor: pointer; \n font-weight: bold;\n background: transparent;\n padding-top: 5px;\n border-style: none;\n - width: 100%;\n - border-bottom: 1px solid #3D6474;\n - height: 20px;\n margin: 0em;\n + width: 10%;\n + float:left\n }\n \n #add_new_gadget_link{\n @@ -294,7 +277,8 @@ div.toggable_dialog{\n height: 20px;\n text-align:right; \n padding-top:5px;\n - border-bottom:1px solid #3D6474;\n + float:right;\n + width:12%;\n }\n \n /* Draggable Area */\n @@ -318,15 +302,6 @@ div.box_inner_content ol{\n margin-top: 0em;\n }\n \n -/* this classes will switch one/off border below tabs selector*/\n -div.border_bottom0px{\n - border-bottom: 1px solid #DAE6F6;\n -}\n -\n -div.border_bottom1px{\n - border-bottom: 1px solid #3D6474;\n -}\n -\n /* seperate gadget tables from rest of ERP5*/\n div.block div.content{\n padding: 0px;\n @@ -520,7 +495,7 @@ div.gadget-rss-reader .body {\n </item> <item> <key> <string>size</string> </key> - <value> <int>8675</int> </value> + <value> <int>8226</int> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_knowledge_pad/bt/revision b/bt5/erp5_knowledge_pad/bt/revision index dd9de55003996a93508b35e10097f762d422e3cf..9251196df347629db89caa8098b7b3316365f168 100644 --- a/bt5/erp5_knowledge_pad/bt/revision +++ b/bt5/erp5_knowledge_pad/bt/revision @@ -1 +1 @@ -677 \ No newline at end of file +678 \ No newline at end of file