[Erp5-report] r41396 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Dec 13 16:16:24 CET 2010


Author: gabriel
Date: Mon Dec 13 16:16:24 2010
New Revision: 41396

URL: http://svn.erp5.org?rev=41396&view=rev
Log:
fixed editor height to have the same dimension of browser

Modified:
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml
    erp5/trunk/bt5/erp5_web_ung_theme/bt/revision

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml?rev=41396&r1=41395&r2=41396&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] Mon Dec 13 16:16:24 2010
@@ -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

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml?rev=41396&r1=41395&r2=41396&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml [utf8] Mon Dec 13 16:16:24 2010
@@ -341,6 +341,7 @@ div.main-left, div.main-right, div.main 
 \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>

Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/revision?rev=41396&r1=41395&r2=41396&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Mon Dec 13 16:16:24 2010
@@ -1 +1 @@
-119
\ No newline at end of file
+120
\ No newline at end of file



More information about the Erp5-report mailing list