diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_content_layout.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_content_layout.xml index a7c6b57e83c467514eeb3f3d9b1ffd80b5bfa1cc..129867ca871307a406f0e43dfb16ebef726776c5 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_content_layout.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_content_layout.xml @@ -62,6 +62,7 @@ <key> <string>group_list</string> </key> <value> <list> + <string>top login</string> <string>menu navbar</string> <string>menu meta</string> <string>path tools</string> @@ -109,7 +110,6 @@ <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> @@ -157,6 +157,14 @@ </list> </value> </item> + <item> + <key> <string>top login</string> </key> + <value> + <list> + <string>user_information_widget</string> + </list> + </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_front_layout.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_front_layout.xml index 88a0e3476b5ec7ca29395c242d3407869f8bfb5e..2d34eb27ff9f0c6ce16f745facdf3b88e033790c 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_front_layout.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_front_layout.xml @@ -62,6 +62,7 @@ <key> <string>group_list</string> </key> <value> <list> + <string>top login</string> <string>menu navbar</string> <string>menu meta</string> <string>path tools</string> @@ -105,7 +106,6 @@ <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> @@ -150,6 +150,14 @@ </list> </value> </item> + <item> + <key> <string>top login</string> </key> + <value> + <list> + <string>user_information_widget</string> + </list> + </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout.xml index ad21cbed2f1e8c010774a1e62c30afcc291b07c4..2e118464189ae22dddeebf2383b78a031409ad42 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/erp5_km_minimal_layout.xml @@ -62,6 +62,7 @@ <key> <string>group_list</string> </key> <value> <list> + <string>top login</string> <string>menu navbar</string> <string>menu meta</string> <string>path tools</string> @@ -116,7 +117,6 @@ <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> @@ -164,6 +164,14 @@ </list> </value> </item> + <item> + <key> <string>top login</string> </key> + <value> + <list> + <string>user_information_widget</string> + </list> + </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml index a7a01f053f51fd9f0a67cdf44374a54a9976e5df..d4e4b481f5564ebcf4a5db0780e480f803b8f876 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/color.css.xml @@ -68,7 +68,7 @@ body {\n \n #header {\n \n -\tcolor:#a8a799;\n +\tcolor:#ffffff;\n \n }\n \n @@ -347,9 +347,9 @@ a:hover { color: #000; }\n \n #header a:link, #header a:active, #header a:visited {\n \n -\tcolor:#a8a799;\n +\tcolor:#fff;\n \tfont-weight:bold;\n -\ttext-shadow: 0 1px 0 #fff;\n +\ttext-shadow: 0 1px 0 #a8a799;\n }\n \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 \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.gif) no-repeat transparent;\n +\tbackground: url(../km_img/home-2.gif) no-repeat transparent;\n \n }\n \n diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml index 6e654bf2dff4b491a217436f13ffc29caa43ce27..e7a75b469e988fdd8c3330f423da936502810a09 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/layout.css.xml @@ -49,7 +49,7 @@ /* - add dynamic properties */\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 ## dreikelvin CSS Framework 3.5\n @@ -334,13 +334,26 @@ button, select, input {\n \n /* ## navigation ###################################### start # */\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 \n -\tfloat:left;\n -\twidth:100%;\n -\tmargin:0;\n -\tpadding:10px 0 0 0;\n +\twidth:90%;\n +\theight:30px;\n +\tmargin:0 5% 0 5%;\n +\tpadding:0px 0 0 0;\n \tz-index: 1;\n +\tborder-style:solid solid none;\n +\tborder-width:1px 1px 0;\n \n }\n \n @@ -363,7 +376,7 @@ button, select, input {\n }\n \n #menu .navbar {\n -\twidth:55%;\n +\twidth:70%;\n }\n \n #menu ul li {\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 \n \theight:100%;\n -\tline-height:42px;\n +\tline-height:30px;\n \tfloat:left;\n \n }\n @@ -410,11 +423,11 @@ button, select, input {\n \n \ttext-indent: -99999px;\n \tdisplay:block;\n -\theight:17px;\n +\theight:20px;\n \twidth:8px;\n \tposition: relative;\n -\ttop: 10px;\n -\tmargin-left:10px;\n +\ttop: 0px;\n +\tmargin:5px 0 5px 5px;\n \n }\n \n @@ -987,7 +1000,7 @@ form p,\n \n .meta {\n \n - line-height: 42px;\n + line-height:30px;\n \n }\n \n @@ -1009,7 +1022,7 @@ form p,\n .meta .search_button {\n width: 20px;\n height: 20px;\n -margin-top:11px;\n +margin:5px 0 5px 5px;\n \n }\n \n diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/pulldown.css.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/pulldown.css.xml index 1ee1b9180af3b5923a5f44d4c90d777716c9d96e..3afc8eb7fd71448b6a1515f57e8bd3248adbf27d 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/pulldown.css.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_css/pulldown.css.xml @@ -105,7 +105,7 @@ display:block;\n position:absolute;\n top:0;\n - padding-top:44px;\n + padding-top:30px;\n left:0;\n width:205px;\n opacity: <tal:block tal:replace="menu_opacity">0.80</tal:block>;\n diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/home-2.gif.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/home-2.gif.xml new file mode 100644 index 0000000000000000000000000000000000000000..8418f30598b7005622a4906fad931743825497b0 --- /dev/null +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/km_img/home-2.gif.xml @@ -0,0 +1,54 @@ +<?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> diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml index f58ec75e1451b351fc584e8b1d760896794112b5..f7d5432433cb0755b06176ecb5dcdcc00ef6fb04 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml @@ -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\']);\n + [\'right\', \'bottom\', \'menu\', \'path\', \'splash\', \'headline\', \'footer\', \'top\']);\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,6 +104,7 @@ 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 @@ -147,6 +148,7 @@ <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 @@ -155,9 +157,17 @@ <!--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 - <!-- Top Bar: navigation and search -->\n <tal:block tal:condition="python: layout_form is not None">\n <tal:block tal:repeat="aggregate python: [(\'menu\', menu_area)]">\n <tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n diff --git a/bt5/erp5_km/bt/change_log b/bt5/erp5_km/bt/change_log index 96db5083c11e3fc3b74adbdfb77b3b8fea499249..dd3a955b96f702f48a232a91f361d06e2bd76cd3 100644 --- a/bt5/erp5_km/bt/change_log +++ b/bt5/erp5_km/bt/change_log @@ -1,3 +1,6 @@ +2010-05-08 Jacques +* Added the group 'top menu' in KM forms + 2010-04-29 Jacques * Created CSS style for splash styling diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision index 81068c63f57b7fda6d43bb13b26e979004ec5b6c..8acff5e398fd6249599a59db5dea925ea3e250e3 100644 --- a/bt5/erp5_km/bt/revision +++ b/bt5/erp5_km/bt/revision @@ -1 +1 @@ -1363 \ No newline at end of file +1364 \ No newline at end of file