From 845b49e8ef03f3d61cdb4d0c6ce015e95ca7c856 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Wed, 11 Mar 2009 22:02:22 +0000 Subject: [PATCH] * revise HTML and CSS structure of tabs so as to make it possible to use transparent tab images. * improve icon images a bit. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25993 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../KnowledgePad_viewColumnWidget.xml | 3 +- .../erp5_knowledge_box.css.xml | 45 +++++++------------ .../erp5_knowledge_pad/icon_edit.gif.xml | 14 ++++-- .../erp5_knowledge_pad/icon_minimize.gif.xml | 14 ++++-- .../erp5_knowledge_pad/icon_remove.gif.xml | 17 +++++-- bt5/erp5_knowledge_pad/bt/revision | 2 +- 6 files changed, 55 insertions(+), 40 deletions(-) diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml index 511fd5174f..9c2cadd8a9 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_viewColumnWidget.xml @@ -74,6 +74,7 @@ tal:attributes="id python: \'%s/%s\' %(here.getRelativeUrl(), box_id)">\n \n <h3 class="handle">\n + <span class="handle">\n <tal:block tal:condition="not: isAnon">\n <a class="clickable-block block-remove" \n i18n:translate="" \n @@ -92,9 +93,9 @@ i18n:attributes="title" \n title="Minimize"></a>\n </tal:block>\n - <span class="gadget_left_side"></span>\n <span class="gadget_title" \n tal:content="python: here.Base_translateString(gadget.getTitle())"/>\n + </span>\n </h3>\n \n <div class="minimize_wrapper"\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 d88fcb750b..5be7a9cebc 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 @@ -9,9 +9,13 @@ </pickle> <pickle> <dictionary> + <item> + <key> <string>_Cacheable__manager_id</string> </key> + <value> <string>http_cache</string> </value> + </item> <item> <key> <string>_EtagSupport__etag</string> </key> - <value> <string>ts25459544.09</string> </value> + <value> <string>ts36808113.24</string> </value> </item> <item> <key> <string>__name__</string> </key> @@ -28,7 +32,7 @@ margin: 0em;\n padding: 0em;\n padding-top: 0em;\n - background-color: #DAE6F6; \n + background-color: inherit; \n min-height: 500px;\n width: 100%;\n float:left;\n @@ -60,38 +64,24 @@ width: 100%;\n }\n \n -.handle {\n +h3.handle {\n margin: 0;\n - padding: 5px;\n + padding: 0 0 0 10px;\n font-size: 14px;\n color: #fff;\n - height: 15px;\n - background: transparent url(images/tab_right_selected.png) no-repeat scroll right top;\n + background: transparent url(images/tab_left_selected.png) no-repeat scroll left top;\n border-bottom: 1px solid #3D6474;\n }\n \n -.block h3 span.gadget_left_side{\n - background: transparent url(images/tab_left_selected.png) no-repeat scroll left top;\n +h3.handle span.handle {\n display: block;\n - float: left;\n - margin-top: -5px;\n - margin-left: -5px;\n - height: 20px;\n - padding-top: 5px;\n - padding-left: 5px;\n - width: 10px;\n + min-height:20px;\n + padding: 5px 5px 0 0;\n + background: transparent url(images/tab_right_selected.png) no-repeat scroll right top;\n }\n \n .block h3 span.gadget_title{\n - display: block;\n - float: left;\n - margin-top: -5px;\n - margin-left: -5px;\n - padding-top: 5px;\n - height: 19px;\n min-width: 100px;\n - border-top: 1px solid #3d7474;\n - background-color: #e3eafa;\n }\n \n \n @@ -99,7 +89,6 @@ .clickable_image{\n cursor: pointer; \n margin-top: 5px!important;\n - margin-left: 1px!important;\n display: block;\n float: left;\n }\n @@ -113,7 +102,7 @@ background-position: center;\n cursor: pointer;\n padding: 0em;\n - margin: 0em;\n + margin: 0;\n }\n \n .block-remove {\n @@ -126,7 +115,6 @@ \n .block-edit-form {\n background-image: url(icon_edit.gif); \n - margin-right: 1pt;\n }\n \n .block-hover {\n @@ -150,7 +138,8 @@ div.edit-form button{\n padding-top: 0.5em; \n padding-left: 1em;\n padding-bottom: 0.5em;\n - border: 1px solid black;\n + border: solid black;\n + border-width: 0 1px 1px 1px;\n background-color: #BDD0F0;\n overflow: auto;\n }\n @@ -585,7 +574,7 @@ div.block div.worklist_list ul li a:hover{\n </item> <item> <key> <string>size</string> </key> - <value> <long>9522</long> </value> + <value> <int>9223</int> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/icon_edit.gif.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/icon_edit.gif.xml index 85d03e37fc..7c33ded26e 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/icon_edit.gif.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/icon_edit.gif.xml @@ -9,6 +9,14 @@ </pickle> <pickle> <dictionary> + <item> + <key> <string>_Cacheable__manager_id</string> </key> + <value> <string>http_cache</string> </value> + </item> + <item> + <key> <string>_EtagSupport__etag</string> </key> + <value> <string>ts36808051.8</string> </value> + </item> <item> <key> <string>__name__</string> </key> <value> <string>icon_edit.gif</string> </value> @@ -19,8 +27,8 @@ </item> <item> <key> <string>data</string> </key> - <value> <string encoding="base64">R0lGODlhDwAPAIABAI6Ojv///yH+EUNyZWF0ZWQgd2l0aCBHSU1QACwAAAAADwAPAAACOYyPGcDt -bYBKwICJgAH4AAMYD2MABmCMgAEYwPEcgAEgDQIYQAIkgAHoGAAGgDAAMACOAINqdEwUAAA7</string> </value> + <value> <string encoding="base64">R0lGODlhDwAPAKEAAI6Ojv///46Ojo6OjiH5BAEKAAIALAAAAAAPAA8AAAI7lI8pwO1tQJi0BmCA +3cCAbQEGAFaAAUwPMwEGQD0UYABVUwEGYAEWYACUKAADYDgBGADIAMCwiiqmhwIAOw==</string> </value> </item> <item> <key> <string>height</string> </key> @@ -32,7 +40,7 @@ bYBKwICJgAH4AAMYD2MABmCMgAEYwPEcgAEgDQIYQAIkgAHoGAAGgDAAMACOAINqdEwUAAA7</string </item> <item> <key> <string>size</string> </key> - <value> <int>111</int> </value> + <value> <int>106</int> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/icon_minimize.gif.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/icon_minimize.gif.xml index 7ac2019779..58afe9504b 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/icon_minimize.gif.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/icon_minimize.gif.xml @@ -9,6 +9,14 @@ </pickle> <pickle> <dictionary> + <item> + <key> <string>_Cacheable__manager_id</string> </key> + <value> <string>http_cache</string> </value> + </item> + <item> + <key> <string>_EtagSupport__etag</string> </key> + <value> <string>ts36808051.84</string> </value> + </item> <item> <key> <string>__name__</string> </key> <value> <string>icon_minimize.gif</string> </value> @@ -19,8 +27,8 @@ </item> <item> <key> <string>data</string> </key> - <value> <string encoding="base64">R0lGODlhDwAPAIAAAI6Ojv///yH5BAAAAAAALAAAAAAPAA8AAAIgjI8ZwO1tgEpyTVTrtXznHYXg -N4qe+DAoyGlXlqZsUgAAOw==</string> </value> + <value> <string encoding="base64">R0lGODlhDwAPAKEBAI6Ojv///////////yH5BAEAAAIALAAAAAAPAA8AAAI5lI8pwO1tQJi0BmCA +3cCAbQEGAFaAAZQUYADqBBjAGwAGMD3MBBjApANMAAYADWAA0ACGoE4BPRQAADs=</string> </value> </item> <item> <key> <string>height</string> </key> @@ -32,7 +40,7 @@ N4qe+DAoyGlXlqZsUgAAOw==</string> </value> </item> <item> <key> <string>size</string> </key> - <value> <int>73</int> </value> + <value> <int>104</int> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/icon_remove.gif.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/icon_remove.gif.xml index 7459742786..69db3520ed 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/icon_remove.gif.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/icon_remove.gif.xml @@ -9,6 +9,14 @@ </pickle> <pickle> <dictionary> + <item> + <key> <string>_Cacheable__manager_id</string> </key> + <value> <string>http_cache</string> </value> + </item> + <item> + <key> <string>_EtagSupport__etag</string> </key> + <value> <string>ts36808051.89</string> </value> + </item> <item> <key> <string>__name__</string> </key> <value> <string>icon_remove.gif</string> </value> @@ -19,9 +27,10 @@ </item> <item> <key> <string>data</string> </key> - <value> <string encoding="base64">R0lGODlhDwAPALMAAPHx8X19fYeHh42NjZSUlJqamqKioqqqqrKysry8vM/Pz9ra2oKCgsbGxufn -5////yH5BAAAAAAALAAAAAAPAA8AAwRD8MlJ6ws46yyDrd71UaG3MIHyCEHSvQ8SDElQTOVEYAyA -w48G5kACDgKoxU8UCxhkhKUJ4wCgELDQiKkdlTbg7nYSAQA7</string> </value> + <value> <string encoding="base64">R0lGODlhDwAPAIQPAPHx8X19fYeHh42NjZSUlJqamqKioqqqqrKysry8vM/Pz9ra2oKCgsbGxufn +5////////////////////////////////////////////////////////////////////yH5BAEA +AA4ALAAAAAAPAA8AAAVRoCOOZOkEaKqmYvC8cPwEYiDfgRi8wwD3r4Ao8OoNHsZXQBSAGXuwgCgQ +M8YCogDsOYAFRIGX8WF8BUSBVw/WewVEgZssIArIYwHRao8y+UchADs=</string> </value> </item> <item> <key> <string>height</string> </key> @@ -33,7 +42,7 @@ w48G5kACDgKoxU8UCxhkhKUJ4wCgELDQiKkdlTbg7nYSAQA7</string> </value> </item> <item> <key> <string>size</string> </key> - <value> <int>150</int> </value> + <value> <int>212</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 1c3e15e55e..3456e74000 100644 --- a/bt5/erp5_knowledge_pad/bt/revision +++ b/bt5/erp5_knowledge_pad/bt/revision @@ -1 +1 @@ -371 \ No newline at end of file +372 \ No newline at end of file -- 2.30.9