diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewColumnOne.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewColumnOne.xml index d12c41fc30b58096219b28803dccfbe6f2f34fab..c525413037dbfae308f62c0c25c66dba2d45b217 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewColumnOne.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/WebSection_viewColumnOne.xml @@ -75,6 +75,7 @@ active_knowledge_pad is not None">\n \n <span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/disable_server_integration"> Disable slot</span>\n +\n <div class="portal-column" \n id="portal-column-0"\n tal:attributes="class python: test(isAnon, \n diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml index 6f5596329e36c1ca1ae8aeffdfd8ea5a6a320b51..d211e3b44b72f20cd9b9201e16e4d0f509e298b6 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/gadget.css.xml @@ -15,7 +15,7 @@ </item> <item> <key> <string>_EtagSupport__etag</string> </key> - <value> <string>ts76669086.16</string> </value> + <value> <string>ts76695040.05</string> </value> </item> <item> <key> <string>__name__</string> </key> @@ -34,99 +34,96 @@ /* - missing docstring */\n /* - add dynamic properties */\n /****************************************************************/\n +\n +/* 3 columng gadget layout */\n +div.portal-column {\n + width:33%; \n + margin-right:3px;\n +}\n +\n +/* column gadget in bottom */\n +div.bottom-gadget div.portal-column {\n + width:100%; \n +}\n +/* column gadget in right */\n +div.right-gadget div.portal-column {\n + width:100%; \n +}\n +\n +/* Add & Stick gadgets side column management */\n +div.gadget-management{\n + margin-bottom: 10px;\n +}\n +\n div.draggable_wrapper{\n background-color:transparent;\n }\n -.border_bottom1px{\n - border-bottom: none!important;\n -}\n \n -.border_bottom0px{\n - border-bottom: none!important;\n +div.border_bottom1px,\n +div.border_bottom0px{\n + border-bottom: none;\n }\n \n -.tab {\n +#tabs_switcher,\n +#tabs ul li.tab {\n border: none;\n }\n \n /* Gadget Navigation table */\n #navigation_table td {\n -\n -\tbackground: url(../km_img/tabsbg.png) repeat-x transparent;\n -\tbackground-position: 0 100%;\n -\n + background: url(../km_img/tabsbg.png) repeat-x transparent;\n + background-position: 0 100%;\n }\n \n #tabs ul li{\n -\n list-style-image: none;\n -\n }\n \n #tabs ul li a, #tabs ul li.last a { background: none; }\n \n #tabs ul li a.tabs-hide:link, #tabs ul li a.tabs-hide:active, #tabs ul li a.tabs-hide:visited {\n -\n -\tbackground: url(../km_img/tabs-hide.png) no-repeat transparent;\n -\tbackground-position: 0 -4px;\n -\n + background: url(../km_img/tabs-hide.png) no-repeat transparent;\n + background-position: 0 -4px;\n }\n \n #tabs ul li.last a.tabs-add {\n -\n -\tbackground: url(../km_img/tabs-add.png) no-repeat transparent;\n -\tbackground-position: 0 2px;\n -\n + background: url(../km_img/tabs-add.png) no-repeat transparent;\n + background-position: 0 2px;\n }\n \n #tabs ul li.first a.tabs-hide:hover, #tabs ul li.last a.tabs-add:hover {\n -\n -\tbackground-position: 0 -20px;\n -\n + background-position: 0 -20px;\n }\n \n -\n #tabs ul li {\n -\n -\tbackground: url(../km_img/tabs.png) no-repeat transparent;\n -\tbackground-position: 0 -44px;\n -\tcolor: #e9e9e9;\n -\n + background: url(../km_img/tabs.png) no-repeat transparent;\n + background-position: 0 -44px;\n + color: #e9e9e9;\n }\n \n #tabs ul li span {\n -\n -\tbackground: url(../km_img/tabs.png) no-repeat transparent;\n -\tbackground-position: 100% -44px;\n -\n + background: url(../km_img/tabs.png) no-repeat transparent;\n + background-position: 100% -44px;\n }\n #tabs ul li.tab,\n #tabs ul li.tab_selected{\n border: none;\n }\n #tabs ul li.tab_selected, #tabs ul li:hover {\n -\n -\tbackground-position: 0 0;\n -\n + background-position: 0 0;\n }\n \n #tabs ul li.tab_selected span, #tabs ul li:hover span {\n -\n -\tbackground-position: 100% 0;\n -\n + background-position: 100% 0;\n }\n \n #tabs ul li.tab_selected:hover {\n -\n -\tbackground-position: 0 -22px;\n -\tcolor:#fff;\n -\n + background-position: 0 -22px;\n + color:#fff;\n }\n \n #tabs ul li.tab_selected:hover span {\n -\n -\tbackground-position: 100% -22px;\n -\n + background-position: 100% -22px;\n }\n \n #tabs ul li.tab_selected:hover span a { color:#fafafa; }\n @@ -134,9 +131,7 @@ div.draggable_wrapper{\n #tabs ul li span a { color: #e2e0d2; }\n \n #tabs ul li.first, #tabs ul li.last {\n -\n -\tbackground: none;\n -\n + background: none;\n }\n \n /* Rename & Remove pad buttons */\n @@ -151,12 +146,12 @@ div.draggable_wrapper{\n }\n \n /* Add new tab link */\n -#add_new_tab_dialog_link{\n - background: url("km_img/bullet.png") no-repeat 0 7px!important;\n - color: #9D968D!important;\n - padding-top: 4px!important;\n - margin-left: 10px!important;\n - padding-left:13px !important;\n +#tabs ul #add_new_tab_dialog_link{\n + background: url("km_img/bullet.png") no-repeat 0 7px;\n + color: #9D968D;\n + padding-top: 4px;\n + margin-left: 10px;\n + padding-left:13px;\n font-size: 8pt;\n font-weight: normal;\n }\n @@ -170,18 +165,16 @@ div.draggable_wrapper{\n \n #navigation_table a:hover, #navigation_table #tabs_switcher:hover{color: #000; }\n \n -\n /* EOF Gadget Navigation Table */\n \n \n -\n -.gadget .post small {\n +div.box .post small {\n \n \tcolor:#827d5c;\n \n }\n \n -.gadget h3 {\n +div.box h3 {\n \n color:#767676;\n \n @@ -197,21 +190,22 @@ a.block-edit-form{\n margin-top: 4px;\n }\n \n -/* Style for showing mvement between gadget columns */\n +/* Style for showing movement between gadget columns */\n .block-hover {\n border: 2px dashed #f00;\n }\n \n +\n /* In edit form disable border */\n div.edit-form fieldset{\n - border: 0px solid black;\n + border: none;\n }\n \n div.edit-form button{\n margin-top: 0.5em;\n }\n \n -.edit-form {\n +div.edit-form {\n padding-top: 0.5em; \n padding-left: 1em;\n padding-bottom: 0.5em;\n @@ -231,7 +225,6 @@ div.block table.listbox button.sort_button:hover{\n color: #FFFFFF;\n }\n \n -\n /* Add gadgets link */\n #add_new_gadget_link{\n margin-top:13px;\n @@ -249,6 +242,7 @@ div.block table.listbox button.sort_button:hover{\n cursor: pointer;\n }\n \n +#stick-gadgets span,\n #add-gadgets span{\n display: none;\n }\n @@ -264,16 +258,12 @@ div.block table.listbox button.sort_button:hover{\n height:18px;\n cursor: pointer;\n }\n +\n #stick-gadgets a{\n height:17px;\n width:72px;\n }\n \n -#stick-gadgets span{\n - display: none;\n -}\n -\n -\n div#add-stick-gadget-tool-section{\n margin-bottom: 1.4em;\n }\n @@ -311,8 +301,9 @@ div.gadget-website-browser li {\n padding-left: 0em;\n }\n \n -div.gadget-website-browser ul.first_level, ul.second_level{\n - list-style-type: none!important;\n +div.gadget-website-browser ul.first_level, \n +div.gadget-website-browser ul.second_level{\n + list-style-type: none;\n }\n \n div.gadget-website-browser ul.first_level {\n @@ -343,9 +334,9 @@ div.gadget-website-browser .empty-list-node{\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 +div.gadget-subsection div.input ul{\n + list-style-position: outside;\n + list-style-type:square;\n margin: 0.5em;\n margin-top: 0em;\n padding: 0.5em;\n @@ -358,7 +349,7 @@ fieldset.gadget div.list_style a.title{\n \n /* Decrease padding for gadgets\' text */\n fieldset.gadget div.text{\n - padding: 3px!important;\n + padding: 3px;\n }\n \n /* Gadget My Documents */\n @@ -420,12 +411,8 @@ div.adminToolbox fieldset .clone-button{\n text-align: center;\n }\n \n -/*WEB*/\n -.portal-column {\n - margin-right: 1%;\n -}\n \n -.block {\n +div.block {\n margin-bottom: 10px;\n }\n \n @@ -443,62 +430,41 @@ div.adminToolbox fieldset .clone-button{\n width: auto;\n }\n \n -/*\n -h3.handle {\n - margin: 0;\n - padding: 0 0 0 10px;\n - color: #776D61;\n - font-size: 10pt;\n - background: none;\n - background-color: #ECECEC;\n -}\n -\n -h3.handle span.handle {\n - display: block;\n - min-height:20px;\n - padding: 5px 5px 0 0;\n - background: none;\n -}\n -*/\n -\n -\n #page_wrapper .content{\n border: none;\n }\n \n -.toggable_dialog {\n +/* Gadget toggable dialog */\n +div.toggable_dialog {\n left:200px;\n top: 100px;\n width: 200px;\n - background-color: #C2C1C1!important;\n - border: 5px solid #C0BFB3!important;\n + background-color: #C2C1C1;\n + border: 5px solid #C0BFB3;\n }\n \n -.toggable_dialog h3{\n +div.toggable_dialog h3{\n color: #000000;\n + margin-bottom: 1em;\n }\n \n -.toggable_dialog button{\n +div.toggable_dialog button{\n padding: 0.1em;\n margin-right: 0.2em;\n float:left;\n }\n \n -.toggable_dialog h3{\n - margin-bottom: 1em;\n -}\n -\n -.wait_block p{\n - text-align: center!important;\n +div.wait_block p{\n + text-align: center;\n }\n \n #add_new_tab_diloag_link{\n - margin-left: 0.5em !important;\n + margin-left: 0.5em;\n }\n \n /* disable cursor for anonymous users */\n -.portal-column-undraggable .handle{\n - cursor: default!important;\n +div.portal-column-undraggable .handle{\n + cursor: default;\n }\n \n /* admin toolbox gadget fix */\n @@ -508,22 +474,13 @@ div.block div.adminToolbox li{\n \n /* h3 tags containing spans get affected by gadget box title */\n div.block div.adminToolbox h3 span{\n - display:inline !important;\n - float:none !important;\n + display:inline ;\n + float:none ;\n }\n \n -/* add space between fieldsets for gadgtes */\n -div.block fieldset label{\n - text-align: left!important;\n - display: block!important;\n -}\n -\n -.gadget .adminToolbox > label{\n - display:none !important;\n -}\n \n -.gadget .adminToolbox .inner label{\n - color: #9D968D !important;\n +div.block div.adminToolbox .inner label{\n + color: #9D968D;\n }\n @@ -535,7 +492,7 @@ div.block fieldset label{\n </item> <item> <key> <string>size</string> </key> - <value> <int>8290</int> </value> + <value> <int>8009</int> </value> </item> <item> <key> <string>title</string> </key> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml index 8314a587207ce5bf9493a34ab17d88922ba28526..39b1512e662105005b168e1e0dae887ab515c117 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml @@ -773,11 +773,13 @@ div#mainwrapper div#wrapper_right fieldset.widget table.gadget td div {\n \tmargin: 0 !important;\n \tborder: 0 !important;\n }\n -\n +/*\n div#mainwrapper div#wrapper_right fieldset.widget div.field ul{\n list-style-position:inside;\n list-style-type:square;\n }\n +*/\n +\n div#mainwrapper div#wrapper_right fieldset.widget div.field label{\n display:block;\n float:left;\n diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/Base_viewToolboxGadget/admin_toolbox.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/Base_viewToolboxGadget/admin_toolbox.xml index b1cdb1f4fedf66222404a5439a99329149ef6af9..db89462a07769a3327e63080befd6de7a4250837 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/Base_viewToolboxGadget/admin_toolbox.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/Base_viewToolboxGadget/admin_toolbox.xml @@ -12,7 +12,9 @@ <item> <key> <string>delegated_list</string> </key> <value> - <list/> + <list> + <string>css_class</string> + </list> </value> </item> <item> @@ -72,6 +74,10 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>css_class</string> </key> + <value> <string>adminToolbox hidden_label</string> </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string>admin_toolbox</string> </value> diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision index 7aba66c1373dc5f3985a0694c64f04bdfab75a18..b53e2759d14caec6caa012cbca4e47cf51c28d74 100644 --- a/bt5/erp5_km/bt/revision +++ b/bt5/erp5_km/bt/revision @@ -1 +1 @@ -1461 \ No newline at end of file +1463 \ No newline at end of file