svn commit: r826450 - in /ofbiz/trunk/applications/manu
Locked
 
|
Author: buscob
Date: Sun Oct 18 14:38:51 2009 New Revision: 826450 URL: http://svn.apache.org/viewvc?rev=826450&view=rev Log: Changed <container style="screenlet"> pattern to <screenlet...>. Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml?rev=826450&r1=826449&r2=826450&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml Sun Oct 18 14:38:51 2009 @@ -122,20 +122,9 @@ <widgets> <decorator-screen name="CommonBomDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingBomSimulation}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="RunBomSimulation" location="component://manufacturing/webapp/manufacturing/bom/BomForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ManufacturingBomSimulation}"> + <include-form name="RunBomSimulation" location="component://manufacturing/webapp/manufacturing/bom/BomForms.xml"/> + </screenlet> <platform-specific> <html><html-template location="component://manufacturing/webapp/manufacturing/bom/BomSimulation.ftl"/></html> </platform-specific> @@ -177,20 +166,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.ManufacturingCreateProductBom}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="CreateProductBom" location="component://manufacturing/webapp/manufacturing/bom/BomForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ManufacturingCreateProductBom}"> + <include-form name="CreateProductBom" location="component://manufacturing/webapp/manufacturing/bom/BomForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml?rev=826450&r1=826449&r2=826450&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CalendarScreens.xml Sun Oct 18 14:38:51 2009 @@ -86,23 +86,12 @@ <widgets> <decorator-screen name="CommonCalendarDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleFindCalendar}"/> - </container> + <screenlet title="${uiLabelMap.PageTitleFindCalendar}"> + <container> + <link style="buttontext" target="EditCalendar" text="${uiLabelMap.ManufacturingNewCalendar}"/> </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link style="buttontext" target="EditCalendar" text="${uiLabelMap.ManufacturingNewCalendar}"/> - </container> - <include-form name="ListTechDataCalendars" location="component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml"/> - </widgets> - </section> - </container> - </container> + <include-form name="ListTechDataCalendars" location="component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -122,23 +111,12 @@ <widgets> <decorator-screen name="CommonCalendarDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListCalendarWeek}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link style="buttontext" target="EditCalendarWeek" text="${uiLabelMap.ManufacturingNewCalendarWeek}"/> - </container> - <include-form name="ListCalendarWeek" location="component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml"/> - </widgets> - </section> + <screenlet title="${uiLabelMap.PageTitleListCalendarWeek}"> + <container> + <link style="buttontext" target="EditCalendarWeek" text="${uiLabelMap.ManufacturingNewCalendarWeek}"/> </container> - </container> + <include-form name="ListCalendarWeek" location="component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -156,23 +134,12 @@ <widgets> <decorator-screen name="CommonCalendarDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditCalendarWeek}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link style="buttontext" target="EditCalendarWeek" text="${uiLabelMap.ManufacturingNewCalendarWeek}"/> - </container> - <include-form name="UpdateCalendarWeek" location="component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml"/> - </widgets> - </section> + <screenlet title="${uiLabelMap.PageTitleEditCalendarWeek}"> + <container> + <link style="buttontext" target="EditCalendarWeek" text="${uiLabelMap.ManufacturingNewCalendarWeek}"/> </container> - </container> + <include-form name="UpdateCalendarWeek" location="component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=826450&r1=826449&r2=826450&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Sun Oct 18 14:38:51 2009 @@ -69,20 +69,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.ManufacturingCreateProductionRun}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="CreateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"></include-form> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ManufacturingCreateProductionRun}"> + <include-form name="CreateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"></include-form> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -129,93 +118,27 @@ </container> </widgets> </section> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="UpdateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - <platform-specific> - <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl"/></html> - </platform-specific> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingOrderItems}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListProductionRunOrderItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ViewListProductionRunRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingMaterials}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListProductionRunComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingListOfProductionRunNotes}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListProductionRunNotes" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}"> + <include-form name="UpdateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <platform-specific> + <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl"/></html> + </platform-specific> + </screenlet> + <screenlet title="${uiLabelMap.ManufacturingOrderItems}"> + <include-form name="ListProductionRunOrderItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}"> + <include-form name="ViewListProductionRunRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ManufacturingMaterials}"> + <include-form name="ListProductionRunComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}"> + <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ManufacturingListOfProductionRunNotes}"> + <include-form name="ListProductionRunNotes" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -280,39 +203,17 @@ </widgets> </section> </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ShowProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}"> + <include-form name="ShowProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> <section> <condition> <if-compare field="canProduce" operator="equals" value="Y"/> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingProductionRunProduce}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ProductionRunProduce" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ManufacturingProductionRunProduce}"> + <include-form name="ProductionRunProduce" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> </widgets> </section> <section> @@ -320,139 +221,40 @@ <if-compare field="canDeclareAndProduce" operator="equals" value="Y"/> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingProductionRunDeclareAndProduce}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ProductionRunDeclareAndProduceTop" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - <include-form name="ProductionRunDeclareAndProduceBottom" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ManufacturingProductionRunDeclareAndProduce}"> + <include-form name="ProductionRunDeclareAndProduceTop" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ProductionRunDeclareAndProduceBottom" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> </widgets> </section> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingAssociatedProductionRuns}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <platform-specific> - <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl"/></html> - </platform-specific> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingInventoryItemsProduced}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListProductionRunInventoryItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingOrderItems}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListProductionRunOrderItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListProductionRunDeclRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingProductionRunDeclaration}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <platform-specific> - <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl"/></html> - </platform-specific> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingMaterialsRequiredByRunningTask}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListIssueProductionRunDeclComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingReturnMaterials}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListReturnProductionRunDeclComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ManufacturingAssociatedProductionRuns}"> + <platform-specific> + <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl"/></html> + </platform-specific> + </screenlet> + <screenlet title="${uiLabelMap.ManufacturingInventoryItemsProduced}"> + <include-form name="ListProductionRunInventoryItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ManufacturingOrderItems}"> + <include-form name="ListProductionRunOrderItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}"> + <include-form name="ListProductionRunDeclRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ManufacturingProductionRunDeclaration}"> + <platform-specific> + <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunDeclaration.ftl"/></html> + </platform-specific> + </screenlet> + <screenlet title="${uiLabelMap.ManufacturingMaterialsRequiredByRunningTask}"> + <include-form name="ListIssueProductionRunDeclComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ManufacturingReturnMaterials}"> + <include-form name="ListReturnProductionRunDeclComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}"> + <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -505,34 +307,12 @@ <widgets> <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingMandatoryWorkEfforts}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="mandatoryWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingDependentWorkEfforts}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="dependentWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ManufacturingMandatoryWorkEfforts}"> + <include-form name="mandatoryWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ManufacturingDependentWorkEfforts}"> + <include-form name="dependentWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -587,20 +367,9 @@ <widgets> <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingProductionRunComponents}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddProductionRunComponent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ManufacturingProductionRunComponents}"> + <include-form name="AddProductionRunComponent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> <section> <widgets> <platform-specific> @@ -631,20 +400,9 @@ <widgets> <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingActualMaterials}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="IssueProductionRunComponent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ManufacturingActualMaterials}"> + <include-form name="IssueProductionRunComponent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> <platform-specific> <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl"/></html> </platform-specific> @@ -671,20 +429,9 @@ <widgets> <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingTaskFixedAssets}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddProductionRunTaskFixedAsset" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ManufacturingTaskFixedAssets}"> + <include-form name="AddProductionRunTaskFixedAsset" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> <section> <widgets> <platform-specific> @@ -744,21 +491,10 @@ <section> <widgets> <include-form name="ListProductionRunContent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="Import Content From Product ${delivProductId}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="FindDelivProductContent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - <include-form name="ListDelivProductContent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="Import Content From Product ${delivProductId}"> + <include-form name="FindDelivProductContent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListDelivProductContent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + </screenlet> </widgets> </section> </decorator-section> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml?rev=826450&r1=826449&r2=826450&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/MrpScreens.xml Sun Oct 18 14:38:51 2009 @@ -57,20 +57,9 @@ <widgets> <decorator-screen name="CommonMrpDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingRunMrp}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="RunMrp" location="component://manufacturing/webapp/manufacturing/mrp/MrpForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ManufacturingRunMrp}"> + <include-form name="RunMrp" location="component://manufacturing/webapp/manufacturing/mrp/MrpForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -121,34 +110,12 @@ <widgets> <decorator-screen name="CommonMrpDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingMrpJobLastExecuted}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListFinishedMrpJobs" location="component://manufacturing/webapp/manufacturing/mrp/MrpForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.ManufacturingMrpJobScheduledOrRunning}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListRunningMrpJobs" location="component://manufacturing/webapp/manufacturing/mrp/MrpForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ManufacturingMrpJobLastExecuted}"> + <include-form name="ListFinishedMrpJobs" location="component://manufacturing/webapp/manufacturing/mrp/MrpForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.ManufacturingMrpJobScheduledOrRunning}"> + <include-form name="ListRunningMrpJobs" location="component://manufacturing/webapp/manufacturing/mrp/MrpForms.xml"/> + </screenlet> <section> <condition> <if-empty field="mrpRunningJobs"/> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml?rev=826450&r1=826449&r2=826450&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml Sun Oct 18 14:38:51 2009 @@ -31,23 +31,12 @@ <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.ManufacturingReports}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="SelectMrpName" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - <platform-specific> - <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl"/></html> - </platform-specific> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.ManufacturingReports}"> + <include-form name="SelectMrpName" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <platform-specific> + <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/MrpReports.ftl"/></html> + </platform-specific> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml?rev=826450&r1=826449&r2=826450&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/RoutingScreens.xml Sun Oct 18 14:38:51 2009 @@ -148,23 +148,12 @@ <widgets> <decorator-screen name="CommonRoutingDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditRouting}"/> - </container> + <screenlet title="${uiLabelMap.PageTitleEditRouting}"> + <container> + <link target="EditRouting" text="${uiLabelMap.ManufacturingNewRouting}" style="buttontext"/> </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link target="EditRouting" text="${uiLabelMap.ManufacturingNewRouting}" style="buttontext"/> - </container> - <include-form name="EditRouting" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/> - </widgets> - </section> - </container> - </container> + <include-form name="EditRouting" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -218,23 +207,12 @@ <widgets> <decorator-screen name="CommonRoutingTaskDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditRoutingTask}"/> - </container> + <screenlet title="${uiLabelMap.PageTitleEditRoutingTask}"> + <container> + <link target="EditRoutingTask" text="${uiLabelMap.ManufacturingNewRoutingTask}" style="buttontext"/> </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link target="EditRoutingTask" text="${uiLabelMap.ManufacturingNewRoutingTask}" style="buttontext"/> - </container> - <include-form name="EditRoutingTask" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/> - </widgets> - </section> - </container> - </container> + <include-form name="EditRoutingTask" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -281,20 +259,9 @@ <widgets> <decorator-screen name="CommonRoutingTaskDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListRoutingTaskRoutings}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListRoutingTaskRoutings" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleListRoutingTaskRoutings}"> + <include-form name="ListRoutingTaskRoutings" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -345,20 +312,9 @@ <widgets> <decorator-screen name="CommonRoutingTaskDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditRoutingTaskProduct}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditRoutingTaskProduct" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditRoutingTaskProduct}"> + <include-form name="EditRoutingTaskProduct" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -383,36 +339,14 @@ <widgets> <decorator-screen name="CommonRoutingDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditRoutingTaskAssoc}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <platform-specific> - <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl"/></html> - </platform-specific> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListRoutingTaskAssoc}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListRoutingTaskAssoc" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditRoutingTaskAssoc}"> + <platform-specific> + <html><html-template location="component://manufacturing/webapp/manufacturing/routing/EditRoutingTaskAssoc.ftl"/></html> + </platform-specific> + </screenlet> + <screenlet title="${uiLabelMap.PageTitleListRoutingTaskAssoc}"> + <include-form name="ListRoutingTaskAssoc" location="component://manufacturing/webapp/manufacturing/routing/RoutingTaskForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |