OFBiz - svn commit: r1082004 - in /ofbiz/trunk: applications/commonext/widget/ framework/bi/widget/ framework/common/widget/ framework/example/widget/example/ framework/webtools/widget/

svn commit: r1082004 - in /ofbiz/trunk: applications/commonext/widget/ framework/bi/widget/ framework/common/widget/ framework/example/widget/example/ framework/webtools/widget/

Posted by adrianc on
URL: http://ofbiz.116.s1.nabble.com/svn-commit-r1082004-in-ofbiz-trunk-applications-commonext-widget-framework-bi-widget-framework-commo-tp3380481.html

Author: adrianc
Date: Tue Mar 15 23:49:07 2011
New Revision: 1082004

URL: http://svn.apache.org/viewvc?rev=1082004&view=rev
Log:
Partially revert a change made in rev 894330 - put multi-column screen elements back in the GlobalDecorator.

Modified:
ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
ofbiz/trunk/framework/bi/widget/BiScreens.xml
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
ofbiz/trunk/framework/webtools/widget/CommonScreens.xml

Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/CommonScreens.xml?rev=1082004&r1=1082003&r2=1082004&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/CommonScreens.xml Tue Mar 15 23:49:07 2011
@@ -73,36 +73,7 @@ under the License.
</actions>
<widgets/>
</section>
- <decorator-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml">
- <decorator-section name="pre-body">
- <decorator-section-include name="pre-body"/>
- </decorator-section>
- <decorator-section name="body">
- <container id="column-container">
- <section>
- <condition>
- <if-empty-section section-name="left-column"/>
- </condition>
- <widgets>
- <container id="content-main-section">
- <decorator-section-include name="body"/>
- </container>
- </widgets>
- <fail-widgets>
- <container style="left">
- <decorator-section-include name="left-column"/>
- </container>
- <container id="content-main-section" style="leftonly">
- <container style="no-clear">
- <decorator-section-include name="body"/>
- </container>
- </container>
- </fail-widgets>
- </section>
- <container style="clear"></container>
- </container>
- </decorator-section>
- </decorator-screen>
+ <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
</widgets>
</section>
</screen>

Modified: ofbiz/trunk/framework/bi/widget/BiScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/widget/BiScreens.xml?rev=1082004&r1=1082003&r2=1082004&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/widget/BiScreens.xml (original)
+++ ofbiz/trunk/framework/bi/widget/BiScreens.xml Tue Mar 15 23:49:07 2011
@@ -35,19 +35,7 @@ under the License.
<set field="applicationTitle" value="${uiLabelMap.BusinessIntelligenceApplication}" global="true"/>
</actions>
<widgets>
- <decorator-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml">
- <decorator-section name="pre-body">
- <decorator-section-include name="pre-body"/>
- </decorator-section>
- <decorator-section name="body">
- <container id="column-container">
- <container id="content-main-section">
- <decorator-section-include name="body"/>
- </container>
- <container style="clear"></container>
- </container>
- </decorator-section>
- </decorator-screen>
+ <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
</widgets>
</section>
</screen>

Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1082004&r1=1082003&r2=1082004&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Tue Mar 15 23:49:07 2011
@@ -210,7 +210,29 @@ under the License.

<container style="contentarea">
<decorator-section-include name="pre-body"/>
- <decorator-section-include name="body"/>
+ <container id="column-container">
+ <section>
+ <condition>
+ <if-empty-section section-name="left-column"/>
+ </condition>
+ <widgets>
+ <container id="content-main-section">
+ <decorator-section-include name="body"/>
+ </container>
+ </widgets>
+ <fail-widgets>
+ <container style="left">
+ <decorator-section-include name="left-column"/>
+ </container>
+ <container id="content-main-section" style="leftonly">
+ <container style="no-clear">
+ <decorator-section-include name="body"/>
+ </container>
+ </container>
+ </fail-widgets>
+ </section>
+ <container style="clear"></container>
+ </container>
</container>



Modified: ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/CommonScreens.xml?rev=1082004&r1=1082003&r2=1082004&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/CommonScreens.xml Tue Mar 15 23:49:07 2011
@@ -46,19 +46,7 @@ under the License.
<set field="applicationTitle" value="${uiLabelMap.ExampleApplication}" global="true"/>
</actions>
<widgets>
- <decorator-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml">
- <decorator-section name="pre-body">
- <decorator-section-include name="pre-body"/>
- </decorator-section>
- <decorator-section name="body">
- <container id="column-container">
- <container id="content-main-section">
- <decorator-section-include name="body"/>
- </container>
- <container style="clear"></container>
- </container>
- </decorator-section>
- </decorator-screen>
+ <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
</widgets>
</section>
</screen>

Modified: ofbiz/trunk/framework/webtools/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CommonScreens.xml?rev=1082004&r1=1082003&r2=1082004&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/CommonScreens.xml Tue Mar 15 23:49:07 2011
@@ -43,19 +43,7 @@ under the License.
<set field="applicationTitle" value="${uiLabelMap.FrameworkWebTools}" global="true"/>
</actions>
<widgets>
- <decorator-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml">
- <decorator-section name="pre-body">
- <decorator-section-include name="pre-body"/>
- </decorator-section>
- <decorator-section name="body">
- <container id="column-container">
- <container id="content-main-section">
- <decorator-section-include name="body"/>
- </container>
- <container style="clear"></container>
- </container>
- </decorator-section>
- </decorator-screen>
+ <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
</widgets>
</section>
</screen>