You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/11/05 18:19:56 UTC
svn commit: r1768265 - in /ofbiz/trunk: applications/accounting/widget/
specialpurpose/assetmaint/widget/
Author: deepak
Date: Sat Nov 5 18:19:56 2016
New Revision: 1768265
URL: http://svn.apache.org/viewvc?rev=1768265&view=rev
Log:
Improved: Consitent menu bar in following screens decorator:
- Agreement
- Billing Account
- Financial Account
- Fixed Assets
- Maintenance
(OFBIZ-8180)(OFBIZ-8178)(OFBIZ-8177)(OFBIZ-8176)(OFBIZ-8175)
Thanks Avnindra Sharma for your contribution.
Modified:
ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=1768265&r1=1768264&r2=1768265&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Sat Nov 5 18:19:56 2016
@@ -66,6 +66,9 @@ under the License.
</widgets>
</section>
<label style="h1">${agreement.description} [${agreement.agreementId}] </label>
+ <container style="button-bar">
+ <link target="EditAgreement" text="${uiLabelMap.AccountingNewAgreement}" style="buttontext create"/>
+ </container>
</widgets>
</section>
<decorator-section-include name="body"/>
@@ -130,16 +133,6 @@ under the License.
<widgets>
<decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}">
<decorator-section name="body">
- <section>
- <condition>
- <not><if-empty field="agreement"/></not>
- </condition>
- <widgets>
- <container style="button-bar">
- <link target="EditAgreement" text="${uiLabelMap.AccountingNewAgreement}" style="buttontext create"/>
- </container>
- </widgets>
- </section>
<screenlet title="${uiLabelMap.PageTitleEditAgreement}">
<include-form name="EditAgreement" location="component://accounting/widget/AgreementForms.xml"/>
</screenlet>
Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=1768265&r1=1768264&r2=1768265&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Sat Nov 5 18:19:56 2016
@@ -51,6 +51,9 @@ under the License.
<if-service-permission service-name="acctgBasePermissionCheck" main-action="VIEW"/>
</condition>
<widgets>
+ <container style="button-bar">
+ <link target="EditBillingAccount" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/>
+ </container>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -69,7 +72,7 @@ under the License.
<set field="headerItem" value="billingaccount"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonBillingAccountDecorator" location="${parameters.billingAccountDecoratorLocation}">
<decorator-section name="body">
<section>
<condition>
@@ -79,11 +82,6 @@ under the License.
<section>
<widgets>
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
- <decorator-section name="menu-bar">
- <container style="button-bar">
- <link target="EditBillingAccount" text="${uiLabelMap.CommonCreateNew}" style="buttontext create"/>
- </container>
- </decorator-section>
<decorator-section name="search-options">
<include-form name="FindBillingAccounts" location="component://accounting/widget/BillingAccountForms.xml"/>
</decorator-section>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=1768265&r1=1768264&r2=1768265&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Sat Nov 5 18:19:56 2016
@@ -58,6 +58,9 @@ under the License.
<label style="h3" text="${uiLabelMap.AccountingViewPermissionError}"/>
</widgets>
</section>
+ <container style="button-bar">
+ <link target="EditFinAccount" text="${uiLabelMap.AccountingCreateNewFinAccount}" style="buttontext create"/>
+ </container>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
@@ -128,9 +131,6 @@ under the License.
<not><if-empty field="finAccountId"/></not>
</condition>
<widgets>
- <container style="button-bar">
- <link target="EditFinAccount" text="${uiLabelMap.AccountingCreateNewFinAccount}" style="buttontext create"/>
- </container>
<label style="h1" text="${uiLabelMap.AccountingEditFinAccount}"></label>
<screenlet id="EditFinAccountPanel" collapsible="true">
<include-form name="EditFinAccount" location="component://accounting/widget/FinAccountForms.xml"/>
Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=1768265&r1=1768264&r2=1768265&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Sat Nov 5 18:19:56 2016
@@ -110,6 +110,7 @@ under the License.
<label style="h1" text="${uiLabelMap[titleProperty]}"/>
</fail-widgets>
</section>
+ <container style="button-bar"><link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext create"/></container>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -138,9 +139,6 @@ under the License.
<condition>
<if-service-permission service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
</condition>
- <widgets>
- <container style="button-bar"><link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext create"/></container>
- </widgets>
</section>
<include-form name="EditFixedAsset" location="component://accounting/widget/FixedAssetForms.xml"/>
</decorator-section>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=1768265&r1=1768264&r2=1768265&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Sat Nov 5 18:19:56 2016
@@ -38,6 +38,7 @@
</section>
</decorator-section>
<decorator-section name="body">
+ <container style="button-bar"><link target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext create"/></container>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
@@ -123,9 +124,6 @@
<condition><not><if-empty field="maintHistSeqId"/></not></condition>
<widgets>
<container style="button-bar">
- <link target="EditFixedAssetMaint" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext create">
- <parameter param-name="fixedAssetId"/>
- </link>
<link target="printFixedAssetMaint.pdf" target-window="_blank" text="${uiLabelMap.CommonPrint}" style="buttontext">
<parameter param-name="fixedAssetId"/>
<parameter param-name="maintHistSeqId"/>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=1768265&r1=1768264&r2=1768265&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Sat Nov 5 18:19:56 2016
@@ -72,6 +72,7 @@ under the License.
</or>
</condition>
<widgets>
+ <container style="button-bar"><link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/></container>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>