You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2009/11/10 08:38:25 UTC
svn commit: r834376 - in /ofbiz/trunk: applications/accounting/widget/
applications/accounting/widget/ap/ applications/accounting/widget/ar/
framework/common/widget/
Author: apatel
Date: Tue Nov 10 07:38:24 2009
New Revision: 834376
URL: http://svn.apache.org/viewvc?rev=834376&view=rev
Log:
Removed extra container around labels. Apply h1 (or h2, h3) style to label instead.
Modified:
ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
ofbiz/trunk/applications/accounting/widget/GlScreens.xml
ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
ofbiz/trunk/framework/common/widget/CommonScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=834376&r1=834375&r2=834376&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Tue Nov 10 07:38:24 2009
@@ -50,9 +50,7 @@
<include-menu name="AgreementItemTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
</section>
- <container>
- <label style="h1">${agreement.description} [${agreement.agreementId}] </label>
- </container>
+ <label style="h1">${agreement.description} [${agreement.agreementId}] </label>
</widgets>
</section>
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=834376&r1=834375&r2=834376&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Tue Nov 10 07:38:24 2009
@@ -87,10 +87,10 @@
</condition>
<widgets>
<include-menu name="PaymentGroupSubTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
- <container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${paymenGroup.paymentGroupName} [${paymentGroupId}]</label></container>
+ <label style="h1">${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${paymenGroup.paymentGroupName} [${paymentGroupId}]</label>
</widgets>
<fail-widgets>
- <container style="h1"><label>${uiLabelMap.AccountingNewPaymentGroup}</label></container>
+ <label style="h1">${uiLabelMap.AccountingNewPaymentGroup}</label>
</fail-widgets>
</section>
<decorator-section-include name="body"/>
@@ -142,9 +142,7 @@
<decorator-section name="body">
<include-menu name="OrganizationAccountingTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
<include-menu name="OrganizationAccountingReportsTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
- <container>
- <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
- </container>
+ <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
@@ -165,9 +163,7 @@
<decorator-section name="body">
<include-menu name="OrganizationAccountingTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
<include-menu name="PartyAccountingChecksTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
- <container>
- <label style="h1">${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
- </container>
+ <label style="h1">${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
<decorator-section-include name="checks-body"/>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=834376&r1=834375&r2=834376&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Tue Nov 10 07:38:24 2009
@@ -127,7 +127,7 @@
</screenlet>
</widgets>
<fail-widgets>
- <label style="h1" text="${uiLabelMap.AccountingCreateNewFinAccount}"></label>
+ <label style="h1" text="${uiLabelMap.AccountingCreateNewFinAccount}"></label>
<screenlet id="CreateFinAccountPanel" collapsible="true">
<include-form name="EditFinAccount" location="component://accounting/widget/FinAccountForms.xml"/>
</screenlet>
Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=834376&r1=834375&r2=834376&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Tue Nov 10 07:38:24 2009
@@ -102,10 +102,10 @@
<not><if-empty field="fixedAssetId"/></not>
</condition>
<widgets>
- <container style="h1"><label text="${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${fixedAsset.fixedAssetName} [${fixedAssetId}] ${${extraFunctionName}}"/></container>
+ <label style="h1" text="${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${fixedAsset.fixedAssetName} [${fixedAssetId}] ${${extraFunctionName}}"/>
</widgets>
<fail-widgets>
- <container style="h1"><label text="${uiLabelMap[titleProperty]}"/></container>
+ <label style="h1" text="${uiLabelMap[titleProperty]}"/>
</fail-widgets>
</section>
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=834376&r1=834375&r2=834376&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Tue Nov 10 07:38:24 2009
@@ -33,9 +33,7 @@
<decorator-screen name="CommonPartyDecorator" location="${parameters.partyDecoratorLocation}">
<decorator-section name="body">
<include-menu name="OrganizationAccountingTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
- <container>
- <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
- </container>
+ <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=834376&r1=834375&r2=834376&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Tue Nov 10 07:38:24 2009
@@ -41,9 +41,7 @@
<include-menu name="PartyAdminAssignTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
</section>
- <container>
- <label style="h1">${labelTitleProperty} ${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
- </container>
+ <label style="h1">${labelTitleProperty} ${uiLabelMap.CommonFor}: ${currentOrganization.groupName} [${organizationPartyId}]</label>
<decorator-section-include name="body"/>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=834376&r1=834375&r2=834376&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Tue Nov 10 07:38:24 2009
@@ -36,10 +36,8 @@
<widgets>
<include-menu name="GlAccountTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
- <container>
<!-- label style="h1">List Accounts</label -->
<label style="h1">${uiLabelMap[labelTitleProperty]}</label>
- </container>
<!-- Now call the SimpleScreen form -->
<decorator-section-include name="body"/>
@@ -72,11 +70,7 @@
</condition -->
<widgets>
<include-menu name="GlAccountTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
-
- <container>
- <label style="h1">${uiLabelMap[labelTitleProperty]} ${product.internalName} [${uiLabelMap.CommonId}:${productId}]</label>
- </container>
-
+ <label style="h1">${uiLabelMap[labelTitleProperty]} ${product.internalName} [${uiLabelMap.CommonId}:${productId}]</label>
<decorator-section-include name="body"/>
</widgets>
<!--
Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=834376&r1=834375&r2=834376&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryScreens.xml Tue Nov 10 07:38:24 2009
@@ -33,7 +33,7 @@
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><label style="h1" text="${uiLabelMap.PageTitleFinancialSummaryReportOptions}"/></container>
+ <label style="h1" text="${uiLabelMap.PageTitleFinancialSummaryReportOptions}"/>
<screenlet title="${uiLabelMap.PageTitleSalesInvoiceByProductCategorySummary}">
<include-form name="SalesInvoiceByProductCategorySummaryOptions" location="component://accounting/widget/ReportFinancialSummaryForms.xml"/>
</screenlet>
Modified: ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml?rev=834376&r1=834375&r2=834376&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Tue Nov 10 07:38:24 2009
@@ -36,9 +36,7 @@
<widgets>
<include-menu name="TransactionsTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
- <container>
<label style="h1">${uiLabelMap[labelTitleProperty]}</label>
- </container>
<!-- Now call the SimpleScreen form -->
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=834376&r1=834375&r2=834376&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Tue Nov 10 07:38:24 2009
@@ -290,10 +290,10 @@
</condition>
<widgets>
<include-menu name="PaymentGroupSubTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
- <container style="h1"><label>${uiLabelMap.AccountingPaymentGroupOverviewFor} ${paymenGroup.paymentGroupName} [${paymentGroupId}]</label></container>
+ <label style="h1">${uiLabelMap.AccountingPaymentGroupOverviewFor} ${paymenGroup.paymentGroupName} [${paymentGroupId}]</label>
</widgets>
<fail-widgets>
- <container style="h1"><label>${uiLabelMap.AccountingNewPaymentGroup}</label></container>
+ <label style="h1">${uiLabelMap.AccountingNewPaymentGroup}</label>
</fail-widgets>
</section>
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=834376&r1=834375&r2=834376&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Tue Nov 10 07:38:24 2009
@@ -146,10 +146,10 @@
</condition>
<widgets>
<include-menu name="PaymentGroupSubTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
- <container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${paymenGroup.paymentGroupName} [${paymentGroupId}]</label></container>
+ <label style="h1">${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${paymenGroup.paymentGroupName} [${paymentGroupId}]</label>
</widgets>
<fail-widgets>
- <container style="h1"><label>${uiLabelMap.AccountingNewPaymentGroup}</label></container>
+ <label style="h1">${uiLabelMap.AccountingNewPaymentGroup}</label>
</fail-widgets>
</section>
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=834376&r1=834375&r2=834376&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Tue Nov 10 07:38:24 2009
@@ -421,10 +421,10 @@
<if-empty field="titleProperty"/>
</condition>
<widgets>
- <container style="page-title"><label text="${title}"></label></container>
+ <label style="h1" text="${title}"></label>
</widgets>
<fail-widgets>
- <container style="page-title"><label text="${uiLabelMap[titleProperty]}"/></container>
+ <label style="h1" text="${uiLabelMap[titleProperty]}"/>
</fail-widgets>
</section>
<decorator-section-include name="menu-bar"/>
@@ -455,8 +455,8 @@
<widgets>
<decorator-screen name="SimpleDecorator">
<decorator-section name="body">
- <container style="h1"><label>${uiLabelMap.PageTitleHelp}</label></container>
- <container style="h3"><label>${helpText}</label></container>
+ <label style="h1">${uiLabelMap.PageTitleHelp}</label>
+ <label style="h3">${helpText}</label>
</decorator-section>
</decorator-screen>
</widgets>