diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml index 618c7da6eb1aee1bb5c72f8b093070408215babd..599294310983ea4380ee7adeb0901ceae2aecbeb 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml @@ -111,7 +111,7 @@ function changeCheckBoxValue(value){\n });\n }\n \n -$(document).ready(function(){\n +$().ready(function(){\n if ($("div.gadget-column").length == 0 && window.location.href.split("?").length > 1) {\n parameterList = getUrlParameterList();\n if (parameterList.hasOwnProperty("upload_document") == true){\n @@ -447,7 +447,8 @@ $(document).ready(function(){\n event.preventDefault();\n $("div.gadget-listbox").dialog("open");\n });\n - $("div#page_wrapper div#portal-column-1.portal-column, div#page_wrapper div#portal-column-2.portal-column").remove();\n + $("div#page_wrapper div#portal-column-1.portal-column, div#page_wrapper div#portal-column-2.portal-column, div.front_pad div.minimize_wrapper p").remove();\n +\n return false;\n }); diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml index 49ac3cdf18a4abaf29b0494696c87a6a6861e186..403288324a6b04e13da638b49176943adc88adc4 100644 --- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml +++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml @@ -455,7 +455,7 @@ div.jSheetControls#jSheetControls_0 {\n }\n \n \n -div.toolbar button, div.gadget-action input {\n +div.toolbar button, div.gadget-action input#upload {\n color: #333333;\n border: 1px solid #BBBBBB;\n background-image: url(\'<dtml-var expr="portal_url()">/ung_images/button_background.png\');\n @@ -548,7 +548,7 @@ div.toolbar button, div.gadget-action input {\n line-height:28px;\n }\n \n -div.gadget-column input {\n +div.gadget-column input#upload {\n left:1em;\n position:relative;\n top:0.5em;\n @@ -949,7 +949,7 @@ table#gadget-table {\n }\n \n div.gadget-action div.front_pad {\n - font-size: 10px;\n + font-size: 12px;\n width: 240px;\n }\n \n @@ -959,6 +959,19 @@ h3.handle {\n \n div.portal-column {\n width: 100% !important;\n +}\n +\n +div#page_wrapper div.minimize_wrapper div.edit-form fieldset.left,\n + div#page_wrapper div.minimize_wrapper div.edit-form fieldset.left label {\n + display: inline !important;\n +}\n +\n +div.edit-form button {\n + margin-top: -1.5em !important;\n +}\n +\n +div.edit-form {\n + padding-left: 0 !important;\n } ]]></string> </value> diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision index dc9414b21fc0a9f0da06762d78acf2a2774d9b01..b912dc118c6d152c61ec7a6dd1962596853bc8f7 100644 --- a/bt5/erp5_web_ung_theme/bt/revision +++ b/bt5/erp5_web_ung_theme/bt/revision @@ -1 +1 @@ -154 \ No newline at end of file +155 \ No newline at end of file