svn commit: r826449 [1/2] - /ofbiz/trunk/applications/acco
Locked
 
|
Author: buscob
Date: Sun Oct 18 14:37:45 2009 New Revision: 826449 URL: http://svn.apache.org/viewvc?rev=826449&view=rev Log: Changed <container style="screenlet"> pattern to <screenlet...>. Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml ofbiz/trunk/applications/accounting/widget/TaxAuthorityScreens.xml ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=826449&r1=826448&r2=826449&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Sun Oct 18 14:37:45 2009 @@ -407,33 +407,21 @@ </container> </container> <container> - <container style="screenlet"> - <section> - <condition> - <if-compare field="acctgTrans.isPosted" operator="equals" value="Y"/> - </condition> - <widgets> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleViewTransactionEntries}"/> - </container> - </container> - <container style="screenlet-body"> - <include-form name="ViewAcctgTransEntries" location="component://accounting/widget/GlForms.xml"/> - </container> - </widgets> - <fail-widgets> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditTransactionEntries}"/> - </container> - </container> - <container style="screenlet-body"> - <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlForms.xml"/> - </container> - </fail-widgets> - </section> - </container> + <section> + <condition> + <if-compare field="acctgTrans.isPosted" operator="equals" value="Y"/> + </condition> + <widgets> + <screenlet title="${uiLabelMap.PageTitleViewTransactionEntries}"> + <include-form name="ViewAcctgTransEntries" location="component://accounting/widget/GlForms.xml"/> + </screenlet> + </widgets> + <fail-widgets> + <screenlet title="${uiLabelMap.PageTitleEditTransactionEntries}"> + <include-form name="ListAcctgTransEntries" location="component://accounting/widget/GlForms.xml"/> + </screenlet> + </fail-widgets> + </section> </container> </widgets> </section> @@ -443,16 +431,9 @@ </condition> <widgets> <container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddTransactionEntry}"/> - </container> - </container> - <container style="screenlet-body"> - <include-form name="EditAcctgTransEntry" location="component://accounting/widget/GlForms.xml"/> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleAddTransactionEntry}"> + <include-form name="EditAcctgTransEntry" location="component://accounting/widget/GlForms.xml"/> + </screenlet> </container> </widgets> </section> @@ -479,16 +460,9 @@ <widgets> <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleUnpostedTransactions}"/> - </container> - </container> - <container style="screenlet-body"> - <include-form name="ListUnpostedAcctgTrans" location="component://accounting/widget/GlForms.xml"/> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleUnpostedTransactions}"> + <include-form name="ListUnpostedAcctgTrans" location="component://accounting/widget/GlForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -525,16 +499,9 @@ <section> <condition><if-has-permission permission="ACCOUNTING" action="_PRINT_CHECKS"/></condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingPrintChecks}"/> - </container> - </container> - <container style="screenlet-body"> - <include-form name="ListChecksToPrint" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingPrintChecks}"> + <include-form name="ListChecksToPrint" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + </screenlet> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.AccountingPrintChecksPermissionError}</label> @@ -574,16 +541,9 @@ <section> <condition><if-has-permission permission="PAY_INFO" action="_UPDATE"/></condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingSendChecks}"/> - </container> - </container> - <container style="screenlet-body"> - <include-form name="ListChecksToSend" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingSendChecks}"> + <include-form name="ListChecksToSend" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + </screenlet> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.AccountingUpdatePaymentPermissionError}</label> @@ -605,16 +565,9 @@ <widgets> <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingCreateAnAccountingTransaction}"/> - </container> - </container> - <container style="screenlet-body"> - <include-form name="CreateAcctgTrans" location="component://accounting/widget/GlForms.xml"/> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingCreateAnAccountingTransaction}"> + <include-form name="CreateAcctgTrans" location="component://accounting/widget/GlForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -633,39 +586,17 @@ <widgets> <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingAcctRecon}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="FindGlAccountReconciliation" location="component://accounting/widget/GlForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingAcctRecon}"> + <include-form name="FindGlAccountReconciliation" location="component://accounting/widget/GlForms.xml"/> + </screenlet> <section> <condition> <if-compare field="parameters.performSearch" operator="equals" value="Y"/> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingAcctRecon}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListGlAccountReconciliation" location="component://accounting/widget/GlForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingAcctRecon}"> + <include-form name="ListGlAccountReconciliation" location="component://accounting/widget/GlForms.xml"/> + </screenlet> </widgets> </section> </decorator-section> @@ -708,39 +639,17 @@ <widgets> <decorator-screen name="CommonPartyAccountsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingAcctRecons}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="FindGlAccountReconciliations" location="component://accounting/widget/GlForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingAcctRecons}"> + <include-form name="FindGlAccountReconciliations" location="component://accounting/widget/GlForms.xml"/> + </screenlet> <section> <condition> <if-compare field="parameters.performSearch" operator="equals" value="Y"/> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingAcctRecons}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListGlAccountReconciliations" location="component://accounting/widget/GlForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingAcctRecons}"> + <include-form name="ListGlAccountReconciliations" location="component://accounting/widget/GlForms.xml"/> + </screenlet> </widgets> </section> </decorator-section> Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=826449&r1=826448&r2=826449&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Sun Oct 18 14:37:45 2009 @@ -73,20 +73,9 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingAvailableInternalOrganizations}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListCompanies" location="component://accounting/widget/GlSetupForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingAvailableInternalOrganizations}"> + <include-form name="ListCompanies" location="component://accounting/widget/GlSetupForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -148,48 +137,15 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingOpenTimePeriods}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListOpenTimePeriods" location="component://accounting/widget/GlSetupForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingClosedTimePeriods}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListClosedTimePeriods" location="component://accounting/widget/GlSetupForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.CommonNew}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="CreateTimePeriod" location="component://accounting/widget/GlSetupForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingOpenTimePeriods}"> + <include-form name="ListOpenTimePeriods" location="component://accounting/widget/GlSetupForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.AccountingClosedTimePeriods}"> + <include-form name="ListClosedTimePeriods" location="component://accounting/widget/GlSetupForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.CommonNew}"> + <include-form name="CreateTimePeriod" location="component://accounting/widget/GlSetupForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -215,16 +171,9 @@ <widgets> <decorator-screen name="CommonAdminDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingPreference}"/> - </container> - </container> - <container style="screenlet-body"> - <include-form name="PartyAcctgPreference" location="component://accounting/widget/GlSetupForms.xml"/> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingPreference}"> + <include-form name="PartyAcctgPreference" location="component://accounting/widget/GlSetupForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml?rev=826449&r1=826448&r2=826449&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/InvoiceItemTypeScreens.xml Sun Oct 18 14:37:45 2009 @@ -35,20 +35,9 @@ <widgets> <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingListInvoiceItemType}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListInvoiceItemType" location="component://accounting/widget/InvoiceItemTypeForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingListInvoiceItemType}"> + <include-form name="ListInvoiceItemType" location="component://accounting/widget/InvoiceItemTypeForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=826449&r1=826448&r2=826449&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Sun Oct 18 14:37:45 2009 @@ -102,34 +102,12 @@ <decorator-section name="body"> <section> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingCreateNewSalesInvoice}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="NewSalesInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingCreateNewPurchaseInvoice}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="NewPurchaseInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingCreateNewSalesInvoice}"> + <include-form name="NewSalesInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.AccountingCreateNewPurchaseInvoice}"> + <include-form name="NewPurchaseInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + </screenlet> </widgets> </section> </decorator-section> @@ -157,36 +135,14 @@ <if-compare field="invoice.statusId" operator="equals" value="INVOICE_IN_PROCESS"/> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditInvoice}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditInvoice}"> + <include-form name="EditInvoice" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + </screenlet> </widgets> <fail-widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditInvoice}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="invoiceHeader" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditInvoice}"> + <include-form name="invoiceHeader" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + </screenlet> </fail-widgets> </section> </decorator-section> @@ -354,20 +310,9 @@ <widgets> <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingInvoiceStatusHistory}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListInvoiceStatus" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingInvoiceStatusHistory}"> + <include-form name="ListInvoiceStatus" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -435,20 +380,9 @@ </screenlet> </widgets> </section> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingAssignPaymentToInvoice}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddPayment" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingAssignPaymentToInvoice}"> + <include-form name="AddPayment" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + </screenlet> </widgets> <fail-widgets> <screenlet title="${uiLabelMap.AccountingPaymentsApplied} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}"> @@ -493,40 +427,22 @@ <widgets> <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingInvoiceItems}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditInvoiceItems" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingInvoiceItemAdd}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <condition> - <not><if-compare field="invoice.invoiceTypeId" operator="equals" value="PAYROL_INVOICE"/></not> - </condition> - <widgets> - <include-form name="EditInvoiceItem" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> - </widgets> - <fail-widgets> - <platform-specific><html><html-template location="component://accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl"/></html></platform-specific> - </fail-widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingInvoiceItems}"> + <include-form name="EditInvoiceItems" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.AccountingInvoiceItemAdd}"> + <section> + <condition> + <not><if-compare field="invoice.invoiceTypeId" operator="equals" value="PAYROL_INVOICE"/></not> + </condition> + <widgets> + <include-form name="EditInvoiceItem" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + </widgets> + <fail-widgets> + <platform-specific><html><html-template location="component://accounting/webapp/accounting/invoice/InvoiceItemsPayrol.ftl"/></html></platform-specific> + </fail-widgets> + </section> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -548,20 +464,9 @@ <widgets> <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingInvoiceTimeEntries}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditTimeEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingInvoiceTimeEntries}"> + <include-form name="EditTimeEntries" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -604,20 +509,9 @@ <widgets> <decorator-screen name="CommonInvoiceDecorator" location="${parameters.invoiceDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.CommonSendPerEmail}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="SendPerEmail" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.CommonSendPerEmail}"> + <include-form name="SendPerEmail" location="component://accounting/webapp/accounting/invoice/InvoiceForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml?rev=826449&r1=826448&r2=826449&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml Sun Oct 18 14:37:45 2009 @@ -107,39 +107,17 @@ <widgets> <decorator-screen name="GenericPaymentGatewayConfigDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfig}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditPaymentGatewayConfig" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleUpdatePaymentGatewayConfig}"> + <include-form name="EditPaymentGatewayConfig" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> + </screenlet> <section> <condition> <not><if-empty field="paymentGatewayAuthorizeNet"/></not> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigAuthorizeNet}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditPaymentGatewayConfigAuthorizeNet" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigAuthorizeNet}"> + <include-form name="EditPaymentGatewayConfigAuthorizeNet" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> + </screenlet> </widgets> </section> <section> @@ -147,20 +125,9 @@ <not><if-empty field="paymentGatewayCyberSource"/></not> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigCyberSource}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditPaymentGatewayConfigCyberSource" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigCyberSource}"> + <include-form name="EditPaymentGatewayConfigCyberSource" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> + </screenlet> </widgets> </section> <section> @@ -168,20 +135,9 @@ <not><if-empty field="paymentGatewayPayflowPro"/></not> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigPayflowPro}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditPaymentGatewayConfigPayflowPro" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigPayflowPro}"> + <include-form name="EditPaymentGatewayConfigPayflowPro" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> + </screenlet> </widgets> </section> <section> @@ -189,20 +145,9 @@ <not><if-empty field="paymentGatewayPayPal"/></not> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigPayPal}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditPaymentGatewayConfigPayPal" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigPayPal}"> + <include-form name="EditPaymentGatewayConfigPayPal" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> + </screenlet> </widgets> </section> <section> @@ -210,20 +155,9 @@ <not><if-empty field="paymentGatewayClearCommerce"/></not> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigClearCommerce}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditPaymentGatewayConfigClearCommerce" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigClearCommerce}"> + <include-form name="EditPaymentGatewayConfigClearCommerce" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> + </screenlet> </widgets> </section> <section> @@ -231,20 +165,9 @@ <not><if-empty field="paymentGatewayWorldPay"/></not> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigWorldPay}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditPaymentGatewayConfigWorldPay" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigWorldPay}"> + <include-form name="EditPaymentGatewayConfigWorldPay" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> + </screenlet> </widgets> </section> </decorator-section> @@ -294,20 +217,9 @@ <widgets> <decorator-screen name="GenericPaymentGatewayConfigDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigType}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditPaymentGatewayConfigType" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleUpdatePaymentGatewayConfigType}"> + <include-form name="EditPaymentGatewayConfigType" location="component://accounting/widget/PaymentGatewayConfigForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml?rev=826449&r1=826448&r2=826449&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentMethodTypeScreens.xml Sun Oct 18 14:37:45 2009 @@ -35,20 +35,9 @@ <widgets> <decorator-screen name="GlobalGLSettingsDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingListPaymentMethodType}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListPaymentMethodType" location="component://accounting/widget/PaymentMethodTypeForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingListPaymentMethodType}"> + <include-form name="ListPaymentMethodType" location="component://accounting/widget/PaymentMethodTypeForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=826449&r1=826448&r2=826449&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Sun Oct 18 14:37:45 2009 @@ -98,34 +98,12 @@ <decorator-section name="body"> <section> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingNewPaymentIncoming}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="NewPaymentIn" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingNewPaymentOutgoing}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="NewPaymentOut" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingNewPaymentIncoming}"> + <include-form name="NewPaymentIn" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.AccountingNewPaymentOutgoing}"> + <include-form name="NewPaymentOut" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + </screenlet> </widgets> </section> </decorator-section> @@ -148,20 +126,9 @@ <decorator-section name="body"> <section> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingInvoiceHeaderDetailedInformation}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditPayment" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingInvoiceHeaderDetailedInformation}"> + <include-form name="EditPayment" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + </screenlet> </widgets> </section> </decorator-section> @@ -450,22 +417,11 @@ <widgets> <decorator-screen name="GenericTransactionDecorator" location="component://accounting/widget/TransactionScreens.xml"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingManualTransaction}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <platform-specific> - <html><html-template location="component://accounting/webapp/accounting/payment/manualTx.ftl"/></html> - </platform-specific> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingManualTransaction}"> + <platform-specific> + <html><html-template location="component://accounting/webapp/accounting/payment/manualTx.ftl"/></html> + </platform-specific> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -524,39 +480,17 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="FindSalesInvoicesByDueDate" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}"> + <include-form name="FindSalesInvoicesByDueDate" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + </screenlet> <section> <condition> <not><if-empty field="invoicePaymentInfoList"/></not> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListInvoicesByDueDate" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingFindSalesInvoicesByDueDate}"> + <include-form name="ListInvoicesByDueDate" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + </screenlet> </widgets> </section> </decorator-section> @@ -577,39 +511,17 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="FindPurchaseInvoicesByDueDate" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}"> + <include-form name="FindPurchaseInvoicesByDueDate" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + </screenlet> <section> <condition> <not><if-empty field="invoicePaymentInfoList"/></not> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListInvoicesByDueDate" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.AccountingFindPurchaseInvoicesByDueDate}"> + <include-form name="ListInvoicesByDueDate" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/> + </screenlet> </widgets> </section> </decorator-section> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |