Skip to content

erp5
erp5
Commit 0f24422d authored by Ivan Tyagov's avatar Ivan Tyagov
Browse files
Options

No need to use tables for gadget pad switch navigation. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42457 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 8f8c3ea3
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 117 deletions
bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
View file @ 0f24422d
...@@ -156,95 +156,78 @@ ...@@ -156,95 +156,78 @@
tal:define="is_tabs_visible \n tal:define="is_tabs_visible \n
python: int(here.REQUEST.get(\'is_tabs_visible\', 1));">\n python: int(here.REQUEST.get(\'is_tabs_visible\', 1));">\n
\n \n
<table id="navigation_table">\n <div class="tab"\n
<tr>\n id="tabs_switcher">\n
<td id="tab-switcher-container">\n <span i18n:translate="" i18n:domain="ui" id="tab_switcher_hidden"\n
<div class="tab"\n tal:attributes="style python: test(is_tabs_visible, \'display:none\', None)">Show tabs</span>\n
id="tabs_switcher"\n <span i18n:translate="" i18n:domain="ui" id="tab_switcher_visible"\n
tal:attributes="class python: test(is_tabs_visible,\n tal:attributes="style python: test(is_tabs_visible, None, \'display:none\')">Hide tabs</span>\n
\'border_bottom1px\',\n </div>\n
\'border_bottom0px\');">\n \n
<span i18n:translate="" i18n:domain="ui" id="tab_switcher_hidden"\n <div id="tabs"\n
tal:attributes="style python: test(is_tabs_visible, \'display:none\', None)">Show tabs</span>\n tal:attributes="style python: \n
<span i18n:translate="" i18n:domain="ui" id="tab_switcher_visible"\n \'display: %s\' %test(is_tabs_visible, \'block\', \'none\')">\n
tal:attributes="style python: test(is_tabs_visible, None, \'display:none\')">Hide tabs</span>\n <ul>\n
</div>\n <tal:block tal:repeat="knowledge_pad knowledge_pads">\n
</td>\n \n
<td id="tab-list-container">\n <tal:block tal:define="knowledge_pad_relative_url knowledge_pad/getRelativeUrl;\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
active_knowledge_pad_relative_url active_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 is_active python: knowledge_pad_relative_url==active_knowledge_pad_relative_url;\n
dom_id python: \'%s\' %knowledge_pad_relative_url.replace(\'/\', \'_\');\n dom_id python: \'%s\' %knowledge_pad_relative_url.replace(\'/\', \'_\');\n
pad_title_dom_id python: \'%s_title\' %dom_id;"> \n pad_title_dom_id python: \'%s_title\' %dom_id;"> \n
\n \n
<li tal:attributes="id dom_id;\n <li tal:attributes="id dom_id;\n
class python: test(is_active, \'tab tab_selected\', \'tab\')">\n class python: test(is_active, \'tab tab_selected\', \'tab\')">\n
\n \n
<!-- \n <!-- \n
<a tal:attributes="href string:\n <a tal:attributes="href string:\n
ERP5Site_toggleActiveKnowledgePad?knowledge_pad_url=${knowledge_pad_relative_url}&amp;mode=${mode}">\n ERP5Site_toggleActiveKnowledgePad?knowledge_pad_url=${knowledge_pad_relative_url}&amp;mode=${mode}">\n
<span tal:attributes="id pad_title_dom_id;"\n <span tal:attributes="id pad_title_dom_id;"\n
tal:content="knowledge_pad/getTitle"/>\n tal:content="knowledge_pad/getTitle"/>\n
</a>-->\n </a>-->\n
\n \n
<span tal:attributes="id pad_title_dom_id;\n <span tal:attributes="id pad_title_dom_id;\n
onclick string:loadPadFromServer(\'${knowledge_pad_relative_url}\', \'${dom_id}\', \'${mode}\')" \n onclick string:loadPadFromServer(\'${knowledge_pad_relative_url}\', \'${dom_id}\', \'${mode}\')" \n
tal:content="knowledge_pad/getTitle"/>\n tal:content="knowledge_pad/getTitle"/>\n
\n \n
<div class="pad-actions"\n <div class="pad-actions"\n
tal:attributes="style python: test(is_active, \'display:block\', \'display:none\')">\n tal:attributes="style python: test(is_active, \'display:block\', \'display:none\')">\n
<span title="Settings"\n <span title="Settings"\n
i18n:attributes="title"\n i18n:attributes="title"\n
i18n:domain="ui"\n i18n:domain="ui"\n
class="clickable_image rename_tab_dialog_image"\n class="clickable_image rename_tab_dialog_image"\n
tal:attributes="onclick string:showRenamePadPopup(\'${knowledge_pad_relative_url}\', \n tal:attributes="onclick string:showRenamePadPopup(\'${knowledge_pad_relative_url}\', \n
\'${pad_title_dom_id}\');"></span>\n \'${pad_title_dom_id}\');"></span>\n
<span title="Remove"\n <span title="Remove"\n
i18n:attributes="title"\n i18n:attributes="title"\n
i18n:domain="ui"\n i18n:domain="ui"\n
class="clickable_image remove_tab_dialog_image"\n class="clickable_image remove_tab_dialog_image"\n
tal:attributes="onclick string: removeKnowledgePadFromServer(\n tal:attributes="onclick string: removeKnowledgePadFromServer(\n
\'${knowledge_pad_relative_url}\', \'${mode}\')"/>\n \'${knowledge_pad_relative_url}\', \'${mode}\')"/>\n
</div>\n </div>\n
\n \n
</li>\n </li>\n
\n \n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
<li class="tab"\n <li class="tab"\n
tal:condition="not: isKnowledgePadTemplateUsed"\n tal:condition="not: isKnowledgePadTemplateUsed"\n
onclick="showAddNewPadPopup();"\n onclick="showAddNewPadPopup();"\n
i18n:translate="title" i18n:domain="ui"\n i18n:translate="title" i18n:domain="ui"\n
title="Add new tab"\n title="Add new tab"\n
id="add_new_tab_dialog_link">Add tab</li>\n id="add_new_tab_dialog_link">Add tab</li>\n
<li class="tab"\n <li class="tab"\n
tal:condition="python: isKnowledgePadTemplateUsed and isUserAllowedToCreateKnowledgePads"\n tal:condition="python: isKnowledgePadTemplateUsed and isUserAllowedToCreateKnowledgePads"\n
onclick="showCreateDefaultKnowledgePadWarningMessage();"\n onclick="showCreateDefaultKnowledgePadWarningMessage();"\n
i18n:translate="title" i18n:domain="ui"\n i18n:translate="title" i18n:domain="ui"\n
title="Create your own tab"\n title="Create your own tab"\n
id="create_own_pad_dialog_link"></li>\n id="create_own_pad_dialog_link"></li>\n
</ul>\n </ul>\n
</div>\n </div>\n
</td>\n \n
\n <div id="add_new_gadget_link">\n
<td id="add-new-gadget-container">\n <span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/add_new_gadget"> Add Gadgets</span>\n
<div id="add_new_gadget_link"\n </div>\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
\n \n
</tal:block>\n </tal:block>\n
\n \n
......
bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.css.xml
View file @ 0f24422d
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</item> </item>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts94401374.54</string> </value> <value> <string>ts95442223.79</string> </value>
</item> </item>
<item> <item>
<key> <string>__name__</string> </key> <key> <string>__name__</string> </key>
...@@ -165,29 +165,17 @@ div.edit-form {\n ...@@ -165,29 +165,17 @@ div.edit-form {\n
}\n }\n
\n \n
/* Tabs for Knowledge Pads */ \n /* Tabs for Knowledge Pads */ \n
#navigation_table {\n #pad-navigation-wrapper{\n
width: 100%;\n margin-top:10px;\n
border-collapse:collapse;\n border-bottom:1px solid #3D6474;\n
margin:0em;\n height:25px;\n
border:medium none;\n width:100%;\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
}\n }\n
\n \n
#tabs {\n #tabs {\n
height: 25px;\n
border-bottom: 1px solid #3D6474;\n
padding-left: 0em;\n padding-left: 0em;\n
width: 100%;\n
float: left;\n float: left;\n
width:78%;\n
}\n }\n
\n \n
#tabs ul {\n #tabs ul {\n
...@@ -273,20 +261,15 @@ div.toggable_dialog{\n ...@@ -273,20 +261,15 @@ div.toggable_dialog{\n
border-style: none;\n border-style: none;\n
}\n }\n
\n \n
#tabs-switcher-container{\n
width: 17.5%;\n
}\n
\n
#tabs_switcher{\n #tabs_switcher{\n
cursor: pointer; \n cursor: pointer; \n
font-weight: bold;\n font-weight: bold;\n
background: transparent;\n background: transparent;\n
padding-top: 5px;\n padding-top: 5px;\n
border-style: none;\n border-style: none;\n
width: 100%;\n
border-bottom: 1px solid #3D6474;\n
height: 20px;\n
margin: 0em;\n margin: 0em;\n
width: 10%;\n
float:left\n
}\n }\n
\n \n
#add_new_gadget_link{\n #add_new_gadget_link{\n
...@@ -294,7 +277,8 @@ div.toggable_dialog{\n ...@@ -294,7 +277,8 @@ div.toggable_dialog{\n
height: 20px;\n height: 20px;\n
text-align:right; \n text-align:right; \n
padding-top:5px;\n padding-top:5px;\n
border-bottom:1px solid #3D6474;\n float:right;\n
width:12%;\n
}\n }\n
\n \n
/* Draggable Area */\n /* Draggable Area */\n
...@@ -318,15 +302,6 @@ div.box_inner_content ol{\n ...@@ -318,15 +302,6 @@ div.box_inner_content ol{\n
margin-top: 0em;\n margin-top: 0em;\n
}\n }\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 /* seperate gadget tables from rest of ERP5*/\n
div.block div.content{\n div.block div.content{\n
padding: 0px;\n padding: 0px;\n
...@@ -520,7 +495,7 @@ div.gadget-rss-reader .body {\n ...@@ -520,7 +495,7 @@ div.gadget-rss-reader .body {\n
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <int>8675</int> </value> <value> <int>8226</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
bt5/erp5_knowledge_pad/bt/revision
View file @ 0f24422d
677 678
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7