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 f568ff20dc84cd9d5004123ec9a4e7107a057c09..421b2b74f281a0c7c652373cfdaa64c04506c28c 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 @@ -34,6 +34,11 @@ function getCurrentObjectUrl(){\n return window.location.href.split("?")[0];\n }\n \n +function getWebEditorName(){\n + currentUrlSplitted = window.location.href.split("?")[0].split("/");\n + return currentUrlSplitted[currentUrlSplitted.length-1];\n +}\n +\n function getUrlParameterList(){\n var argumentList = {};\n resultList = window.location.href.split("?")[1].split("&");\n @@ -105,6 +110,12 @@ $(document).ready(function(){\n $("a#loading_message").show();\n setTimeout(checkConversion(), 1000);\n }\n + if (getWebEditorName() == "WebPage_viewEditor" || getWebEditorName() == "WebTable_viewEditor")\n + $("div.content").css({"position":"fixed", "bottom": "0px", "left": "0px", "right": "0px"});\n + if (getWebEditorName() == "WebPage_viewEditor")\n + $("div.content").css({"top": "5em"});\n + if (getWebEditorName() == "WebTable_viewEditor")\n + $("div.content").css({"top": "7em"});\n }\n $("a[name=\'document_title\']").html(getObjectPropertyValue("getTitle"));\n $("input#upload").click(function(event){\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 2f35688cddab489e8ede5827184dadd0c746691a..6864a379e4fe228fa6f52f7a1d6e33257d290af4 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 @@ -341,6 +341,7 @@ div.main-left, div.main-right, div.main {\n \n div.main {\n margin-top: 0.5em;\n + height: auto;\n }\n button.delete {\n margin-top: 6px;\n @@ -415,7 +416,6 @@ div.main-right div.content {\n height:27em;\n }\n \n -\n div.listbox-body div.main-right tbody {\n height:25.35em;\n overflow-x:hidden;\n @@ -869,6 +869,10 @@ input#submit_document {\n \n a#loading_message {\n display: none;\n +}\n +\n +iframe#field_my_text_content___Frame {\n + height: 489px !important;\n } ]]></string> </value> diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision index 176fdebf1bd8be248521f57896a16a3540e3f661..8bc6583717d617da1f8bf8bbaa7c16c25ef17113 100644 --- a/bt5/erp5_web_ung_theme/bt/revision +++ b/bt5/erp5_web_ung_theme/bt/revision @@ -1 +1 @@ -119 \ No newline at end of file +120 \ No newline at end of file