Skip to content

erp5
erp5
Commit e5265158 authored by Ivan Tyagov's avatar Ivan Tyagov
Browse files
Options

Revert part of previous commits. Fix web toolbox CSS layout. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35204 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 8c991007
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 45 deletions
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_content_layout.xml
View file @ e5265158
......@@ -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>
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_front_layout.xml
View file @ e5265158
......@@ -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>
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout.xml
View file @ e5265158
......@@ -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>
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml
View file @ e5265158
......@@ -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 @@ body {\n
\n
\n
#header {\n
\n
\tcolor:#ffffff;\n
color:#a8a799;\n
\n
}\n
\n
......@@ -395,18 +392,6 @@ a.pub:link, a.pub:active, a.pub:visited, .pub { color:#45cb45; }\n
\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
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml
View file @ e5265158
......@@ -347,12 +347,13 @@ button, select, input {\n
}\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 @@ width: auto;\n
\theight:22px;\n
\tline-height:24px;\n
\tpadding-right:40px;\n
\tpadding-top: 0em;\n
\tposition: relative;\n
\n
}\n
......@@ -1394,7 +1396,6 @@ fieldset.right_registration select {\n
\n
/* Web Toolbar */\n
div.web-toolbar{\n
padding-left: 200px;\n
color: auto;\n
height: 30px;\n
}\n
......@@ -1404,6 +1405,19 @@ div.web-toolbar h3{\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
]]></string> </value>
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml
View file @ e5265158
......@@ -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
......
bt5/erp5_km/bt/revision
View file @ e5265158
1375
\ No newline at end of file
1377
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7