You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2008/01/30 14:50:11 UTC
svn commit: r616762 - in /ofbiz/trunk/applications/accounting: config/
webapp/accounting/transaction/ widget/
Author: mrisaliti
Date: Wed Jan 30 05:50:03 2008
New Revision: 616762
URL: http://svn.apache.org/viewvc?rev=616762&view=rev
Log:
Transactions/Tax Authorities forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1603)
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties
ofbiz/trunk/applications/accounting/webapp/accounting/transaction/TransactionsTabBar.ftl
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml
ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml
ofbiz/trunk/applications/accounting/widget/TransactionForms.xml
ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=616762&r1=616761&r2=616762&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Wed Jan 30 05:50:03 2008
@@ -913,6 +913,7 @@
FormFieldTitle_rateTypeId=Rate Type Id
FormFieldTitle_otherCurrency=Other Currency
FormFieldTitle_removeButton=Remove
+FormFieldTitle_taxPromotions=Tax Promotions
AccountingFinAccount=Financial Account
AccountingFinAccounts=Financial Accounts
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties?rev=616762&r1=616761&r2=616762&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels_it.properties Wed Jan 30 05:50:03 2008
@@ -577,6 +577,7 @@
FormFieldTitle_roleTypeIdTo=Tipo Ruolo A
FormFieldTitle_toPaymentId=Codice Pagamento A
FormFieldTitle_productId=Codice Prodotto
+FormFieldTitle_taxPromotions=Promozioni Tassabili
#payment services messages
AccountingPSUpdateNotAllowedBecauseOfStatus=Stato non permette un aggiornamento delle informazioni
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/transaction/TransactionsTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/transaction/TransactionsTabBar.ftl?rev=616762&r1=616761&r2=616762&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/transaction/TransactionsTabBar.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/transaction/TransactionsTabBar.ftl Wed Jan 30 05:50:03 2008
@@ -17,8 +17,8 @@
under the License.
-->
-<#assign selected = page.tabButtonItem?default("void")>
-<div class="button-bar button-style-1">
+<#assign selected = tabButtonItem?default("void")>
+<div class="button-bar tab-bar">
<ul>
<li<#if selected == "authorizetransactiontab"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingAuthorize}</a></li>
<li<#if selected == "capturetransactiontab"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingCapture}</a></li>
@@ -26,4 +26,4 @@
<li<#if selected == "manualtransactiontab"> class="selected"</#if>><a href="<@o...@ofbizUrl>">${uiLabelMap.AccountingManualTransaction}</a></li>
</ul>
<br class="clear"/>
-</div>
+</div>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=616762&r1=616761&r2=616762&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Wed Jan 30 05:50:03 2008
@@ -466,6 +466,7 @@
<screen name="ManualTransaction">
<section>
<actions>
+ <set field="titleProperty" value="AccountingManualTransaction"/>
<set field="headerItem" value="transaction"/>
<set field="tabButtonItem" value="manualtransactiontab"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/manualTx.bsh"/>
Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml?rev=616762&r1=616761&r2=616762&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityForms.xml Wed Jan 30 05:50:03 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="FindTaxAuthority" type="list" list-name="taxAuthorityList">
+ <form name="FindTaxAuthority" type="list" list-name="taxAuthorityList"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="TaxAuthority" list-name="taxAuthorityList">
<order-by field-name="taxAuthGeoId"/>
@@ -41,7 +42,8 @@
</field>
</form>
- <form name="EditTaxAuthority" type="single" target="updateTaxAuthority" title="" default-map-name="taxAuthority">
+ <form name="EditTaxAuthority" type="single" target="updateTaxAuthority" title="" default-map-name="taxAuthority"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="taxAuthority==null" target="createTaxAuthority"/>
<auto-fields-service service-name="updateTaxAuthority" map-name="taxAuthority"/>
@@ -64,7 +66,8 @@
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListTaxAuthorityCategories" type="list" list-name="taxAuthorityCategoryList" target="updateTaxAuthorityCategory">
+ <form name="ListTaxAuthorityCategories" type="list" list-name="taxAuthorityCategoryList" target="updateTaxAuthorityCategory"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="TaxAuthorityCategory" list-name="taxAuthorityCategoryList">
<condition-list combine="and">
@@ -88,8 +91,8 @@
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="AddTaxAuthorityCategory" type="single" target="createTaxAuthorityCategory" title="" default-map-name="taxAuthorityCategory">
-
+ <form name="AddTaxAuthorityCategory" type="single" target="createTaxAuthorityCategory" title="" default-map-name="taxAuthorityCategory"
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createTaxAuthorityCategory"/>
<field name="taxAuthPartyId"><hidden/></field>
<field name="taxAuthGeoId"><hidden/></field>
@@ -97,7 +100,8 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListTaxAuthorityAssocs" type="list" list-name="taxAuthorityAssocList" target="updateTaxAuthorityAssoc">
+ <form name="ListTaxAuthorityAssocs" type="list" list-name="taxAuthorityAssocList" target="updateTaxAuthorityAssoc"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="TaxAuthorityAssoc" list-name="taxAuthorityAssocList">
<condition-list combine="and">
@@ -134,8 +138,8 @@
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="AddTaxAuthorityAssoc" type="single" target="createTaxAuthorityAssoc" title="" default-map-name="taxAuthorityAssoc">
-
+ <form name="AddTaxAuthorityAssoc" type="single" target="createTaxAuthorityAssoc" title="" default-map-name="taxAuthorityAssoc"
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createTaxAuthorityAssoc"/>
<field name="taxAuthPartyId"><hidden/></field>
<field name="taxAuthGeoId"><hidden/></field>
@@ -153,7 +157,8 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListTaxAuthorityGlAccounts" type="list" list-name="taxAuthorityGlAccountList" target="updateTaxAuthorityGlAccount">
+ <form name="ListTaxAuthorityGlAccounts" type="list" list-name="taxAuthorityGlAccountList" target="updateTaxAuthorityGlAccount"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="TaxAuthorityGlAccount" list-name="taxAuthorityGlAccountList">
<condition-list combine="and">
@@ -182,8 +187,8 @@
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="AddTaxAuthorityGlAccount" type="single" target="createTaxAuthorityGlAccount" title="" default-map-name="taxAuthorityGlAccount">
-
+ <form name="AddTaxAuthorityGlAccount" type="single" target="createTaxAuthorityGlAccount" title="" default-map-name="taxAuthorityGlAccount"
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createTaxAuthorityGlAccount"/>
<field name="taxAuthPartyId"><hidden/></field>
<field name="taxAuthGeoId"><hidden/></field>
@@ -192,7 +197,8 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="ListTaxAuthorityRateProducts" type="list" list-name="taxAuthorityRateProductList" target="updateTaxAuthorityRateProduct" separate-columns="true">
+ <form name="ListTaxAuthorityRateProducts" type="list" list-name="taxAuthorityRateProductList" target="updateTaxAuthorityRateProduct" separate-columns="true"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="TaxAuthorityRateProduct" list-name="taxAuthorityRateProductList">
<condition-list combine="and">
@@ -240,7 +246,8 @@
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="AddTaxAuthorityRateProduct" type="single" target="createTaxAuthorityRateProduct" title="" default-map-name="taxAuthorityRateProduct">
+ <form name="AddTaxAuthorityRateProduct" type="single" target="createTaxAuthorityRateProduct" title="" default-map-name="taxAuthorityRateProduct"
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createTaxAuthorityRateProduct"/>
<field name="taxAuthPartyId"><hidden/></field>
@@ -278,8 +285,8 @@
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="FindTaxAuthorityParties" type="single" target="ListTaxAuthorityParties" title="">
-
+ <form name="FindTaxAuthorityParties" type="single" target="ListTaxAuthorityParties" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<field name="taxAuthPartyId"><hidden/></field>
<field name="taxAuthGeoId"><hidden/></field>
@@ -297,7 +304,8 @@
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
- <form name="ListTaxAuthorityParties" type="list" title="" list-name="listIt">
+ <form name="ListTaxAuthorityParties" type="list" title="" list-name="listIt"
+ 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"/>
@@ -330,7 +338,8 @@
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
- <form name="EditTaxAuthorityPartyInfo" type="single" target="updateTaxAuthorityPartyInfo" title="" default-map-name="partyTaxAuthInfo">
+ <form name="EditTaxAuthorityPartyInfo" type="single" target="updateTaxAuthorityPartyInfo" title="" default-map-name="partyTaxAuthInfo"
+ header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="partyTaxAuthInfo==null" target="createTaxAuthorityPartyInfo"/>
<field name="taxAuthPartyId"><hidden/></field>
@@ -354,4 +363,4 @@
<field use-when="partyTaxAuthInfo!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
<field use-when="partyTaxAuthInfo==null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
-</forms>
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml?rev=616762&r1=616761&r2=616762&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml Wed Jan 30 05:50:03 2008
@@ -19,8 +19,9 @@
-->
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
- <menu name="TaxAuthorityTabBar" default-menu-item-name="EditTaxAuthority" type="simple">
-
+ <menu name="TaxAuthorityTabBar" default-menu-item-name="EditTaxAuthority" type="simple"
+ menu-container-style="button-bar tab-bar" default-selected-style="selected">
+
<menu-item name="EditTaxAuthority" title="${uiLabelMap.AccountingTaxAuthority}">
<link target="EditTaxAuthority?taxAuthPartyId=${taxAuthPartyId}&taxAuthGeoId=${taxAuthGeoId}"/>
</menu-item>
@@ -41,4 +42,4 @@
<link target="ListTaxAuthorityParties?taxAuthPartyId=${taxAuthPartyId}&taxAuthGeoId=${taxAuthGeoId}"/>
</menu-item>
</menu>
-</menus>
+</menus>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml?rev=616762&r1=616761&r2=616762&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml Wed Jan 30 05:50:03 2008
@@ -30,9 +30,21 @@
<widgets>
<decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><label style="head1">${uiLabelMap.AccountingTaxAuthorities}</label></container>
- <container><link target="EditTaxAuthority" text="${uiLabelMap.AccountingNewTaxAuthority}" style="buttontext"/></container>
- <include-form name="FindTaxAuthority" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFindTaxAuthority}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container><link target="EditTaxAuthority" text="${uiLabelMap.AccountingNewTaxAuthority}" style="buttontext"/></container>
+ <include-form name="FindTaxAuthority" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -53,7 +65,20 @@
<widgets>
<decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="EditTaxAuthority" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditTaxAuthority}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="EditTaxAuthority" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -73,9 +98,34 @@
<widgets>
<decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="ListTaxAuthorityCategories" location="component://accounting/widget/TaxAuthorityForms.xml"/>
- <container><label style="head1">${uiLabelMap.PageTitleAddTaxAuthorityCategory}</label></container>
- <include-form name="AddTaxAuthorityCategory" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditTaxAuthorityCategories}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListTaxAuthorityCategories" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleAddTaxAuthorityCategory}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AddTaxAuthorityCategory" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -94,9 +144,34 @@
<widgets>
<decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="ListTaxAuthorityAssocs" location="component://accounting/widget/TaxAuthorityForms.xml"/>
- <container><label style="head1">${uiLabelMap.PageTitleAddTaxAuthorityAssoc}</label></container>
- <include-form name="AddTaxAuthorityAssoc" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditTaxAuthorityAssocs}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListTaxAuthorityAssocs" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleAddTaxAuthorityAssoc}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AddTaxAuthorityAssoc" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -115,9 +190,34 @@
<widgets>
<decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="ListTaxAuthorityGlAccounts" location="component://accounting/widget/TaxAuthorityForms.xml"/>
- <container><label style="head1">${uiLabelMap.PageTitleAddTaxAuthorityGlAccount}</label></container>
- <include-form name="AddTaxAuthorityGlAccount" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditTaxAuthorityGlAccounts}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListTaxAuthorityGlAccounts" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleAddTaxAuthorityGlAccount}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AddTaxAuthorityGlAccount" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -136,9 +236,34 @@
<widgets>
<decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-form name="ListTaxAuthorityRateProducts" location="component://accounting/widget/TaxAuthorityForms.xml"/>
- <container><label style="head1">${uiLabelMap.PageTitleAddTaxAuthorityCategory}</label></container>
- <include-form name="AddTaxAuthorityRateProduct" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditTaxAuthorityRateProducts}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListTaxAuthorityRateProducts" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleAddTaxAuthorityCategory}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AddTaxAuthorityRateProduct" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -158,9 +283,35 @@
<widgets>
<decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><link target="EditTaxAuthorityPartyInfo?taxAuthPartyId=${taxAuthPartyId}&taxAuthGeoId=${taxAuthGeoId}" text="${uiLabelMap.AccountingNewTaxAuthorityPartyInfo}" style="buttontext"/></container>
- <include-form name="FindTaxAuthorityParties" location="component://accounting/widget/TaxAuthorityForms.xml"/>
- <include-form name="ListTaxAuthorityParties" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleListTaxAuthorityParties}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container><link target="EditTaxAuthorityPartyInfo?taxAuthPartyId=${taxAuthPartyId}&taxAuthGeoId=${taxAuthGeoId}" text="${uiLabelMap.AccountingNewTaxAuthorityPartyInfo}" style="buttontext"/></container>
+ <include-form name="FindTaxAuthorityParties" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleListTaxAuthorityParties}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListTaxAuthorityParties" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -182,11 +333,24 @@
<widgets>
<decorator-screen name="CommonTaxAuthorityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><link target="EditTaxAuthorityPartyInfo?taxAuthPartyId=${taxAuthPartyId}&taxAuthGeoId=${taxAuthGeoId}" text="${uiLabelMap.AccountingNewTaxAuthorityPartyInfo}" style="buttontext"/></container>
- <include-form name="EditTaxAuthorityPartyInfo" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleEditTaxAuthorityPartyInfo}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <container><link target="EditTaxAuthorityPartyInfo?taxAuthPartyId=${taxAuthPartyId}&taxAuthGeoId=${taxAuthGeoId}" text="${uiLabelMap.AccountingNewTaxAuthorityPartyInfo}" style="buttontext"/></container>
+ <include-form name="EditTaxAuthorityPartyInfo" location="component://accounting/widget/TaxAuthorityForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-</screens>
+</screens>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/TransactionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionForms.xml?rev=616762&r1=616761&r2=616762&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionForms.xml Wed Jan 30 05:50:03 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 whose input filters the ListGatewayResponses -->
- <form name="FindGatewayResponses" type="single" target="FindGatewayResponses" title="">
+ <form name="FindGatewayResponses" type="single" target="FindGatewayResponses" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<field name="hideSearch"><hidden value="Y"/></field> <!-- what is this for? -->
<field name="paymentGatewayResponseId" title="${uiLabelMap.AccountingPaymentGatewayResponseId}"><text-find/></field>
<field name="orderPaymentPreferenceId" title="${uiLabelMap.AccountingOrderPaymentPreferenceId}"><text-find/></field>
@@ -38,7 +39,8 @@
</form>
<!-- Brings up a list of gateway responses. TODO: should cut down data displayd -->
- <form name="ListGatewayResponses" type="list" use-row-submit="true" target="" title="" list-name="listIt" paginate-target="FindGatewayResponses">
+ <form name="ListGatewayResponses" type="list" use-row-submit="true" target="" title="" list-name="listIt" paginate-target="FindGatewayResponses"
+ odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<set field="entityName" value="PaymentGatewayResponse"/>
<set field="orderBy" value="transactionDate DESC"/>
@@ -56,7 +58,8 @@
</form>
<!-- presents the orderId and orderPaymentPreferenceId for a gateway response with links to the order -->
- <form name="ViewGatewayResponseRelations" type="single" target="" title="">
+ <form name="ViewGatewayResponseRelations" type="single" target="" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<field name="orderId" widget-style="buttontext">
<hyperlink also-hidden="false" target-type="inter-app" description="${orderId}" target="/ordermgr/control/orderview?orderId=${orderId}"/>
</field>
@@ -64,7 +67,8 @@
</form>
<!-- displays the gateway response in detail -->
- <form name="ViewGatewayResponse" type="single" target="processCaptureTransaction" title="" default-map-name="paymentGatewayResponse">
+ <form name="ViewGatewayResponse" type="single" target="processCaptureTransaction" title="" default-map-name="paymentGatewayResponse"
+ header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="PaymentGatewayResponse" default-field-type="display"/>
<!-- TODO: what is the correct way to ensure that the response was authorized?
<field name="submitButton" use-when="paymentGatewayResponse!=null&&paymentGatewayResponse.getString("gatewayFlag").equals("A")" title="${uiLabelMap.AccountingCapture}" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -72,7 +76,8 @@
</form>
<!-- form for authorizing a transaction -->
- <form name="AuthorizeTransaction" type="single" target="processAuthorizeTransaction" title="">
+ <form name="AuthorizeTransaction" type="single" target="processAuthorizeTransaction" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<field name="orderId"><text/></field>
<field name="orderPaymentPreferenceId"><text/></field>
<field name="paymentMethodTypeId" title="${uiLabelMap.AccountingPaymentMethodType}">
@@ -85,7 +90,8 @@
</form>
<!-- form for capturing a transaction -->
- <form name="CaptureTransaction" type="single" target="processCaptureTransaction" title="">
+ <form name="CaptureTransaction" type="single" target="processCaptureTransaction" title=""
+ header-row-style="header-row" default-table-style="basic-table">
<field name="orderId"><text/></field>
<field name="orderPaymentPreferenceId"><text/></field>
<field name="paymentMethodTypeId" title="${uiLabelMap.AccountingPaymentMethodType}">
@@ -103,5 +109,4 @@
<field name="captureAmount" title="${uiLabelMap.AccountingAmount}"><text/></field>
<field name="submitButton" title="${uiLabelMap.AccountingCapture}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-
-</forms>
+</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml?rev=616762&r1=616761&r2=616762&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Wed Jan 30 05:50:03 2008
@@ -55,7 +55,6 @@
<screen name="FindGatewayResponses">
<section>
<actions>
- <set field="title" value="Find Gateway Responses"/>
<set field="titleProperty" value="PageTitleFindGatewayResponses"/> <!-- shows up in browser title bar -->
<set field="tabButtonItem" value="gatewayresponsestab"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
@@ -64,11 +63,34 @@
<widgets>
<decorator-screen name="GenericTransactionDecorator">
<decorator-section name="body">
- <container>
- <label style="head1">${uiLabelMap.AccountingGatewayResponses}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFindGatewayResponses}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="FindGatewayResponses" location="component://accounting/widget/TransactionForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleFindGatewayResponses}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ListGatewayResponses" location="component://accounting/widget/TransactionForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="FindGatewayResponses" location="component://accounting/widget/TransactionForms.xml"/>
- <include-form name="ListGatewayResponses" location="component://accounting/widget/TransactionForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -79,7 +101,6 @@
<screen name="ViewGatewayResponse">
<section>
<actions>
- <set field="title" value="View Gateway Response"/>
<set field="titleProperty" value="PageTitleViewGatewayResponse"/>
<set field="tabButtonItem" value="gatewayresponsestab"/>
@@ -93,11 +114,34 @@
<widgets>
<decorator-screen name="GenericTransactionDecorator">
<decorator-section name="body">
- <container>
- <label style="head1">${uiLabelMap.AccountingGatewayResponse}</label>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleViewGatewayResponse}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ViewGatewayResponseRelations" location="component://accounting/widget/TransactionForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.PageTitleViewGatewayResponse}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="ViewGatewayResponse" location="component://accounting/widget/TransactionForms.xml"/>
+ </widgets>
+ </section>
+ </container>
</container>
- <include-form name="ViewGatewayResponseRelations" location="component://accounting/widget/TransactionForms.xml"/>
- <include-form name="ViewGatewayResponse" location="component://accounting/widget/TransactionForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -108,7 +152,6 @@
<screen name="AuthorizeTransaction">
<section>
<actions>
- <set field="title" value="Authorize Transaction"/>
<set field="titleProperty" value="AccountingAuthorize"/>
<set field="tabButtonItem" value="authorizetransactiontab"/>
@@ -125,7 +168,20 @@
<widgets>
<decorator-screen name="GenericTransactionDecorator">
<decorator-section name="body">
- <include-form name="AuthorizeTransaction" location="component://accounting/widget/TransactionForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingAuthorize}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="AuthorizeTransaction" location="component://accounting/widget/TransactionForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -136,7 +192,6 @@
<screen name="CaptureTransaction">
<section>
<actions>
- <set field="title" value="Capture Transaction"/>
<set field="titleProperty" value="AccountingCapture"/>
<set field="tabButtonItem" value="capturetransactiontab"/>
@@ -153,11 +208,23 @@
<widgets>
<decorator-screen name="GenericTransactionDecorator">
<decorator-section name="body">
- <include-form name="CaptureTransaction" location="component://accounting/widget/TransactionForms.xml"/>
+ <container style="screenlet">
+ <container style="screenlet-title-bar">
+ <container style="head4">
+ <label text="${uiLabelMap.AccountingCapture}"/>
+ </container>
+ </container>
+ <container style="screenlet-body">
+ <section>
+ <widgets>
+ <include-form name="CaptureTransaction" location="component://accounting/widget/TransactionForms.xml"/>
+ </widgets>
+ </section>
+ </container>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
</section>
</screen>
-</screens>
-
+</screens>
\ No newline at end of file