[Erp5-report] r39644 gabriel - in /experimental/bt5/erp5_web_ung_theme: SkinTemplateItem/po...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Oct 29 02:05:52 CEST 2010
Author: gabriel
Date: Fri Oct 29 02:05:50 2010
New Revision: 39644
URL: http://svn.erp5.org?rev=39644&view=rev
Log:
continuation of r39640.
- Reorganize layout groups and update css
Modified:
experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewFavoriteWidget.xml
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_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/WebSection_viewFavoriteWidget.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewFavoriteWidget.xml?rev=39644&r1=39643&r2=39644&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewFavoriteWidget.xml [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_viewFavoriteWidget.xml [utf8] Fri Oct 29 02:05:50 2010
@@ -36,6 +36,7 @@
<key> <string>_text</string> </key>
<value> <unicode encoding="cdata"><![CDATA[
+<div class="favorite">\n
<tal:block tal:define="website here/getWebSiteValue;\n
portal_path python:website.absolute_url();\n
current_url here/absolute_url;\n
@@ -47,7 +48,8 @@ Starred\n
<tal:block tal:condition="python: has_editor">\n
<a tal:attributes="href python: request.get(\'URL\') + \'?editable_mode:int=1\'">Refresh</a>\n
</tal:block>\n
-</tal:block>
+</tal:block>\n
+</div>
]]></unicode> </value>
</item>
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=39644&r1=39643&r2=39644&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] Fri Oct 29 02:05:50 2010
@@ -83,7 +83,6 @@
<value>
<list>
<string>document_action_box</string>
- <string>document_box</string>
</list>
</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=39644&r1=39643&r2=39644&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] Fri Oct 29 02:05:50 2010
@@ -61,11 +61,9 @@
<list>
<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>
+ <string>main main-right</string>
</list>
</value>
</item>
@@ -74,23 +72,6 @@
<value>
<dictionary>
<item>
- <key> <string>content listbox</string> </key>
- <value>
- <list>
- <string>listbox</string>
- <string>listbox_icon</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>favorite favorite-box</string> </key>
- <value>
- <list>
- <string>favorite_box</string>
- </list>
- </value>
- </item>
- <item>
<key> <string>header header-left</string> </key>
<value>
<list>
@@ -107,26 +88,29 @@
</value>
</item>
<item>
- <key> <string>navigation navigation-left</string> </key>
+ <key> <string>main main-right</string> </key>
<value>
<list>
- <string>navigation_box</string>
+ <string>favorite_box</string>
+ <string>toolbar</string>
+ <string>listbox</string>
+ <string>listbox_icon</string>
</list>
</value>
</item>
<item>
- <key> <string>navigation navigation-right</string> </key>
+ <key> <string>navigation navigation-left</string> </key>
<value>
<list>
- <string>login_box</string>
+ <string>navigation_box</string>
</list>
</value>
</item>
<item>
- <key> <string>toolbar</string> </key>
+ <key> <string>navigation navigation-right</string> </key>
<value>
<list>
- <string>toolbar</string>
+ <string>login_box</string>
</list>
</value>
</item>
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=39644&r1=39643&r2=39644&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] Fri Oct 29 02:05:50 2010
@@ -44,13 +44,10 @@
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\', \'toolbar\', \'favorite\', \'content\', \'navigation\', \'main\']);\n
+ [\'header\', \'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
- 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
@@ -58,10 +55,7 @@
\'%s/ung_theme.css\' % portal_path,];\n
global js_list js_list | python:[];\n
global css_list css_list | python:[];\n
- dummy python:css_list.extend(css_list_ung_template);\n
- js_url_list python: [\'jquery-ui-1.8.2/js/jquery-1.4.2.min.js\',\n
- \'ung_js/ung.js\'];\n
- dummy python:js_list.extend([item for item in js_url_list if item not in js_list]);">\n
+ dummy python:css_list.extend(css_list_ung_template);">\n
<tal:block metal:use-macro="here/template_erp5_xhtml_style/macros/master">\n
<tal:block metal:fill-slot="layout">\n
<div class="container">\n
@@ -79,35 +73,16 @@
</tal:block>\n
</tal:block>\n
</div>\n
- <tal:block tal:condition="python: layout_form is not None">\n
+ <div class="main">\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 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
- <tal:block tal:repeat="aggregate python: [(\'favorite\', favorite_area)]">\n
- <tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n
- </tal:block>\n
- </tal:block>\n
- </div>\n
- <div class="main-content">\n
- <tal:block tal:condition="python: layout_form is not None">\n
- <tal:block tal:repeat="aggregate python: [(\'toolbar\', toolbar_area)]">\n
- <tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n
- </tal:block>\n
- </tal:block>\n
- <tal:block tal:condition="python: layout_form is not None">\n
- <tal:block tal:repeat="aggregate python: [(\'content\', content_area)]">\n
- <tal:block metal:use-macro="here/aggregate_render/macros/aggregate_render"/>\n
- </tal:block>\n
- </tal:block>\n
<tal:block tal:condition="python: has_editor">\n
<tal:block metal:define-slot="main"/>\n
</tal:block>\n
<p class="clear"></p>\n
- </div>\n
</div>\n
</div>\n
</tal:block>\n
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=39644&r1=39643&r2=39644&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] Fri Oct 29 02:05:50 2010
@@ -24,7 +24,9 @@
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string>/* No margins, take all screen */\n
+ <value> <string encoding="cdata"><![CDATA[
+
+/* No margins, take all screen */\n
\n
body {\n
background: #fff !important;\n
@@ -97,22 +99,20 @@ div.share-action-area {\n
\n
/* Main classes */\n
\n
-div.main {\n
+div.main-right {\n
width:80%;\n
float:right;\n
- background-color: #BBCCFF;\n
- color: #333333;\n
border-left: 4px solid #BBCCFF;\n
}\n
\n
-div.main div.main-content {\n
+div.main-right div.main-content {\n
width: 100%;\n
height: 100%;\n
background-color: #fff;\n
vertical-align: middle;\n
}\n
\n
-div.main div.main-status {\n
+div.main-right div.main-status {\n
padding: 5px;\n
height: 22px;\n
vertical-align: middle;\n
@@ -210,7 +210,7 @@ div.listbox-content a img, div.main-cont
div.listbox-content td.listbox-table-data-cell a img {\n
margin-right: -12px;\n
}\n
-div.main div.main-status a {\n
+div.main-right div.main-status a {\n
float:right;\n
font-size:14px;\n
padding-right:1%;\n
@@ -294,7 +294,7 @@ div#wrapper_toolbar {\n
}\n
\n
button.clone {\n
- background-image: url(\'http://localhost:18081/erp5/images/fileclone.png\');\n
+ background-image: url(\'<dtml-var expr="portal_url()">/images/fileclone.png\');\n
border: 0 none;\n
height:22px;\n
width:23px;\n
@@ -313,11 +313,6 @@ div#wrapper_header div.field fieldset {\
border:0px;\n
}\n
\n
-div#wrapper_header div.field input.field, \n
- div#wrapper_header div.field img {\n
- margin-left:10px;\n
-}\n
-\n
div#wrapper_header div.field a[name="document_title"], \n
div#wrapper_header div.field a[name="document_state"] {\n
margin-left:40px;\n
@@ -346,12 +341,16 @@ div.bottom_actions button {\n
display: none;\n
}\n
\n
-div.main-left, div.main {\n
- margin-top: 0.5%;\n
+div.main-left, div.main-right, div.main {\n
+ margin-top: -0.5em;\n
}\n
\n
+div.main {\n
+ margin-top: 0.5em;\n
+}\n
button.delete {\n
- margin-top: 3px;\n
+ margin-top: 6px;\n
+ margin-left: 6px;\n
}\n
\n
div.favorite-box {\n
@@ -359,20 +358,12 @@ div.favorite-box {\n
margin-left:-16px;\n
}\n
\n
-div.document, div#wrapper_content fieldset.widget{\n
- background:none repeat scroll 0 0 #EFF3FA;\n
-}\n
-\n
-div#wrapper_content fieldset.widget {\n
- width:98%;\n
- margin-left:0px;\n
-}\n
-\n
table.listbox {\n
- margin-left:-9px;\n
+ margin-left: -12px;\n
+ background: #eff3fa;\n
}\n
\n
-div.main fieldset.widget div.field:last-child img {\n
+div.main-right fieldset.widget div.field:last-child img {\n
display:none;\n
}\n
\n
@@ -392,7 +383,35 @@ div.main-left {\n
background-color: #DAE6F6;\n
height:4em;\n
border: 0;\n
-}</string> </value>
+}\n
+\n
+div.favorite {\n
+ background-color: #BBCCFF;\n
+ height:27px; \n
+ margin-left:-12px;\n
+ margin-top:-5px;\n
+ padding-top:8px;\n
+}\n
+\n
+div.favorite a {\n
+ font-size: 14px;\n
+ float: right;\n
+ margin-right: 5px;\n
+}\n
+\n
+div.toolbar {\n
+ background-color: #E3E9FF;\n
+ height:27px; \n
+ margin-left:-12px;\n
+ padding-bottom:5px;\n
+}\n
+\n
+div.content {\n
+ border-bottom:4px solid #BBCCFF;\n
+ border-top:4px solid #BBCCFF;\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=39644&r1=39643&r2=39644&view=diff
==============================================================================
--- experimental/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ experimental/bt5/erp5_web_ung_theme/bt/revision [utf8] Fri Oct 29 02:05:50 2010
@@ -1 +1 @@
-47
\ No newline at end of file
+49
\ No newline at end of file
More information about the Erp5-report
mailing list