svn commit: r618474 - in /ofbiz/trunk/specialpurpose/as
Locked
 
|
Author: mrisaliti
Date: Mon Feb 4 14:37:01 2008 New Revision: 618474 URL: http://svn.apache.org/viewvc?rev=618474&view=rev Log: All the Asset Maintenance forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1617) Modified: ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels_it.properties ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FacilityForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/LookupForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Modified: ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties?rev=618474&r1=618473&r2=618474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties (original) +++ ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties Mon Feb 4 14:37:01 2008 @@ -25,7 +25,7 @@ # Override Page and Label title AssetMaintApplication=Asset Maintenance Application -AssetMaintCompanyName=Ofbiz +AssetMaintCompanyName=OFBiz: Asset Maintenance AssetMaintCompanySubtitle=Maintenance Department PageTitleFindFixedAssets=Find Equipments Modified: ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels_it.properties?rev=618474&r1=618473&r2=618474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels_it.properties (original) +++ ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels_it.properties Mon Feb 4 14:37:01 2008 @@ -24,7 +24,8 @@ # Override Page and Label title -AssetMaintCompanyName=Azienda OFBiz +AssetMaintApplication=Applicazione Manutenzione Beni +AssetMaintCompanyName=OFBiz: Manutenzione Beni AssetMaintCompanySubtitle=Manutenzione Dipartimento PageTitleFindFixedAssets=Ricerca Cespite Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=618474&r1=618473&r2=618474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Mon Feb 4 14:37:01 2008 @@ -30,16 +30,37 @@ <widgets> <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="button-bar"><link target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/></container> <container style="screenlet"> <container style="screenlet-title-bar"> - <label style="head3">${uiLabelMap.PageTitleFindFixedAssetMaints}</label> + <container style="head3"> + <label text="${uiLabelMap.PageTitleFindFixedAssetMaints}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container style="button-bar"> + <link target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/> + </container> + <include-form name="FindFixedAssetMaint" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleFindFixedAssetMaints}"/> + </container> </container> <container style="screenlet-body"> - <include-form name="FindFixedAssetMaint" location="component://assetmaint/widget/forms/FixedAssetForms.xml" /> + <section> + <widgets> + <include-form name="ListFixedAssetMaints" location="component://assetmaint/widget/forms/FixedAssetForms.xml" /> + </widgets> + </section> </container> </container> - <include-form name="ListFixedAssetMaints" location="component://assetmaint/widget/forms/FixedAssetForms.xml" /> </decorator-section> </decorator-screen> </widgets> @@ -80,7 +101,9 @@ </container> <container style="screenlet"> <container style="screenlet-title-bar"> - <label style="head3">${uiLabelMap.FixedAssetMaintWorkEffortName}</label> + <container style="head3"> + <label text="${uiLabelMap.FixedAssetMaintWorkEffortName}"/> + </container> </container> <container style="screenlet-body"> <include-form name="EditFixedAssetMaint" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/> @@ -91,7 +114,9 @@ <container style="button-bar"><label/></container> <container style="screenlet"> <container style="screenlet-title-bar"> - <label style="head3">${uiLabelMap.AccountingNewFixedAssetMaint}</label> + <container style="head3"> + <label text="${uiLabelMap.AccountingNewFixedAssetMaint}"/> + </container> </container> <container style="screenlet-body"> <include-form name="EditFixedAssetMaint" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/> @@ -119,8 +144,26 @@ <widgets> <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListFixedAssetMaintMeters" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - <include-form name="AddFixedAssetMaintMeter" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleEditFixedAssetMaintenance}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="ListFixedAssetMaintMeters" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleEditFixedAssetMaintenance}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="AddFixedAssetMaintMeter" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -130,6 +173,7 @@ <screen name="EditWorkEfforts"> <section> <actions> + <set field="titleProperty" value="PageTitleEditWorkEffort"/> <set field="tabButtonItemFixedAssetMaint" value="EditWorkEfforts"/> <script location="component://assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.bsh"/> </actions> @@ -141,14 +185,48 @@ <if-empty field-name="workEffort"/> </condition> <widgets> - <label style="head1">${uiLabelMap.PageTitleEditWorkEffort}</label> - <include-form name="EditWorkEffort" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleEditWorkEffort}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="EditWorkEffort" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> + </container> + </container> </widgets> <fail-widgets> - <include-form name="EditWorkEffort" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> - <container><label style="head1">${uiLabelMap.PageTitleChildWorkEfforts}</label></container> - <include-form name="WorkEffortChildren" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> - <include-form name="AddWorkEffortChild" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleEditWorkEffort}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="EditWorkEffort" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleChildWorkEfforts}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="WorkEffortChildren" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleChildWorkEfforts}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="AddWorkEffortChild" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> + </container> + </container> </fail-widgets> </section> </decorator-section> @@ -174,10 +252,26 @@ <widgets> <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleListWorkEffortTimeEntries}</label></container> - <include-form name="ListWorkEffortTimeEntries" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> - <container><label style="head1">${uiLabelMap.PageTitleAddWorkEffortTimeEntry}</label></container> - <include-form name="AddWorkEffortTimeEntry" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleListWorkEffortTimeEntries}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="ListWorkEffortTimeEntries" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleAddWorkEffortTimeEntry}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="AddWorkEffortTimeEntry" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -201,10 +295,26 @@ <widgets> <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleListWorkEffortNotes}</label></container> - <include-form name="ListWorkEffortNotes" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> - <container><label style="head1">${uiLabelMap.PageTitleAddWorkEffortNotes}</label></container> - <include-form name="AddWorkEffortNote" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleListWorkEffortNotes}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="ListWorkEffortNotes" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleAddWorkEffortNotes}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="AddWorkEffortNote" location="component://assetmaint/widget/forms/WorkEffortForms.xml"/> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -229,10 +339,26 @@ <widgets> <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleListItemIssuance}</label></container> - <include-form name="ListItemIssuance" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/> - <container><label style="head1">${uiLabelMap.PageTitleAddItemIssuance}</label></container> - <include-form name="AddItemIssuance" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleListItemIssuance}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="ListItemIssuance" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleAddItemIssuance}"/> + </container> + </container> + <container style="screenlet-body"> + <include-form name="AddItemIssuance" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -275,5 +401,4 @@ </widgets> </section> </screen> - -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=618474&r1=618473&r2=618474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Mon Feb 4 14:37:01 2008 @@ -60,11 +60,7 @@ <condition><not><if-empty field-name="fixedAsset"/></not></condition> <widgets> <include-menu name="FixedAssetTabBar" location="component://assetmaint/widget/Menus.xml"/> - <label style="head1" text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${fixedAsset.fixedAssetName} [${fixedAsset.fixedAssetId}] ${${extraFunctionName}}"/> </widgets> - <fail-widgets> - <label style="head1" text="${uiLabelMap.${labelTitleProperty}}"/> - </fail-widgets> </section> <decorator-section-include name="body"/> </widgets> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml?rev=618474&r1=618473&r2=618474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/FacilityScreens.xml Mon Feb 4 14:37:01 2008 @@ -23,6 +23,7 @@ <screen name="FindFacility"> <section> <actions> + <set field="titleProperty" value="PageTitleFindFacility"/> <set field="headerItem" value="facility"/> <entity-condition entity-name="Facility" list-name="facilities"> <condition-expr field-name="facilityTypeId" value="WAREHOUSE"/> @@ -32,7 +33,20 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-form name="ListFacilities" location="component://assetmaint/widget/forms/FacilityForms.xml" /> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleFindFacility}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFacilities" location="component://assetmaint/widget/forms/FacilityForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml?rev=618474&r1=618473&r2=618474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml Mon Feb 4 14:37:01 2008 @@ -24,24 +24,42 @@ <screen name="FindFixedAssets"> <section> <actions> - <set field="titleProperty" value="AccountingFindFixedAsset" /> - <set field="labelTitleProperty" value="AccountingFindFixedAsset" /> + <set field="titleProperty" value="AccountingFindFixedAsset"/> </actions> <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="button-bar"> - <link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext" /> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.AccountingFindFixedAsset}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container style="button-bar"> + <link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext"/> + </container> + <include-form name="FindFixedAssets" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/> + </widgets> + </section> + </container> </container> <container style="screenlet"> - <container style="screenlet-title-bar"> - <label style="head3">${uiLabelMap.AccountingFixedAssets}</label> - </container> - <container style="screenlet-body"> - <include-form name="FindFixedAssets" location="component://assetmaint/widget/forms/FixedAssetForms.xml" /> - </container> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.AccountingFindFixedAsset}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFixedAssets" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/> + </widgets> + </section> + </container> </container> - <include-form name="ListFixedAssets" location="component://assetmaint/widget/forms/FixedAssetForms.xml" /> </decorator-section> </decorator-screen> </widgets> @@ -52,13 +70,13 @@ <screen name="EditFixedAsset"> <section> <actions> + <set field="titleProperty" value="AccountingEditFixedAsset"/> <set field="labelTitleProperty" value="AccountingEditFixedAsset" /> <set field="tabButtonItem" value="EditFixedAsset" /> <set field="fixedAssetId" from-field="parameters.fixedAssetId" /> <entity-one entity-name="FixedAsset" value-name="fixedAsset" /> <property-map resource="AssetMaintUiLabels" map-name="uiLabelMap"/> <set field="fixedAssetName" from-field="fixedAsset.fixedAssetName" default-value="${uiLabelMap.AccountingNewFixedAsset}"/> - <set field="title" value="${uiLabelMap.AccountingEditFixedAsset}: ${fixedAssetName}"/> </actions> <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}"> @@ -66,33 +84,41 @@ <section> <condition><not><if-empty field-name="fixedAssetId"/></not></condition> <widgets> - <container style="button-bar"> - <link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext" /> - </container> <container style="screenlet"> <container style="screenlet-title-bar"> - <label style="head3">${uiLabelMap.AccountingEditFixedAsset}</label> + <container style="head3"> + <label text="${uiLabelMap.AccountingEditFixedAsset} ${uiLabelMap.CommonFor} ${fixedAsset.fixedAssetName} [${fixedAsset.fixedAssetId}] ${${extraFunctionName}}"/> + </container> </container> <container style="screenlet-body"> - <include-form name="EditFixedAsset" location="component://assetmaint/widget/forms/FixedAssetForms.xml" /> + <section> + <widgets> + <container style="button-bar"> + <link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext"/> + </container> + <include-form name="EditFixedAsset" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/> + </widgets> + </section> </container> </container> </widgets> <fail-widgets> - <container style="button-bar"><label/></container> <container style="screenlet"> <container style="screenlet-title-bar"> - <label style="head3">${uiLabelMap.AccountingNewFixedAsset}</label> + <container style="head3"> + <label text="${uiLabelMap.AccountingNewFixedAsset}"/> + </container> </container> <container style="screenlet-body"> - <include-form name="EditFixedAsset" location="component://assetmaint/widget/forms/FixedAssetForms.xml" /> + <section> + <widgets> + <include-form name="EditFixedAsset" location="component://assetmaint/widget/forms/FixedAssetForms.xml"/> + </widgets> + </section> </container> </container> </fail-widgets> </section> - <!--platform-specific> - <html><html-template location="component://assetmaint/webapp/assetmaint/includes/EquipmentsFocus.ftl"/></html> - </platform-specific--> </decorator-section> </decorator-screen> </widgets> @@ -102,7 +128,7 @@ <screen name="FixedAssetChildren"> <section> <actions> - <set field="titleProperty" value="AccountingEditFixedAsset"/> + <set field="titleProperty" value="AccountingFixedAssetChildren"/> <set field="labelTitleProperty" value="AccountingFixedAssetChildren"/> <set field="tabButtonItem" value="FixedAssetChildren"/> <set field="rootAssetId" from-field="parameters.rootAssetId" default-value="${parameters.fixedAssetId}"/> @@ -113,7 +139,20 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <include-tree name="TreeFixedAsset" location="component://assetmaint/widget/AssetMaintTrees.xml" /> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.AccountingFixedAssetChildren} ${uiLabelMap.CommonFor} ${fixedAsset.fixedAssetName} [${fixedAsset.fixedAssetId}] ${${extraFunctionName}}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-tree name="TreeFixedAsset" location="component://assetmaint/widget/AssetMaintTrees.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -142,10 +181,34 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="button-bar"><label/></container> - <include-form name="ListFixedAssetStdCosts" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - <container style="button-bar"><label/></container> - <include-form name="EditFixedAssetStdCost" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleEditFixedAssetStdCost} ${uiLabelMap.CommonFor} ${fixedAsset.fixedAssetName} [${fixedAsset.fixedAssetId}] ${${extraFunctionName}}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListFixedAssetStdCosts" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleEditFixedAssetStdCost}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditFixedAssetStdCost" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -157,7 +220,6 @@ <actions> <set field="layoutSettings.styleSheets[]" value="/images/calendarstyles.css" global="true"/> <set field="tabButtonItem" value="ListFixedAssetCalendar"/> - <set field="labelTitleProperty" value="AssetMaintMaintenanceCalendar"/> <script location="component://assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/viewCalendar.bsh"/> <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> <property-map resource="AssetMaintUiLabels" map-name="uiLabelMap"/> @@ -177,6 +239,7 @@ <screen name="CalendarDay"> <section> <actions> + <set field="titleProperty" value="PageTitleCalendarDay"/> <set field="parameters.viewMode" value="D"/> </actions> <widgets> @@ -194,6 +257,7 @@ <screen name="CalendarWeek"> <section> <actions> + <set field="titleProperty" value="PageTitleCalendarWeek"/> <set field="parameters.viewMode" value="W"/> </actions> <widgets> @@ -211,6 +275,7 @@ <screen name="CalendarMonth"> <section> <actions> + <set field="titleProperty" value="PageTitleCalendarMonth"/> <set field="parameters.viewMode" value="M"/> </actions> <widgets> @@ -224,5 +289,4 @@ </widgets> </section> </screen> - -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml?rev=618474&r1=618473&r2=618474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/LookupScreens.xml Mon Feb 4 14:37:01 2008 @@ -40,12 +40,24 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> - <include-form name="lookupPerson" location="component://assetmaint/widget/forms/LookupForms.xml"/> - <include-form name="listLookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PartyLookupPartyPerson}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="lookupPerson" location="component://assetmaint/widget/forms/LookupForms.xml"/> + <include-form name="listLookupPerson" location="component://party/webapp/partymgr/lookup/LookupForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> </section> </screen> -</screens> - \ No newline at end of file +</screens> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml?rev=618474&r1=618473&r2=618474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml Mon Feb 4 14:37:01 2008 @@ -97,7 +97,7 @@ </menu> <menu name="CalendarTabBar" selected-menuitem-context-field-name="parameters.viewMode" - type="simple" default-selected-style="selected" menu-container-style="button-bar button-style-1"> + type="simple" default-selected-style="selected" menu-container-style="button-bar tab-bar"> <menu-item name="D" title="${uiLabelMap.CommonDay}"> <link target="day?fixedAssetId=${fixedAssetId}"/> </menu-item> @@ -108,7 +108,4 @@ <link target="month?fixedAssetId=${fixedAssetId}"/> </menu-item> </menu> - -</menus> - - +</menus> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml?rev=618474&r1=618473&r2=618474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/ProductScreens.xml Mon Feb 4 14:37:01 2008 @@ -40,8 +40,21 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> - <include-form name="lookupProduct" location="component://assetmaint/widget/forms/ProductForms.xml" /> - <include-form name="listLookupProduct" location="component://assetmaint/widget/forms/ProductForms.xml" /> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head3"> + <label text="${uiLabelMap.PageTitleLookupProduct}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="lookupProduct" location="component://assetmaint/widget/forms/ProductForms.xml" /> + <include-form name="listLookupProduct" location="component://assetmaint/widget/forms/ProductForms.xml" /> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FacilityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FacilityForms.xml?rev=618474&r1=618473&r2=618474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FacilityForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FacilityForms.xml Mon Feb 4 14:37:01 2008 @@ -21,11 +21,12 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="ListFacilities" type="list" list-name="facilities"> + <form name="ListFacilities" type="list" list-name="facilities" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="facilityId" widget-style="buttontext"> <hyperlink also-hidden="false" description="${facilityId}" target="EditFacility?facilityId=${facilityId}"/> </field> <field name="facilityName"><display/></field> <field name="description"><display/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml?rev=618474&r1=618473&r2=618474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Mon Feb 4 14:37:01 2008 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -20,7 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="FindFixedAssets" type="single" target="findFixedAssets" title="${uiLabelMap.AccountingFindFixedAssets}"> + <form name="FindFixedAssets" type="single" target="findFixedAssets" title="${uiLabelMap.AccountingFindFixedAssets}" + header-row-style="header-row" default-table-style="basic-table"> <field name="hideSearch"><hidden value="Y"/></field> <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}"><text-find default-option="contains" ignore-case="true"/></field> <field name="instanceOfProductId" title="${uiLabelMap.AccountingInstanceOfProductId}"><text-find default-option="contains" ignore-case="true"/></field> @@ -37,7 +38,8 @@ </form> <!-- list all assets in a tabular format --> - <form name="ListFixedAssets" type="list" list-name="listIt" paginate-target="findFixedAsset"> + <form name="ListFixedAssets" type="list" list-name="listIt" paginate-target="findFixedAsset" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> @@ -68,7 +70,8 @@ </form> <!-- create and update a Equipment --> - <form name="EditFixedAsset" type="single" target="updateFixedAsset" title="${uiLabelMap.AccountingFixedAsset}" default-map-name="fixedAsset" style="basic-form form-widget"> + <form name="EditFixedAsset" type="single" target="updateFixedAsset" title="${uiLabelMap.AccountingFixedAsset}" default-map-name="fixedAsset" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="fixedAsset==null" target="createFixedAsset"/> <auto-fields-service service-name="updateFixedAsset" map-name="fixedAsset"/> @@ -102,10 +105,11 @@ <field name="locatedAtFacilityId" title="${uiLabelMap.AccountingFacilityId}"><lookup target-form-name="LookupFacility"/></field> <field name="locatedAtLocationSeqId"><hidden/></field> <field name="submitButton" use-when="fixedAssetId!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - <field name="submitButton" use-when="fixedAssetId==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> + <field name="submitButton" use-when="fixedAssetId==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - <form name="FindFixedAssetMaint" default-map-name="timesheet" target="findFixedAssetMaints" title="" type="single"> + <form name="FindFixedAssetMaint" default-map-name="timesheet" target="findFixedAssetMaints" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="fixedAssetId"><text-find default-option="contains" ignore-case="true"/></field> <field name="maintHistSeqId"><text-find default-option="contains" ignore-case="true"/></field> <field name="statusId"><text-find default-option="contains" ignore-case="true"/></field> @@ -114,7 +118,8 @@ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> - <form name="ListFixedAssetMaints" target="" title="" type="list" list-name="listIt" paginate-target="findFixedAssetMaints" paginate="true"> + <form name="ListFixedAssetMaints" target="" title="" type="list" list-name="listIt" paginate-target="findFixedAssetMaints" paginate="true" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> @@ -136,7 +141,8 @@ <field name="intervalMeterTypeId" title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}"><display/></field> </form> - <form name="EditFixedAssetMaint" type="single" default-map-name="fixedAssetMaint" target="updateFixedAssetMaintAndWorkEffort" style="basic-form form-widget"> + <form name="EditFixedAssetMaint" type="single" default-map-name="fixedAssetMaint" target="updateFixedAssetMaintAndWorkEffort" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="fixedAssetMaint==null" target="createFixedAssetMaintUpdateWorkEffort"/> <field name="fixedAssetId" use-when="fixedAssetMaint==null" title="${uiLabelMap.AccountingFixedAssetId}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><lookup target-form-name="LookupFixedAsset"/></field> <field name="dummy" use-when="fixedAssetMaint !=null" title="${uiLabelMap.AccountingFixedAssetId}" widget-style="buttontext"> @@ -169,7 +175,7 @@ </entity-options> </drop-down> </field> - <field name="intervalQuantity" position="1" title="${uiLabelMap.AccountingFixedAssetMaintIntervalQuantity}" tooltip="${uiLabelMap.CommonRequired}"><text size="10"/></field> + <field name="intervalQuantity" position="1" title="${uiLabelMap.AccountingFixedAssetMaintIntervalQuantity}" tooltip="${uiLabelMap.CommonRequired}"><text size="10"/></field> <field name="intervalMeterTypeId" position="1" title="${uiLabelMap.AccountingFixedAssetMaintIntervalMeterType}"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="ProductMeterType" key-field-name="productMeterTypeId"> @@ -202,10 +208,11 @@ </field> <field name="purchaseOrderId"><text/></field> <field name="submitButton" use-when="fixedAssetMaint!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - <field name="submitButton" use-when="fixedAssetMaint==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> + <field name="submitButton" use-when="fixedAssetMaint==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - <form name="AddItemIssuance" target="issueInventoryItemToFixedAssetMaint" title="PageTitleFixedAssetMaintItemIssuance" default-map-name="newIssuanceItem" type="single"> + <form name="AddItemIssuance" target="issueInventoryItemToFixedAssetMaint" title="PageTitleFixedAssetMaintItemIssuance" default-map-name="newIssuanceItem" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="facilityId"> <drop-down> <entity-options description="${description}" entity-name="Facility"> @@ -221,7 +228,8 @@ <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - <form name="ListItemIssuance" title="PageTitleFixedAssetMaintItemIssuance" type="list" list-name="itemIssuanceList" style="basic-form form-widget"> + <form name="ListItemIssuance" title="PageTitleFixedAssetMaintItemIssuance" type="list" list-name="itemIssuanceList" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="productId" title="Part Id"><display/></field> <field name="quantity" position="1" title="${uiLabelMap.CommonQuantity}"><display/></field> <field name="productName" position="1" title="${uiLabelMap.CommonName}"><display/></field> @@ -231,4 +239,4 @@ <hyperlink description="${uiLabelMap.CommonReturn}" target="returnPartIssuedToFixedAssetMaint?itemIssuanceId=${itemIssuanceId}&fixedAssetId=${fixedAssetId}&maintHistSeqId=${maintHistSeqId}"/> </field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/LookupForms.xml?rev=618474&r1=618473&r2=618474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/LookupForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/LookupForms.xml Mon Feb 4 14:37:01 2008 @@ -21,7 +21,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <!-- Person Lookup forms --> - <form name="lookupPerson" target="LookupPerson" title="" type="single"> + <form name="lookupPerson" target="LookupPerson" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <!--<auto-fields-entity entity-name="Person" default-field-type="find" />--> <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field> <field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field> @@ -29,5 +30,4 @@ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field> </form> -</forms> - \ No newline at end of file +</forms> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml?rev=618474&r1=618473&r2=618474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/ProductForms.xml Mon Feb 4 14:37:01 2008 @@ -21,8 +21,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="EditProduct" type="single" target="updateProduct" title="" default-map-name="product"> - + <form name="EditProduct" type="single" target="updateProduct" title="" default-map-name="product" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="product==null" target="createProduct"/> <field use-when="product==null" name="isCreate"><hidden value="true"/></field> @@ -57,7 +57,8 @@ </field> </form> <!-- List Product --> - <form name="ListProducts" type="list" list-name="listIt" paginate-target="${submitTarget}"> + <form name="ListProducts" type="list" list-name="listIt" paginate-target="${submitTarget}" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> @@ -73,7 +74,8 @@ <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct?productId=${productId}"/> </field> </form> - <form name="lookupProduct" target="${submitTarget}" type="single"> + <form name="lookupProduct" target="${submitTarget}" type="single" + header-row-style="header-row" default-table-style="basic-table"> <!-- <auto-fields-entity entity-name="Product" default-field-type="hidden" /> --> <field name="productId" title="${uiLabelMap.CommonId}"><text-find default-option="contains" ignore-case="true"/></field> <field name="brandName" title="${uiLabelMap.ProductBrandName}"><text-find default-option="contains" ignore-case="true"/></field> @@ -83,7 +85,8 @@ <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> - <form name="listLookupProduct" list-name="listIt" paginate-target="${submitTarget}" title="" type="list"> + <form name="listLookupProduct" list-name="listIt" paginate-target="${submitTarget}" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> @@ -100,4 +103,4 @@ <hyperlink also-hidden="false" target-type="plain" description="${uiLabelMap.ProductVariants}" target="LookupVariantProduct?productId=${productId}"/> </field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml?rev=618474&r1=618473&r2=618474&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Mon Feb 4 14:37:01 2008 @@ -20,7 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="EditWorkEffort" target="updateWorkEffort" title="" type="single" default-map-name="workEffort"> + <form name="EditWorkEffort" target="updateWorkEffort" title="" type="single" default-map-name="workEffort" + header-row-style="header-row" default-table-style="basic-table"> <alt-target target="createWorkEffort" use-when="workEffort==null"/> <field name="maintHistSeqId" map-name="fixedAssetMaint"><hidden/></field> <field map-name="workEffort" name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}*"><display/></field> @@ -54,8 +55,8 @@ <field map-name="workEffort" name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field> </form> - <form name="AddWorkEffortChild" target="createWorkEffortAndAssoc" title="" type="single"> - + <form name="AddWorkEffortChild" target="createWorkEffortAndAssoc" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="fixedAssetId"><hidden/></field> <field name="maintHistSeqId"><hidden/></field> <field name="workEffortIdTo"><hidden/></field> @@ -93,7 +94,8 @@ <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> - <form name="WorkEffortChildren" target="updateWorkEffortAndAssoc" title="" type="list" separate-columns="true"> + <form name="WorkEffortChildren" target="updateWorkEffortAndAssoc" title="" type="list" separate-columns="true" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="WorkEffortAssocView"> <condition-expr field-name="workEffortIdFrom" operator="equals" env-name="workEffortIdFrom"/> @@ -133,7 +135,8 @@ <field name="actualCompletionDate" entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> - <form name="AddWorkEffortTimeEntry" type="single" target="createWorkEffortTimeEntry" title=""> + <form name="AddWorkEffortTimeEntry" type="single" target="createWorkEffortTimeEntry" title="" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createTimeEntry"/> <field name="workEffortId"><hidden/></field> @@ -155,7 +158,8 @@ <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> <!-- TimeEntry --> - <form name="ListWorkEffortTimeEntries" type="list" list-name="timesheetEntries" target="updateWorkEffortTimeEntry"> + <form name="ListWorkEffortTimeEntries" type="list" list-name="timesheetEntries" target="updateWorkEffortTimeEntry" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="TimeEntry"> <condition-expr field-name="workEffortId" env-name="workEffortId"/> @@ -194,7 +198,8 @@ </form> <!-- WorkEffort Note --> - <form name="ListWorkEffortNotes" type="list" list-name="workEffortNotes"> + <form name="ListWorkEffortNotes" type="list" list-name="workEffortNotes" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="WorkEffortNoteAndData"> <condition-expr field-name="workEffortId" env-name="workEffortId"/> @@ -209,7 +214,8 @@ <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${noteDateTime}"/></field> </form> - <form name="AddWorkEffortNote" type="single" target="createWorkEffortNote" title=""> + <form name="AddWorkEffortNote" type="single" target="createWorkEffortNote" title="" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createWorkEffortNote"/> <field name="noteId"><ignored/><!-- don't pass, will be sequenced --></field> <field name="workEffortId"><hidden/></field> @@ -220,4 +226,4 @@ <field name="noteName"><hidden/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> -</forms> +</forms> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |