Author: jleroux
Date: Sun Oct 18 20:11:57 2009
New Revision: 826513
URL: http://svn.apache.org/viewvc?rev=826513&view=rev
Log:
A patch from Bruno Busco "Moving from container-based screenlets to widgets"
(https://issues.apache.org/jira/browse/OFBIZ-3050) - OFBIZ-3050
Bruno : I have completed the change in ALL ofbiz XML files. In the attached
path I included the BI files that I cannot commit.
Modified:
ofbiz/trunk/framework/bi/widget/BiScreens.xml
Modified: ofbiz/trunk/framework/bi/widget/BiScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/widget/BiScreens.xml?rev=826513&r1=826512&r2=826513&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/widget/BiScreens.xml (original)
+++ ofbiz/trunk/framework/bi/widget/BiScreens.xml Sun Oct 18 20:11:57 2009
@@ -48,20 +48,9 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.BusinessIntelligenceReportBuilderSelectStarSchema}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="selectStarSchema"
location="component://bi/widget/BiForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet
title="${uiLabelMap.BusinessIntelligenceReportBuilderSelectStarSchema}">
+ <include-form name="selectStarSchema"
location="component://bi/widget/BiForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -77,22 +66,11 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.BusinessIntelligenceReportBuilderSelectStarSchemaFields}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html><html-template
location="component://bi/webapp/bi/reportbuilder/SelectStarSchemaFields.ftl"/></html>
- </platform-specific>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet
title="${uiLabelMap.BusinessIntelligenceReportBuilderSelectStarSchemaFields}">
+ <platform-specific>
+ <html><html-template
location="component://bi/webapp/bi/reportbuilder/SelectStarSchemaFields.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -108,22 +86,11 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label
text="${uiLabelMap.BusinessIntelligenceReportBuilderRenderStarSchemaReport}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html><html-template
location="component://bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl"/></html>
- </platform-specific>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet
title="${uiLabelMap.BusinessIntelligenceReportBuilderRenderStarSchemaReport}">
+ <platform-specific>
+ <html><html-template
location="component://bi/webapp/bi/reportbuilder/RenderStarSchemaReport.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -141,17 +108,13 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
+ <screenlet>
<container>
- <section>
- <widgets>
- <platform-specific>
- <html><html-template
location="component://bi/webapp/bi/main.ftl"/></html>
- </platform-specific>
- </widgets>
- </section>
+ <platform-specific>
+ <html><html-template
location="component://bi/webapp/bi/main.ftl"/></html>
+ </platform-specific>
</container>
- <container style="screenlet-body">
+ <container>
<link target="quickInitDataWarehouse"
text="${uiLabelMap.BusinessIntelligenceQuickInitDataWarehouse}"
style="buttontext">
<parameter param-name="fromDate"/>
<parameter param-name="thruDate"/>
@@ -162,8 +125,8 @@
${uiLabelMap.BusinessIntelligenceNote30}
${uiLabelMap.BusinessIntelligenceNote31}
</label>
- </container>
- </container>
+ </container>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
