You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2009/10/18 20:24:33 UTC
svn commit: r826483 - in /ofbiz/trunk/specialpurpose: ebay/widget/
ecommerce/widget/ googlebase/widget/ oagis/widget/ projectmgr/widget/
webpos/widget/ workflow/widget/
Author: buscob
Date: Sun Oct 18 18:24:32 2009
New Revision: 826483
URL: http://svn.apache.org/viewvc?rev=826483&view=rev
Log:
Changed <container style="screenlet"> pattern to <screenlet...>.
Modified:
ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml
ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
ofbiz/trunk/specialpurpose/oagis/widget/MessageInfoScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml
ofbiz/trunk/specialpurpose/workflow/widget/MiscScreens.xml
Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=826483&r1=826482&r2=826483&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Sun Oct 18 18:24:32 2009
@@ -84,24 +84,11 @@
<widgets>
<decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEbayProductsExportToEbay}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html>
- <html-template location="component://ebay/webapp/ebay/find/productsExportToEbay.ftl"/>
- </html>
- </platform-specific>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEbayProductsExportToEbay}">
+ <platform-specific>
+ <html><html-template location="component://ebay/webapp/ebay/find/productsExportToEbay.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -118,34 +105,12 @@
<widgets>
<decorator-screen name="permission-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.EbayImportSearchSingleTransactionFromEbay}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ManageOrdersFromEbay" location="component://ebay/widget/EbayForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.EbayImportOrdersFromEbay}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListOrdersFromEbay" location="component://ebay/widget/EbayForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.EbayImportSearchSingleTransactionFromEbay}">
+ <include-form name="ManageOrdersFromEbay" location="component://ebay/widget/EbayForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.EbayImportOrdersFromEbay}">
+ <include-form name="ListOrdersFromEbay" location="component://ebay/widget/EbayForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -165,31 +130,13 @@
<widgets>
<decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditProduct}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditProduct}">
+ <include-form name="EditProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+ </screenlet>
<!-- include the duplicate product form template -->
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ProductDuplicateProduct}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="EditProductDup" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.ProductDuplicateProduct}">
+ <include-form name="EditProductDup" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml?rev=826483&r1=826482&r2=826483&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CustomerScreens.xml Sun Oct 18 18:24:32 2009
@@ -418,36 +418,31 @@
<section>
<condition><not><if-empty field="ownedFinAccountList"/></not></condition>
<widgets>
- <container id="fin-account-list" style="screenlet">
- <container style="screenlet-header">
- <label style="boxhead" text="${uiLabelMap.EcommerceMyAccount}"/>
- </container>
- <container style="screenlet-body">
- <iterate-section entry="ownedFinAccount" list="ownedFinAccountList">
- <section>
- <actions>
- <entity-condition entity-name="FinAccountTrans" list="ownedFinAccountTransList">
- <condition-expr field-name="finAccountId" from-field="ownedFinAccount.finAccountId"/>
- <order-by field-name="transactionDate"/>
- </entity-condition>
- <entity-condition entity-name="FinAccountAuth" list="ownedFinAccountAuthList" filter-by-date="true">
- <condition-expr field-name="finAccountId" from-field="ownedFinAccount.finAccountId"/>
- <order-by field-name="authorizationDate"/>
- </entity-condition>
- <entity-one entity-name="StatusItem" value-field="finAccountStatusItem">
- <field-map field-name="statusId" from-field="ownedFinAccount.statusId"/>
- </entity-one>
- <entity-one entity-name="Uom" value-field="accountCurrencyUom" auto-field-map="false" use-cache="true">
- <field-map field-name="uomId" from-field="ownedFinAccount.currencyUomId"/>
- </entity-one>
- </actions>
- <widgets>
- <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl"/></html></platform-specific>
- </widgets>
- </section>
- </iterate-section>
- </container>
- </container>
+ <screenlet id="fin-account-list" title="${uiLabelMap.EcommerceMyAccount}">
+ <iterate-section entry="ownedFinAccount" list="ownedFinAccountList">
+ <section>
+ <actions>
+ <entity-condition entity-name="FinAccountTrans" list="ownedFinAccountTransList">
+ <condition-expr field-name="finAccountId" from-field="ownedFinAccount.finAccountId"/>
+ <order-by field-name="transactionDate"/>
+ </entity-condition>
+ <entity-condition entity-name="FinAccountAuth" list="ownedFinAccountAuthList" filter-by-date="true">
+ <condition-expr field-name="finAccountId" from-field="ownedFinAccount.finAccountId"/>
+ <order-by field-name="authorizationDate"/>
+ </entity-condition>
+ <entity-one entity-name="StatusItem" value-field="finAccountStatusItem">
+ <field-map field-name="statusId" from-field="ownedFinAccount.statusId"/>
+ </entity-one>
+ <entity-one entity-name="Uom" value-field="accountCurrencyUom" auto-field-map="false" use-cache="true">
+ <field-map field-name="uomId" from-field="ownedFinAccount.currencyUomId"/>
+ </entity-one>
+ </actions>
+ <widgets>
+ <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl"/></html></platform-specific>
+ </widgets>
+ </section>
+ </iterate-section>
+ </screenlet>
</widgets>
</section>
</widgets>
Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=826483&r1=826482&r2=826483&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Sun Oct 18 18:24:32 2009
@@ -77,20 +77,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.PageTitleGoogleBaseProductsExportToGoogle}"></label>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ProductsExportToGoogle" location="component://googlebase/widget/GoogleBaseForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleGoogleBaseProductsExportToGoogle}">
+ <include-form name="ProductsExportToGoogle" location="component://googlebase/widget/GoogleBaseForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -109,31 +98,13 @@
<widgets>
<decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleEditProduct}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditProduct}">
+ <include-form name="EditProduct" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+ </screenlet>
<!-- include the duplicate product form template -->
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ProductDuplicateProduct}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="EditProductDup" location="component://product/webapp/catalog/product/ProductForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.ProductDuplicateProduct}">
+ <include-form name="EditProductDup" location="component://product/webapp/catalog/product/ProductForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/specialpurpose/oagis/widget/MessageInfoScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/MessageInfoScreens.xml?rev=826483&r1=826482&r2=826483&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/widget/MessageInfoScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/widget/MessageInfoScreens.xml Sun Oct 18 18:24:32 2009
@@ -29,38 +29,16 @@
<widgets>
<decorator-screen name="CommonOagisMessageScreen" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OagisListMessageInfo}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditMessageInfo" text="${uiLabelMap.OagisNewMessageInfo}" style="buttontext"/>
- </container>
- <label><br/></label>
- <include-form name="FindMessageInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OagisListMessageInfo}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListMessageInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.OagisListMessageInfo}">
+ <container>
+ <link target="EditMessageInfo" text="${uiLabelMap.OagisNewMessageInfo}" style="buttontext"/>
+ </container>
+ <label><br/></label>
+ <include-form name="FindMessageInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.OagisListMessageInfo}">
+ <include-form name="ListMessageInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -81,20 +59,9 @@
<widgets>
<decorator-screen name="CommonOagisMessageScreen" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OagisEditMessageInfo}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditMessageInfo" location="component://oagis/widget/forms/MessageInfoForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.OagisEditMessageInfo}">
+ <include-form name="EditMessageInfo" location="component://oagis/widget/forms/MessageInfoForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -110,38 +77,16 @@
<widgets>
<decorator-screen name="CommonOagisMessageScreen" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OagisListMessageErrorInfo}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container>
- <link target="EditMessageErrorInfo" text="${uiLabelMap.OagisNewMessageErrorInfo}" style="buttontext"/>
- </container>
- <label><br/></label>
- <include-form name="FindMessageErrorInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OagisListMessageErrorInfo}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListMessageErrorInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.OagisListMessageErrorInfo}">
+ <container>
+ <link target="EditMessageErrorInfo" text="${uiLabelMap.OagisNewMessageErrorInfo}" style="buttontext"/>
+ </container>
+ <label><br/></label>
+ <include-form name="FindMessageErrorInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.OagisListMessageErrorInfo}">
+ <include-form name="ListMessageErrorInfos" location="component://oagis/widget/forms/MessageInfoForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -163,20 +108,9 @@
<widgets>
<decorator-screen name="CommonOagisMessageScreen" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.OagisEditMessageErrorInfo}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditMessageErrorInfo" location="component://oagis/widget/forms/MessageInfoForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.OagisEditMessageErrorInfo}">
+ <include-form name="EditMessageErrorInfo" location="component://oagis/widget/forms/MessageInfoForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=826483&r1=826482&r2=826483&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sun Oct 18 18:24:32 2009
@@ -147,57 +147,28 @@
<widgets>
<decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.${titleProperty}}"/>
- </container>
- </container>
- <container style="screenlet-body">
+ <screenlet title="${uiLabelMap.${titleProperty}}">
+ <include-form name="EditProjectTasks" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+ </screenlet>
+ <container style="lefthalf">
+ <screenlet title="${uiLabelMap.PageTitleAddTask}">
<section>
+ <condition>
+ <if-empty field="phases"/>
+ </condition>
<widgets>
- <include-form name="EditProjectTasks" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+ <label style="h3" text="${uiLabelMap.ProjectMgrNoPhasesYet}"/>
</widgets>
+ <fail-widgets>
+ <include-form name="EditTask" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ </fail-widgets>
</section>
- </container>
- </container>
- <container style="lefthalf">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleAddTask}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <condition>
- <if-empty field="phases"/>
- </condition>
- <widgets>
- <label style="h3" text="${uiLabelMap.ProjectMgrNoPhasesYet}"/>
- </widgets>
- <fail-widgets>
- <include-form name="EditTask" location="component://projectmgr/widget/forms/TaskForms.xml"/>
- </fail-widgets>
- </section>
- </container>
- </container>
+ </screenlet>
</container>
<container style="righthalf">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleAddPhase}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddProjectPhase" location="component://projectmgr/widget/forms/TaskForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleAddPhase}">
+ <include-form name="AddProjectPhase" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ </screenlet>
</container>
</decorator-section>
</decorator-screen>
@@ -466,20 +437,9 @@
<set field="parameters.workEffortParentId" from-field="projectId"/>
</actions>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ProjectMgrSubProjects}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.ProjectMgrSubProjects}">
+ <include-form name="ListProjects" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
+ </screenlet>
</widgets>
</section>
</screen>
@@ -492,11 +452,11 @@
<set field="phases" from-field="result.phaseList"/>
</actions>
<widgets>
- <container style="screenlet">
+ <screenlet>
<screenlet title="${uiLabelMap.ProjectMgrPhases}">
<include-form name="ListPhaseInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
</screenlet>
- </container>
+ </screenlet>
</widgets>
</section>
</screen>
@@ -1106,11 +1066,11 @@
<set field="phases" from-field="result.phaseList"/>
</actions>
<widgets>
- <container style="screenlet">
+ <screenlet>
<screenlet title="${uiLabelMap.ProjectMgrPhases}">
<include-form name="ListPhaseInfo" location="component://projectmgr/widget/forms/ProjectForms.xml"/>
</screenlet>
- </container>
+ </screenlet>
</widgets>
</section>
</container>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=826483&r1=826482&r2=826483&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Sun Oct 18 18:24:32 2009
@@ -416,16 +416,9 @@
<set field="taskParties" from-field="result.taskParties"/>
</actions>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.ProjectMgrTaskTeam}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <include-form name="ListTaskParties" location="component://projectmgr/widget/forms/TaskForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.ProjectMgrTaskTeam}">
+ <include-form name="ListTaskParties" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ </screenlet>
</widgets>
</section>
</screen>
@@ -450,20 +443,9 @@
</entity-and>
</actions>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleTasksBefore}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="TaskBefore" location="component://projectmgr/widget/forms/TaskForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleTasksBefore}">
+ <include-form name="TaskBefore" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ </screenlet>
</widgets>
</section>
</screen>
@@ -476,20 +458,9 @@
</entity-and>
</actions>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleTasksAfter}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="TaskAfter" location="component://projectmgr/widget/forms/TaskForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleTasksAfter}">
+ <include-form name="TaskAfter" location="component://projectmgr/widget/forms/TaskForms.xml"/>
+ </screenlet>
</widgets>
</section>
</screen>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=826483&r1=826482&r2=826483&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Sun Oct 18 18:24:32 2009
@@ -57,40 +57,22 @@
<widgets>
<decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} week: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <condition>
- <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
- </condition>
- <widgets>
- <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
- </widgets>
- <fail-widgets>
- <include-form name="EditWeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
- </fail-widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleAddATimesheet}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="AddWeeklyTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} week: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}">
+ <section>
+ <condition>
+ <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
+ </condition>
+ <widgets>
+ <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+ </widgets>
+ <fail-widgets>
+ <include-form name="EditWeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+ </fail-widgets>
+ </section>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PageTitleAddATimesheet}">
+ <include-form name="AddWeeklyTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+ </screenlet>
<include-screen name="ListTimesheets"/>
</decorator-section>
</decorator-screen>
@@ -111,12 +93,9 @@
<decorator-section name="body">
<section>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId}</label></container>
- <container style="screenlet-body">
- <include-form name="EditTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId}">
+ <include-form name="EditTimesheet" location="component://workeffort/widget/TimesheetForms.xml"/>
+ </screenlet>
</widgets>
</section>
</decorator-section>
@@ -139,12 +118,9 @@
<decorator-section name="body">
<section>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddTimesheet}</label></container>
- <container style="screenlet-body">
- <include-form name="AddWeeklyTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleAddTimesheet}">
+ <include-form name="AddWeeklyTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+ </screenlet>
</widgets>
</section>
</decorator-section>
@@ -188,18 +164,12 @@
<decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container><link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="linktext"/></container>
- <container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditTimesheetEntries}</label></container>
- <container style="screenlet-body">
- <include-form name="ListTimesheetEntries" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddTimesheetEntry}</label></container>
- <container style="screenlet-body">
- <include-form name="AddTimesheetEntry" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditTimesheetEntries}">
+ <include-form name="ListTimesheetEntries" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PageTitleAddTimesheetEntry}">
+ <include-form name="AddTimesheetEntry" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -219,18 +189,12 @@
<decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container><link text="${uiLabelMap.WorkEffortTimesheetCreate}" target="EditTimesheet" style="linktext"/></container>
- <container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleEditTimesheetRoles}</label></container>
- <container style="screenlet-body">
- <include-form name="ListTimesheetRoles" location="component://workeffort/widget/TimesheetForms.xml"/>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar"><label style="boxhead">${uiLabelMap.PageTitleAddTimesheetRole}</label></container>
- <container style="screenlet-body">
- <include-form name="AddTimesheetRole" location="component://workeffort/widget/TimesheetForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleEditTimesheetRoles}">
+ <include-form name="ListTimesheetRoles" location="component://workeffort/widget/TimesheetForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PageTitleAddTimesheetRole}">
+ <include-form name="AddTimesheetRole" location="component://workeffort/widget/TimesheetForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -280,20 +244,9 @@
</entity-one>
</actions>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleTimesheets} ${uiLabelMap.CommonOf} ${partyNameView.firstName} ${partyNameView.middleName} ${partyNameView.lastName}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ListTimeSheets" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleTimesheets} ${uiLabelMap.CommonOf} ${partyNameView.firstName} ${partyNameView.middleName} ${partyNameView.lastName}">
+ <include-form name="ListTimeSheets" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+ </screenlet>
</widgets>
</section>
</screen>
Modified: ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml?rev=826483&r1=826482&r2=826483&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/widget/WebPosScreens.xml Sun Oct 18 18:24:32 2009
@@ -100,19 +100,14 @@
<widgets>
<decorator-screen name="webPosMainDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.WebPosCart}"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.WebPosCart}">
<container id="SearchProducts">
<platform-specific><html><html-template location="component://webpos/webapp/webpos/search/SearchProducts.ftl"/></html></platform-specific>
</container>
<container id="CartScreen">
<include-screen name="ShowCart"/>
</container>
- </container>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -156,16 +151,11 @@
<script location="component://webpos/webapp/webpos/WEB-INF/actions/cart/MicroCart.groovy"/>
</actions>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.PageTitleMain}"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleMain}">
<container id="MicroCart">
<platform-specific><html><html-template location="component://webpos/webapp/webpos/cart/MicroCart.ftl"/></html></platform-specific>
</container>
- </container>
+ </screenlet>
</widgets>
</section>
</screen>
Modified: ofbiz/trunk/specialpurpose/workflow/widget/MiscScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/workflow/widget/MiscScreens.xml?rev=826483&r1=826482&r2=826483&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/workflow/widget/MiscScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/workflow/widget/MiscScreens.xml Sun Oct 18 18:24:32 2009
@@ -30,24 +30,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.WebtoolsReadXPDLFile}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html>
- <html-template location="component://webtools/webapp/webtools/workflow/readxpdl.ftl"/>
- </html>
- </platform-specific>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.WebtoolsReadXPDLFile}">
+ <platform-specific>
+ <html><html-template location="component://webtools/webapp/webtools/workflow/readxpdl.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -64,24 +51,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.WebtoolsActiveWorkflowMonitor}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <platform-specific>
- <html>
- <html-template location="component://webtools/webapp/webtools/workflow/workflowMonitor.ftl"/>
- </html>
- </platform-specific>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.WebtoolsActiveWorkflowMonitor}">
+ <platform-specific>
+ <html><html-template location="component://webtools/webapp/webtools/workflow/workflowMonitor.ftl"/></html>
+ </platform-specific>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>