[Erp5-report] r39640 gabriel - in /experimental/bt5/erp5_web_ung_theme: SkinTemplateItem/po...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Oct 28 23:17:58 CEST 2010
Author: gabriel
Date: Thu Oct 28 23:17:54 2010
New Revision: 39640
URL: http://svn.erp5.org?rev=39640&view=rev
Log:
reorganize layout groups and update css
Modified:
experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_content_layout.xml
experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_layout.xml
experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml
experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml
experimental/bt5/erp5_web_ung_theme/bt/revision
Modified: experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_content_layout.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_content_layout.xml?rev=39640&r1=39639&r2=39640&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_content_layout.xml [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_content_layout.xml [utf8] Thu Oct 28 23:17:54 2010
@@ -59,12 +59,10 @@
<key> <string>group_list</string> </key>
<value>
<list>
- <string>header header-top</string>
- <string>header header-bottom</string>
+ <string>navigation navigation-left</string>
+ <string>header header-left</string>
<string>header header-right</string>
- <string>header user-navigation</string>
- <string>toolbar</string>
- <string>favorite favorite-box</string>
+ <string>navigation navigation-right</string>
</list>
</value>
</item>
@@ -73,13 +71,7 @@
<value>
<dictionary>
<item>
- <key> <string>favorite favorite-box</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>header header-bottom</string> </key>
+ <key> <string>header header-left</string> </key>
<value>
<list>
<string>search_bar</string>
@@ -96,7 +88,7 @@
</value>
</item>
<item>
- <key> <string>header header-top</string> </key>
+ <key> <string>navigation navigation-left</string> </key>
<value>
<list>
<string>navigation_box</string>
@@ -104,19 +96,13 @@
</value>
</item>
<item>
- <key> <string>header user-navigation</string> </key>
+ <key> <string>navigation navigation-right</string> </key>
<value>
<list>
<string>login_box</string>
</list>
</value>
</item>
- <item>
- <key> <string>toolbar</string> </key>
- <value>
- <list/>
- </value>
- </item>
</dictionary>
</value>
</item>
Modified: experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_layout.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_layout.xml?rev=39640&r1=39639&r2=39640&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_layout.xml [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_layout.xml [utf8] Thu Oct 28 23:17:54 2010
@@ -59,11 +59,11 @@
<key> <string>group_list</string> </key>
<value>
<list>
- <string>header header-top</string>
- <string>header header-bottom</string>
- <string>center</string>
- <string>header user-navigation</string>
+ <string>navigation navigation-left</string>
+ <string>header header-left</string>
<string>toolbar</string>
+ <string>navigation navigation-right</string>
+ <string>main main-left</string>
<string>favorite favorite-box</string>
<string>content listbox</string>
</list>
@@ -74,14 +74,6 @@
<value>
<dictionary>
<item>
- <key> <string>center</string> </key>
- <value>
- <list>
- <string>menu_box</string>
- </list>
- </value>
- </item>
- <item>
<key> <string>content listbox</string> </key>
<value>
<list>
@@ -99,7 +91,7 @@
</value>
</item>
<item>
- <key> <string>header header-bottom</string> </key>
+ <key> <string>header header-left</string> </key>
<value>
<list>
<string>search_bar</string>
@@ -107,7 +99,15 @@
</value>
</item>
<item>
- <key> <string>header header-top</string> </key>
+ <key> <string>main main-left</string> </key>
+ <value>
+ <list>
+ <string>menu_box</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>navigation navigation-left</string> </key>
<value>
<list>
<string>navigation_box</string>
@@ -115,7 +115,7 @@
</value>
</item>
<item>
- <key> <string>header user-navigation</string> </key>
+ <key> <string>navigation navigation-right</string> </key>
<value>
<list>
<string>login_box</string>
Modified: experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml?rev=39640&r1=39639&r2=39640&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/template_erp5_web_ung.xml [utf8] Thu Oct 28 23:17:54 2010
@@ -44,13 +44,14 @@
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
- [\'header\', \'center\', \'toolbar\', \'favorite\', \'content\']);\n
+ [\'header\', \'toolbar\', \'favorite\', \'content\', \'navigation\', \'main\']);\n
aggregate python: ((aggregate is not has_no_layout) and dict(aggregate)) or {};\n
+ navigation_area python:aggregate.get(\'navigation\', []);\n
header_area python:aggregate.get(\'header\', []);\n
- center_area python:aggregate.get(\'center\', []);\n
toolbar_area python:aggregate.get(\'toolbar\', []);\n
favorite_area python:aggregate.get(\'favorite\', []);\n
content_area python:aggregate.get(\'content\', []);\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
@@ -64,20 +65,25 @@
<tal:block metal:use-macro="here/template_erp5_xhtml_style/macros/master">\n
<tal:block metal:fill-slot="layout">\n
<div class="container">\n
- <div class="header"> \n
+ <div class="navigation"> \n
<tal:block tal:condition="python: layout_form is not None">\n
- <tal:block tal:repeat="aggregate python: [(\'header\', header_area)]">\n
+ <tal:block tal:repeat="aggregate python: [(\'navigation\', navigation_area)]">\n
<tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n
</tal:block>\n
</tal:block>\n
</div>\n
- <div class="gadget-column">\n
+ <div class="header"> \n
<tal:block tal:condition="python: layout_form is not None">\n
- <tal:block tal:repeat="aggregate python: [(\'center\', center_area)]">\n
+ <tal:block tal:repeat="aggregate python: [(\'header\', header_area)]">\n
<tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n
</tal:block>\n
</tal:block>\n
- </div>\n
+ </div>\n
+ <tal:block tal:condition="python: layout_form is not None">\n
+ <tal:block tal:repeat="aggregate python: [(\'main\', main_area)]">\n
+ <tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n
+ </tal:block>\n
+ </tal:block>\n
<div class="main">\n
<div class="main-status">\n
<tal:block tal:condition="python: layout_form is not None">\n
Modified: experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml?rev=39640&r1=39639&r2=39640&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] Thu Oct 28 23:17:54 2010
@@ -25,7 +25,7 @@
<item>
<key> <string>raw</string> </key>
<value> <string>$(document).ready(function(){\n
- if ($("div.gadget-column").length == 1)\n
+ if ($("div.gadget-column").length == 0)\n
{\n
$("div.main").css("width","100%");\n
$("div.main").css("background-color","#FFFFFF");\n
@@ -33,10 +33,11 @@
$("div.content").css("border-bottom","4px solid #BBCCFF");\n
$("div.content").css("margin-top","-3em");\n
$("div").removeClass("gadget-column");\n
- $("div.main").css("margin-top","2%");\n
+ $("div.main").css("margin-top","1.5%");\n
}\n
return false;\n
});\n
+\n
</string> </value>
</item>
<item>
Modified: experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml?rev=39640&r1=39639&r2=39640&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_theme.css.xml [utf8] Thu Oct 28 23:17:54 2010
@@ -24,9 +24,7 @@
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-/* No margins, take all screen */\n
+ <value> <string>/* No margins, take all screen */\n
\n
body {\n
background: #fff !important;\n
@@ -46,22 +44,24 @@ fieldset#hidden_fieldset {\t \n
\n
/* Header classes */\n
\n
-div.header { \n
- padding: 5px;\n
- height: 15px;\n
- border-bottom: 1px solid #C9D7F1;\n
- font-size: 13px;\n
+div.navigation {\n
+ font-family: arial,sans-serif;\n
+ padding: 5px;\n
+ height: 15px;\n
+ border-bottom: 1px solid #C9D7F1;\n
+ font-size: 13px;\n
}\n
\n
-div.header fieldset.widget {\n
+div.navigation fieldset.widget {\n
border: 0px;\n
padding-top: 0.6%; \n
margin: -0.60%;\n
width: 93%;\n
}\n
\n
-div.header-navigation { \n
- float: left;\n
+div.navigation-right { \n
+ float: right;\n
+ margin-top: -16px;\n
}\n
\n
div.header-user { \n
@@ -122,11 +122,6 @@ div.main div.main-status {\n
\n
div.gadget-column {\n
margin-left:-4px;\n
- width: 20%;\n
- float:left;\n
- background-color: #DAE6F6;\n
- height:4em;\n
- border: 0;\n
}\n
\n
div.gadget-column div.gadget-action {\n
@@ -135,10 +130,8 @@ div.gadget-column div.gadget-action {\n
\n
div.gadget-column div.gadget-container {\n
background-color:#FFFFFF;\n
- margin-left:-4px;\n
- margin-top:3px;\n
- text-align:center;\n
- width:339%;\n
+ margin-top:9px;\n
+ text-align:left;\n
}\n
\n
div.gadget-column div.file-selection {\n
@@ -152,19 +145,20 @@ div.gadget-column div.file-selection div
border-bottom: 1px solid #DDD;\n
padding-bottom: 5px;\n
padding-top: 5px;\n
- width:190px;\n
+ width:21em;\n
}\n
\n
div.gadget-column div.file-selection div.file-quick-browser {\n
padding-top: 5px;\n
padding-bottom: 5px;\n
border-bottom: 1px solid #DDD;\n
+ width:19em;\n
}\n
\n
div.quick-search-item {\n
padding-left: 20px;\n
font-size: 13px;\n
- line-height: 18px;\n
+ line-height: 19px;\n
cursor: pointer;\n
}\n
\n
@@ -300,7 +294,7 @@ div#wrapper_toolbar {\n
}\n
\n
button.clone {\n
- background-image: url(\'<dtml-var expr="portal_url()">/images/fileclone.png\');\n
+ background-image: url(\'http://localhost:18081/erp5/images/fileclone.png\');\n
border: 0 none;\n
height:22px;\n
width:23px;\n
@@ -310,7 +304,7 @@ div#wrapper_toolbar fieldset.widget div.
margin-top:-2px;\n
}\n
\n
-div#wrapper_header div.user-navigation {\n
+div#wrapper_header div.navigation-right {\n
float: right;\n
margin-top: -5.2em;\n
}\n
@@ -343,16 +337,16 @@ div.header-bottom {\n
\n
div.header-right {\n
float: right;\n
- margin-top: -31px;\n
+ margin-top: -38px;\n
height: 18px;\n
- width: 43.3%;;\n
+ width: 41.3%;;\n
}\n
\n
div.bottom_actions button {\n
display: none;\n
}\n
\n
-div.gadget-column, div.main {\n
+div.main-left, div.main {\n
margin-top: 0.5%;\n
}\n
\n
@@ -389,9 +383,16 @@ div.header-right div.input a {\n
\n
a.ung_docs img {\n
border:0 none;\n
-}
-
-]]></string> </value>
+}\n
+\n
+div.main-left {\n
+ margin-left:-4px;\n
+ width: 20%;\n
+ float:left;\n
+ background-color: #DAE6F6;\n
+ height:4em;\n
+ border: 0;\n
+}</string> </value>
</item>
<item>
<key> <string>title</string> </key>
Modified: experimental/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/bt/revision?rev=39640&r1=39639&r2=39640&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/bt/revision [utf8] Thu Oct 28 23:17:54 2010
@@ -1 +1 @@
-45
\ No newline at end of file
+46
\ No newline at end of file
More information about the Erp5-report
mailing list