- fix issue with ung template.

- fix css git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42360 20353a03-c40f-0410-a6d1-a30d3c3de9de

- fix issue with ung template.
- fix css git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42360 20353a03-c40f-0410-a6d1-a30d3c3de9de
a263157e · Gabriel Monnerat · 4f8fa4f2 · a263157e · a263157e · a263157e
Commit a263157e authored Jan 16, 2011 by Gabriel Monnerat
4 changed files
--- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml
+++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml
@@ -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

--- 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
@@ -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

--- 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
@@ -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
 \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_gadget_link {\n
 \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>

--- a/bt5/erp5_web_ung_theme/bt/revision
+++ b/bt5/erp5_web_ung_theme/bt/revision
-166
\ No newline at end of file
+167
\ No newline at end of file