[OFBiz] SVN: r7499 - in trunk/applications/marketing: config webapp/marketing/contact webapp/marketing/segment webapp/marketing/trackingcode widget
jacopo@svn.ofbiz.org
jacopo at svn.ofbiz.org
Wed May 3 07:41:28 CDT 2006
Author: jacopo
Date: 2006-05-03 07:41:10 -0500 (Wed, 03 May 2006)
New Revision: 7499
Modified:
trunk/applications/marketing/config/MarketingUiLabels.properties
trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml
trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml
trunk/applications/marketing/widget/ContactListScreens.xml
trunk/applications/marketing/widget/LookupScreens.xml
Log:
i18n patches from Marco Risaliti OFBIZ-823
Modified: trunk/applications/marketing/config/MarketingUiLabels.properties
===================================================================
--- trunk/applications/marketing/config/MarketingUiLabels.properties 2006-05-03 11:22:53 UTC (rev 7498)
+++ trunk/applications/marketing/config/MarketingUiLabels.properties 2006-05-03 12:41:10 UTC (rev 7499)
@@ -56,6 +56,7 @@
PageTitleEditTrackingCodeOrder=Edit Tracking Code Order
PageTitleEditTrackingCodeType=Edit Tracking Code Type
PageTitleEditTrackingCodeVisit=Edit Tracking Code Visit
+PageTitleFindContactListCommEvent=Find Contact List Communication Event
PageTitleFindContactListParty=Find Contact List Parties
PageTitleFindMarketingCampaignRole=Find Marketing Campaign Role
PageTitleFindSegmentGroup=Find Segment Group
@@ -78,6 +79,8 @@
PageTitleListTrackingCodeFor=List Tracking Code Visit for
PageTitleLookupCommEvent=Lookup Communication Event
PageTitleLookupContactList=Lookup Contact List
+PageTitleLookupGeo=Lookup Geo
+PageTitleLookupSegmentGroup=Lookup Segment Group
PageTitleLookupTrackingCode=Lookup Tracking Code
PageTitleLookupTrackingCodeType=Lookup Tracking Code Type
PageTitleLookupVisit=Lookup Visit
Modified: trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml 2006-05-03 11:22:53 UTC (rev 7498)
+++ trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml 2006-05-03 12:41:10 UTC (rev 7499)
@@ -248,7 +248,7 @@
<field name="contactMechIdFrom" title="${uiLabelMap.PartyFromContactMech}">
<text default-value="${thisUserPrimaryEmail.contactMechId}"/> <!-- this default value is the logged in user's primary email and is useful for comm events which are emails -->
</field>
- <field name="contactListId" title="${uiLabelMap.ContactListId}"><lookup size="20" target-form-name="LookupContactList"/></field>
+ <field name="contactListId"><lookup size="20" target-form-name="LookupContactList"/></field>
<field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><date-time/></field>
<field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><date-time/></field>
<field name="subject" title="${uiLabelMap.PartySubject}"><text size="30"/></field>
@@ -293,7 +293,7 @@
<field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><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>
+ <field name="custReqestId" position="1"><text size="20"/></field>
<field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
<field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
<field map-name="subjectMap" name="subject" title="${uiLabelMap.PartyCommEventSubject}"><text size="30"/></field>
@@ -401,10 +401,10 @@
</entity-and>
</actions>
- <field name="contactMechId" widget-style="buttontext" title="${uiLabelMap.PartyContactMechId}">
+ <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="cmDetail" title="${uiLabelMap.PartyContactMechDetail}"><display description="[${infoString}] [${tnCountryCode}-${tnAreaCode}-${tnContactNumber}] [${paAddress1}, ${paAddress2}, ${paCity}, ${paStateProvinceGeoId}, ${paPostalCode}, ${paPostalCodeExt} ${paCountryGeoId}]" also-hidden="false"/></field>
+ <field name="cmDetail"><display description="[${infoString}] [${tnCountryCode}-${tnAreaCode}-${tnContactNumber}] [${paAddress1}, ${paAddress2}, ${paCity}, ${paStateProvinceGeoId}, ${paPostalCode}, ${paPostalCodeExt} ${paCountryGeoId}]" also-hidden="false"/></field>
</form>
</forms>
Modified: trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml 2006-05-03 11:22:53 UTC (rev 7498)
+++ trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml 2006-05-03 12:41:10 UTC (rev 7499)
@@ -61,7 +61,7 @@
</entity-options>
</drop-down>
</field>
- <field name="productStoreId" title="${uiLabelMap.CatalogProductStore}">
+ <field name="productStoreId">
<drop-down allow-empty="true">
<entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]">
<entity-order-by field-name="storeName"/>
@@ -81,7 +81,7 @@
<field name="segmentGroupId"><hidden/></field>
- <field name="partyClassificationGroupId" title="${uiLabelMap.PartyPartyClassificationGroupId}">
+ <field name="partyClassificationGroupId">
<lookup target-form-name="LookupPartyClassificationGroup"/>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
@@ -95,7 +95,7 @@
</entity-and>
</actions>
<field name="segmentGroupId"><hidden/></field>
- <field name="partyClassificationGroupId" title="${uiLabelMap.SegmentGroupPartyClassificationGroupId}"><display/></field>
+ <field name="partyClassificationGroupId"><display/></field>
<field name="deleteLink" title="" widget-style="buttontext">
<hyperlink target="deleteSegmentGroupClassification?segmentGroupId=${segmentGroupId}&partyClassificationGroupId=${partyClassificationGroupId}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
@@ -109,7 +109,7 @@
<field name="segmentGroupId"><hidden/></field>
- <field name="geoId" title="${uiLabelMap.CommonGeoId}"><lookup target-form-name="LookupGeo"/></field>
+ <field name="geoId" title="${uiLabelMap.SegmentGroupGeoId}"><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" default-title-style="tableheadtext"
@@ -135,7 +135,7 @@
<field name="segmentGroupId"><hidden/></field>
- <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="roleTypeId">
<drop-down>
<entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
Modified: trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml 2006-05-03 11:22:53 UTC (rev 7498)
+++ trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml 2006-05-03 12:41:10 UTC (rev 7499)
@@ -84,7 +84,7 @@
<field name="description" title="${uiLabelMap.TrackingCodeDescription}"><display/></field>
<field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"><display-entity entity-name="TrackingCodeType"/></field>
<field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity description="${campaignName}" entity-name="MarketingCampaign"/></field>
- <field name="prodCatalogId" title="${uiLabelMap.TrackingCodeProdCatalogId}"><display-entity description="${catalogName}" entity-name="ProdCatalog"/></field>
+ <field name="prodCatalogId"><display-entity description="${catalogName}" entity-name="ProdCatalog"/></field>
<field name="deleteLink" title="&nbsp;" widget-style="buttontext">
<hyperlink target="deleteTrackingCode?trackingCodeId=${trackingCodeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
Modified: trunk/applications/marketing/widget/ContactListScreens.xml
===================================================================
--- trunk/applications/marketing/widget/ContactListScreens.xml 2006-05-03 11:22:53 UTC (rev 7498)
+++ trunk/applications/marketing/widget/ContactListScreens.xml 2006-05-03 12:41:10 UTC (rev 7499)
@@ -204,7 +204,7 @@
<widgets>
<decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container><label style="head1">${uiLabelMap.PageTitleListContactList} for contactListId=${contactListId}</label></container>
+ <container><label style="head1">${uiLabelMap.PageTitleListContactList} ${uiLabelMap.CommonFor} contactListId=${contactListId}</label></container>
<container><link text="${uiLabelMap.ContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container>
<include-form name="ListContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
</decorator-section>
@@ -237,6 +237,7 @@
<screen name="LookupContactList">
<section>
<actions>
+ <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
<set field="titleProperty" value="PageTitleLookupContactList"/>
<set field="tabButtonItem" value="ContactList"/>
<set field="labelTitleProperty" value="PageTitleLookupContactList"/>
@@ -256,6 +257,7 @@
<screen name="LookupPreferredContactMech">
<section>
<actions>
+ <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
<set field="titleProperty" value="PageTitlePreferredContactMech"/>
<set field="tabButtonItem" value="ContactList"/>
<set field="labelTitleProperty" value="PageTitlePreferredContactMech"/>
Modified: trunk/applications/marketing/widget/LookupScreens.xml
===================================================================
--- trunk/applications/marketing/widget/LookupScreens.xml 2006-05-03 11:22:53 UTC (rev 7498)
+++ trunk/applications/marketing/widget/LookupScreens.xml 2006-05-03 12:41:10 UTC (rev 7499)
@@ -37,7 +37,7 @@
<actions>
<property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
- <set field="title" value="Lookup SegmentGroup"/>
+ <set field="title" value="${uiLabelMap.PageTitleLookupSegmentGroup}"/>
<set field="queryString" from-field="result.queryString"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
@@ -52,27 +52,4 @@
</widgets>
</section>
</screen>
-
-
- <!-- Geo Lookup Screen -->
- <screen name="LookupGeo">
- <section>
- <actions>
- <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
-
- <set field="title" value="Lookup Geo"/>
- <set field="queryString" from-field="result.queryString"/>
- <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
- <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
- </actions>
- <widgets>
- <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
- <decorator-section name="body">
- <include-form name="LookupGeo" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
- <include-form name="listLookupGeo" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
</screens>
More information about the Svn
mailing list