svn commit: r658838 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: adrianc
Date: Wed May 21 13:02:02 2008 New Revision: 658838 URL: http://svn.apache.org/viewvc?rev=658838&view=rev Log: Major layout fixes in the Accounting Fixed Asset screens. I eliminated a number of unnecessary screenlets, added more meaningful UI labels, and changed the arrangement of some screens. In the case where a screen has a list of items in combination with a form to add an item to the list, it is better to have the form on top of the list, so that as items are entered, the form isn't scrolled off the screen. In those types of screens, I made the form collapsible so that you have more room to scroll through the list. Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml ofbiz/trunk/applications/accounting/widget/CommonScreens.xml ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml ofbiz/trunk/applications/accounting/widget/Menus.xml Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=658838&r1=658837&r2=658838&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Wed May 21 13:02:02 2008 @@ -145,6 +145,62 @@ <value xml:lang="en">Add FinAccount Type Gl Account</value> <value xml:lang="th">à¹à¸à¸´à¹à¸¡à¸à¸±à¸à¸à¸µà¸à¸£à¸°à¹à¸ à¸à¸à¸±à¸à¸à¸µà¹à¸¢à¸à¸à¸£à¸°à¹à¸ à¸à¸à¸±à¹à¸§à¹à¸</value> </property> + <property key="AccountingAddFixedAssetIdent"> + <value xml:lang="en">Add Fixed Asset Identification</value> + <value xml:lang="es">Editar Indents de Activo Fijo</value> + <value xml:lang="fr">Modifier identifiants d'actif immobilisé</value> + <value xml:lang="it">Aggiorna Identità Cespite</value> + <value xml:lang="ro">Actualizeaza Identitate Mijloc Fix</value> + <value xml:lang="ru">РедакÑиÑование иденÑиÑикаÑоÑов ÐС</value> + <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸²à¸£à¹à¸¢à¸à¹à¸¢à¸°à¸à¸¥à¸¸à¹à¸¡à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value> + <value xml:lang="zh">ç¼è¾åºå®èµäº§æ è¯</value> + </property> + <property key="AccountingAddFixedAssetMaintenance"> + <value xml:lang="en">Add Fixed Asset Maintenance</value> + <value xml:lang="es">Editar Mantenimiento de Activo Fijo</value> + <value xml:lang="fr">Modifier la maintenance de l'actif immobilisé</value> + <value xml:lang="it">Aggiorna Manutenzione Cespite</value> + <value xml:lang="ro">Actualizeaza Intretinere Mijloc Fix</value> + <value xml:lang="ru">ÐзмениÑÑ Ð¾Ð±ÑлÑживание ÐС</value> + <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸²à¸£à¸à¸³à¸£à¸¸à¸à¸£à¸±à¸à¸©à¸²à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value> + <value xml:lang="zh">ç¼è¾åºå®èµäº§ç»´ä¿®ä¿å »</value> + </property> + <property key="AccountingAddFixedAssetMaintMeter"> + <value xml:lang="en">Add Fixed Asset Maintenance Meter</value> + <value xml:lang="it">Aggiorna Manutenzione Cespite Contatori</value> + <value xml:lang="th">Add Fixed Asset Maintenance Meter</value> + </property> + <property key="AccountingAddFixedAssetMaintOrder"> + <value xml:lang="en">Add Fixed Asset Maintenance Order</value> + <value xml:lang="it">Aggiorna Manutenzione Cespite Ordine</value> + <value xml:lang="th">à¹à¸à¹à¹à¸à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸³à¸£à¸¸à¸à¸£à¸±à¸à¸©à¸²à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value> + </property> + <property key="AccountingAddFixedAssetPartyAssignment"> + <value xml:lang="en">Add Party Fixed Asset Assignment</value> + <value xml:lang="it">Aggiorna Assegnamenti Cespiti Soggetto</value> + <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value> + </property> + <property key="AccountingAddFixedAssetRegistration"> + <value xml:lang="en">Add Fixed Asset Registration</value> + <value xml:lang="es">Editar Registros de Activo Fijo</value> + <value xml:lang="fr">Modifier les immatriculations d'actifs immobilisés</value> + <value xml:lang="it">Aggiorna Registrazioni Cespite</value> + <value xml:lang="ro">Actualizeaza Inregistrare Mijloc Fix</value> + <value xml:lang="ru">ÐзмениÑÑ ÑегиÑÑÑаÑий ÐС</value> + <value xml:lang="th">à¹à¸à¹à¹à¸à¸à¸²à¸£à¸¥à¸à¸à¸°à¹à¸à¸µà¸¢à¸à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value> + <value xml:lang="zh">ç¼è¾åºå®èµäº§ç»è®°</value> + </property> + <property key="AccountingAddFixedAssetStdCost"> + <value xml:lang="en">Add Fixed Asset Standard Cost</value> + <value xml:lang="es">Editar Costo Estandar de Activo Fijo</value> + <value xml:lang="fr">Modifier un coût standard d'actif immobilisé</value> + <value xml:lang="it">Aggiorna Costi Standard Cespiti</value> + <value xml:lang="nl">Aanpassen faktuur rekening vaste kosten</value> + <value xml:lang="ro">Actualizeaza Costuri Standard Mijloace Fixe</value> + <value xml:lang="ru">ÐзмениÑÑ ÑÑанд. ÑÑоимоÑÑÑ ÐС</value> + <value xml:lang="th">à¹à¸à¹à¹à¸à¸£à¸²à¸à¸²à¸¡à¸²à¸à¸£à¸à¸²à¸à¸à¸£à¸±à¸à¸¢à¹à¸ªà¸´à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value> + <value xml:lang="zh">ç¼è¾åºå®èµäº§æ åè´¹ç¨</value> + </property> <property key="AccountingAddNewCreditCard"> <value xml:lang="ar">إضاÙØ© بطاÙØ© Ùرض جدÙدة</value> <value xml:lang="en">Add New Credit Card</value> @@ -8360,7 +8416,7 @@ <value xml:lang="zh">ç¼è¾åºå®èµäº§</value> </property> <property key="PageTitleEditFixedAssetIdents"> - <value xml:lang="en">Edit Fixed Asset Idents</value> + <value xml:lang="en">Edit Fixed Asset Identifications</value> <value xml:lang="es">Editar Indents de Activo Fijo</value> <value xml:lang="fr">Modifier identifiants d'actif immobilisé</value> <value xml:lang="it">Aggiorna Identità Cespite</value> @@ -8411,7 +8467,7 @@ <value xml:lang="zh">ç¼è¾åºå®èµäº§æ åè´¹ç¨</value> </property> <property key="PageTitleEditFixedAssetStdCosts"> - <value xml:lang="en">Edit Standard Cost</value> + <value xml:lang="en">Edit Fixed Asset Standard Costs</value> <value xml:lang="fr">Modifier les coûts standard d'actifs immobilisés</value> <value xml:lang="ru">РедакÑиÑование ÑÑандаÑÑной ÑÑоимоÑÑи</value> <value xml:lang="th">à¹à¸à¹à¹à¸à¸£à¸²à¸à¸²à¸¡à¸²à¸à¸£à¸à¸²à¸</value> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml?rev=658838&r1=658837&r2=658838&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml Wed May 21 13:02:02 2008 @@ -105,7 +105,7 @@ </form> <form name="ListFixedAssetProducts" type="list" list-name="fixedAssetProducts" target="updateFixedAssetProduct" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <field name="productId" title="${uiLabelMap.AccountingProduct}"><display-entity entity-name="Product" description="${description}[${productId}]"/></field> <field name="fixedAssetProductTypeId" title="${uiLabelMap.AccountingFixedAssetProductType}"><display-entity entity-name="FixedAssetProductType"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> @@ -172,7 +172,7 @@ </form> <form name="ListFixedAssetStdCosts" list-name="fixedAssetStdCosts" type="list" target="updateFixedAssetStdCost" title="" paginate-target="EditFixedAssetStdCosts" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetStdCost"> <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/> @@ -221,7 +221,7 @@ <!-- List all fixed asset idents --> <form name="ListFixedAssetIdents" type="list" list-name="fixedAssetIdents" target="updateFixedAssetIdent" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetIdent"> <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/> @@ -258,7 +258,7 @@ <!-- List all fixed asset Registration --> <form name="ListFixedAssetRegistrations" type="list" list-name="fixedAssetRegistrations" target="updateFixedAssetRegistration" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetRegistration"> <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/> @@ -289,7 +289,7 @@ </form> <!-- list all Fixed Asset Maintenance--> <form name="ListFixedAssetMaints" type="list" list-name="fixedAssetMaints" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetMaint"> <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/> @@ -369,7 +369,7 @@ <!-- List all fixed asset Maintenance Meter --> <form name="ListFixedAssetMaintMeters" type="list" list-name="fixedAssetMaintMeters" target="updateFixedAssetMaintMeter" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetMaintMeter"> <condition-list combine="and"> @@ -410,7 +410,7 @@ </form> <!-- List all fixed asset Maintenance Order --> <form name="ListFixedAssetMaintOrders" type="list" list-name="fixedAssetMaintOrders" target="updateFixedAssetMaintOrder" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetMaintOrder" list-name="fixedAssetMaintOrders"> <condition-list combine="and"> @@ -443,7 +443,7 @@ <!-- =====================Party Fixed Asset Assignment Forms============== --> <form name="ListPartyFixedAssetAssignments" type="list" list-name="listPartyFixedAssets" target="updatePartyFixedAssetAssignment" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="PartyFixedAssetAssignment" list-name="listPartyFixedAssets"> <condition-expr field-name="fixedAssetId" env-name="fixedAssetId"/> Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=658838&r1=658837&r2=658838&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Wed May 21 13:02:02 2008 @@ -72,37 +72,6 @@ </widgets> </section> </screen> - <screen name="CommonFixedAssetMaintDecorator"> - <section> - <actions> - <set field="headerItem" value="ListFixedAssetMaints"/> - </actions> - <widgets> - <decorator-screen name="CommonFixedAssetDecorator"> - <decorator-section name="body"> - <section> - <!-- do check for ACCOUNTING, _VIEW permission --> - <condition> - <if-has-permission permission="ACCOUNTING" action="_VIEW"/> - </condition> - <widgets> - <section> - <condition><not><if-empty field-name="maintHistSeqId"/></not></condition> - <widgets> - <include-menu name="FixedAssetMaintTabBar" location="component://accounting/widget/Menus.xml"/> - </widgets> - </section> - </widgets> - <fail-widgets> - <label style="h3">${uiLabelMap.AcccountingViewPermissionError}</label> - </fail-widgets> - </section> - <decorator-section-include name="body"/> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> <screen name="CommonTaxAuthorityDecorator"> <section> Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=658838&r1=658837&r2=658838&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Wed May 21 13:02:02 2008 @@ -28,6 +28,17 @@ </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="pre-body"> + <section> + <condition> + <not><if-empty field-name="fixedAssetId"/></not> + </condition> + <widgets> + <include-menu name="FixedAssetTabBar" location="component://accounting/widget/Menus.xml"/> + </widgets> + </section> + <decorator-section-include name="pre-body"/> + </decorator-section> <decorator-section name="body"> <section> <condition> @@ -35,18 +46,22 @@ </condition> <widgets> <section> - <condition><not><if-empty field-name="fixedAssetId"/></not></condition> + <condition> + <not><if-empty field-name="fixedAssetId"/></not> + </condition> <widgets> - <include-menu name="FixedAssetTabBar" location="component://accounting/widget/Menus.xml"/> - <label style="h1" text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${fixedAsset.fixedAssetName} [${uiLabelMap.CommonId}:${fixedAssetId}] ${${extraFunctionName}}"/> + <container style="h1"><label text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor} ${fixedAsset.fixedAssetName} [${fixedAssetId}] ${${extraFunctionName}}"/></container> </widgets> + <fail-widgets> + <container style="h1"><label text="${uiLabelMap.${titleProperty}}"/></container> + </fail-widgets> </section> + <decorator-section-include name="body"/> </widgets> <fail-widgets> <label style="h3" text="${uiLabelMap.AcccountingViewPermissionError}"/> </fail-widgets> </section> - <decorator-section-include name="body"/> </decorator-section> </decorator-screen> </widgets> @@ -61,7 +76,7 @@ <set field="tabButtonItem" value="ListFixedAssets"/> </actions> <widgets> - <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="menu-bar"> @@ -86,6 +101,7 @@ </widgets> </section> </screen> + <screen name="FixedAssetSearchResults"> <section> <condition> @@ -113,21 +129,15 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingFixedAssetEdit}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container><link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext"/></container> - <include-form name="EditFixedAsset" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - </widgets> - </section> - </container> - </container> + <section> + <condition> + <if-service-permission service-name="fixedAssetPermissionCheck" main-action="CREATE"/> + </condition> + <widgets> + <container style="button-bar"><link target="EditFixedAsset" text="${uiLabelMap.AccountingNewFixedAsset}" style="buttontext"/></container> + </widgets> + </section> + <include-form name="EditFixedAsset" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -156,34 +166,10 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListFixedAssetProducts}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListFixedAssetProducts" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingFixedAssetProductNew}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddFixedAssetProduct" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet id="add-fixedasset-product" title="${uiLabelMap.AccountingFixedAssetProductNew}" collapsible="true"> + <include-form name="AddFixedAssetProduct" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </screenlet> + <include-form name="ListFixedAssetProducts" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -247,34 +233,10 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListFixedAssetStdCosts}"/> - </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="h3"> - <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> + <screenlet id="add-fixed-asset-std-cost" title="${uiLabelMap.AccountingAddFixedAssetStdCost}" collapsible="true"> + <include-form name="EditFixedAssetStdCost" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </screenlet> + <include-form name="ListFixedAssetStdCosts" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -295,34 +257,10 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListFixedAssetIdents}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListFixedAssetIdents" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditFixedAssetIdents}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddFixedAssetIdent" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet id="edit-fixed-asset-idents" title="${uiLabelMap.AccountingAddFixedAssetIdent}" collapsible="true"> + <include-form name="AddFixedAssetIdent" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </screenlet> + <include-form name="ListFixedAssetIdents" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -342,40 +280,38 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListFixedAssetRegistrations}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListFixedAssetRegistrations" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditFixedAssetRegistrations}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddFixedAssetRegistration" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet id="add-fixed-asset-registration" title="${uiLabelMap.AccountingAddFixedAssetRegistration}" collapsible="true"> + <include-form name="AddFixedAssetRegistration" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </screenlet> + <include-form name="ListFixedAssetRegistrations" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> </section> </screen> <!-- Fixed Asset Maintenance --> + <screen name="CommonFixedAssetMaintDecorator"> + <section> + <actions> + <set field="headerItem" value="ListFixedAssetMaints"/> + </actions> + <widgets> + <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> + <decorator-section name="pre-body"> + <section> + <condition><not><if-empty field-name="maintHistSeqId"/></not></condition> + <widgets> + <include-menu name="FixedAssetMaintTabBar" location="component://accounting/widget/Menus.xml"/> + </widgets> + </section> + </decorator-section> + <decorator-section name="body"> + <decorator-section-include name="body"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> <screen name="ListFixedAssetMaints"> <section> <actions> @@ -389,21 +325,8 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListFixedAssetMaints}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> <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"/> - </widgets> - </section> - </container> - </container> </decorator-section> </decorator-screen> </widgets> @@ -420,26 +343,27 @@ <set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/> <entity-one entity-name="FixedAsset" value-name="fixedAsset"/> <entity-one entity-name="FixedAssetMaint" value-name="fixedAssetMaint"/> - </actions> <widgets> - <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}"> + <section> + <condition><if-empty field-name="maintHistSeqId"/></condition> + <actions><set field="titleProperty" value="AccountingAddFixedAssetMaintenance"/></actions> + <widgets/> + </section> + <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.fixedAssetMaintDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditFixedAssetMaintenance}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container><link target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/></container> - <include-form name="EditFixedAssetMaint" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - </widgets> + <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"/></container> + </widgets> + <fail-widgets> + <section><actions><set field="titleProperty" value="AccountingAddFixedAssetMaintenance"/></actions> + <widgets/> </section> - </container> - </container> + </fail-widgets> + </section> + <include-form name="EditFixedAssetMaint" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -459,36 +383,12 @@ <entity-one entity-name="FixedAssetMaint" value-name="fixedAssetMaint"/> </actions> <widgets> - <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.fixedAssetMaintDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListFixedAssetMaintMeters}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListFixedAssetMaintMeters" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditFixedAssetMaintMeters}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddFixedAssetMaintMeter" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet id="add-fixedasset-maint-meter" title="${uiLabelMap.AccountingAddFixedAssetMaintMeter}" collapsible="true"> + <include-form name="AddFixedAssetMaintMeter" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </screenlet> + <include-form name="ListFixedAssetMaintMeters" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -509,20 +409,7 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListFixedAssetChildren}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-tree name="TreeFixedAsset" location="component://accounting/widget/AccountingTrees.xml" /> - </widgets> - </section> - </container> - </container> + <include-tree name="TreeFixedAsset" location="component://accounting/widget/AccountingTrees.xml" /> </decorator-section> </decorator-screen> </widgets> @@ -545,36 +432,12 @@ <entity-one entity-name="FixedAssetMaintOrder" value-name="fixedAssetMaintOrder"/> </actions> <widgets> - <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.mainDecoratorLocation}"> + <decorator-screen name="CommonFixedAssetMaintDecorator" location="${parameters.fixedAssetMaintDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListFixedAssetMaintOrders}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListFixedAssetMaintOrders" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditFixedAssetMaintOrders}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddFixedAssetMaintOrder" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet id="add-fixedasset-maint-order" title="${uiLabelMap.AccountingAddFixedAssetMaintOrder}" collapsible="true"> + <include-form name="AddFixedAssetMaintOrder" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </screenlet> + <include-form name="ListFixedAssetMaintOrders" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -597,34 +460,10 @@ <widgets> <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.fixedAssetDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListPartyFixedAssetAssignments}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListPartyFixedAssetAssignments" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditPartyFixedAssetAssignments}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddPartyFixedAssetAssignment" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet id="add-party-fixedasset-assignments" title="${uiLabelMap.AccountingAddFixedAssetPartyAssignment}" collapsible="true"> + <include-form name="AddPartyFixedAssetAssignment" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> + </screenlet> + <include-form name="ListPartyFixedAssetAssignments" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=658838&r1=658837&r2=658838&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/Menus.xml (original) +++ ofbiz/trunk/applications/accounting/widget/Menus.xml Wed May 21 13:02:02 2008 @@ -358,7 +358,8 @@ <link target="printChecks.pdf?paymentId=${payment.paymentId}"/> </menu-item> </menu> - <menu name="FixedAssetMaintTabBar" selected-menuitem-context-field-name="tabButtonItemFixedAssetMaint" default-menu-item-name="EditFixedAssetMaint"> + <menu name="FixedAssetMaintTabBar" selected-menuitem-context-field-name="tabButtonItemFixedAssetMaint" default-menu-item-name="EditFixedAssetMaint" + menu-container-style="button-bar tab-bar" type="simple"> <menu-item name="EditFixedAssetMaint" title="${uiLabelMap.AccountingFixedAssetMaint}"> <link target="EditFixedAssetMaint?fixedAssetId=${fixedAssetMaint.fixedAssetId}&maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/> </menu-item> @@ -370,7 +371,7 @@ </menu-item> </menu> <menu name="FixedAssetTabBar" default-menu-item-name="EditFixedAsset" default-selected-style="selected" - menu-container-style="button-bar button-style-1" type="simple" selected-menuitem-context-field-name="tabButtonItem"> + menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="EditFixedAsset" title="${uiLabelMap.AccountingFixedAsset}"> <link target="EditFixedAsset?fixedAssetId=${fixedAssetId}"/> </menu-item> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |