Author: adrianc
Date: Wed Sep 5 17:44:14 2007
New Revision: 573121
URL: http://svn.apache.org/viewvc?rev=573121&view=rev
Log:
More Asset Maintenance UI cleanups. No functional changes.
Modified:
ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties
ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=573121&r1=573120&r2=573121&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Wed Sep 5
17:44:14 2007
@@ -173,7 +173,9 @@
<widgets>
<decorator-screen name="CommonFixedAssetDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <container style="button-bar"><label/></container>
<include-form name="ListFixedAssetIdents"
location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
+ <container style="button-bar"><label/></container>
<include-form name="AddFixedAssetIdent"
location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -194,7 +196,9 @@
<widgets>
<decorator-screen name="CommonFixedAssetDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <container style="button-bar"><label/></container>
<include-form name="ListFixedAssetRegistrations"
location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
+ <container style="button-bar"><label/></container>
<include-form name="AddFixedAssetRegistration"
location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -215,7 +219,7 @@
<widgets>
<decorator-screen name="CommonFixedAssetDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><link
target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}"
text="${uiLabelMap.AccountingNewFixedAssetMaint}"
style="buttontext"/></container>
+ <container style="button-bar"><link
target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}"
text="${uiLabelMap.AccountingNewFixedAssetMaint}"
style="buttontext"/></container>
<include-form name="ListFixedAssetMaints"
location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -332,7 +336,9 @@
<widgets>
<decorator-screen name="CommonFixedAssetDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
+ <container style="button-bar"><label/></container>
<include-form name="ListPartyFixedAssetAssignments"
location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
+ <container style="button-bar"><label/></container>
<include-form name="AddPartyFixedAssetAssignment"
location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
</decorator-section>
</decorator-screen>
Modified:
ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties?rev=573121&r1=573120&r2=573121&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties
(original)
+++ ofbiz/trunk/specialpurpose/assetmaint/config/AssetMaintUiLabels.properties
Wed Sep 5 17:44:14 2007
@@ -25,7 +25,7 @@
# Override Page and Label title
AssetMaintApplication=Asset Maintenance Application
-AssetMaintCompanyName=Ofbiz Company
+AssetMaintCompanyName=Ofbiz
AssetMaintCompanySubtitle=Maintenance Department
PageTitleFindFixedAssets=Find Equipments
@@ -54,6 +54,7 @@
AccountingFixedAssetName=Description
AccountingFixedAssetIdent=Identification
AccountingFixedAssetIdents=Identifications
+AccountingNewFixedAsset=New Equipment
AccountingNewFixedAssetIdent=Create Identification
AccountingFixedAssetIdentTypeId=Equipment Identification Type Id
AccountingFixedAssetIdentIdValue=Value
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=573121&r1=573120&r2=573121&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
(original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Wed Sep
5 17:44:14 2007
@@ -25,10 +25,12 @@
<section>
<actions>
<set field="titleProperty"
value="PageTitleFindFixedAssetMaints"/>
+ <set field="labelTitleProperty"
value="AccountingFixedAssetMaint"/>
</actions>
<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-header">
<label
style="boxhead">${uiLabelMap.PageTitleFindFixedAssetMaints}</label>
@@ -37,7 +39,6 @@
<include-form name="FindFixedAssetMaint"
location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
</container>
</container>
- <container style="button-bar"><link
target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}"
style="buttontext"/></container>
<include-form name="ListFixedAssetMaints"
location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
</decorator-section>
</decorator-screen>
@@ -48,7 +49,8 @@
<screen name="EditFixedAssetMaint">
<section>
<actions>
- <set field="titleProperty" value="Edit WorkOrder"/>
+ <set field="titleProperty" value="AccountingFixedAssetMaint"/>
+ <set field="labelTitleProperty"
value="AccountingFixedAssetMaint"/>
<set field="tabButtonItemFixedAssetMaint"
value="EditFixedAssetMaint"/>
<set field="fixedAssetId"
from-field="parameters.fixedAssetId"/>
<set field="maintHistSeqId"
from-field="parameters.maintHistSeqId"/>
@@ -67,18 +69,34 @@
<widgets>
<decorator-screen name="CommonFixedAssetMaintDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="button-bar">
- <link
target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}"
text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/>
- <link
target="printFixedAssetMaint.pdf?fixedAssetId=${fixedAssetId}&maintHistSeqId=${maintHistSeqId}"
text="${uiLabelMap.CommonPrint}" style="buttontext"/>
- </container>
- <container style="screenlet">
- <container style="screenlet-header">
- <label
style="boxhead">${uiLabelMap.AccountingNewFixedAssetMaint}</label>
- </container>
- <container style="screenlet-body">
- <include-form name="EditFixedAssetMaint"
location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
- </container>
- </container>
+ <section>
+ <condition><not><if-empty
field-name="maintHistSeqId"/></not></condition>
+ <widgets>
+ <container style="button-bar">
+ <link
target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}"
text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/>
+ <link
target="printFixedAssetMaint.pdf?fixedAssetId=${fixedAssetId}&maintHistSeqId=${maintHistSeqId}"
text="${uiLabelMap.CommonPrint}" style="buttontext"/>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-header">
+ <label
style="boxhead">${uiLabelMap.AccountingNewFixedAssetMaint}</label>
+ </container>
+ <container style="screenlet-body">
+ <include-form
name="EditFixedAssetMaint"
location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
+ </container>
+ </container>
+ </widgets>
+ <fail-widgets>
+ <container
style="button-bar"><label/></container>
+ <container style="screenlet">
+ <container style="screenlet-header">
+ <label
style="boxhead">${uiLabelMap.AccountingNewFixedAssetMaint}</label>
+ </container>
+ <container style="screenlet-body">
+ <include-form
name="EditFixedAssetMaint"
location="component://assetmaint/widget/forms/FixedAssetForms.xml"/>
+ </container>
+ </container>
+ </fail-widgets>
+ </section>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=573121&r1=573120&r2=573121&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Wed Sep 5
17:44:14 2007
@@ -98,7 +98,6 @@
<label style="head1"
text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}:
${fixedAsset.fixedAssetName} [${fixedAsset.fixedAssetId}]
${${extraFunctionName}}"/>
</widgets>
<fail-widgets>
- <include-menu name="FixedAssetTabBar"
location="component://assetmaint/widget/Menus.xml"/>
<label style="head1"
text="${uiLabelMap.${labelTitleProperty}}"/>
</fail-widgets>
</section>
@@ -129,16 +128,14 @@
</condition>
<widgets>
<section>
- <condition>
- <and>
- <not><if-empty
field-name="fixedAssetId"/></not>
- <not><if-empty
field-name="maintHistSeqId"/></not>
- </and>
- </condition>
+ <condition><not><if-empty
field-name="maintHistSeqId"/></not></condition>
<widgets>
<include-menu
name="FixedAssetMaintTabBar"
location="component://assetmaint/widget/Menus.xml"/>
- <label style="head1"
text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}:
${fixedAsset.fixedAssetName} [${uiLabelMap.CommonId}:${fixedAssetId}]
${${extraFunctionName}}"/>
+ <label style="head1"
text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}:
${fixedAsset.fixedAssetName} [${fixedAssetId}] ${${extraFunctionName}}"/>
</widgets>
+ <fail-widgets>
+ <label style="head1"
text="${uiLabelMap.${labelTitleProperty}}"/>
+ </fail-widgets>
</section>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml?rev=573121&r1=573120&r2=573121&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml
(original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/FixedAssetScreens.xml Wed Sep
5 17:44:14 2007
@@ -30,6 +30,9 @@
<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>
<container style="screenlet">
<container style="screenlet-header">
<label
style="boxhead">${uiLabelMap.AccountingFixedAssets}</label>
@@ -38,9 +41,6 @@
<include-form name="FindFixedAssets"
location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
</container>
</container>
- <container style="button-bar">
- <link target="EditFixedAsset"
text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext" />
- </container>
<include-form name="ListFixedAssets"
location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
</decorator-section>
</decorator-screen>
@@ -55,24 +55,39 @@
<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" />
</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>
- <container style="screenlet">
- <container style="screenlet-header">
- <label
style="boxhead">${uiLabelMap.AccountingEditFixedAsset}</label>
- </container>
- <container style="screenlet-body">
- <include-form name="EditFixedAsset"
location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
- </container>
- </container>
+ <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-header">
+ <label
style="boxhead">${uiLabelMap.AccountingEditFixedAsset}</label>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="EditFixedAsset"
location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
+ </container>
+ </container>
+ </widgets>
+ <fail-widgets>
+ <container
style="button-bar"><label/></container>
+ <container style="screenlet">
+ <container style="screenlet-header">
+ <label
style="boxhead">${uiLabelMap.AccountingNewFixedAsset}</label>
+ </container>
+ <container style="screenlet-body">
+ <include-form name="EditFixedAsset"
location="component://assetmaint/widget/forms/FixedAssetForms.xml" />
+ </container>
+ </container>
+ </fail-widgets>
+ </section>
<!--platform-specific>
<html><html-template
location="component://assetmaint/webapp/assetmaint/includes/EquipmentsFocus.ftl"/></html>
</platform-specific-->
@@ -91,7 +106,6 @@
<set field="rootAssetId" from-field="parameters.rootAssetId"
default-value="${parameters.fixedAssetId}"/>
<set field="fixedAssetId" from-field="rootAssetId"/>
<entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
- <set field="fixedAssetId" from-field="parameters.fixedAssetId"
default-value="${parameters.trail}"/>
<set field="trail" from-field="parameters.trail"
default-value="${parameters.fixedAssetId}"/>
</actions>
<widgets>
@@ -126,8 +140,9 @@
<widgets>
<decorator-screen name="CommonFixedAssetDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><link
target="EditFixedAssetStdCost?fixedAssetId=${fixedAsset.fixedAssetId}"
text="${uiLabelMap.AccountingNewFixedAssetStdCost}"
style="buttontext"/></container>
+ <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"/>
</decorator-section>
</decorator-screen>
