svn commit: r1806326 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/widget
Locked
svn commit: r1806326 [2/2] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/widget
 
|
Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/EmailPartyScreens.xml Sat Aug 26 20:23:40 2017 @@ -24,7 +24,7 @@ under the License. <section> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyNotificationMailCreate}"/> + <set field="title" from-field="uiLabelMap.PartyNotificationMailCreate"/> </actions> <widgets> <platform-specific><html><html-template location="component://party/template/email/CreatePartyNotification.ftl"/></html></platform-specific> @@ -35,7 +35,7 @@ under the License. <section> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyNotificationMailChange}"/> + <set field="title" from-field="uiLabelMap.PartyNotificationMailChange"/> </actions> <widgets> <platform-specific><html><html-template location="component://party/template/email/ChangePersonalInfoNotification.ftl"/></html></platform-specific> @@ -46,7 +46,7 @@ under the License. <section> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyNotificationMailVerification}"/> + <set field="title" from-field="uiLabelMap.PartyNotificationMailVerification"/> </actions> <widgets> <platform-specific><html><html-template location="component://party/template/email/VerifyEmailAddressNotification.ftl"/></html></platform-specific> @@ -57,7 +57,7 @@ under the License. <section> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyNotificationMailActivated}"/> + <set field="title" from-field="uiLabelMap.PartyNotificationMailActivated"/> </actions> <widgets> <platform-specific><html><html-template location="component://party/template/email/AccountActivatedNotification.ftl"/></html></platform-specific> Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/LookupScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/LookupScreens.xml Sat Aug 26 20:23:40 2017 @@ -27,7 +27,7 @@ under the License. </condition> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupPartyByName}"/> + <set field="title" from-field="uiLabelMap.PartyLookupPartyByName"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -67,7 +67,7 @@ under the License. </condition> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupPartyByName}"/> + <set field="title" from-field="uiLabelMap.PartyLookupPartyByName"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -94,7 +94,7 @@ under the License. </condition> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupPartyByName}"/> + <set field="title" from-field="uiLabelMap.PartyLookupPartyByName"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -123,7 +123,7 @@ under the License. </condition> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupPartyByName}"/> + <set field="title" from-field="uiLabelMap.PartyLookupPartyByName"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -149,7 +149,7 @@ under the License. </condition> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupPartyPerson}"/> + <set field="title" from-field="uiLabelMap.PartyLookupPartyPerson"/> <set field="queryString" from-field="result.queryString"/> <set field="entityName" value="PartyAndPerson"/> <set field="searchFields" value="[partyId, firstName, middleName, lastName]"/> @@ -175,7 +175,7 @@ under the License. </condition> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupContact}"/> + <set field="title" from-field="uiLabelMap.PartyLookupContact"/> <set field="entityName" value="PartyRoleAndPartyDetail"/> <set field="parameters.roleTypeId" value="CONTACT"/> <set field="searchFields" value="[partyId, firstName, middleName, lastName]"/> @@ -201,7 +201,7 @@ under the License. </condition> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupLead}"/> + <set field="title" from-field="uiLabelMap.PartyLookupLead"/> <set field="entityName" value="PartyRoleAndPartyDetail"/> <set field="parameters.roleTypeId" value="LEAD"/> </actions> @@ -225,7 +225,7 @@ under the License. </condition> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupPartyAndUserLoginAndPerson}"/> + <set field="title" from-field="uiLabelMap.PartyLookupPartyAndUserLoginAndPerson"/> <set field="entityName" value="PartyAndUserLoginAndPerson"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> @@ -254,7 +254,7 @@ under the License. <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupUserLoginAndPartyDetails}"/> + <set field="title" from-field="uiLabelMap.PartyLookupUserLoginAndPartyDetails"/> <set field="entityName" value="UserLoginAndPartyDetails"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> @@ -282,7 +282,7 @@ under the License. </condition> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupPartyGroup}"/> + <set field="title" from-field="uiLabelMap.PartyLookupPartyGroup"/> <set field="entityName" value="PartyAndGroup"/> <set field="searchFields" value="[partyId, groupName, comments]"/> <script location="component://party/groovyScripts/party/StatusCondition.groovy"/> @@ -306,7 +306,7 @@ under the License. </condition> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupAccount}"/> + <set field="title" from-field="uiLabelMap.PartyLookupAccount"/> <set field="entityName" value="PartyRoleAndPartyDetail"/> <set field="searchFields" value="[partyId, groupName, firstName, lastName]"/> <set field="conditionFields.roleTypeId" value="ACCOUNT"/> @@ -333,7 +333,7 @@ under the License. </condition> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupPartyClassificationGroup}"/> + <set field="title" from-field="uiLabelMap.PartyLookupPartyClassificationGroup"/> <set field="entityName" value="PartyClassificationGroup"/> <set field="searchFields" value="[partyClassificationGroupId, parentGroupId, description]"/> <set field="queryString" from-field="result.queryString"/> @@ -361,7 +361,7 @@ under the License. <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/> <set field="entityName" value="CommunicationEvent"/> <set field="searchFields" value="[communicationEventId, subject]"/> - <set field="title" value="${uiLabelMap.PartyLookupPartyCommEvent}"/> + <set field="title" from-field="uiLabelMap.PartyLookupPartyCommEvent"/> <set field="tabButtonItem" value="ContactList"/> </actions> <widgets> @@ -382,7 +382,7 @@ under the License. <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupContactMech}"/> + <set field="title" from-field="uiLabelMap.PartyLookupContactMech"/> <set field="entityName" value="PartyAndContactMech"/> <set field="searchFields" value="[contactMechId, partyId, contactMechTypeId, infoString, paToName]"/> <script location="component://party/groovyScripts/party/StatusCondition.groovy"/> @@ -410,7 +410,7 @@ under the License. </condition> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PartyLookupInternalOrganization}"/> + <set field="title" from-field="uiLabelMap.PartyLookupInternalOrganization"/> <set field="entityName" value="PartyRoleAndPartyDetail"/> <set field="roleTypeId" value="INTERNAL_ORGANIZATIO"/> <set field="searchFields" value="[partyId, groupName, partyGroupComments]"/> Modified: ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml Sat Aug 26 20:23:40 2017 @@ -26,7 +26,7 @@ under the License. <set field="titleProperty" value="PageTitleListContactList"/> <set field="headerItem" value="find"/> <set field="tabButtonItem" value="ContactList"/> - <set field="partyId" value="${parameters.partyId}"/> + <set field="partyId" from-field="parameters.partyId"/> <set field="entityName" value="ContactListParty"/> </actions> <widgets> @@ -58,8 +58,8 @@ under the License. <property-map resource="MarketingUiLabels" map-name="uiLabelMap"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <set field="tabButtonItem" value="ContactList"/> - <set field="labelTitleProperty" value="${uiLabelMap.PageTitleListContactList}"/> - <set field="title" value="${uiLabelMap.PageTitleListContactList}"/> + <set field="labelTitleProperty" from-field="uiLabelMap.PageTitleListContactList"/> + <set field="title" from-field="uiLabelMap.PageTitleListContactList"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListContactList"/> <set field="contactListId" from-field="parameters.contactListId"/> <set field="entityName" value="ContactList"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/LookupScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/catalog/LookupScreens.xml Sat Aug 26 20:23:40 2017 @@ -27,7 +27,7 @@ under the License. </condition> <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupProduct}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupProduct"/> <set field="queryString" from-field="result.queryString"/> <set field="entityName" value="Product"/> <set field="searchFields" value="[productId, internalName, brandName]"/> @@ -51,7 +51,7 @@ under the License. </condition> <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupProductVirtual}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupProductVirtual"/> <set field="queryString" from-field="result.queryString"/> <set field="entityName" value="Product"/> <set field="searchFields" value="[productId, brandName, internalName]"/> @@ -76,7 +76,7 @@ under the License. </condition> <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupProductVariant}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupProductVariant"/> <set field="entityName" value="Product"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> @@ -102,7 +102,7 @@ under the License. </condition> <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupProductPrice}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupProductPrice"/> <set field="queryString" from-field="result.queryString"/> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> <set field="entityName" value="ProductAndPriceView"/> @@ -128,7 +128,7 @@ under the License. </condition> <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupProductCategory}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupProductCategory"/> <set field="queryString" from-field="result.queryString"/> <set field="entityName" value="ProductCategory"/> <set field="searchFields" value="[productCategoryId, categoryName, description]"/> @@ -152,7 +152,7 @@ under the License. </condition> <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupProductFeature}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupProductFeature"/> <set field="queryString" from-field="result.queryString"/> <set field="entityName" value="ProductFeature"/> <set field="searchFields" value="[productFeatureId, description, productFeatureCategoryId]"/> @@ -178,7 +178,7 @@ under the License. </condition> <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupProductStore}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupProductStore"/> <set field="entityName" value="ProductStore"/> <set field="queryString" from-field="result.queryString"/> <set field="entityName" value="ProductStore"/> @@ -231,7 +231,7 @@ under the License. </condition> <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupCostComponentCalc}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupCostComponentCalc"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/CommonScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/CommonScreens.xml Sat Aug 26 20:23:40 2017 @@ -42,7 +42,7 @@ under the License. <set field="activeApp" value="facilitymgr" global="true"/> <set field="applicationMenuName" value="FacilityAppBar" global="true"/> <set field="applicationMenuLocation" value="component://product/widget/facility/FacilityMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.ProductFacilityManagerApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.ProductFacilityManagerApplication" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml Sat Aug 26 20:23:40 2017 @@ -283,7 +283,7 @@ under the License. <script location="component://product/groovyScripts/facility/facility/FindFacilityLocation.groovy"/> <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> - <set field="title" value="${uiLabelMap.PageTitleFindFacilityLocation}"/> + <set field="title" from-field="uiLabelMap.PageTitleFindFacilityLocation"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> @@ -306,7 +306,7 @@ under the License. <script location="component://product/groovyScripts/facility/facility/EditFacilityLocation.groovy"/> <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> - <set field="title" value="${uiLabelMap.PageTitleNewFacilityLocation}"/> + <set field="title" from-field="uiLabelMap.PageTitleNewFacilityLocation"/> </actions> <widgets> <section> @@ -314,7 +314,7 @@ under the License. <not><if-empty field="locationSeqId"/></not> </condition> <actions> - <set field="title" value="${uiLabelMap.PageTitleEditFacilityLocation}"/> + <set field="title" from-field="uiLabelMap.PageTitleEditFacilityLocation"/> </actions> <widgets/> </section> @@ -337,7 +337,7 @@ under the License. <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> - <set field="title" value="${uiLabelMap.PageTitleEditFacilityInventoryItems}"/> + <set field="title" from-field="uiLabelMap.PageTitleEditFacilityInventoryItems"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> @@ -428,7 +428,7 @@ under the License. <script location="component://product/groovyScripts/facility/facility/ViewFacilityInventoryByProduct.groovy"/> <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> - <set field="title" value="${uiLabelMap.PageTitleFindFacilityInventoryItems}"/> + <set field="title" from-field="uiLabelMap.PageTitleFindFacilityInventoryItems"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> @@ -629,7 +629,7 @@ under the License. <entity-one entity-name="Facility" value-field="facility" use-cache="true"/> <script location="component://product/groovyScripts/facility/inventory/InventoryItemTotals.groovy"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> - <set field="title" value="${uiLabelMap.PageTitleInventoryItemGrandTotals}"/> + <set field="title" from-field="uiLabelMap.PageTitleInventoryItemGrandTotals"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> @@ -706,7 +706,7 @@ under the License. <entity-one entity-name="Facility" value-field="facility"/> <get-related value-field="facility" relation-name="FacilityGroupMember" list="facilityGroupMembers" order-by-list="orderByList"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> - <set field="title" value="${uiLabelMap.PageTitleEditFacilityGroups}"/> + <set field="title" from-field="uiLabelMap.PageTitleEditFacilityGroups"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> @@ -737,7 +737,7 @@ under the License. <order-by field-name="partyId"/> </entity-and> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> - <set field="title" value="${uiLabelMap.PageTitleEditFacilityParties}"/> + <set field="title" from-field="uiLabelMap.PageTitleEditFacilityParties"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> @@ -763,7 +763,7 @@ under the License. <set field="facilityId" from-field="parameters.facilityId"/> <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> - <set field="title" value="${uiLabelMap.PageTitleViewFacilityContactMechanism}"/> + <set field="title" from-field="uiLabelMap.PageTitleViewFacilityContactMechanism"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> @@ -823,7 +823,7 @@ under the License. <set field="facilityId" from-field="parameters.facilityId"/> <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> - <set field="title" value="${uiLabelMap.PageTitleNewFacilityContactMech}"/> + <set field="title" from-field="uiLabelMap.PageTitleNewFacilityContactMech"/> </actions> <widgets> <section> @@ -831,7 +831,7 @@ under the License. <not><if-empty field="parameters.contactMechId"/></not> </condition> <actions> - <set field="title" value="${uiLabelMap.PageTitleEditFacilityContactMech}"/> + <set field="title" from-field="uiLabelMap.PageTitleEditFacilityContactMech"/> </actions> <widgets/> </section> @@ -1039,7 +1039,7 @@ under the License. <set field="facilityId" from-field="parameters.facilityId"/> <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> - <set field="title" value="${uiLabelMap.PageTitleTransferInventoryItem}"/> + <set field="title" from-field="uiLabelMap.PageTitleTransferInventoryItem"/> <entity-one entity-name="InventoryItem" value-field="inventoryItem"/> <entity-one entity-name="InventoryItemType" value-field="inventoryItemType"> @@ -1094,7 +1094,7 @@ under the License. <set field="facilityId" from-field="parameters.facilityId"/> <entity-one entity-name="Facility" value-field="facility"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> - <set field="title" value="${uiLabelMap.ProductReceiveInventory}"/> + <set field="title" from-field="uiLabelMap.ProductReceiveInventory"/> <set field="layoutSettings.javaScripts[+0]" value="/ordermgr-js/ConvertUom.js" global="true"/> </actions> <widgets> @@ -1497,7 +1497,7 @@ under the License. </entity-and> <property-map resource="ProductUiLabels" map-name="uiLabelMap"/> <property-map resource="ContentUiLabels" map-name="uiLabelMap"/> - <set field="title" value="${uiLabelMap.PageTitleEditFacilityContent}"/> + <set field="title" from-field="uiLabelMap.PageTitleEditFacilityContent"/> </actions> <widgets> <decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}"> Modified: ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/LookupScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/LookupScreens.xml Sat Aug 26 20:23:40 2017 @@ -27,7 +27,7 @@ under the License. </condition> <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupFacility}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupFacility"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -54,7 +54,7 @@ under the License. </condition> <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupFacility}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupFacility"/> <set field="facilityId" from-field="parameters.facilityId" default-value="${parameters.parm0}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> @@ -80,7 +80,7 @@ under the License. <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.ProductLookupShipment}"/> + <set field="title" from-field="uiLabelMap.ProductLookupShipment"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -106,12 +106,12 @@ under the License. <actions> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.ProductLookupInventory}"/> + <set field="title" from-field="uiLabelMap.ProductLookupInventory"/> <set field="queryString" from-field="result.queryString"/> <set field="entityName" value="InventoryItem"/> <set field="searchFields" value="[inventoryItemId]"/> <script location="component://product/groovyScripts/catalog/GetSupplierInventories.groovy"/> - <set field="andCondition" value="${context.andCondition}"/> + <set field="andCondition" from-field="context.andCondition"/> <script location="component://product/groovyScripts/facility/inventory/LookupInventoryItems.groovy"/> </actions> <widgets> @@ -131,7 +131,7 @@ under the License. <actions> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductErrorUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.ProductListFacilityLocation}"/> + <set field="title" from-field="uiLabelMap.ProductListFacilityLocation"/> <set field="facilityId" from-field="parameters.facilityId"/> <set field="productId" from-field="parameters.productId"/> <service service-name="findProductInventorylocations"> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CommonScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/CommonScreens.xml Sat Aug 26 20:23:40 2017 @@ -43,7 +43,7 @@ under the License. <set field="activeApp" value="workeffort" global="true"/> <set field="applicationMenuName" value="WorkEffortAppBar" global="true"/> <set field="applicationMenuLocation" value="component://workeffort/widget/WorkEffortMenus.xml" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.WorkEffortManagerApplication}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.WorkEffortManagerApplication" global="true"/> </actions> <widgets> <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/LookupScreens.xml Sat Aug 26 20:23:40 2017 @@ -27,7 +27,7 @@ under the License. </condition> <actions> <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupWorkEffort}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupWorkEffort"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -55,7 +55,7 @@ under the License. </condition> <actions> <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupTimesheet}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupTimesheet"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -83,7 +83,7 @@ under the License. </condition> <actions> <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.PageTitleLookupWorkEffort}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupWorkEffort"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/widget/WorkEffortScreens.xml Sat Aug 26 20:23:40 2017 @@ -878,7 +878,7 @@ under the License. <if-empty field="workEffort"/> </condition> <actions> - <set field="title" value="${uiLabelMap.WorkEffortICalendarAdd}"/> + <set field="title" from-field="uiLabelMap.WorkEffortICalendarAdd"/> </actions> <widgets/> </section> @@ -1012,7 +1012,7 @@ under the License. <set field="tabButtonItem" value="ICalendarHelp"/> <set field="workEffortId" from-field="parameters.workEffortId"/> <entity-one entity-name="WorkEffort" value-field="workEffort"/> - <set field="title" value="${uiLabelMap.WorkEffortICalendarHelp}"/> + <set field="title" from-field="uiLabelMap.WorkEffortICalendarHelp"/> <set field="document" from-field="dom:readHtmlDocument(uiLabelMap.WorkEffortICalendarHelpUrl)"/> <set field="wikiDivList" from-field="document["//DIV[@class='wiki-content']"]"/> <set field="wikiContent" from-field="dom:toHtmlString(wikiDivList[0], 'UTF-8', true, 2)"/> Modified: ofbiz/ofbiz-framework/trunk/framework/common/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/widget/LookupScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/widget/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/widget/LookupScreens.xml Sat Aug 26 20:23:40 2017 @@ -25,7 +25,7 @@ under the License. <screen name="LookupGeo"> <section> <actions> - <set field="title" value="${uiLabelMap.PageTitleLookupGeo}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupGeo"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -62,7 +62,7 @@ under the License. <screen name="LookupGeoName"> <section> <actions> - <set field="title" value="${uiLabelMap.PageTitleLookupGeo}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupGeo"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -154,7 +154,7 @@ under the License. </condition> <actions> <property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.LookupUserLogin}"/> + <set field="title" from-field="uiLabelMap.LookupUserLogin"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> @@ -175,7 +175,7 @@ under the License. <screen name="LookupPortalPage"> <section> <actions> - <set field="title" value="${uiLabelMap.CommonPortalPage}"/> + <set field="title" from-field="uiLabelMap.CommonPortalPage"/> </actions> <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> @@ -195,7 +195,7 @@ under the License. <actions> <property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - <set field="title" value="${uiLabelMap.CommonLookupLocale}"/> + <set field="title" from-field="uiLabelMap.CommonLookupLocale"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/widget/CommonScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/widget/CommonScreens.xml Sat Aug 26 20:23:40 2017 @@ -40,7 +40,7 @@ under the License. <set field="helpTopic" value="${groovy: webappName.toUpperCase() + '_' + requestAttributes._CURRENT_VIEW_}"/> <set field="applicationMenuLocation" value="component://webtools/widget/Menus.xml" global="true"/> <set field="applicationMenuName" value="WebtoolsAppBar" global="true"/> - <set field="applicationTitle" value="${uiLabelMap.FrameworkWebTools}" global="true"/> + <set field="applicationTitle" from-field="uiLabelMap.FrameworkWebTools" global="true"/> </actions> <widgets> <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/widget/EntityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/widget/EntityScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/widget/EntityScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/widget/EntityScreens.xml Sat Aug 26 20:23:40 2017 @@ -199,7 +199,7 @@ under the License. <property-map resource="CommonUiLabels" map-name="uiLabelMap"/> <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap"/> <set field="title" value="${uiLabelMap.WebtoolsFindValues} ${uiLabelMap.WebtoolsForEntity}: ${entityName}"/> - <set field="commonDisplaying" value="${uiLabelMap.CommonDisplaying}"/> + <set field="commonDisplaying" from-field="uiLabelMap.CommonDisplaying"/> <set field="tabButtonItem" value="entitymaint"/> </actions> <widgets> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/widget/GeoManagementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/widget/GeoManagementScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/widget/GeoManagementScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/widget/GeoManagementScreens.xml Sat Aug 26 20:23:40 2017 @@ -127,7 +127,7 @@ <screen name="LookupGeo"> <section> <actions> - <set field="title" value="${uiLabelMap.PageTitleLookupGeo}"/> + <set field="title" from-field="uiLabelMap.PageTitleLookupGeo"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> <set field="viewSizeDefaultValue" value="${groovy: modelTheme.getDefaultViewSize()}" type="Integer"/> @@ -166,7 +166,7 @@ <set field="asm_asmListItemPercentOfForm" value="95"/> <set field="asm_sortable" value="false"/> <property-map resource="WebtoolsUiLabels" map-name="uiLabelMap" global="true"/> - <set field="asm_title" value="${uiLabelMap.WebtoolsGeosSelect}"/> + <set field="asm_title" from-field="uiLabelMap.WebtoolsGeosSelect"/> <!-- selectMultipleRelatedValues parameters --> <set field="asm_relatedField" value="LinkGeos_geoId"/> <set field="asm_requestName" value="getRelatedGeos"/> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/widget/MiscScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/widget/MiscScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/widget/MiscScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/widget/MiscScreens.xml Sat Aug 26 20:23:40 2017 @@ -54,15 +54,15 @@ under the License. <set field="titleProperty" value="WebtoolsLayoutDemo"/> <set field="headerItem" value="LayoutDemo"/> <set field="tabButtonItem" value="Selected"/> - <set field="demoText" value="${uiLabelMap.WebtoolsLayoutDemoText}" global="true"/> + <set field="demoText" from-field="uiLabelMap.WebtoolsLayoutDemoText" global="true"/> <set field="errorMessage" from-field="demoText" global="true"/> <set field="eventMessage" from-field="demoText" global="true"/> <set field="demoTargetUrl" value="WebtoolsLayoutDemo"/> <set field="demoParam1" value="one"/> <set field="demoParam2" value="two"/> <set field="demoParam3" value="three"/> - <set field="demoMap.name" value="${uiLabelMap.WebtoolsLayoutDemo}"/> - <set field="demoMap.description" value="${uiLabelMap.WebtoolsLayoutDemoText}"/> + <set field="demoMap.name" from-field="uiLabelMap.WebtoolsLayoutDemo"/> + <set field="demoMap.description" from-field="uiLabelMap.WebtoolsLayoutDemoText"/> <set field="demoMap.dropDown" value="Y"/> <set field="demoMap.checkBox" value="Y"/> <set field="demoMap.radioButton" value="Y"/> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/widget/TempExprScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/widget/TempExprScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/widget/TempExprScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/widget/TempExprScreens.xml Sat Aug 26 20:23:40 2017 @@ -52,7 +52,7 @@ under the License. <section> <actions> <set field="tabMenuItem" value="findExpression"/> - <set field="titleProperty" value="${titleProperty}" default-value="TemporalExpressionFind"/> + <set field="titleProperty" from-field="titleProperty" default-value="TemporalExpressionFind"/> </actions> <widgets> <decorator-screen name="TemporalExpressionDecorator" location="${parameters.tempExprDecoratorLocation}"> @@ -87,7 +87,7 @@ under the License. <section> <actions> <set field="tabMenuItem" value="editExpression"/> - <set field="titleProperty" value="${titleProperty}" default-value="TemporalExpressionMaintenance"/> + <set field="titleProperty" from-field="titleProperty" default-value="TemporalExpressionMaintenance"/> <entity-one entity-name="TemporalExpression" value-field="temporalExpression"/> <set field="fromTempExprId" from-field="parameters.tempExprId"/> <entity-condition entity-name="TemporalExpressionChild" list="childExpressionList"> Modified: ofbiz/ofbiz-framework/trunk/themes/common/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/widget/LookupScreens.xml?rev=1806326&r1=1806325&r2=1806326&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/common/widget/LookupScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/common/widget/LookupScreens.xml Sat Aug 26 20:23:40 2017 @@ -25,7 +25,7 @@ under the License. <screen name="ListLocales"> <section> <actions> - <set field="title" value="${uiLabelMap.CommonChooseLanguage}"/> + <set field="title" from-field="uiLabelMap.CommonChooseLanguage"/> <set field="parameters.presentation" value="window"/> </actions> <widgets> @@ -71,7 +71,7 @@ under the License. <screen name="ListTimezones"> <section> <actions> - <set field="title" value="${uiLabelMap.CommonTime}"/> + <set field="title" from-field="uiLabelMap.CommonTime"/> <set field="parameters.presentation" value="window"/> </actions> <widgets> @@ -92,7 +92,7 @@ under the License. <screen name="ListVisualThemes"> <section> <actions> - <set field="title" value="${uiLabelMap.CommonVisualThemes}"/> + <set field="title" from-field="uiLabelMap.CommonVisualThemes"/> <set field="parameters.presentation" value="window"/> <entity-one entity-name="WebSite" value-field="webSite"/> <set field="visualThemeSetId" from-field="webSite.visualThemeSetId" default-value="BACKOFFICE" /> @@ -116,7 +116,7 @@ under the License. <screen name="TimeDuration"> <section> <actions> - <set field="title" value="${uiLabelMap.CommonTime}"/> + <set field="title" from-field="uiLabelMap.CommonTime"/> <set field="parameters.presentation" value="window"/> </actions> <widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |