Skip to content

erp5
erp5
Commit 3c2313e5 authored by Jacques Honoré's avatar Jacques Honoré
Browse files
Options

- created top menu area for login link 

- added a blank div to declare the top bar background color with a CSS property
- created a new home image
- changed color and style of the menu

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35119 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 548e2169
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 23 deletions
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_content_layout.xml
View file @ 3c2313e5
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
<key> <string>group_list</string> </key> <key> <string>group_list</string> </key>
<value> <value>
<list> <list>
<string>top login</string>
<string>menu navbar</string> <string>menu navbar</string>
<string>menu meta</string> <string>menu meta</string>
<string>path tools</string> <string>path tools</string>
...@@ -109,7 +110,6 @@ ...@@ -109,7 +110,6 @@
<key> <string>menu meta</string> </key> <key> <string>menu meta</string> </key>
<value> <value>
<list> <list>
<string>user_information_widget</string>
<string>your_search_text</string> <string>your_search_text</string>
<string>your_search_portal_type</string> <string>your_search_portal_type</string>
<string>your_search_form_id</string> <string>your_search_form_id</string>
...@@ -157,6 +157,14 @@ ...@@ -157,6 +157,14 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>top login</string> </key>
<value>
<list>
<string>user_information_widget</string>
</list>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_front_layout.xml
View file @ 3c2313e5
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
<key> <string>group_list</string> </key> <key> <string>group_list</string> </key>
<value> <value>
<list> <list>
<string>top login</string>
<string>menu navbar</string> <string>menu navbar</string>
<string>menu meta</string> <string>menu meta</string>
<string>path tools</string> <string>path tools</string>
...@@ -105,7 +106,6 @@ ...@@ -105,7 +106,6 @@
<key> <string>menu meta</string> </key> <key> <string>menu meta</string> </key>
<value> <value>
<list> <list>
<string>user_information_widget</string>
<string>your_search_text</string> <string>your_search_text</string>
<string>your_search_portal_type</string> <string>your_search_portal_type</string>
<string>your_search_form_id</string> <string>your_search_form_id</string>
...@@ -150,6 +150,14 @@ ...@@ -150,6 +150,14 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>top login</string> </key>
<value>
<list>
<string>user_information_widget</string>
</list>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout.xml
View file @ 3c2313e5
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
<key> <string>group_list</string> </key> <key> <string>group_list</string> </key>
<value> <value>
<list> <list>
<string>top login</string>
<string>menu navbar</string> <string>menu navbar</string>
<string>menu meta</string> <string>menu meta</string>
<string>path tools</string> <string>path tools</string>
...@@ -116,7 +117,6 @@ ...@@ -116,7 +117,6 @@
<key> <string>menu meta</string> </key> <key> <string>menu meta</string> </key>
<value> <value>
<list> <list>
<string>user_information_widget</string>
<string>your_search_text</string> <string>your_search_text</string>
<string>your_search_portal_type</string> <string>your_search_portal_type</string>
<string>your_search_form_id</string> <string>your_search_form_id</string>
...@@ -164,6 +164,14 @@ ...@@ -164,6 +164,14 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>top login</string> </key>
<value>
<list>
<string>user_information_widget</string>
</list>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml
View file @ 3c2313e5
...@@ -68,7 +68,7 @@ body {\n ...@@ -68,7 +68,7 @@ body {\n
\n \n
#header {\n #header {\n
\n \n
\tcolor:#a8a799;\n \tcolor:#ffffff;\n
\n \n
}\n }\n
\n \n
...@@ -347,9 +347,9 @@ a:hover { color: #000; }\n ...@@ -347,9 +347,9 @@ a:hover { color: #000; }\n
\n \n
#header a:link, #header a:active, #header a:visited {\n #header a:link, #header a:active, #header a:visited {\n
\n \n
\tcolor:#a8a799;\n \tcolor:#fff;\n
\tfont-weight:bold;\n \tfont-weight:bold;\n
\ttext-shadow: 0 1px 0 #fff;\n \ttext-shadow: 0 1px 0 #a8a799;\n
}\n }\n
\n \n
#header .meta div a:link, #header .meta div a:active, #header .meta div a:visited {\n #header .meta div a:link, #header .meta div a:active, #header .meta div a:visited {\n
...@@ -397,10 +397,19 @@ a.pub:link, a.pub:active, a.pub:visited, .pub { color:#45cb45; }\n ...@@ -397,10 +397,19 @@ a.pub:link, a.pub:active, a.pub:visited, .pub { color:#45cb45; }\n
\n \n
/* ## navigation ###################################### start # */\n /* ## navigation ###################################### start # */\n
\n \n
#top-bar{\n
\tbackground-color:#69654A;\n
}\n
\n
#menu{\n
\tbackground:#818363;\n
\tborder-color:#37391E;\n
}\n
\n
\n \n
#menu ul li #n1:link, #menu ul li #n1:active, #menu ul li #n1:visited {\n #menu ul li #n1:link, #menu ul li #n1:active, #menu ul li #n1:visited {\n
\n \n
\tbackground: url(../km_img/home.gif) no-repeat transparent;\n \tbackground: url(../km_img/home-2.gif) no-repeat transparent;\n
\n \n
}\n }\n
\n \n
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml
View file @ 3c2313e5
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
/* - add dynamic properties */\n /* - add dynamic properties */\n
/****************************************************************/\n /****************************************************************/\n
\n \n
<tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css;; charset=utf-8\')"/>\n <tal:block define="dummy python: request.RESPONSE.setHeader(\'Content-Type\', \'text/css;; charset=utf-8\');"/>\n
\n \n
/*\n /*\n
## dreikelvin CSS Framework 3.5\n ## dreikelvin CSS Framework 3.5\n
...@@ -334,13 +334,26 @@ button, select, input {\n ...@@ -334,13 +334,26 @@ button, select, input {\n
\n \n
/* ## navigation ###################################### start # */\n /* ## navigation ###################################### start # */\n
\n \n
#top-bar{\n
\theight:61px;\n
\tleft:0;\n
\tposition:absolute;\n
}\n
#top{\n
\n
\ttext-align:right;\n
\tline-height:30px;\n
\n
}\n
#menu {\n #menu {\n
\n \n
\tfloat:left;\n \twidth:90%;\n
\twidth:100%;\n \theight:30px;\n
\tmargin:0;\n \tmargin:0 5% 0 5%;\n
\tpadding:10px 0 0 0;\n \tpadding:0px 0 0 0;\n
\tz-index: 1;\n \tz-index: 1;\n
\tborder-style:solid solid none;\n
\tborder-width:1px 1px 0;\n
\n \n
}\n }\n
\n \n
...@@ -363,7 +376,7 @@ button, select, input {\n ...@@ -363,7 +376,7 @@ button, select, input {\n
}\n }\n
\n \n
#menu .navbar {\n #menu .navbar {\n
\twidth:55%;\n \twidth:70%;\n
}\n }\n
\n \n
#menu ul li {\n #menu ul li {\n
...@@ -397,7 +410,7 @@ button, select, input {\n ...@@ -397,7 +410,7 @@ button, select, input {\n
#menu ul li a:link, #menu ul li a:active, #menu ul li a:visited {\n #menu ul li a:link, #menu ul li a:active, #menu ul li a:visited {\n
\n \n
\theight:100%;\n \theight:100%;\n
\tline-height:42px;\n \tline-height:30px;\n
\tfloat:left;\n \tfloat:left;\n
\n \n
}\n }\n
...@@ -410,11 +423,11 @@ button, select, input {\n ...@@ -410,11 +423,11 @@ button, select, input {\n
\n \n
\ttext-indent: -99999px;\n \ttext-indent: -99999px;\n
\tdisplay:block;\n \tdisplay:block;\n
\theight:17px;\n \theight:20px;\n
\twidth:8px;\n \twidth:8px;\n
\tposition: relative;\n \tposition: relative;\n
\ttop: 10px;\n \ttop: 0px;\n
\tmargin-left:10px;\n \tmargin:5px 0 5px 5px;\n
\n \n
}\n }\n
\n \n
...@@ -987,7 +1000,7 @@ form p,\n ...@@ -987,7 +1000,7 @@ form p,\n
\n \n
.meta {\n .meta {\n
\n \n
line-height: 42px;\n line-height:30px;\n
\n \n
}\n }\n
\n \n
...@@ -1009,7 +1022,7 @@ form p,\n ...@@ -1009,7 +1022,7 @@ form p,\n
.meta .search_button {\n .meta .search_button {\n
width: 20px;\n width: 20px;\n
height: 20px;\n height: 20px;\n
margin-top:11px;\n margin:5px 0 5px 5px;\n
\n \n
}\n }\n
\n \n
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/pulldown.css.xml
View file @ 3c2313e5
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
display:block;\n display:block;\n
position:absolute;\n position:absolute;\n
top:0;\n top:0;\n
padding-top:44px;\n padding-top:30px;\n
left:0;\n left:0;\n
width:205px;\n width:205px;\n
opacity: <tal:block tal:replace="menu_opacity">0.80</tal:block>;\n opacity: <tal:block tal:replace="menu_opacity">0.80</tal:block>;\n
......
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/home-2.gif.xml 0 → 100644
View file @ 3c2313e5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="Image" module="OFS.Image"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts73339255.07</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
<value> <string>home-2.gif</string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>image/gif</string> </value>
</item>
<item>
<key> <string>data</string> </key>
<value> <string encoding="base64">R0lGODlhFAAoAKEBAMfHx////////////yH5BAEKAAIALAAAAAAUACgAAAKglI+py80A3YEGAiks
EFZCAwmQAyGQADSQARlQAxmaAS2QoUEGlEBGbjFADhADUGOAJI45BlPD0CA0DA1Cw9AgNAwNQsPQ
IDSYsvmMXgTW5bVhHcDAAwK4ZG1YC9aONWItENCwZrBmsNawZjBnsLawZjC3ZrCWsGYgCWewdrBm
kDlnsJYAKslQOscwhzDHMIcwxzCHMMcwhzDHMIcwl7ZQAAA7</string> </value>
</item>
<item>
<key> <string>height</string> </key>
<value> <int>40</int> </value>
</item>
<item>
<key> <string>precondition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <int>207</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <int>20</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml
View file @ 3c2313e5
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
dummy python: request.set(\'dialog_mode\', dialog_mode);\n dummy python: request.set(\'dialog_mode\', dialog_mode);\n
dummy python: request.set(\'list_mode\', list_mode);\n dummy python: request.set(\'list_mode\', list_mode);\n
aggregate python: has_no_layout or layout_form.Form_getGroupList(\n aggregate python: has_no_layout or layout_form.Form_getGroupList(\n
[\'right\', \'bottom\', \'menu\', \'path\', \'splash\', \'headline\', \'footer\']);\n [\'right\', \'bottom\', \'menu\', \'path\', \'splash\', \'headline\', \'footer\', \'top\']);\n
aggregate python: ((aggregate is not has_no_layout) and dict(aggregate)) or {};\n aggregate python: ((aggregate is not has_no_layout) and dict(aggregate)) or {};\n
right_area python:aggregate.get(\'right\', []);\n right_area python:aggregate.get(\'right\', []);\n
menu_area python:aggregate.get(\'menu\', []);\n menu_area python:aggregate.get(\'menu\', []);\n
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
headline_area python:aggregate.get(\'headline\', []);\n headline_area python:aggregate.get(\'headline\', []);\n
footer_area python:aggregate.get(\'footer\', []);\n footer_area python:aggregate.get(\'footer\', []);\n
bottom_area python:aggregate.get(\'bottom\', []);\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 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_right_area_empty python:right_list == 0 or len(right_list) == 0;\n
is_front_layout python: layout_form is not None and\n is_front_layout python: layout_form is not None and\n
...@@ -147,6 +148,7 @@ ...@@ -147,6 +148,7 @@
<link rel="stylesheet" type="text/css" href="css/fix-ie.css" media="screen" />\n <link rel="stylesheet" type="text/css" href="css/fix-ie.css" media="screen" />\n
<![endif]-->\n <![endif]-->\n
\n \n
<div id="top-bar"></div>\n
\n \n
<div id="mainwrapper">\n <div id="mainwrapper">\n
\n \n
...@@ -155,9 +157,17 @@ ...@@ -155,9 +157,17 @@
<!--index here//-->\n <!--index here//-->\n
<h1 id="index"><a href="/" title="ERP5" name="top">ERP5</a></h1>\n <h1 id="index"><a href="/" title="ERP5" name="top">ERP5</a></h1>\n
<!--index here//-->\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 \n
<div id="menu" tal:define="dummy python: request.set(\'editable_mode\', True)">\n <div id="menu" tal:define="dummy python: request.set(\'editable_mode\', True)">\n
<!-- Top Bar: navigation and search -->\n
<tal:block tal:condition="python: layout_form is not None">\n <tal:block tal:condition="python: layout_form is not None">\n
<tal:block tal:repeat="aggregate python: [(\'menu\', menu_area)]">\n <tal:block tal:repeat="aggregate python: [(\'menu\', menu_area)]">\n
<tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n <tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n
......
bt5/erp5_km/bt/change_log
View file @ 3c2313e5
2010-05-08 Jacques
* Added the group 'top menu' in KM forms
2010-04-29 Jacques 2010-04-29 Jacques
* Created CSS style for splash styling * Created CSS style for splash styling
......
bt5/erp5_km/bt/revision
View file @ 3c2313e5
1363 1364
\ No newline at end of file \ 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