Author: adrianc
Date: Tue Dec 9 12:55:33 2008
New Revision: 724882
URL: http://svn.apache.org/viewvc?rev=724882&view=rev
Log:
Eliminated some unnecessary nested expressions.
Modified:
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.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/applications/party/widget/partymgr/CommonScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml
ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml
ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml
ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Tue Dec 9
12:55:33 2008
@@ -60,7 +60,7 @@
<widgets>
<include-menu name="PaymentTabBar"
location="component://accounting/widget/Menus.xml"/>
<include-menu name="PaymentSubTabBar"
location="component://accounting/widget/Menus.xml"/>
- <label style="h2"
text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonId}:[${paymentId}]
${${extraFunctionName}}"/>
+ <label style="h2"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}]
${${extraFunctionName}}"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -105,7 +105,7 @@
<widgets>
<include-menu
name="TaxAuthorityTabBar"
location="component://accounting/widget/TaxAuthorityMenus.xml"/>
<container><link
target="EditTaxAuthority" text="${uiLabelMap.AccountingNewTaxAuthority}"
style="buttontext"/></container>
- <label style="h1"
text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}:
${uiLabelMap.AccountingTaxAuthorityParty} "${taxAuthPartyName.firstName}
${taxAuthPartyName.lastName} ${taxAuthPartyName.groupName}"
[${uiLabelMap.CommonId}:${taxAuthPartyId}], ${uiLabelMap.CommonGeo}
"${taxAuthGeo.geoName}" [${uiLabelMap.CommonId}:${taxAuthGeoId}]
${${extraFunctionName}}"/>
+ <label style="h1"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${uiLabelMap.AccountingTaxAuthorityParty} "${taxAuthPartyName.firstName}
${taxAuthPartyName.lastName} ${taxAuthPartyName.groupName}"
[${uiLabelMap.CommonId}:${taxAuthPartyId}], ${uiLabelMap.CommonGeo}
"${taxAuthGeo.geoName}" [${uiLabelMap.CommonId}:${taxAuthGeoId}]
${${extraFunctionName}}"/>
</widgets>
</section>
</widgets>
@@ -157,7 +157,7 @@
<decorator-section name="body">
<include-menu name="OrganizationAccountingTabBar"
location="component://accounting/widget/Menus.xml"/>
<container>
- <label
style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}:
${currentOrganization.groupName} [${organizationPartyId}]</label>
+ <label
style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${currentOrganization.groupName} [${organizationPartyId}]</label>
</container>
<decorator-section-include name="body"/>
</decorator-section>
@@ -180,7 +180,7 @@
<include-menu name="OrganizationAccountingTabBar"
location="component://accounting/widget/Menus.xml"/>
<include-menu
name="OrganizationAccountingReportsTabBar"
location="component://accounting/widget/Menus.xml"/>
<container>
- <label
style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}:
${currentOrganization.groupName} [${organizationPartyId}]</label>
+ <label
style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${currentOrganization.groupName} [${organizationPartyId}]</label>
</container>
<decorator-section-include name="body"/>
</decorator-section>
Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Tue Dec 9
12:55:33 2008
@@ -50,10 +50,10 @@
<not><if-empty
field-name="fixedAssetId"/></not>
</condition>
<widgets>
- <container style="h1"><label
text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}
${fixedAsset.fixedAssetName} [${fixedAssetId}]
${${extraFunctionName}}"/></container>
+ <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>
+ <container style="h1"><label
text="${uiLabelMap[titleProperty]}"/></container>
</fail-widgets>
</section>
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Tue
Dec 9 12:55:33 2008
@@ -38,7 +38,7 @@
<container>
<!-- label style="h1">List Accounts</label
-->
- <label
style="h1">${uiLabelMap.${labelTitleProperty}}</label>
+ <label
style="h1">${uiLabelMap[labelTitleProperty]}</label>
</container>
<!-- Now call the SimpleScreen form -->
@@ -74,7 +74,7 @@
<include-menu name="GlAccountTabBar"
location="component://accounting/widget/Menus.xml"/>
<container>
- <label
style="h1">${uiLabelMap.${labelTitleProperty}} ${product.internalName}
[${uiLabelMap.CommonId}:${productId}]</label>
+ <label
style="h1">${uiLabelMap[labelTitleProperty]} ${product.internalName}
[${uiLabelMap.CommonId}:${productId}]</label>
</container>
<decorator-section-include name="body"/>
@@ -340,7 +340,7 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label
text="${uiLabelMap.${labelTitleProperty}}"/>
+ <label
text="${uiLabelMap[labelTitleProperty]}"/>
</container>
</container>
<container style="screenlet-body">
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Tue Dec 9
12:55:33 2008
@@ -42,7 +42,7 @@
<widgets>
<include-menu name="InvoiceTabBar"
location="component://accounting/widget/Menus.xml"/>
<include-menu name="InvoiceSubTabBar"
location="component://accounting/widget/Menus.xml"/>
- <label style="h1"
text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}:
${invoice.description} [${invoiceId}] ${${extraFunctionName}}"/>
+ <label style="h1"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${invoice.description} [${invoiceId}] ${${extraFunctionName}}"/>
</widgets>
</section>
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Tue Dec
9 12:55:33 2008
@@ -36,7 +36,7 @@
<include-menu name="TransactionsTabBar"
location="component://accounting/widget/Menus.xml"/>
<container>
- <label
style="h1">${uiLabelMap.${labelTitleProperty}}</label>
+ <label
style="h1">${uiLabelMap[labelTitleProperty]}</label>
</container>
<!-- Now call the SimpleScreen form -->
Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Tue Dec 9
12:55:33 2008
@@ -213,7 +213,7 @@
<widgets>
<include-menu name="PaymentTabBar"
location="component://accounting/widget/Menus.xml"/>
<include-menu name="PaymentSubTabBar"
location="component://accounting/widget/Menus.xml"/>
- <label style="h2"
text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonId}:[${paymentId}]
${${extraFunctionName}}"/>
+ <label style="h2"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}]
${${extraFunctionName}}"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Tue Dec 9
12:55:33 2008
@@ -88,7 +88,7 @@
<widgets>
<include-menu name="PaymentTabBar"
location="component://accounting/widget/Menus.xml"/>
<include-menu name="PaymentSubTabBar"
location="component://accounting/widget/Menus.xml"/>
- <label style="h2"
text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonId}:[${paymentId}]
${${extraFunctionName}}"/>
+ <label style="h2"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}]
${${extraFunctionName}}"/>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Tue Dec 9
12:55:33 2008
@@ -147,7 +147,7 @@
</condition>
<widgets>
<container>
- <label style="h1"
text="${uiLabelMap.${labelTitleProperty}} [${groupId}]"/>
+ <label style="h1"
text="${uiLabelMap[labelTitleProperty]} [${groupId}]"/>
</container>
<container style="button-bar">
<link target="EditSecurityGroup"
style="smallSubmit" text="${uiLabelMap.PartyNewSecurityGroup}"/>
Modified:
ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
(original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationScreens.xml
Tue Dec 9 12:55:33 2008
@@ -43,7 +43,7 @@
<widgets>
<include-menu
name="PartyInvitationTabBar"
location="component://party/widget/partymgr/PartyMenus.xml"/>
<container style="button-bar"><link
target="editPartyInvitation"
text="${uiLabelMap.PartyInvitationNewPartyInvitation}"
style="buttontext"/></container>
- <container style="button-bar"><label
style="h1">${uiLabelMap.${titleProperty}}</label><label style="h2">
${uiLabelMap.CommonFor} "${partyInvitation.partyIdFrom}"
[${partyInvitationId}]</label></container>
+ <container style="button-bar"><label
style="h1">${uiLabelMap[titleProperty]}</label><label style="h2">
${uiLabelMap.CommonFor} "${partyInvitation.partyIdFrom}"
[${partyInvitationId}]</label></container>
</widgets>
</section>
<decorator-section-include name="body"/>
@@ -74,7 +74,7 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label
text="${uiLabelMap.${titleProperty}}"/>
+ <label
text="${uiLabelMap[titleProperty]}"/>
</container>
</container>
<container style="screenlet-body">
@@ -99,7 +99,7 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label
text="${uiLabelMap.${titleProperty}}"/>
+ <label
text="${uiLabelMap[titleProperty]}"/>
</container>
</container>
<container style="screenlet-body">
@@ -135,7 +135,7 @@
<container style="screenlet">
<container style="screenlet-title-bar">
<container style="h3">
- <label
text="${uiLabelMap.${titleProperty}}"/>
+ <label
text="${uiLabelMap[titleProperty]}"/>
</container>
</container>
<container style="screenlet-body">
Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Tue Dec
9 12:55:33 2008
@@ -41,7 +41,7 @@
<widgets>
<include-menu name="CategoryTabBar"
location="component://product/widget/catalog/Menus.xml"/>
<container>
- <label
style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}:
${productCategory.description} [${uiLabelMap.CommonId}:${productCategoryId}]
${${extraFunctionName}}</label>
+ <label
style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${productCategory.description} [${uiLabelMap.CommonId}:${productCategoryId}]
${${extraFunctionName}}</label>
</container>
<container>
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Tue Dec
9 12:55:33 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -73,7 +73,7 @@
<widgets>
<include-menu name="ProductTabBar"
location="component://product/widget/catalog/Menus.xml"/>
<container>
- <label
style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}:
${product.internalName} [${uiLabelMap.CommonId}:${productId}]
${${extraFunctionName}}</label>
+ <label
style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${product.internalName} [${uiLabelMap.CommonId}:${productId}]
${${extraFunctionName}}</label>
<image
src="${product.smallImageUrl}" height="40" width="40" url-mode="content"/>
</container>
@@ -161,7 +161,7 @@
<include-menu
name="ProductStoreTabBar"
location="component://product/widget/catalog/Menus.xml"/>
<container>
- <label
style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}:
${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}]
${${extraFunctionName}}</label>
+ <label
style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}]
${${extraFunctionName}}</label>
</container>
<container>
<link target="EditProductStore"
text="${uiLabelMap.ProductNewProductStore}" style="buttontext"/>
@@ -201,7 +201,7 @@
<include-menu name="ShippingTabBar"
location="component://product/widget/catalog/Menus.xml"/>
<!--<include-menu
name="EditSubscriptionResource"
location="component://product/widget/catalog/SubscriptionMenus.xml"/>-->
<container>
- <label
style="h1">${uiLabelMap.${labelTitleProperty}}</label>
+ <label
style="h1">${uiLabelMap[labelTitleProperty]}</label>
</container>
<decorator-section-include name="body"/>
</widgets>
Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Tue Dec
9 12:55:33 2008
@@ -41,7 +41,7 @@
<widgets>
<include-menu name="ConfigItemTabBar"
location="component://product/widget/catalog/Menus.xml"/>
<container>
- <label
style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}:
${configItem.configItemName} [${uiLabelMap.CommonId}:${configItemId}]
${${extraFunctionName}}</label>
+ <label
style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${configItem.configItemName} [${uiLabelMap.CommonId}:${configItemId}]
${${extraFunctionName}}</label>
</container>
<container>
<link
target="EditProductConfigItem" text="[${uiLabelMap.CommonNew}
${uiLabelMap.ProductConfigItem}]" style="buttontext"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Tue Dec 9
12:55:33 2008
@@ -42,7 +42,7 @@
<include-menu name="PromoTabBar"
location="component://product/widget/catalog/Menus.xml"/>
<container>
- <label
style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}:
${productPromo.promoName} [${uiLabelMap.CommonId}:${productPromoId}]
${${extraFunctionName}}</label>
+ <label
style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${productPromo.promoName} [${uiLabelMap.CommonId}:${productPromoId}]
${${extraFunctionName}}</label>
</container>
<container>
<link target="EditProductPromo"
text="${uiLabelMap.ProductNewProductPromo}" style="buttontext"/>
Modified:
ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml Tue
Dec 9 12:55:33 2008
@@ -82,11 +82,11 @@
</condition>
<widgets>
<include-menu name="EditSubscription"
location="component://product/widget/catalog/SubscriptionMenus.xml"/>
- <container
style="h1"><label>${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}
${subscription.description} [${subscriptionId}]</label></container>
+ <container
style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor}
${subscription.description} [${subscriptionId}]</label></container>
<container style="button-bar"><link
target="EditSubscription" text="${uiLabelMap.ProductNewSubscription}"
style="buttontext"/></container>
</widgets>
<fail-widgets>
- <container
style="h1"><label>${uiLabelMap.${titleProperty}}</label></container>
+ <container
style="h1"><label>${uiLabelMap[titleProperty]}</label></container>
</fail-widgets>
</section>
<decorator-section-include name="body"/>
@@ -202,14 +202,14 @@
</condition>
<widgets>
<include-menu
name="EditSubscriptionResource"
location="component://product/widget/catalog/SubscriptionMenus.xml"/>
- <container
style="h1"><label>${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}
"${subscriptionResource.description}"
[${subscriptionResourceId}]</label></container>
+ <container
style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor}
"${subscriptionResource.description}"
[${subscriptionResourceId}]</label></container>
<container style="button-bar">
<link
target="EditSubscriptionResource"
text="${uiLabelMap.ProductNewSubscriptionResource}" style="buttontext"/>
<link
target="FindSubscription?subscriptionResourceId=${subscriptionResourceId}"
text="${uiLabelMap.ProductFindResourceSubscriptions}" style="buttontext"/>
</container>
</widgets>
<fail-widgets>
- <container
style="h1"><label>${uiLabelMap.${titleProperty}}</label></container>
+ <container
style="h1"><label>${uiLabelMap[titleProperty]}</label></container>
</fail-widgets>
</section>
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CommonScreens.xml Tue Dec 9
12:55:33 2008
@@ -74,7 +74,7 @@
<widgets>
<include-menu name="WorkEffortTabBar"
location="component://workeffort/widget/WorkEffortMenus.xml"/>
<container style="h1">
-
<label>${uiLabelMap.${titleProperty}} - ${workEffort.workEffortName}
[${workEffortId}]</label>
+
<label>${uiLabelMap[titleProperty]} - ${workEffort.workEffortName}
[${workEffortId}]</label>
</container>
</widgets>
</section>
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Tue Dec 9 12:55:33
2008
@@ -389,7 +389,7 @@
</widgets>
<fail-widgets>
<container style="h1">
- <label text="${uiLabelMap.${titleProperty}}"/>
+ <label text="${uiLabelMap[titleProperty]}"/>
</container>
</fail-widgets>
</section>
@@ -423,7 +423,7 @@
<actions>
<set field="titleProperty" value="PageTitleHelp"></set>
<property-map resource="CommonHelpUiLabels"
map-name="uiLabelMap" global="true"/>
- <set field="helpText"
value="${uiLabelMap.${parameters.topic}}"
default-value="${uiLabelMap.HelpNotFound}"/>
+ <set field="helpText" value="${uiLabelMap[parameters.topic]}"
default-value="${uiLabelMap.HelpNotFound}"/>
</actions>
<widgets>
<decorator-screen name="SimpleDecorator">
Modified: ofbiz/trunk/framework/example/widget/example/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/CommonScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/CommonScreens.xml Tue Dec 9
12:55:33 2008
@@ -92,7 +92,7 @@
<not><if-empty
field-name="example"/></not>
</condition>
<widgets>
- <container
style="h1"><label>${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}
${example.exampleName} [${exampleId}]</label></container>
+ <container
style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor}
${example.exampleName} [${exampleId}]</label></container>
<container style="button-bar">
<link target="EditExample"
text="${uiLabelMap.ExampleNewExample}" style="buttontext"/>
<link
target="ExampleReportHtml?exampleId=${exampleId}"
text="${uiLabelMap.CommonPrinterFriendly}" style="buttontext"/>
@@ -150,7 +150,7 @@
</condition>
<widgets>
<container style="h1">
-
<label>${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}
${exampleFeature.description} [${exampleFeatureId}]</label>
+
<label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor}
${exampleFeature.description} [${exampleFeatureId}]</label>
</container>
<container style="button-bar">
<link target="EditExampleFeature"
text="${uiLabelMap.ExampleNewExampleFeature}" style="buttontext"/>
Modified: ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml
(original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleAjaxScreens.xml Tue Dec
9 12:55:33 2008
@@ -37,7 +37,7 @@
<if-has-permission permission="EXAMPLE"
action="_VIEW"/>
</condition>
<widgets>
- <container
style="h1"><label>${uiLabelMap.${titleProperty}}</label></container>
+ <container
style="h1"><label>${uiLabelMap[titleProperty]}</label></container>
<section>
<condition>
<if-compare
field-name="javaScriptEnabled" value="true" operator="equals"/>
Modified:
ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml
(original)
+++ ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml
Tue Dec 9 12:55:33 2008
@@ -35,7 +35,7 @@
<if-has-permission permission="EXAMPLE"
action="_VIEW"/>
</condition>
<widgets>
- <container
style="h1"><label>${uiLabelMap.${titleProperty}}</label></container>
+ <container
style="h1"><label>${uiLabelMap[titleProperty]}</label></container>
<container style="screenlet-body">
<container style="button-bar"><label
style="h2">Date/Time fields</label></container>
<container style="screenlet-body">
Modified: ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/exampleext/widget/example/CommonScreens.xml Tue Dec
9 12:55:33 2008
@@ -66,7 +66,7 @@
<not><if-empty
field-name="example"/></not>
</condition>
<widgets>
- <container
style="h1"><label>${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}
${example.exampleName} [${exampleId}]</label></container>
+ <container
style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor}
${example.exampleName} [${exampleId}]</label></container>
<container style="button-bar"><link
target="EditExample" text="${uiLabelMap.ExampleNewExample}"
style="buttontext"/></container>
</widgets>
</section>
Modified: ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml?rev=724882&r1=724881&r2=724882&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/TempExprScreens.xml Tue Dec 9
12:55:33 2008
@@ -26,7 +26,7 @@
<actions>
<set field="headerItem" value="tempexpr"/>
<property-map resource="TemporalExpressionUiLabels"
map-name="uiLabelMap" global="true"/>
- <set field="title" value="${uiLabelMap.${titleProperty}}"
global="true"/>
+ <set field="title" value="${uiLabelMap[titleProperty]}"
global="true"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
