svn commit: r733943 [3/4] - in /ofbiz/trunk/applications: ecommerce/config/ ecommerce/webapp/ecommerce/cus
Locked
svn commit: r733943 [3/4] - in /ofbiz/trunk/applications: ecommerce/config/ ecommerce/webapp/ecommerce/cus
 
|
Modified: ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java (original) +++ ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java Mon Jan 12 14:36:38 2009 @@ -62,7 +62,7 @@ Map<String, Object> input = UtilMisc.<String, Object>toMap("contactListId", contactListId); GenericValue contactList = delegator.findByPrimaryKey("ContactList", input); if (contactList == null) { - String error = UtilProperties.getMessage(resourceMarketing, "ContactListNotFound", input, locale); + String error = UtilProperties.getMessage(resourceMarketing, "MarketingContactListNotFound", input, locale); return ServiceUtil.returnError(error); } Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Mon Jan 12 14:36:38 2009 @@ -24,30 +24,30 @@ header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="contactList==null" target="createContactList"/> - <field use-when="contactList!=null" name="contactListId" title="${uiLabelMap.ContactListContactListId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field use-when="contactList==null&&contactListId==null" name="contactListId" title="${uiLabelMap.ContactListContactListId}"><ignored/></field> - <field use-when="contactList==null&&contactListId!=null" name="contactListId" title="${uiLabelMap.ContactListContactListId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${contactListId}]"><display/></field> + <field use-when="contactList!=null" name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> + <field use-when="contactList==null&&contactListId==null" name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><ignored/></field> + <field use-when="contactList==null&&contactListId!=null" name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${contactListId}]"><display/></field> - <field name="contactListName" title="${uiLabelMap.ContactListContactListName}"><text/></field> - <field name="contactListTypeId" title="${uiLabelMap.ContactListContactListTypeId}"> + <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><text/></field> + <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}"> <drop-down> <entity-options description="${description}" entity-name="ContactListType" key-field-name="contactListTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> - <field name="isPublic" title="${uiLabelMap.ContactListIsPublic}"> + <field name="isPublic" title="${uiLabelMap.MarketingContactListIsPublic}"> <drop-down allow-empty="true"> <option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> </field> - <field name="singleUse" title="${uiLabelMap.ContactListIsSingleUse}"> + <field name="singleUse" title="${uiLabelMap.MarketingContactListIsSingleUse}"> <drop-down allow-empty="true"> <option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> </field> - <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"> + <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"> <drop-down no-current-selected-key="EMAIL_ADDRESS"> <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"> <entity-order-by field-name="description"/> @@ -62,12 +62,12 @@ </drop-down> </field> - <field name="ownerPartyId" title="${uiLabelMap.ContactListOwnerPartyId}"><lookup target-form-name="LookupPartyName"/></field> + <field name="ownerPartyId" title="${uiLabelMap.MarketingContactListOwnerPartyId}"><lookup target-form-name="LookupPartyName"/></field> - <field name="verifyEmailFrom" title="${uiLabelMap.ContactListVerifyEmailFrom}"><text size="40"/></field> - <field name="verifyEmailScreen" title="${uiLabelMap.ContactListVerifyEmailScreen}"><text size="60"/></field> - <field name="verifyEmailSubject" title="${uiLabelMap.ContactListVerifyEmailSubject}"><text size="60"/></field> - <field name="verifyEmailWebSiteId" title="${uiLabelMap.ContactListVerifyEmailWebSiteId}"> + <field name="verifyEmailFrom" title="${uiLabelMap.MarketingContactListVerifyEmailFrom}"><text size="40"/></field> + <field name="verifyEmailScreen" title="${uiLabelMap.MarketingContactListVerifyEmailScreen}"><text size="60"/></field> + <field name="verifyEmailSubject" title="${uiLabelMap.MarketingContactListVerifyEmailSubject}"><text size="60"/></field> + <field name="verifyEmailWebSiteId" title="${uiLabelMap.MarketingContactListVerifyEmailWebSiteId}"> <drop-down allow-empty="true"> <entity-options entity-name="WebSite" key-field-name="webSiteId" description="${siteName} [${webSiteId}]"> <entity-order-by field-name="siteName"/> @@ -83,16 +83,16 @@ <form name="FindContactLists" target="ListContactLists" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="contactListId" title="${uiLabelMap.ContactListContactListId}"><text size="20" maxlength="20"/></field> - <field name="contactListName" title="${uiLabelMap.ContactListContactListName}"><text-find/></field> - <field name="contactListTypeId" title="${uiLabelMap.ContactListContactListTypeId}"> + <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text size="20" maxlength="20"/></field> + <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><text-find/></field> + <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="ContactListType" key-field-name="contactListTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> - <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"> + <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"> <entity-order-by field-name="description"/> @@ -118,15 +118,15 @@ <field-map field-name="entityName" value="ContactList"/> </service> </actions> - <field name="contactListId" widget-style="buttontext" title="${uiLabelMap.ContactListContactListId}"> + <field name="contactListId" widget-style="buttontext" title="${uiLabelMap.MarketingContactListContactListId}"> <hyperlink target="EditContactList?contactListId=${contactListId}" description="${contactListId}" also-hidden="false"/> </field> - <field name="contactListName" title="${uiLabelMap.ContactListContactListName}"><display/></field> - <field name="isPublic" title="${uiLabelMap.ContactListIsPublic}"><display/></field> - <field name="singleUse" title="${uiLabelMap.ContactListIsSingleUse}"><display/></field> - <field name="contactListTypeId" title="${uiLabelMap.ContactListContactListTypeId}"><display-entity entity-name="ContactListType"/></field> + <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><display/></field> + <field name="isPublic" title="${uiLabelMap.MarketingContactListIsPublic}"><display/></field> + <field name="singleUse" title="${uiLabelMap.MarketingContactListIsSingleUse}"><display/></field> + <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}"><display-entity entity-name="ContactListType"/></field> - <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field> + <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field> <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity entity-name="MarketingCampaign" description="${campaignName}"/></field> <!-- deleting contact lists is a bit more complicated than this... don't like have a link like this for top level entities <field name="deleteLink" title="&nbsp;" widget-style="buttontext"> @@ -140,7 +140,7 @@ <alt-target use-when="contactListParty==null" target="createContactListParty"/> <field name="contactListId"><hidden/></field> - <field name="partyId" title="${uiLabelMap.ContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> @@ -152,9 +152,9 @@ </entity-options> </drop-down> </field> - <field name="optInVerifyCode" map-name="parameters" title="${uiLabelMap.ContactListOptInVerifyCode}"><text size="10"/></field> + <field name="optInVerifyCode" map-name="parameters" title="${uiLabelMap.MarketingContactListOptInVerifyCode}"><text size="10"/></field> - <field name="preferredContactMechId" title="${uiLabelMap.ContactListPreferredContactMech}"> + <field name="preferredContactMechId" title="${uiLabelMap.MarketingContactListPreferredContactMech}"> <lookup target-form-name="LookupPreferredContactMech" target-parameter="partyId"/> </field> @@ -163,8 +163,8 @@ <form name="FindContactListParties" type="single" target="ListContactListParties" title="" header-row-style="header-row" default-table-style="basic-table"> - <field name="contactListId" title="${uiLabelMap.ContactListContactListId}"><text-find/></field> - <field name="partyId" title="${uiLabelMap.ContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field> + <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text-find/></field> + <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-find/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-find/></field> @@ -176,7 +176,7 @@ </entity-options> </drop-down> </field> - <field name="preferredContactMechId" title="${uiLabelMap.ContactListPreferredContactMech}"> + <field name="preferredContactMechId" title="${uiLabelMap.MarketingContactListPreferredContactMech}"> <lookup target-form-name="LookupContactMech" target-parameter="partyId"/> </field> @@ -193,11 +193,11 @@ </actions> <field name="contactListId"><hidden/></field> - <field name="partyId" title="${uiLabelMap.ContactListPartyId}"><display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${groupName} [${partyId}]"/></field> + <field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${groupName} [${partyId}]"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field> - <field name="preferredContactMechId" title="${uiLabelMap.ContactListPreferredContactMech}"> + <field name="preferredContactMechId" title="${uiLabelMap.MarketingContactListPreferredContactMech}"> <display-entity entity-name="ContactMechDetail" key-field-name="contactMechId" description="[${contactMechId}]: [${infoString}] [${tnCountryCode}-${tnAreaCode}-${tnContactNumber}] [${paAddress1}, ${paAddress1}, ${paCity}, ${paStateProvinceGeoId}, ${paPostalCode}, ${paPostalCodeExt} ${paCountryGeoId}]"/> </field> <field name="editLink" title="&nbsp;" widget-style="buttontext"> @@ -209,8 +209,8 @@ <form name="EditContactListCommEvent" default-map-name="communicationEvent" target="updateContactListCommEvent" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <alt-target target="createContactListCommEvent" use-when="communicationEvent==null"/> - <field name="communicationEventId" use-when="communicationEvent!=null" title="${uiLabelMap.ContactListCommEventId}"><display/></field> - <field name="communicationEventTypeId" title="${uiLabelMap.ContactListCommEventTypeId}"> + <field name="communicationEventId" use-when="communicationEvent!=null" title="${uiLabelMap.MarketingContactListCommEventId}"><display/></field> + <field name="communicationEventTypeId" title="${uiLabelMap.MarketingContactListCommEventTypeId}"> <drop-down no-current-selected-key="EMAIL_COMMUNICATION"> <entity-options entity-name="CommunicationEventType" description="${description}"> <entity-order-by field-name="description"/> @@ -236,17 +236,17 @@ </drop-down> </field> - <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}" use-when="commEventContactMechType!=null&&parentCommEventContactMechType==null"> + <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}" use-when="commEventContactMechType!=null&&parentCommEventContactMechType==null"> <drop-down> <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/> </drop-down> </field> - <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}" use-when="commEventContactMechType==null&&parentCommEventContactMechType!=null"> + <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}" use-when="commEventContactMechType==null&&parentCommEventContactMechType!=null"> <drop-down> <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/> </drop-down> </field> - <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}" use-when="commEventContactMechType==null&&parentCommEventContactMechType==null"> + <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}" use-when="commEventContactMechType==null&&parentCommEventContactMechType==null"> <drop-down> <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/> </drop-down> @@ -297,8 +297,8 @@ </form> <form name="FindContactListCommEvents" target="ListContactListCommEvents" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="contactListId" title="${uiLabelMap.ContactListContactListId}"><text/></field> - <field name="commEventId" title="${uiLabelMap.ContactListCommEventId}"><lookup target-form-name="LookupCommEvent"/></field> + <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text/></field> + <field name="commEventId" title="${uiLabelMap.MarketingContactListCommEventId}"><lookup target-form-name="LookupCommEvent"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="StatusItem"> @@ -318,7 +318,7 @@ <field-map field-name="entityName" value="CommunicationEvent"/> </service> </actions> - <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}"> + <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}"> <hyperlink description="${communicationEventId}" target="EditContactListCommEvent?contactListId=${contactListId}&communicationEventId=${communicationEventId}&DONE_PAGE=${donePage}" target-type="intra-app"/> </field> <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"> @@ -328,7 +328,7 @@ <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/> </field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field> - <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field> + <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field> <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field> <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field> <field name="custReqestId" position="1"><display/></field> @@ -339,16 +339,16 @@ <form name="LookupContactList" default-map-name="contactList" target="LookupContactList" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="contactListId" title="${uiLabelMap.ContactListContactListId}"><text-find/></field> - <field name="contactListName" title="${uiLabelMap.ContactListContactListName}"><text-find/></field> - <field name="contactListTypeId" title="${uiLabelMap.ContactListContactListTypeId}"> + <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text-find/></field> + <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><text-find/></field> + <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="ContactListType" key-field-name="contactListTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> - <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"> + <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"> <entity-order-by field-name="description"/> @@ -373,18 +373,18 @@ <field-map value="ContactList" field-name="entityName"/> </service> </actions> - <field name="contactListId" title="${uiLabelMap.ContactListContactListId}" widget-style="buttontext"> + <field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${contactListId}" target="javascript:set_value('${contactListId}')" target-type="plain"/> </field> - <field name="contactListName" title="${uiLabelMap.ContactListContactListName}"><display/></field> - <field name="contactListTypeId" title="${uiLabelMap.ContactListContactListTypeId}"><display-entity entity-name="ContactListType"/></field> - <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field> + <field name="contactListName" title="${uiLabelMap.MarketingContactListContactListName}"><display/></field> + <field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}"><display-entity entity-name="ContactListType"/></field> + <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field> <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity description="${campaignName}" entity-name="MarketingCampaign"/></field> </form> <form name="LookupCommEvent" target="LookupCommEvent" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}"><text-find/></field> + <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}"><text-find/></field> <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field> <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup target-form-name="LookupPartyName"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> @@ -394,7 +394,7 @@ </entity-options> </drop-down> </field> - <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"> + <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/> </drop-down> @@ -418,7 +418,7 @@ <field-map env-name="entityName" field-name="entityName"/> </service> </actions> - <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}" widget-style="buttontext"> + <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" target-type="plain"/> </field> <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"> @@ -428,7 +428,7 @@ <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/> </field> <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field> - <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field> + <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field> <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field> <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field> <field name="custReqestId" position="1" title="{uiLabelMap.ServicemgntCustRequestId}"><text size="20"/></field> @@ -446,7 +446,7 @@ <field name="contactMechId" widget-style="buttontext"> <hyperlink description="${contactMechId}" target-type="plain" target="javascript:set_value('${contactMechId}')" also-hidden="false"/> </field> - <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field> + <field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field> <field name="cmDetail"><display description="[${infoString}] [${tnCountryCode}-${tnAreaCode}-${tnContactNumber}] [${paAddress1}, ${paAddress2}, ${paCity}, ${paStateProvinceGeoId}, ${paPostalCode}, ${paPostalCodeExt} ${paCountryGeoId}]" also-hidden="false"/></field> </form> </forms> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml Mon Jan 12 14:36:38 2009 @@ -21,7 +21,7 @@ <menu name="ContactListTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="ContactList" selected-menuitem-context-field-name="contactListTabButtonItem"> - <menu-item name="ContactList" title="${uiLabelMap.ContactList}"> + <menu-item name="ContactList" title="${uiLabelMap.MarketingContactList}"> <link target="/EditContactList?contactListId=${contactListId}"/> </menu-item> <menu-item name="ContactListParty" title="${uiLabelMap.PartyParties}"> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml Mon Jan 12 14:36:38 2009 @@ -23,10 +23,10 @@ <!-- SegmentGroup Lookup forms --> <form name="LookupSegmentGroup" target="LookupSegmentGroup" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}"><text-find/></field> - <field name="segmentGroupTypeId" title="${uiLabelMap.SegmentGroupSegmentGroupTypeId}"><text-find/></field> + <field name="segmentGroupId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}"><text-find/></field> + <field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}"><text-find/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field> - <field name="productStoreId" title="${uiLabelMap.SegmentGroupProductStoreId}"><text-find/></field> + <field name="productStoreId" title="${uiLabelMap.MarketingSegmentGroupProductStoreId}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -38,12 +38,12 @@ <field-map field-name="entityName" value="SegmentGroup"/> </service> </actions> - <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.SegmentGroupSegmentGroupId}"> + <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}"> <hyperlink also-hidden="false" target-type="plain" description="${segmentGroupId}" target="javascript:set_value('${segmentGroupId}')"/> </field> - <field name="segmentGroupTypeId" title="${uiLabelMap.SegmentGroupSegmentGroupTypeId}"><display/></field> + <field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}"><display/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> - <field name="productStoreId" title="${uiLabelMap.SegmentGroupProductStoreId}"><display/></field> + <field name="productStoreId" title="${uiLabelMap.MarketingSegmentGroupProductStoreId}"><display/></field> </form> <form name="listSegmentGroupClass" list-name="listIt" target="" title="" type="list" paginate-target="listSegmentGroupClass" @@ -53,7 +53,7 @@ <field-map field-name="segmentGroupId" /> </entity-and> </actions> - <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.SegmentGroupSegmentGroupId}"> + <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}"> <hyperlink also-hidden="false" target-type="intra-app" description="${segmentGroupId}" target="viewSegmentGroup?segmentGroupId=${segmentGroupId}"/> </field> <field name="partyClassificationGroupId" title="${uiLabelMap.SegmentGroupPartyClassificationGroupId}"><display/></field> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml Mon Jan 12 14:36:38 2009 @@ -30,12 +30,12 @@ <field-map field-name="noConditionFind" value="Y"/> </service> </actions> - <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.SegmentGroupSegmentGroupId}"> + <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}"> <hyperlink also-hidden="false" description="${segmentGroupId}" target="viewSegmentGroup?segmentGroupId=${segmentGroupId}"/> </field> - <field name="segmentGroupTypeId" title="${uiLabelMap.SegmentGroupSegmentGroupTypeId}"><display-entity entity-name="SegmentGroupType" description="${description}"/></field> + <field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}"><display-entity entity-name="SegmentGroupType" description="${description}"/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> - <field name="productStoreId" title="${uiLabelMap.SegmentGroupProductStoreId}"><display/></field> + <field name="productStoreId" title="${uiLabelMap.MarketingSegmentGroupProductStoreId}"><display/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteSegmentGroup?segmentGroupId=${segmentGroupId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> @@ -45,11 +45,11 @@ header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="segmentGroup==null" target="createSegmentGroup"/> - <field use-when="segmentGroup!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field use-when="segmentGroup==null&&segmentGroupId==null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}"><ignored/></field> - <field use-when="segmentGroup==null&&segmentGroupId!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${segmentGroupId}]"><display/></field> + <field use-when="segmentGroup!=null" name="segmentGroupId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> + <field use-when="segmentGroup==null&&segmentGroupId==null" name="segmentGroupId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}"><ignored/></field> + <field use-when="segmentGroup==null&&segmentGroupId!=null" name="segmentGroupId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${segmentGroupId}]"><display/></field> - <field name="segmentGroupTypeId" title="${uiLabelMap.SegmentGroupSegmentGroupTypeId}"> + <field name="segmentGroupTypeId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupTypeId}"> <drop-down> <entity-options description="${description}" entity-name="SegmentGroupType" key-field-name="segmentGroupTypeId"> <entity-order-by field-name="description"/> @@ -101,7 +101,7 @@ <field name="segmentGroupId"><hidden/></field> - <field name="geoId" title="${uiLabelMap.SegmentGroupGeoId}"><lookup target-form-name="LookupGeo"/></field> + <field name="geoId" title="${uiLabelMap.MarketingSegmentGroupGeoId}"><lookup target-form-name="LookupGeo"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> <form name="listSegmentGroupGeo" list-name="segmentGroupGeos" target="" title="" type="list" paginate-target="listSegmentGroupGeo" @@ -112,7 +112,7 @@ </entity-and> </actions> <field name="segmentGroupId"><hidden/></field> - <field name="geoId" title="${uiLabelMap.SegmentGroupGeoId}"><display-entity entity-name="Geo" description="${geoName} [Code:${geoCode}][ID:${geoId}]"/></field> + <field name="geoId" title="${uiLabelMap.MarketingSegmentGroupGeoId}"><display-entity entity-name="Geo" description="${geoName} [Code:${geoCode}][ID:${geoId}]"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteSegmentGroupGeo?segmentGroupId=${segmentGroupId}&geoId=${geoId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml Mon Jan 12 14:36:38 2009 @@ -21,16 +21,16 @@ <menu name="SegmentGroupTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="Segment" selected-menuitem-context-field-name="segmentTabButtonItem"> - <menu-item name="SegmentGroup" title="${uiLabelMap.SegmentGroupSegmentGroup}"> + <menu-item name="SegmentGroup" title="${uiLabelMap.MarketingSegmentGroupSegmentGroup}"> <link target="viewSegmentGroup?segmentGroupId=${segmentGroupId}"/> </menu-item> - <menu-item name="SegmentGroupClassification" title="${uiLabelMap.SegmentGroupSegmentGroupClassification}"> + <menu-item name="SegmentGroupClassification" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupClassification}"> <link target="listSegmentGroupClass?segmentGroupId=${segmentGroupId}"/> </menu-item> - <menu-item name="SegmentGroupGeo" title="${uiLabelMap.SegmentGroupSegmentGroupGeo}"> + <menu-item name="SegmentGroupGeo" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupGeo}"> <link target="listSegmentGroupGeo?segmentGroupId=${segmentGroupId}"/> </menu-item> - <menu-item name="SegmentGroupRole" title="${uiLabelMap.SegmentGroupSegmentGroupRole}"> + <menu-item name="SegmentGroupRole" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupRole}"> <link target="listSegmentGroupRole?segmentGroupId=${segmentGroupId}"/> </menu-item> </menu> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml Mon Jan 12 14:36:38 2009 @@ -24,13 +24,13 @@ header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="trackingCode==null" target="createTrackingCode"/> - <field use-when="trackingCode!=null" name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field use-when="trackingCode==null&&trackingCodeId==null" name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><text/></field> - <field use-when="trackingCode==null&&trackingCodeId!=null" name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${trackingCodeId}]"><display/></field> + <field use-when="trackingCode!=null" name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> + <field use-when="trackingCode==null&&trackingCodeId==null" name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><text/></field> + <field use-when="trackingCode==null&&trackingCodeId!=null" name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${trackingCodeId}]"><display/></field> - <field name="description" title="${uiLabelMap.TrackingCodeDescription}"><text/></field> - <field name="comments" title="${uiLabelMap.TrackingCodeComments}"><textarea/></field> - <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"> + <field name="description" title="${uiLabelMap.MarketingTrackingCodeDescription}"><text/></field> + <field name="comments" title="${uiLabelMap.MarketingTrackingCodeComments}"><textarea/></field> + <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"> <drop-down> <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId"> <entity-order-by field-name="description"/> @@ -44,7 +44,7 @@ </entity-options> </drop-down> </field> - <field name="prodCatalogId" title="${uiLabelMap.TrackingCodeDefaultProdCatalogId}" tooltip="${uiLabelMap.TrackingCodeNoOverrideIfEmpty}"> + <field name="prodCatalogId" title="${uiLabelMap.MarketingTrackingCodeDefaultProdCatalogId}" tooltip="${uiLabelMap.MarketingTrackingCodeNoOverrideIfEmpty}"> <drop-down allow-empty="true"> <entity-options description="${catalogName}" entity-name="ProdCatalog" key-field-name="prodCatalogId"> <entity-order-by field-name="catalogName"/> @@ -54,13 +54,13 @@ <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field> - <field name="redirectUrl" title="${uiLabelMap.TrackingCodeRedirectUrl}" tooltip="${uiLabelMap.TrackingCodeNoRedirectIfEmpty}"><text size="40"/></field> - <field name="overrideLogo" title="${uiLabelMap.TrackingCodeOverrideLogo}" tooltip="${uiLabelMap.TrackingCodeNoOverrideIfEmpty}"><text size="60"/></field> - <field name="overrideCss" title="${uiLabelMap.TrackingCodeOverrideCss}" tooltip="${uiLabelMap.TrackingCodeNoOverrideIfEmpty}"><text size="60"/></field> - <field name="trackableLifetime" title="${uiLabelMap.TrackingCodeTrackableLifetime}" tooltip="${uiLabelMap.TrackingCodeInSeconds}"><text size="10"/></field> - <field name="billableLifetime" title="${uiLabelMap.TrackingCodeBillableLifetime}" tooltip="${uiLabelMap.TrackingCodeInSeconds}"><text size="10"/></field> - <field name="groupId" title="${uiLabelMap.TrackingCodeGroupId}"><text size="10"/></field> - <field name="subgroupId" title="${uiLabelMap.TrackingCodeSubgroupId}"><text size="10"/></field> + <field name="redirectUrl" title="${uiLabelMap.MarketingTrackingCodeRedirectUrl}" tooltip="${uiLabelMap.MarketingTrackingCodeNoRedirectIfEmpty}"><text size="40"/></field> + <field name="overrideLogo" title="${uiLabelMap.MarketingTrackingCodeOverrideLogo}" tooltip="${uiLabelMap.MarketingTrackingCodeNoOverrideIfEmpty}"><text size="60"/></field> + <field name="overrideCss" title="${uiLabelMap.MarketingTrackingCodeOverrideCss}" tooltip="${uiLabelMap.MarketingTrackingCodeNoOverrideIfEmpty}"><text size="60"/></field> + <field name="trackableLifetime" title="${uiLabelMap.MarketingTrackingCodeTrackableLifetime}" tooltip="${uiLabelMap.MarketingTrackingCodeInSeconds}"><text size="10"/></field> + <field name="billableLifetime" title="${uiLabelMap.MarketingTrackingCodeBillableLifetime}" tooltip="${uiLabelMap.MarketingTrackingCodeInSeconds}"><text size="10"/></field> + <field name="groupId" title="${uiLabelMap.MarketingTrackingCodeGroupId}"><text size="10"/></field> + <field name="subgroupId" title="${uiLabelMap.MarketingTrackingCodeSubgroupId}"><text size="10"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> <!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> --> @@ -72,11 +72,11 @@ <actions> <entity-condition entity-name="TrackingCode"/> </actions> - <field name="trackingCodeId" widget-style="buttontext" title="${uiLabelMap.TrackingCodeTrackingCodeId}"> + <field name="trackingCodeId" widget-style="buttontext" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"> <hyperlink target="EditTrackingCode?trackingCodeId=${trackingCodeId}" description="${trackingCodeId}" also-hidden="false"/> </field> - <field name="description" title="${uiLabelMap.TrackingCodeDescription}"><display/></field> - <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field> + <field name="description" title="${uiLabelMap.MarketingTrackingCodeDescription}"><display/></field> + <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field> <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity description="${campaignName}" entity-name="MarketingCampaign"/></field> <field name="prodCatalogId"><display-entity description="${catalogName}" entity-name="ProdCatalog"/></field> @@ -92,9 +92,9 @@ header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="trackingCodeOrder==null" target="createTrackingCodeOrder"/> - <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><display/></field> - <field name="orderId" title="${uiLabelMap.TrackingCodeOrderOrderId}"><display/></field> - <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"> + <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><display/></field> + <field name="orderId" title="${uiLabelMap.MarketingTrackingCodeOrderOrderId}"><display/></field> + <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"> <drop-down> <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId"> <entity-order-by field-name="description"/> @@ -102,7 +102,7 @@ </drop-down> </field> - <field name="isBillable" title="${uiLabelMap.TrackingCodeOrderIsBilliable}"> + <field name="isBillable" title="${uiLabelMap.MarketingTrackingCodeOrderIsBilliable}"> <drop-down allow-empty="true"> <option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> @@ -113,9 +113,9 @@ <form name="FindTrackingCodeOrders" type="single" target="ListTrackingCodeOrders" title="" header-row-style="header-row" default-table-style="basic-table"> - <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><text-find/></field> - <field name="orderId" title="${uiLabelMap.TrackingCodeOrderOrderId}"><lookup target-form-name="LookupOrderName"/></field> - <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"> + <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><text-find/></field> + <field name="orderId" title="${uiLabelMap.MarketingTrackingCodeOrderOrderId}"><lookup target-form-name="LookupOrderName"/></field> + <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"> <drop-down> <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId"> <entity-order-by field-name="description"/> @@ -135,20 +135,20 @@ </service> </actions> - <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><display/></field> - <field name="orderId" title="${uiLabelMap.TrackingCodeOrderOrderId}"><display-entity entity-name="OrderHeader" description="${orderDate} [${orderId}]"/></field> - <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType" description="${description}"/></field> - <field name="isBillable" title="${uiLabelMap.TrackingCodeOrderIsBilliable}"><display/></field> + <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><display/></field> + <field name="orderId" title="${uiLabelMap.MarketingTrackingCodeOrderOrderId}"><display-entity entity-name="OrderHeader" description="${orderDate} [${orderId}]"/></field> + <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType" description="${description}"/></field> + <field name="isBillable" title="${uiLabelMap.MarketingTrackingCodeOrderIsBilliable}"><display/></field> </form> <form name="EditTrackingCodeVisit" default-map-name="visit" target="updateTrackingCodeVisit" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <alt-target target="createTrackingCodeVisit" use-when="visit==null"/> - <field name="tackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><display/></field> - <field name="visitId" title="${uiLabelMap.TrackingCodeVisitVisitId}"><display/></field> + <field name="tackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><display/></field> + <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}"><display/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> - <field name="sourceEnumId" title="${uiLabelMap.TrackingCodeVisitSourceEnumId}"> + <field name="sourceEnumId" title="${uiLabelMap.MarketingTrackingCodeVisitSourceEnumId}"> <drop-down> <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value=" TRACKINGCODE_SRC"/> @@ -160,10 +160,10 @@ </form> <form name="FindTrackingCodeVisits" target="ListTrackingCodeVisits" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><text/></field> - <field name="visitId" title="${uiLabelMap.TrackingCodeVisitVisitId}"><lookup target-form-name="LookupVisit"/></field> + <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><text/></field> + <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}"><lookup target-form-name="LookupVisit"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-find/></field> - <field name="sourceEnumId" title="${uiLabelMap.TrackingCodeVisitSourceEnumId}"> + <field name="sourceEnumId" title="${uiLabelMap.MarketingTrackingCodeVisitSourceEnumId}"> <drop-down> <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value=" TRACKINGCODE_SRC"/> @@ -181,10 +181,10 @@ <field-map field-name="orderBy" value="-fromDate"/> </service> </actions> - <field name="visitId" title="${uiLabelMap.TrackingCodeVisitVisitId}"> + <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}"> <hyperlink description="${visitId}" target="/partymgr/control/visitdetail?visitId=${visitId}&DONE_PAGE=${donePage}" target-type="inter-app"/> </field> - <field name="sourceEnumId" title="${uiLabelMap.TrackingCodeVisitSourceEnumId}"> + <field name="sourceEnumId" title="${uiLabelMap.MarketingTrackingCodeVisitSourceEnumId}"> <display-entity description="${description} [${enumCode}]" entity-name="Enumeration" key-field-name="enumId"/> </field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> @@ -192,16 +192,16 @@ <form name="LookupTrackingCode" default-map-name="trackingCode" target="LookupTrackingCode" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><text-find/></field> - <field name="description" title="${uiLabelMap.TrackingCodeDescription}"><text-find/></field> - <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"> + <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}"><text-find/></field> + <field name="description" title="${uiLabelMap.MarketingTrackingCodeDescription}"><text-find/></field> + <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"> <drop-down> <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId"> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> - <field name="prodCatalogId" title="${uiLabelMap.TrackingCodeProdCatalogId}"> + <field name="prodCatalogId" title="${uiLabelMap.MarketingTrackingCodeProdCatalogId}"> <drop-down> <entity-options description="${catalogName}" entity-name="ProdCatalog" key-field-name="prodCatalogId"> <entity-order-by field-name="catalogName"/> @@ -225,19 +225,19 @@ <field-map env-name="entityName" field-name="entityName"/> </service> </actions> - <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}" widget-style="buttontext"> + <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${trackingCodeId}" target="javascript:set_value('${trackingCodeId}')" target-type="plain"/> </field> - <field name="description" title="${uiLabelMap.TrackingCodeDescription}"><display/></field> - <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field> - <field name="prodCatalogId" title="${uiLabelMap.TrackingCodeProdCatalogId}"><display-entity description="${catalogName}" entity-name="ProdCatalog"/></field> + <field name="description" title="${uiLabelMap.MarketingTrackingCodeDescription}"><display/></field> + <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field> + <field name="prodCatalogId" title="${uiLabelMap.MarketingTrackingCodeProdCatalogId}"><display-entity description="${catalogName}" entity-name="ProdCatalog"/></field> <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity description="${campaignName}" entity-name="MarketingCampaign"/></field> </form> <form name="LookupVisit" target="LookupVisit" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="visitId" title="${uiLabelMap.TrackingCodeVisitVisitId}"><text-find/></field> - <field name="partyId" title="${uiLabelMap.TrackingCodeVisitPartyId}"><lookup target-form-name="LookupPartyName"/></field> + <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}"><text-find/></field> + <field name="partyId" title="${uiLabelMap.MarketingTrackingCodeVisitPartyId}"><lookup target-form-name="LookupPartyName"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-find/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-find/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> @@ -250,34 +250,34 @@ <field-map env-name="entityName" field-name="entityName"/> </service> </actions> - <field name="visitId" title="${uiLabelMap.TrackingCodeVisitVisitId}" widget-style="buttontext"> + <field name="visitId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${visitId}" target="javascript:set_value('${visitId}')" target-type="plain"/> </field> - <field name="partyId" title="${uiLabelMap.TrackingCodeVisitPartyId}"> + <field name="partyId" title="${uiLabelMap.MarketingTrackingCodeVisitPartyId}"> <display-entity description="${partyId}" entity-name="Party" key-field-name="partyId"/> </field> - <field name="visitorId" title="${uiLabelMap.TrackingCodeVisitVisitorId}"> + <field name="visitorId" title="${uiLabelMap.MarketingTrackingCodeVisitVisitorId}"> <display-entity description="${partyId} ${userLoginId} [${visitorId}]" entity-name="Visitor" key-field-name="visitorId"/> </field> - <field name="contactMechTypeId" title="${uiLabelMap.TrackingCodeVisitContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field> - <field name="roleTypeId" title="${uiLabelMap.TrackingCodeVisitRoleTypeId}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field> - <field name="userLoginId" title="${uiLabelMap.TrackingCodeVisitUserLoginId}"><display/></field> + <field name="contactMechTypeId" title="${uiLabelMap.MarketingTrackingCodeVisitContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field> + <field name="roleTypeId" title="${uiLabelMap.MarketingTrackingCodeVisitRoleTypeId}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field> + <field name="userLoginId" title="${uiLabelMap.MarketingTrackingCodeVisitUserLoginId}"><display/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field> - <field name="clientIpAddress" title="${uiLabelMap.TrackingCodeVisitClientIpAddress}"><display/></field> - <field name="clientHostName" title="${uiLabelMap.TrackingCodeVisitClientHostName}"><display/></field> - <field name="webappName" title="${uiLabelMap.TrackingCodeVisitWebappName}"><display/></field> - <field name="sessionId" title="${uiLabelMap.TrackingCodeVisitSessionId}"><display/></field> + <field name="clientIpAddress" title="${uiLabelMap.MarketingTrackingCodeVisitClientIpAddress}"><display/></field> + <field name="clientHostName" title="${uiLabelMap.MarketingTrackingCodeVisitClientHostName}"><display/></field> + <field name="webappName" title="${uiLabelMap.MarketingTrackingCodeVisitWebappName}"><display/></field> + <field name="sessionId" title="${uiLabelMap.MarketingTrackingCodeVisitSessionId}"><display/></field> </form> <form name="EditTrackingCodeType" type="single" target="updateTrackingCodeType" title="" default-map-name="trackingCodeType" header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="trackingCodeType==null" target="createTrackingCodeType"/> - <field use-when="trackingCodeType!=null" name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field use-when="trackingCodeType==null&&trackingCodeTypeId==null" name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"><text/></field> - <field use-when="trackingCodeType==null&&trackingCodeTypeId!=null" name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${trackingCodeTypeId}]"><display/></field> + <field use-when="trackingCodeType!=null" name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> + <field use-when="trackingCodeType==null&&trackingCodeTypeId==null" name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><text/></field> + <field use-when="trackingCodeType==null&&trackingCodeTypeId!=null" name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${trackingCodeTypeId}]"><display/></field> - <field name="description" title="${uiLabelMap.TrackingCodeTypeDescription}"><text/></field> + <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> <!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> --> <!-- <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> --> @@ -288,10 +288,10 @@ <actions> <entity-condition entity-name="TrackingCodeType"/> </actions> - <field name="trackingCodeTypeId" widget-style="buttontext" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"> + <field name="trackingCodeTypeId" widget-style="buttontext" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"> <hyperlink target="EditTrackingCodeType?trackingCodeTypeId=${trackingCodeTypeId}" description="${trackingCodeTypeId}" also-hidden="false"/> </field> - <field name="description" title="${uiLabelMap.TrackingCodeTypeDescription}"><display/></field> + <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><display/></field> <field name="deleteLink" title="&nbsp;" widget-style="buttontext"> <hyperlink target="deleteTrackingCodeType?trackingCodeTypeId=${trackingCodeTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> @@ -299,8 +299,8 @@ </form> <form name="LookupTrackingCodeType" default-map-name="trackingCode" target="LookupTrackingCodeType" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"><text-find/></field> - <field name="description" title="${uiLabelMap.TrackingCodeTypeDescription}"><text-find/></field> + <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}"><text-find/></field> + <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><text-find/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> <form name="ListLookupTrackingCodeType" target="" title="" type="list" @@ -311,9 +311,9 @@ <field-map env-name="entityName" field-name="entityName"/> </service> </actions> - <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}" widget-style="buttontext"> + <field name="trackingCodeTypeId" title="${uiLabelMap.MarketingTrackingCodeTrackingCodeTypeId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${trackingCodeTypeId}" target="javascript:set_value('${trackingCodeTypeId}')" target-type="plain"/> </field> - <field name="description" title="${uiLabelMap.TrackingCodeTypeDescription}"><display/></field> + <field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><display/></field> </form> </forms> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml Mon Jan 12 14:36:38 2009 @@ -21,10 +21,10 @@ <menu name="TrackingCodeTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="TrackingCode" selected-menuitem-context-field-name="trackingCodeTabButtonItem"> - <menu-item name="TrackingCode" title="${uiLabelMap.TrackingCode}"> + <menu-item name="TrackingCode" title="${uiLabelMap.MarketingTrackingCode}"> <link target="/FindTrackingCode"/> </menu-item> - <menu-item name="TrackingCodeOrder" title="${uiLabelMap.TrackingCodeOrder}"> + <menu-item name="TrackingCodeOrder" title="${uiLabelMap.MarketingTrackingCodeOrder}"> <condition> <not> <if-empty field-name="trackingCodeId"/> @@ -32,7 +32,7 @@ </condition> <link target="/FindTrackingCodeOrders?trackingCodeId=${trackingCodeId}"/> </menu-item> - <menu-item name="TrackingCodeVisit" title="${uiLabelMap.TrackingCodeVisit}"> + <menu-item name="TrackingCodeVisit" title="${uiLabelMap.MarketingTrackingCodeVisit}"> <condition> <not> <if-empty field-name="trackingCodeId"/> @@ -40,7 +40,7 @@ </condition> <link target="/FindTrackingCodeVisits?trackingCodeId=${trackingCodeId}"/> </menu-item> - <menu-item name="TrackingCodeType" title="${uiLabelMap.TrackingCodeType}"> + <menu-item name="TrackingCodeType" title="${uiLabelMap.MarketingTrackingCodeType}"> <link target="/FindTrackingCodeType"/> </menu-item> </menu> Modified: ofbiz/trunk/applications/marketing/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Mon Jan 12 14:36:38 2009 @@ -26,6 +26,7 @@ <!-- base/top/specific map first, then more common map added for shared labels --> <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="layoutSettings.companyName" from-field="uiLabelMap.MarketingCompanyName" global="true"/> @@ -69,7 +70,7 @@ <widgets> <include-menu name="ContactListTabBar" location="component://marketing/webapp/marketing/contact/ContactListMenus.xml"/> <container> - <label style="h1">${uiLabelMap.ContactList} ${contactList.contactListName} [${contactListId}]</label> + <label style="h1">${uiLabelMap.MarketingContactList} ${contactList.contactListName} [${contactListId}]</label> </container> </widgets> </section> Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Mon Jan 12 14:36:38 2009 @@ -24,7 +24,7 @@ <screen name="FindContactLists"> <section> <actions> - <set field="titleProperty" value="ContactListFindContactLists"/> + <set field="titleProperty" value="MarketingContactListFindContactLists"/> <set field="contactListTabButtonItem" value="ContactList"/> <set field="labelTitleProperty" value="PageTitleFindContactLists"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/FindContactList"/> @@ -35,13 +35,13 @@ <container style="screenlet"> <container style="screenlet-title-bar"> <container style="h3"> - <label text="${uiLabelMap.ContactListFindContactLists}"/> + <label text="${uiLabelMap.MarketingContactListFindContactLists}"/> </container> </container> <container style="screenlet-body"> <section> <widgets> - <container><link text="${uiLabelMap.ContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container> + <container><link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container> <include-form name="FindContactLists" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> </widgets> </section> @@ -81,7 +81,7 @@ <container style="screenlet-body"> <section> <widgets> - <container><link text="${uiLabelMap.ContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container> + <container><link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container> <include-form name="EditContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> </widgets> </section> @@ -138,7 +138,7 @@ <container style="screenlet-body"> <section> <widgets> - <container><link text="${uiLabelMap.ContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container> + <container><link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container> <include-form name="ListContactLists" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> </widgets> </section> @@ -182,7 +182,7 @@ <container style="screenlet-body"> <section> <widgets> - <container><link text="${uiLabelMap.ContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> + <container><link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> <include-form name="EditContactListParty" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> <container><label style="h2" text="${uiLabelMap.CommonStatusHistory}"/></container> <iterate-section entry-name="contactListPartyStatus" list-name="contactListPartyStatusList"> @@ -228,7 +228,7 @@ <container style="screenlet-body"> <section> <widgets> - <container><link text="${uiLabelMap.ContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> + <container><link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> <include-form name="ListContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> </widgets> </section> @@ -261,7 +261,7 @@ <container style="screenlet-body"> <section> <widgets> - <container><link text="${uiLabelMap.ContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> + <container><link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> <include-form name="FindContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> </widgets> </section> @@ -300,7 +300,7 @@ <container style="screenlet-body"> <section> <widgets> - <container><link text="${uiLabelMap.ContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> + <container><link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> <include-form name="EditContactListCommEvent" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> </widgets> </section> @@ -337,7 +337,7 @@ <container style="screenlet-body"> <section> <widgets> - <container><link text="${uiLabelMap.ContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> + <container><link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> <include-form name="ListContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> </widgets> </section> @@ -370,7 +370,7 @@ <container style="screenlet-body"> <section> <widgets> - <container><link text="${uiLabelMap.ContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> + <container><link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> <include-form name="FindContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> </widgets> </section> Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Mon Jan 12 14:36:38 2009 @@ -59,6 +59,7 @@ <screen name="EditMarketingCampaign"> <section> <actions> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" /> <set field="titleProperty" value="PageTitleEditMarketingCampaign"/> <set field="campaignTabButtonItem" value="MarketingCampaign"/> <set field="labelTitleProperty" value="PageTitleEditMarketingCampaign"/> Modified: ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml (original) +++ ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml Mon Jan 12 14:36:38 2009 @@ -21,9 +21,9 @@ <menu name="MarketingAppBar" title="${uiLabelMap.MarketingManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="DataSource" title="${uiLabelMap.DataSource}"><link target="FindDataSource"/></menu-item> <menu-item name="Campaign" title="${uiLabelMap.MarketingCampaign}"><link target="FindMarketingCampaign"/></menu-item> - <menu-item name="Tracking" title="${uiLabelMap.Tracking}"><link target="FindTrackingCode"/></menu-item> - <menu-item name="Segment" title="${uiLabelMap.Segment}"><link target="FindSegmentGroup"/></menu-item> - <menu-item name="ContactList" title="${uiLabelMap.ContactList}"><link target="FindContactLists"/></menu-item> + <menu-item name="Tracking" title="${uiLabelMap.MarketingTracking}"><link target="FindTrackingCode"/></menu-item> + <menu-item name="Segment" title="${uiLabelMap.MarketingSegment}"><link target="FindSegmentGroup"/></menu-item> + <menu-item name="ContactList" title="${uiLabelMap.MarketingContactList}"><link target="FindContactLists"/></menu-item> <menu-item name="Reports" title="${uiLabelMap.MarketingReports}"><link target="MarketingReport"/></menu-item> </menu> </menus> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/widget/ReportForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ReportForms.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/ReportForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/ReportForms.xml Mon Jan 12 14:36:38 2009 @@ -30,7 +30,7 @@ <date-time type="timestamp"/> </field> - <field name="trackingCodeId" title="${uiLabelMap.TrackingCode}"> + <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCode}"> <drop-down allow-empty="true"> <option key="" description="- ${uiLabelMap.CommonAny} -"/> <entity-options entity-name="TrackingCode" description="${trackingCodeId}"> @@ -65,9 +65,9 @@ </field> </form> - <form name="TrackingCodeReport" list-name="trackingCodeVisitAndOrders" target="" title="${uiLabelMap.TrackingCodeReportTitle}" type="list" paginate-target="TrackingCodeReport" + <form name="TrackingCodeReport" list-name="trackingCodeVisitAndOrders" target="" title="${uiLabelMap.MarketingTrackingCodeReportTitle}" type="list" paginate-target="TrackingCodeReport" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="trackingCodeId" title="${uiLabelMap.TrackingCode}"> + <field name="trackingCodeId" title="${uiLabelMap.MarketingTrackingCode}"> <display-entity entity-name="TrackingCode" key-field-name="trackingCodeId" description="${description} [${trackingCodeId}]"/> </field> <field name="visits" title="${uiLabelMap.MarketingVisits}"><display/></field> Modified: ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml?rev=733943&r1=733942&r2=733943&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml Mon Jan 12 14:36:38 2009 @@ -57,7 +57,7 @@ <container style="screenlet-body"> <section> <widgets> - <container><link text="${uiLabelMap.SegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container> + <container><link text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container> <include-form name="FindSegmentGroup" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> </widgets> </section> @@ -96,7 +96,7 @@ <condition><not><if-empty field-name="segmentGroupId"/></not></condition> <widgets> <include-menu location="component://marketing/webapp/marketing/segment/SegmentMenus.xml" name="SegmentGroupTabBar"/> - <container><link text="${uiLabelMap.SegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container> + <container><link text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container> </widgets> </section> @@ -176,7 +176,7 @@ <if-has-permission permission="MARKETING" action="_VIEW"/> </condition> <widgets> - <screenlet id="AddSegmentGroupClassPanel" title="${uiLabelMap.SegmentGroupClassCreate}" collapsible="true"> + <screenlet id="AddSegmentGroupClassPanel" title="${uiLabelMap.MarketingSegmentGroupClassCreate}" collapsible="true"> <include-form name="AddSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> </screenlet> <include-form name="listSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |