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

nobody at svn.erp5.org nobody at svn.erp5.org
Sun Jan 16 20:45:48 CET 2011 

Author: gabriel
Date: Sun Jan 16 20:45:47 2011
New Revision: 42360

URL: http://svn.erp5.org?rev=42360&view=rev
Log:
- fix issue with ung template.
- fix css

Modified:
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml
    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/template_erp5_web_ung.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml?rev=42360&r1=42359&r2=42360&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml [utf8] Sun Jan 16 20:45:47 2011
@@ -40,8 +40,11 @@
 <body>\n
   <tal:block metal:define-macro="master">\n
      <tal:block tal:define="website here/getWebSiteValue;\n
-                            portal_path python:website.absolute_url();\n
+                            portal_path python: website.absolute_url();\n
                             dummy python: request.set(\'editable_mode\', 0);\n
+                            layout_form_id here/getApplicableLayout | nothing;\n
+                            ignore_layout request/ignore_layout | nothing;\n
+                            global layout_form python:(not layout_form_id or ignore_layout) or getattr(here, layout_form_id, None);\n
                             has_no_layout python: layout_form is None;\n
                             has_editor python: here.absolute_url() != portal_path;\n
                             aggregate python: has_no_layout or layout_form.Form_getGroupList(\n
@@ -50,7 +53,6 @@
                             navigation_area python:aggregate.get(\'navigation\', []);\n
                             header_area python:aggregate.get(\'header\', []);\n
                             main_area python:aggregate.get(\'main\', []);\n
-                            has_no_layout python: layout_form is None;\n
                             global css_list_template css_list_template | python: [];\n
                             global css_list_ung_template python:css_list_template + [\n
                                   \'ung_theme.css\',\n

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=42360&r1=42359&r2=42360&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] Sun Jan 16 20:45:47 2011
@@ -105,6 +105,7 @@ function changeCheckBoxValue(value){\n
 }\n
 \n
 $().ready(function(){\n
+  $("p.clear").remove();\n
   if ($("div.gadget-column").length == 0 && window.location.href.split("?").length > 1) {\n
     parameterList = getUrlParameterList();\n
     if (parameterList.hasOwnProperty("upload_document") == true){\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=42360&r1=42359&r2=42360&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] Sun Jan 16 20:45:47 2011
@@ -327,8 +327,8 @@ div.header-right {\n
 }\n
 \n
 div.main-left, div.main-right, div.main {\n
-  margin-top: -1em;\n
-  height:45em;\n
+  height: 45em;\n
+  margin-top: -0.6em;\n
 }\n
 \n
 div.main {\n
@@ -415,7 +415,6 @@ div.listbox-body div.main-right tbody {\
 }\n
 \n
 div.header-left {\n
-  height:80%;\n
   margin-left:1px;\n
   margin-top:-4px;\n
 }\n
@@ -733,8 +732,8 @@ div.listbox-navigation {\n
 }\n
 \n
 div.listbox-navigation input {\n
-  height:14px;\n
-  width:20px;\n
+  height: 18px;\n
+  width: 20px;\n
 }\n
 \n
 div.listbox-header-box {\n
@@ -982,6 +981,17 @@ table#navigation_table div#add_new_gadge
 \n
 div.front_pad div#page_wrapper {\n
   margin: -0.5em 0 0 !important;\n
+}\n
+\n
+#add-gadgets{\n
+ font-size: 11px;\n
+}\n
+\n
+form#ung_preference,\n
+ form#system_preference,\n
+ form#erp5_preference {\n
+  margin:0px;\n
+  padding: 0px;\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=42360&r1=42359&r2=42360&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Sun Jan 16 20:45:47 2011
@@ -1 +1 @@
-166
\ No newline at end of file
+167
\ No newline at end of file

More information about the Erp5-report mailing list