[Erp5-report] r35204 ivan - in /erp5/trunk/bt5/erp5_km: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed May 12 14:47:44 CEST 2010
Author: ivan
Date: Wed May 12 14:47:44 2010
New Revision: 35204
URL: http://svn.erp5.org?rev=35204&view=rev
Log:
Revert part of previous commits. Fix web toolbox CSS layout.
Modified:
erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_content_layout.xml
erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_front_layout.xml
erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout.xml
erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml
erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml
erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml
erp5/trunk/bt5/erp5_km/bt/revision
Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_content_layout.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_content_layout.xml?rev=35204&r1=35203&r2=35204&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_content_layout.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_content_layout.xml [utf8] Wed May 12 14:47:44 2010
@@ -111,6 +111,7 @@
<key> <string>menu meta</string> </key>
<value>
<list>
+ <string>user_information_widget</string>
<string>your_search_text</string>
<string>your_search_portal_type</string>
<string>your_search_form_id</string>
@@ -161,9 +162,7 @@
<item>
<key> <string>top login</string> </key>
<value>
- <list>
- <string>user_information_widget</string>
- </list>
+ <list/>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_front_layout.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_front_layout.xml?rev=35204&r1=35203&r2=35204&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_front_layout.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_front_layout.xml [utf8] Wed May 12 14:47:44 2010
@@ -107,6 +107,7 @@
<key> <string>menu meta</string> </key>
<value>
<list>
+ <string>user_information_widget</string>
<string>your_search_text</string>
<string>your_search_portal_type</string>
<string>your_search_form_id</string>
@@ -154,9 +155,7 @@
<item>
<key> <string>top login</string> </key>
<value>
- <list>
- <string>user_information_widget</string>
- </list>
+ <list/>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout.xml?rev=35204&r1=35203&r2=35204&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout.xml [utf8] Wed May 12 14:47:44 2010
@@ -118,6 +118,7 @@
<key> <string>menu meta</string> </key>
<value>
<list>
+ <string>user_information_widget</string>
<string>your_search_text</string>
<string>your_search_portal_type</string>
<string>your_search_form_id</string>
@@ -168,9 +169,7 @@
<item>
<key> <string>top login</string> </key>
<value>
- <list>
- <string>user_information_widget</string>
- </list>
+ <list/>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml?rev=35204&r1=35203&r2=35204&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml [utf8] Wed May 12 14:47:44 2010
@@ -54,9 +54,7 @@
\n
\n
body {\n
-\n
- background: #e9e9e9;\n
-\n
+ background:#E9E9E9 url(../km_img/bg.png) repeat-x scroll 0 0;\n
}\n
\n
.content .error .input {border:2px solid #FF4400;}\n
@@ -67,8 +65,7 @@
\n
\n
#header {\n
-\n
-\tcolor:#ffffff;\n
+ color:#a8a799;\n
\n
}\n
\n
@@ -395,18 +392,6 @@
\n
/* ## link styling ################################### end ### */\n
\n
-/* ## navigation ###################################### start # */\n
-\n
-#top-bar{\n
-\tbackground-color:#69654A;\n
-}\n
-\n
-#menu{\n
-\tbackground:#818363;\n
-\tborder-color:#37391E;\n
-}\n
-\n
-\n
#menu ul li #n1:link, #menu ul li #n1:active, #menu ul li #n1:visited {\n
\n
\tbackground: url(../km_img/home-2.gif) no-repeat transparent;\n
Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml?rev=35204&r1=35203&r2=35204&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml [utf8] Wed May 12 14:47:44 2010
@@ -347,12 +347,13 @@
}\n
#menu {\n
\n
-\twidth:90%;\n
-\theight:30px;\n
-\tmargin:0 5% 0 5%;\n
-\tpadding:0px 0 0 0;\n
+\twidth:100%;\n
+\theight:45px;\n
+\tmargin:0em;\n
+\tpadding:0px;\n
+ padding-top: 4px;\n
\tz-index: 1;\n
-\tborder-style:solid solid none;\n
+\tborder-style: none;\n
\tborder-width:1px 1px 0;\n
\n
}\n
@@ -593,6 +594,7 @@
\theight:22px;\n
\tline-height:24px;\n
\tpadding-right:40px;\n
+\tpadding-top: 0em;\n
\tposition: relative;\n
\n
}\n
@@ -1394,7 +1396,6 @@
\n
/* Web Toolbar */\n
div.web-toolbar{\n
- padding-left: 200px;\n
color: auto;\n
height: 30px;\n
}\n
@@ -1402,6 +1403,19 @@
div.web-toolbar h3{\n
color:#000000;\n
height: 30px;\n
+}\n
+\n
+div.web-toolbar ul{\n
+ padding: 0em!important;\n
+ margin: 0em!important;\n
+ height: 30px;\n
+}\n
+div.web-toolbar ul li{\n
+ padding-top:5px;\n
+}\n
+\n
+div.web-toolbar ul li.toolboxSection:hover {\n
+ background:#ccf;\n
}\n
\n
Modified: erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml?rev=35204&r1=35203&r2=35204&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml [utf8] Wed May 12 14:47:44 2010
@@ -95,7 +95,7 @@
dummy python: request.set(\'dialog_mode\', dialog_mode);\n
dummy python: request.set(\'list_mode\', list_mode);\n
aggregate python: has_no_layout or layout_form.Form_getGroupList(\n
- [\'right\', \'bottom\', \'menu\', \'path\', \'splash\', \'headline\', \'footer\', \'top\']);\n
+ [\'right\', \'bottom\', \'menu\', \'path\', \'splash\', \'headline\', \'footer\',]);\n
aggregate python: ((aggregate is not has_no_layout) and dict(aggregate)) or {};\n
right_area python:aggregate.get(\'right\', []);\n
menu_area python:aggregate.get(\'menu\', []);\n
@@ -104,7 +104,6 @@
headline_area python:aggregate.get(\'headline\', []);\n
footer_area python:aggregate.get(\'footer\', []);\n
bottom_area python:aggregate.get(\'bottom\', []);\n
- top_area python:aggregate.get(\'top\', []);\n
right_list python:len(right_area) and layout_form.get_fields_in_group(right_area[0][\'goid\']);\n
is_right_area_empty python:right_list == 0 or len(right_list) == 0;\n
is_front_layout python: layout_form is not None and\n
@@ -151,7 +150,6 @@
<link rel="stylesheet" type="text/css" href="css/fix-ie.css" media="screen" />\n
<![endif]-->\n
\n
- <div id="top-bar"></div>\n
\n
<div id="mainwrapper">\n
\n
@@ -160,15 +158,6 @@
<!--index here//-->\n
<h1 id="index"><a href="/" title="ERP5" name="top">ERP5</a></h1>\n
<!--index here//-->\n
- <!-- Top Bar: navigation and search -->\n
-\n
- <div id="top" tal:define="dummy python: request.set(\'editable_mode\', True)">\n
- <tal:block tal:condition="python: layout_form is not None">\n
- <tal:block tal:repeat="aggregate python: [(\'top\', top_area)]">\n
- <tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n
- </tal:block>\n
- </tal:block>\n
- </div>\n
\n
<div id="menu" tal:define="dummy python: request.set(\'editable_mode\', True)">\n
<tal:block tal:condition="python: layout_form is not None">\n
@@ -195,9 +184,11 @@
</tal:block>\n
</tal:block>\n
<!-- Web toolbar -->\n
+\n
<tal:block tal:repeat="aggregate python: [(\'toolbox\', splash_area)]">\n
<tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n
</tal:block>\n
+\n
<div id="content_back_km">\n
<!-- Headline Box -->\n
<!-- Layout form rendering -->\n
Modified: erp5/trunk/bt5/erp5_km/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_km/bt/revision?rev=35204&r1=35203&r2=35204&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_km/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_km/bt/revision [utf8] Wed May 12 14:47:44 2010
@@ -1,1 +1,1 @@
-1375
+1377
More information about the Erp5-report
mailing list