[OFBiz] SVN: r5968 - in trunk/applications: marketing/config
marketing/script/org/ofbiz/marketing/campaign
marketing/servicedef marketing/webapp/marketing/WEB-INF
marketing/webapp/marketing/campaign
marketing/webapp/marketing/contact marketing/webapp/marketing/lookup
marketing/webapp/marketing/segment marketing/widget
party/config party/webapp/partymgr/WEB-INF
party/webapp/partymgr/lookup product/config
product/webapp/catalog/store
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Sat Oct 15 02:57:21 EDT 2005
Author: jonesde
Date: 2005-10-15 01:56:57 -0500 (Sat, 15 Oct 2005)
New Revision: 5968
Added:
trunk/applications/marketing/config/MarketingEntityLabels.properties
trunk/applications/marketing/config/MarketingEntityLabels_fr.properties
trunk/applications/marketing/config/MarketingUiLabels_fr.properties
trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml
trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml
trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignTabBar.ftl
trunk/applications/marketing/widget/MarketingCampaignScreens.xml
Modified:
trunk/applications/marketing/config/MarketingUiLabels.properties
trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml
trunk/applications/marketing/servicedef/services.xml
trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml
trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml
trunk/applications/party/config/PartyUiLabels.properties
trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
trunk/applications/product/config/ProductUiLabels.properties
trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
Log:
Patch from Yannick Thebault with a bunch of i18n in marketing forms and conversion of some old JSP stuff to modern tools, basically a rewrite; also a few little cleanups while reviewing; Jira #OFBIZ-525
Added: trunk/applications/marketing/config/MarketingEntityLabels.properties
===================================================================
--- trunk/applications/marketing/config/MarketingEntityLabels.properties 2005-10-15 05:43:54 UTC (rev 5967)
+++ trunk/applications/marketing/config/MarketingEntityLabels.properties 2005-10-15 06:56:57 UTC (rev 5968)
@@ -0,0 +1,12 @@
+ContactListType.description.MARKETING=Marketing
+ContactListType.description.NEWSLETTER=Newsletter
+ContactListType.description.ANNOUNCEMENT=Announcement
+StatusType.description.CONTACTLST_PARTY=Contact List Party
+StatusItem.description.CLPT_PENDING=Pending Acceptance
+StatusItem.description.CLPT_ACCEPTED=Accepted
+StatusItem.description.CLPT_REJECTED=Rejected
+SegmentGroupType.description.MARKET_SEGMENT=Market Segment
+SegmentGroupType.description.SALES_SEGMENT=Sales Segment
+TrackingCodeType.description.INTERNAL=Internal
+TrackingCodeType.description.EXTERNAL=External
+TrackingCodeType.description.PARTNER_MGD=Partner Managed
Property changes on: trunk/applications/marketing/config/MarketingEntityLabels.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Added: trunk/applications/marketing/config/MarketingEntityLabels_fr.properties
===================================================================
--- trunk/applications/marketing/config/MarketingEntityLabels_fr.properties 2005-10-15 05:43:54 UTC (rev 5967)
+++ trunk/applications/marketing/config/MarketingEntityLabels_fr.properties 2005-10-15 06:56:57 UTC (rev 5968)
@@ -0,0 +1,12 @@
+ContactListType.description.MARKETING=Marketing
+ContactListType.description.NEWSLETTER=Lettre d'information
+ContactListType.description.ANNOUNCEMENT=Annonce
+StatusType.description.CONTACTLST_PARTY=Acteur de liste de contact
+StatusItem.description.CLPT_PENDING=Acceptation en attente
+StatusItem.description.CLPT_ACCEPTED=Accept\u00e9
+StatusItem.description.CLPT_REJECTED=Refu\u00e9
+SegmentGroupType.description.MARKET_SEGMENT=Segment de march\u00e9
+SegmentGroupType.description.SALES_SEGMENT=Segment de vente
+TrackingCodeType.description.INTERNAL=Interne
+TrackingCodeType.description.EXTERNAL=Externe
+TrackingCodeType.description.PARTNER_MGD=G\u00e9r\u00e9 par un tiers
Property changes on: trunk/applications/marketing/config/MarketingEntityLabels_fr.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Modified: trunk/applications/marketing/config/MarketingUiLabels.properties
===================================================================
--- trunk/applications/marketing/config/MarketingUiLabels.properties 2005-10-15 05:43:54 UTC (rev 5967)
+++ trunk/applications/marketing/config/MarketingUiLabels.properties 2005-10-15 06:56:57 UTC (rev 5968)
@@ -7,27 +7,46 @@
MarketingCompanySubtitle=Part of the Open For Business Family of Open Source Software
ContactList=Contact List
-ContactListCommEventId=Comm Event Id
+ContactListCommEventCreate=Create New Contact List Comm Event
+ContactListCommEventId=Communication Event Id
+ContactListCommEventTypeId=Communication Event Type Id
ContactListContactListId=Contact List Id
-ContactListCommEventCreate=Create New Contact List Comm Event
+ContactListContactListName=Contact List Name
+ContactListContactListTypeId=Contact List Type Id
+ContactListContactMechTypeId=Contact Mechanisism Type Id
ContactListCreate=Create New Contact List
+ContactListIsPublic=Is Public ?
+ContactListOptInVerifyCode=Opt-In Verify Code
+ContactListOwnerPartyId=Owner Party Id
+ContactListParty=Contact List Party
ContactListPartyCreate=Create New Contact List Party
-ContactListParty=Contact List Party
-SegmentGroupSegmentGroupId=Segment Group Id
-SegmentGroupSegmentGroupTypeId=Segment Group Type Id
-SegmentGroupDescription=Description
-SegmentGroupProductStoreId=Product Store Id
-SegmentGroupCreate=Create New Segment Group
-SegmentGroupClassCreate=Create New Segment Group Classification
-SegmentGroupGeoCreate=Create New Segment Group Geo
-SegmentGroupRoleCreate=Create New Segment Group Role
+ContactListPartyId=Party Id
+ContactListPreferredContactMech=Preferred Contact Mechanism
+ContactListVerifyEmailFrom=Verify Email From
+ContactListVerifyEmailScreen=Verify Email Screen
+ContactListVerifyEmailSubject=Verify Email Subject
+ContactListVerifyEmailWebSiteId=Verify Email WebSite Id
+MarketingCampaign=Marketing Campaign
+MarketingCampaignCreate=Create Marketing Campaign
+MarketingCampaignId=Marketing Campaign Id
+MarketingCampaignName=Campaign Name
+MarketingCampaignRoleCreate=Create Marketing Campaign Role
+MarketingCampaignSummary=Campaign Summary
+MarketingParentCampaignId=Parent Campaign Id
+MarketingViewPermissionError=View Permission Error
PageTitleAddContactList=Add Contact List
+PageTitleAddMarketingCampaign=Add New Marketing Campaign
PageTitleEditContactListCommEvent=Edit Contact List Comm Event
PageTitleEditContactList=Edit Contact List
PageTitleEditContactListParty=Edit Contact List Party
+PageTitleEditMarketingCampaign=Edit Marketing Campaign
+PageTitleEditMarketingCampaignRole=Edit Marketing Campaign Role
PageTitleEditSegmentGroup=Edit Segment Group
PageTitleFindContactListParty=Find Contact List Parties
+PageTitleFindMarketingCampaignRole=Find Marketing Campaign Role
PageTitleFindSegmentGroup=Find Segment Group
+PageTitleListMarketingCampaign=List Marketing Campaign
+PageTitleListMarketingCampaignRole=List Marketing Campaign Role
PageTitleListSegmentGroupClass=List Segment Group Classifications
PageTitleEditSegmentGroupClass=Edit Segment Group Classification
PageTitleListSegmentGroupGeo=List Segment Group Geos
@@ -41,16 +60,23 @@
PageTitleEditSegmentGroupRole=Edit Segment Group Role
PageTitlePreferredContactMech=Preferred Contact Mechanism
PageTitleFindContactListCommEvents=Find Associated CommEvents
+SegmentGroupCreate=Create New Segment Group
+SegmentGroupClassCreate=Create New Segment Group Classification
+SegmentGroupGeoAbbr=Abbreviation
+SegmentGroupGeoCode=Code
+SegmentGroupGeoCreate=Create New Segment Group Geo
+SegmentGroupGeoId=Geo ID
+SegmentGroupGeoName=Name
+SegmentGroupGeoSecCode=Secondary Code
+SegmentGroupGeoTypeId=Geo Type ID
+SegmentGroupNoSegmentGroupFoundWithId=No SegmentGroup found with ID:
+SegmentGroupProductStoreId=Product Store Id
+SegmentGroupRoleCreate=Create New Segment Group Role
SegmentGroupSegmentGroup=Segment
+SegmentGroupSegmentGroupClassification=Classification
+SegmentGroupSegmentGroupId=Segment Group Id
SegmentGroupSegmentGroupType=Type
-SegmentGroupSegmentGroupClassification=Classification
+SegmentGroupSegmentGroupTypeId=Segment Group Type Id
SegmentGroupSegmentGroupRole=Role
SegmentGroupSegmentGroupGeo=Geo
SegmentGroupSegmentGroupLookup=Find
-SegmentGroupNoSegmentGroupFoundWithId=No SegmentGroup found with ID:
-SegmentGroupGeoId=Geo ID
-SegmentGroupGeoTypeId=Geo Type ID
-SegmentGroupGeoName=Name
-SegmentGroupGeoCode=Code
-SegmentGroupGeoSecCode=Secondary Code
-SegmentGroupGeoAbbr=Abbreviation
Added: trunk/applications/marketing/config/MarketingUiLabels_fr.properties
===================================================================
--- trunk/applications/marketing/config/MarketingUiLabels_fr.properties 2005-10-15 05:43:54 UTC (rev 5967)
+++ trunk/applications/marketing/config/MarketingUiLabels_fr.properties 2005-10-15 06:56:57 UTC (rev 5968)
@@ -0,0 +1,82 @@
+#
+# OFBiz UiLabel Properties
+#
+####
+
+MarketingCompanyName=OFBiz: Gestion du Marketing
+MarketingCompanySubtitle=Application de gestion du marketing de la solution ERP OFBiz Neogia
+
+ContactList=List de contacts
+ContactListCommEventCreate=Nouvel \u00e9v\u00e9nement de communication de la liste de contact
+ContactListCommEventId=Ev\u00e9nement de communication
+ContactListCommEventTypeId=R\u00e9f. du type d'\u00e9v\u00e9nement de communication
+ContactListContactListId=R\u00e9f. de la liste de contact
+ContactListContactListName=Nom de la liste de contact
+ContactListContactListTypeId=R\u00e9f. du type de liste de contact
+ContactListContactMechTypeId=Type de m\u00e9canisme de contact
+ContactListCreate=Nouvelle liste de contact
+ContactListIsPublic=est publique ?
+ContactListOptInVerifyCode=Code de v\u00e9rification d'inscription volontaire (Opt-in)
+ContactListOwnerPartyId=R\u00e9f. acteur propri\u00e9taire
+ContactListParty=Acteur de la liste de contact
+ContactListPartyCreate=Nouvel acteur de la liste de contact
+ContactListPartyId=R\u00e9f. de l'acteur
+ContactListPreferredContactMech=M\u00e9canisme de contact favori
+ContactListVerifyEmailFrom=Exp\u00e9diteur courriel de v\u00e9rification
+ContactListVerifyEmailScreen=Ecran du courriel de v\u00e9rification
+ContactListVerifyEmailSubject=Sujet du courriel de v\u00e9rification
+ContactListVerifyEmailWebSiteId=R\u00e9f. du site Internet du courriel de v\u00e9rification
+MarketingCampaign=Campagne marketing
+MarketingCampaignCreate=Nouvelle campagne marketing
+MarketingCampaignId=R\u00e9f. de campagne marketing
+MarketingCampaignName=Nom de la campagne
+MarketingCampaignRoleCreate=Nouveau r\u00f4le de la campagne marketing
+MarketingCampaignSummary=R\u00e9sum\u00e9 de la campagne
+MarketingParentCampaignId=R\u00e9f. de campagne parent
+MarketingViewPermissionError=Vous n'avez pas la permission de voir
+PageTitleAddContactList=Nouvelle liste de contact
+PageTitleAddMarketingCampaign=Nouvelle campagne marketing
+PageTitleEditContactListCommEvent=Edition de l'\u00e9v\u00e9nement de communication de la liste de contact
+PageTitleEditContactList=Edition de la liste de contact
+PageTitleEditContactListParty=Edition de l'acteur de la liste de contact
+PageTitleEditMarketingCampaign=Edition de campagne marketing
+PageTitleEditMarketingCampaignRole=Edition des r\u00f4les de la campagne marketing
+PageTitleEditSegmentGroup=Edition du groupe de segment
+PageTitleFindContactListParty=Recherche des acteurs de liste de contact
+PageTitleFindMarketingCampaignRole=Recherche de r\u00f4le de campagne marketing
+PageTitleFindSegmentGroup=Recherche groupe de segment
+PageTitleListMarketingCampaign=Liste des campagnes marketing
+PageTitleListMarketingCampaignRole=Liste des r\u00f4les de la campagne marketing
+PageTitleListSegmentGroupClass=Liste des classifications du groupe de segment
+PageTitleEditSegmentGroupClass=Edition des classification de groupe de segment
+PageTitleListSegmentGroupGeo=Liste des zones g\u00e9ographiques de groupe de segment
+PageTitleEditSegmentGroupGeo=Edition des zones g\u00e9ographiques de groupe de segment
+PageTitleListContactListCommEvent=Liste des \u00e9v\u00e9nements de communication de la liste de contact
+PageTitleListContactList=Liste des listes de contact
+PageTitleListContactListParty=Liste des acteurs de la liste de contact
+PageTitleListSegmentGroupRole=Liste des r\u00f4les du groupe de segment
+PageTitleLookupCommEvent=Recherche \u00e9v\u00e9nement de communication
+PageTitleLookupContactList=Recherche liste de contact
+PageTitleEditSegmentGroupRole=Edition r\u00f4le de groupe de segment
+PageTitlePreferredContactMech=M\u00e9canisme de contact favori
+PageTitleFindContactListCommEvents=Recherche \u00e9v\u00e9nement de communication associ\u00e9s
+SegmentGroupCreate=Nouveau groupe de segment
+SegmentGroupClassCreate=Nouvelle classification de groupe de segment
+SegmentGroupGeoAbbr=Abbr\u00e9viation
+SegmentGroupGeoCreate=Nouvelle zone g\u00e9ographique de groupe de segment
+SegmentGroupGeoCode=Code
+SegmentGroupGeoId=R\u00e9f. de zone g\u00e9ographique
+SegmentGroupGeoName=Nom
+SegmentGroupGeoTypeId=R\u00e9f. de type de zone g\u00e9ographique
+SegmentGroupGeoSecCode=Code secondaire
+SegmentGroupNoSegmentGroupFoundWithId=Pas de groupe de segment trouv\u00e9 pour la r\u00e9f\u00e9rence :
+SegmentGroupProductStoreId=Centre de profit
+SegmentGroupRoleCreate=Nouveau r\u00f4le de groupe de segment
+SegmentGroupSegmentGroup=Segment
+SegmentGroupSegmentGroupClassification=Classification
+SegmentGroupSegmentGroupGeo=Zone g\u00e9ographique
+SegmentGroupSegmentGroupId=R\u00e9f. du groupe de segment
+SegmentGroupSegmentGroupLookup=Recherche
+SegmentGroupSegmentGroupType=Type
+SegmentGroupSegmentGroupTypeId=R\u00e9f. du type de groupe de segment
+SegmentGroupSegmentGroupRole=R\u00f4le
Property changes on: trunk/applications/marketing/config/MarketingUiLabels_fr.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Modified: trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml
===================================================================
--- trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml 2005-10-15 05:43:54 UTC (rev 5967)
+++ trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml 2005-10-15 06:56:57 UTC (rev 5968)
@@ -126,4 +126,54 @@
<find-by-primary-key entity-name="MarketingCampaignRole" map-name="lookupPKMap" value-name="lookedUpValue"/>
<remove-value value-name="lookedUpValue"/>
</simple-method>
+ <simple-method method-name="createMarketingCampaignRole" short-description="Add Role To MarketingCampaign">
+ <!-- allow if userLogin.partyId = parameters.partyId or has permission -->
+ <if>
+ <condition>
+ <and>
+ <if-compare-field field-name="userLogin.partyId" operator="not-equals" to-field-name="parameters.partyId"/>
+ <not><if-has-permission permission="MARKETING" action="_CREATE"/></not>
+ </and>
+ </condition>
+ <then><add-error><fail-message message="Security Error: to run createMarketingCampaignRole you must run it for yourself or have the MARKETING_CREATE or MARKETING_ADMIN permissions."/></add-error></then>
+ </if>
+
+ <entity-one entity-name="MarketingCampaign" value-name="marketingCampaign"/>
+
+ <!-- okay, now check for all errors -->
+ <check-errors/>
+
+
+ <make-value entity-name="MarketingCampaignRole" value-name="newEntity"/>
+ <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <set-pk-fields map-name="parameters" value-name="newEntity"/>
+ <create-value value-name="newEntity"/>
+
+ </simple-method>
+ <simple-method method-name="updateMarketingCampaignRole" short-description="Update Add Role To MarketingCampaign">
+ <!-- allow if userLogin.partyId = parameters.partyId or has permission -->
+ <if>
+ <condition>
+ <and>
+ <if-compare-field field-name="userLogin.partyId" operator="not-equals" to-field-name="parameters.partyId"/>
+ <not><if-has-permission permission="MARKETING" action="_UPDATE"/></not>
+ </and>
+ </condition>
+ <then><add-error><fail-message message="Security Error: to run updateMarketingCampaignRole you must run it for yourself or have the MARKETING_UPDATE or MARKETING_ADMIN permissions."/></add-error></then>
+ </if>
+ <check-errors/>
+
+ <entity-one entity-name="MarketingCampaign" value-name="marketingCampaign"/>
+
+ <entity-one entity-name="MarketingCampaignRole" value-name="lookedUpValue"/>
+ <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
+ <store-value value-name="lookedUpValue"/>
+ </simple-method>
+ <simple-method method-name="deleteMarketingCampaignRole" short-description="Remove Role from MarketingCampaign">
+ <check-permission permission="MARKETING" action="_DELETE"><fail-message message="Security Error: to run deleteMarketingCampaignRole you must have the MARKETING_DELETE or MARKETING_ADMIN permission"/></check-permission>
+ <check-errors/>
+
+ <entity-one entity-name="MarketingCampaignRole" value-name="lookedUpValue"/>
+ <remove-value value-name="lookedUpValue"/>
+ </simple-method>
</simple-methods>
Modified: trunk/applications/marketing/servicedef/services.xml
===================================================================
--- trunk/applications/marketing/servicedef/services.xml 2005-10-15 05:43:54 UTC (rev 5967)
+++ trunk/applications/marketing/servicedef/services.xml 2005-10-15 06:56:57 UTC (rev 5968)
@@ -40,7 +40,13 @@
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
-
+ <service name="removeMarketingCampaign" default-entity-name="MarketingCampaign" engine="simple"
+ location="org/ofbiz/marketing/campaign/MarketingCampaignServices.xml" invoke="removeMarketingCampaign" auth="true">
+ <description>Remove a MarketingCampaign record</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+
<!-- MarketingCampaignPrice Services -->
<service name="addPriceRuleToMarketingCampaign" default-entity-name="MarketingCampaignPrice" engine="simple"
location="org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="addPriceRuleToMarketingCampaign" auth="true">
@@ -76,7 +82,24 @@
<description>Remove Role from MarketingCampaign</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
-
+ <service name="createMarketingCampaignRole" default-entity-name="MarketingCampaignRole" engine="simple"
+ location="org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="createMarketingCampaignRole" auth="true">
+ <description>Add Role to Campaign</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="updateMarketingCampaignRole" default-entity-name="MarketingCampaignRole" engine="simple"
+ location="org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="updateMarketingCampaignRole" auth="true">
+ <description>Update Role to Campaign Join</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="deleteMarketingCampaignRole" default-entity-name="MarketingCampaignRole" engine="simple"
+ location="org/ofbiz/marketing/campaign/CampaignServices.xml" invoke="removeMarketingCampaignRole" auth="true">
+ <description>Remove Role from Campaign</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
+
<!-- ContactList Services -->
<service name="createContactList" default-entity-name="ContactList" engine="simple"
location="org/ofbiz/marketing/contact/ContactListServices.xml" invoke="createContactList" auth="true">
Modified: trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml 2005-10-15 05:43:54 UTC (rev 5967)
+++ trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml 2005-10-15 06:56:57 UTC (rev 5968)
@@ -45,13 +45,13 @@
<handler name="jasperreportsxml" type="view" class="org.ofbiz.webapp.view.JasperReportsXmlViewHandler"/>
<preprocessor>
- <!-- Events to run on every request before security (chains exempt) -->
- <!-- <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> -->
- <event type="java" path="org.ofbiz.securityext.login.LoginEvents" invoke="checkExternalLoginKey"/>
+ <!-- Events to run on every request before security (chains exempt) -->
+ <!-- <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> -->
+ <event type="java" path="org.ofbiz.securityext.login.LoginEvents" invoke="checkExternalLoginKey"/>
</preprocessor>
<postprocessor>
- <!-- Events to run on every request after all other processing (chains exempt) -->
- <!-- <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> -->
+ <!-- Events to run on every request after all other processing (chains exempt) -->
+ <!-- <event type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> -->
</postprocessor>
<!-- Security Mappings -->
@@ -79,23 +79,10 @@
<!-- End of Security Mappings -->
<!-- Request Mappings -->
- <request-map uri="view">
- <security https="true" auth="false"/>
- <response name="success" type="view" value="main"/>
- <response name="error" type="view" value="error"/>
- </request-map>
+ <request-map uri="view"><security https="true" auth="false"/><response name="success" type="view" value="main"/></request-map>
+ <request-map uri="authview"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map>
+ <request-map uri="main"><security https="true" auth="true"/><response name="success" type="view" value="FindMarketingCampaign"/></request-map>
- <request-map uri="authview">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="main"/>
- <response name="error" type="view" value="error"/>
- </request-map>
-
- <request-map uri="main">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="FindMarketingCampaign"/>
- </request-map>
-
<request-map uri="changeDelegator">
<event type="java" path="org.ofbiz.webapp.event.CoreEvents" invoke="changeDelegator"/>
<response name="success" type="view" value="main"/>
@@ -103,93 +90,100 @@
</request-map>
<!-- =========== DataSource =========== -->
- <request-map uri="EditDataSources"><security https="true" auth="true"/>
- <response name="success" type="view" value="EditDataSources"/>
- </request-map>
+ <request-map uri="EditDataSources"><security https="true" auth="true"/><response name="success" type="view" value="EditDataSources"/></request-map>
<request-map uri="createDataSource"><security https="true" auth="true"/>
<event type="service" path="" invoke="createDataSource"/>
- <response name="success" type="view" value="EditDataSources"/>
- <response name="error" type="view" value="EditDataSources"/>
+ <response name="success" type="view" value="EditDataSources"/>
+ <response name="error" type="view" value="EditDataSources"/>
</request-map>
<request-map uri="updateDataSource"><security https="true" auth="true"/>
<event type="service" path="" invoke="updateDataSource"/>
- <response name="success" type="view" value="EditDataSources"/>
- <response name="error" type="view" value="EditDataSources"/>
+ <response name="success" type="view" value="EditDataSources"/>
+ <response name="error" type="view" value="EditDataSources"/>
</request-map>
<request-map uri="deleteDataSource"><security https="true" auth="true"/>
<event type="service" path="" invoke="deleteDataSource"/>
- <response name="success" type="view" value="EditDataSources"/>
- <response name="error" type="view" value="EditDataSources"/>
+ <response name="success" type="view" value="EditDataSources"/>
+ <response name="error" type="view" value="EditDataSources"/>
</request-map>
<!-- =========== TrackingCode =========== -->
- <request-map uri="FindTrackingCode"><security https="true" auth="true"/>
- <response name="success" type="view" value="FindTrackingCode"/>
- </request-map>
-
- <request-map uri="EditTrackingCode"><security https="true" auth="true"/>
- <response name="success" type="view" value="EditTrackingCode"/>
- </request-map>
+ <request-map uri="FindTrackingCode"><security https="true" auth="true"/><response name="success" type="view" value="FindTrackingCode"/></request-map>
+ <request-map uri="EditTrackingCode"><security https="true" auth="true"/><response name="success" type="view" value="EditTrackingCode"/></request-map>
<request-map uri="createTrackingCode"><security https="true" auth="true"/>
<event type="service" path="" invoke="createTrackingCode"/>
- <response name="success" type="view" value="EditTrackingCode"/>
- <response name="error" type="view" value="EditTrackingCode"/>
+ <response name="success" type="view" value="EditTrackingCode"/>
+ <response name="error" type="view" value="EditTrackingCode"/>
</request-map>
<request-map uri="updateTrackingCode"><security https="true" auth="true"/>
<event type="service" path="" invoke="updateTrackingCode"/>
- <response name="success" type="view" value="EditTrackingCode"/>
- <response name="error" type="view" value="EditTrackingCode"/>
+ <response name="success" type="view" value="EditTrackingCode"/>
+ <response name="error" type="view" value="EditTrackingCode"/>
</request-map>
- <request-map uri="FindTrackingCodeOrders"><security https="true" auth="true"/>
- <response name="success" type="view" value="FindTrackingCodeOrders"/>
- </request-map>
- <request-map uri="FindTrackingCodeVisits"><security https="true" auth="true"/>
- <response name="success" type="view" value="FindTrackingCodeVisits"/>
- </request-map>
+ <request-map uri="FindTrackingCodeOrders"><security https="true" auth="true"/><response name="success" type="view" value="FindTrackingCodeOrders"/></request-map>
+ <request-map uri="FindTrackingCodeVisits"><security https="true" auth="true"/><response name="success" type="view" value="FindTrackingCodeVisits"/></request-map>
<!-- =========== MarketingCampaign =========== -->
<request-map uri="FindMarketingCampaign"><security https="true" auth="true"/>
- <response name="success" type="view" value="FindMarketingCampaign"/>
+ <response name="success" type="view" value="FindMarketingCampaign"/>
</request-map>
<request-map uri="EditMarketingCampaign"><security https="true" auth="true"/>
- <response name="success" type="view" value="EditMarketingCampaign"/>
+ <response name="success" type="view" value="EditMarketingCampaign"/>
</request-map>
<request-map uri="createMarketingCampaign"><security https="true" auth="true"/>
<event type="service" path="" invoke="createMarketingCampaign"/>
- <response name="success" type="view" value="EditMarketingCampaign"/>
- <response name="error" type="view" value="EditMarketingCampaign"/>
+ <response name="success" type="view" value="EditMarketingCampaign"/>
+ <response name="error" type="view" value="EditMarketingCampaign"/>
</request-map>
<request-map uri="updateMarketingCampaign"><security https="true" auth="true"/>
<event type="service" path="" invoke="updateMarketingCampaign"/>
- <response name="success" type="view" value="EditMarketingCampaign"/>
- <response name="error" type="view" value="EditMarketingCampaign"/>
+ <response name="success" type="view" value="EditMarketingCampaign"/>
+ <response name="error" type="view" value="EditMarketingCampaign"/>
</request-map>
- <request-map uri="EditMarketingCampaignRoles"><security https="true" auth="true"/>
- <response name="success" type="view" value="EditMarketingCampaignRoles"/>
- </request-map>
+ <request-map uri="EditMarketingCampaignRoles"><security https="true" auth="true"/><response name="success" type="view" value="EditMarketingCampaignRoles"/></request-map>
<request-map uri="addRoleToMarketingCampaign"><security https="true" auth="true"/>
<event type="service" path="" invoke="addRoleToMarketingCampaign"/>
- <response name="success" type="view" value="EditMarketingCampaignRoles"/>
- <response name="error" type="view" value="EditMarketingCampaignRoles"/>
+ <response name="success" type="view" value="EditMarketingCampaignRoles"/>
+ <response name="error" type="view" value="EditMarketingCampaignRoles"/>
</request-map>
<request-map uri="removeRoleFromMarketingCampaign"><security https="true" auth="true"/>
<event type="service" path="" invoke="removeRoleFromMarketingCampaign"/>
- <response name="success" type="view" value="EditMarketingCampaignRoles"/>
- <response name="error" type="view" value="EditMarketingCampaignRoles"/>
+ <response name="success" type="view" value="EditMarketingCampaignRoles"/>
+ <response name="error" type="view" value="EditMarketingCampaignRoles"/>
</request-map>
-
- <!-- SegmentGroup requests -->
- <request-map uri="viewSegmentGroup">
+ <request-map uri="FindMarketingCampaignRoles">
<security https="true" auth="true"/>
- <response name="success" type="view" value="viewSegmentGroup"/>
+ <response name="success" type="view" value="FindMarketingCampaignRoles"/>
</request-map>
- <request-map uri="FindSegmentGroup">
+ <request-map uri="ListMarketingCampaignRoles">
<security https="true" auth="true"/>
- <response name="success" type="view" value="FindSegmentGroup"/>
+ <response name="success" type="view" value="ListMarketingCampaignRoles"/>
</request-map>
+ <request-map uri="createMarketingCampaignRole">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createMarketingCampaignRole"/>
+ <response name="success" type="view" value="EditMarketingCampaignRoles"/>
+ <response name="error" type="view" value="EditMarketingCampaignRoles"/>
+ </request-map>
+ <request-map uri="updateMarketingCampaignRole">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateMarketingCampaignRole"/>
+ <response name="success" type="view" value="EditMarketingCampaignRoles"/>
+ <response name="error" type="view" value="EditMarketingCampaignRoles"/>
+ </request-map>
+ <request-map uri="removeMarketingCampaignRole">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deleteMarketingCampaignRole"/>
+ <response name="success" type="view" value="ListMarketingCampaignRoles"/>
+ <response name="error" type="view" value="ListMarketingCampaignRoles"/>
+ </request-map>
+
+ <!-- SegmentGroup requests -->
+ <request-map uri="viewSegmentGroup"><security https="true" auth="true"/><response name="success" type="view" value="viewSegmentGroup"/></request-map>
+ <request-map uri="FindSegmentGroup"><security https="true" auth="true"/><response name="success" type="view" value="FindSegmentGroup"/></request-map>
<request-map uri="createSegmentGroup">
<security https="true" auth="true"/>
<event type="service" path="" invoke="createSegmentGroup"/>
@@ -210,10 +204,7 @@
</request-map>
<!-- SegmentGroupClassification requests -->
- <request-map uri="listSegmentGroupClass">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="listSegmentGroupClass"/>
- </request-map>
+ <request-map uri="listSegmentGroupClass"><security https="true" auth="true"/><response name="success" type="view" value="listSegmentGroupClass"/></request-map>
<request-map uri="createSegmentGroupClassification">
<security https="true" auth="true"/>
<event type="service" path="" invoke="createSegmentGroupClassification"/>
@@ -235,10 +226,7 @@
<!-- SegmentGroupGeo requests -->
- <request-map uri="listSegmentGroupGeo">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="listSegmentGroupGeo"/>
- </request-map>
+ <request-map uri="listSegmentGroupGeo"><security https="true" auth="true"/><response name="success" type="view" value="listSegmentGroupGeo"/></request-map>
<request-map uri="createSegmentGroupGeo">
<security https="true" auth="true"/>
<event type="service" path="" invoke="createSegmentGroupGeo"/>
@@ -259,10 +247,7 @@
</request-map>
<!-- SegmentGroupRole requests -->
- <request-map uri="listSegmentGroupRole">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="listSegmentGroupRole"/>
- </request-map>
+ <request-map uri="listSegmentGroupRole"><security https="true" auth="true"/><response name="success" type="view" value="listSegmentGroupRole"/></request-map>
<request-map uri="createSegmentGroupRole">
<security https="true" auth="true"/>
<event type="service" path="" invoke="createSegmentGroupRole"/>
@@ -282,64 +267,22 @@
<response name="error" type="view" value="listSegmentGroupRole"/>
</request-map>
- <!-- Lookup request mappings -->
- <request-map uri="LookupSegmentGroup">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupSegmentGroup"/>
- </request-map>
-
- <request-map uri="LookupProductStore">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupProductStore"/>
- </request-map>
-
- <request-map uri="LookupPartyClassificationGroup">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupPartyClassificationGroup"/>
- </request-map>
-
- <request-map uri="LookupGeo">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupGeo"/>
- </request-map>
-
- <request-map uri="LookupPartyName">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupPartyName"/>
- </request-map>
-
- <request-map uri="LookupRoleType">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupRoleType"/>
- </request-map>
-
<!-- ContactList request mappings -->
- <request-map uri="ListContactLists">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ListContactLists"/>
- </request-map>
- <request-map uri="EditContactList">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditContactList"/>
- </request-map>
- <request-map uri="LookupContactList">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupContactList"/>
- </request-map>
+ <request-map uri="ListContactLists"><security https="true" auth="true"/><response name="success" type="view" value="ListContactLists"/></request-map>
+ <request-map uri="EditContactList"><security https="true" auth="true"/><response name="success" type="view" value="EditContactList"/></request-map>
+ <request-map uri="LookupContactList"><security https="true" auth="true"/><response name="success" type="view" value="LookupContactList"/></request-map>
<request-map uri="createContactList">
<security https="true" auth="true"/>
<event type="service" invoke="createContactList"/>
<response name="success" type="view" value="EditContactList"/>
<response name="error" type="view" value="EditContactList"/>
</request-map>
-
<request-map uri="updateContactList">
<security https="true" auth="true"/>
<event type="service" invoke="updateContactList"/>
<response name="success" type="view" value="EditContactList"/>
<response name="error" type="view" value="EditContactList"/>
</request-map>
-
<request-map uri="removeContactList">
<security https="true" auth="true"/>
<event type="service" invoke="removeContactList"/>
@@ -347,33 +290,21 @@
<response name="error" type="view" value="ListContactLists"/>
</request-map>
- <request-map uri="EditContactListParty">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditContactListParty"/>
- </request-map>
- <request-map uri="FindContactListParties">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="FindContactListParties"/>
- </request-map>
- <request-map uri="ListContactListParties">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ListContactListParties"/>
- </request-map>
-
+ <request-map uri="EditContactListParty"><security https="true" auth="true"/><response name="success" type="view" value="EditContactListParty"/></request-map>
+ <request-map uri="FindContactListParties"><security https="true" auth="true"/><response name="success" type="view" value="FindContactListParties"/></request-map>
+ <request-map uri="ListContactListParties"><security https="true" auth="true"/><response name="success" type="view" value="ListContactListParties"/></request-map>
<request-map uri="createContactListParty">
<security https="true" auth="true"/>
<event type="service" invoke="createContactListParty"/>
<response name="success" type="view" value="EditContactListParty"/>
<response name="error" type="view" value="EditContactListParty"/>
</request-map>
-
<request-map uri="updateContactListParty">
<security https="true" auth="true"/>
<event type="service" invoke="updateContactListParty"/>
<response name="success" type="view" value="EditContactListParty"/>
<response name="error" type="view" value="EditContactListParty"/>
</request-map>
-
<request-map uri="removeContactListParty">
<security https="true" auth="true"/>
<event type="service" invoke="deleteContactListParty"/>
@@ -381,18 +312,9 @@
<response name="error" type="view" value="ListContactListParties"/>
</request-map>
- <request-map uri="ListContactListCommEvents">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ListContactListCommEvents"/>
- </request-map>
- <request-map uri="EditContactListCommEvent">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditContactListCommEvent"/>
- </request-map>
- <request-map uri="FindContactListCommEvents">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="FindContactListCommEvents"/>
- </request-map>
+ <request-map uri="ListContactListCommEvents"><security https="true" auth="true"/><response name="success" type="view" value="ListContactListCommEvents"/></request-map>
+ <request-map uri="EditContactListCommEvent"><security https="true" auth="true"/><response name="success" type="view" value="EditContactListCommEvent"/></request-map>
+ <request-map uri="FindContactListCommEvents"><security https="true" auth="true"/><response name="success" type="view" value="FindContactListCommEvents"/></request-map>
<request-map uri="createContactListCommEvent">
<security https="true" auth="true"/>
<event type="service" invoke="createCommunicationEvent"/>
@@ -412,18 +334,18 @@
<response name="error" type="view" value="ListContactListEvents"/>
</request-map>
- <request-map uri="LookupCommEvent">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupCommEvent"/>
- </request-map>
- <request-map uri="LookupPreferredContactMech">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupPreferredContactMech"/>
- </request-map>
- <request-map uri="LookupCommEvent">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="LookupCommEvent"/>
- </request-map>
+ <!-- Lookup request mappings -->
+ <request-map uri="LookupSegmentGroup"><security https="true" auth="true"/><response name="success" type="view" value="LookupSegmentGroup"/></request-map>
+ <request-map uri="LookupProductStore"><security https="true" auth="true"/><response name="success" type="view" value="LookupProductStore"/></request-map>
+ <request-map uri="LookupGeo"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeo"/></request-map>
+
+ <request-map uri="LookupPartyName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyName"/></request-map>
+ <request-map uri="LookupRoleType"><security https="true" auth="true"/><response name="success" type="view" value="LookupRoleType"/></request-map>
+ <request-map uri="LookupPartyClassificationGroup"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyClassificationGroup"/></request-map>
+
+ <request-map uri="LookupCommEvent"><security https="true" auth="true"/><response name="success" type="view" value="LookupCommEvent"/></request-map>
+ <request-map uri="LookupPreferredContactMech"><security https="true" auth="true"/><response name="success" type="view" value="LookupPreferredContactMech"/></request-map>
+ <request-map uri="LookupCommEvent"><security https="true" auth="true"/><response name="success" type="view" value="LookupCommEvent"/></request-map>
<!-- end of request mappings -->
<!-- View Mappings -->
@@ -438,9 +360,10 @@
<view-map name="FindTrackingCodeOrders" type="region"/>
<view-map name="FindTrackingCodeVisits" type="region"/>
- <view-map name="FindMarketingCampaign" type="region"/>
- <view-map name="EditMarketingCampaign" type="region"/>
- <view-map name="EditMarketingCampaignRoles" type="region"/>
+ <view-map name="FindMarketingCampaign" type="screen" page="component://marketing/widget/MarketingCampaignScreens.xml#ListMarketingCampaign"/>
+ <view-map name="EditMarketingCampaign" type="screen" page="component://marketing/widget/MarketingCampaignScreens.xml#EditMarketingCampaign"/>
+ <view-map name="FindMarketingCampaignRoles" type="screen" page="component://marketing/widget/MarketingCampaignScreens.xml#ListMarketingCampaignRoles"/>
+ <view-map name="EditMarketingCampaignRoles" type="screen" page="component://marketing/widget/MarketingCampaignScreens.xml#EditMarketingCampaignRoles"/>
<view-map name="FindSegmentGroup" type="screen" page="component://marketing/widget/SegmentScreens.xml#FindSegmentGroup"/>
<view-map name="viewSegmentGroup" type="screen" page="component://marketing/widget/SegmentScreens.xml#EditSegmentGroup"/>
Added: trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml 2005-10-15 05:43:54 UTC (rev 5967)
+++ trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml 2005-10-15 06:56:57 UTC (rev 5968)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+ <form name="EditMarketingCampaign" type="single"
+ target="updateMarketingCampaign" title="" default-map-name="marketingCampaign"
+ default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ <alt-target use-when="marketingCampaign==null" target="createMarketingCampaign"/>
+
+ <field use-when="marketingCampaign!=null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field use-when="marketingCampaign==null&&marketingCampaignId==null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><ignored/></field>
+ <field use-when="marketingCampaign==null&&marketingCampaignId!=null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${marketingCampaignId}]"><display/></field>
+
+ <field name="parentCampaignId" title="${uiLabelMap.MarketingParentCampaignId}">
+ <drop-down allow-empty="true">
+ <entity-options description="${campaignName}" entity-name="MarketingCampaign" key-field-name="marketingCampaignId">
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="campaignName" title="${uiLabelMap.MarketingCampaignName}"><text size="55"/></field>
+ <field name="campaignSummary" title="${uiLabelMap.MarketingCampaignSummary}">
+ <textarea rows="5"/>
+ </field>
+
+ <field name="DONE_PAGE">
+ <hidden value="${donePage}"/>
+ </field>
+
+ <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext"><submit button-type="text-link"/></field>
+ <field name="cancelLink" widget-style="buttontext" title="${uiLabelMap.CommonCancel}"><hyperlink target="${donePage}" also-hidden="false" description="[${uiLabelMap.CommonCancelDone}]" target-type="inter-app"/></field>
+ </form>
+
+ <form name="ListMarketingCampaign" default-title-style="tableheadtext"
+ default-tooltip-style="tabletext" default-widget-style="tabletext"
+ list-iterator-name="" target="" paginate-target="listMarketingCampaign" title="" type="list">
+ <actions>
+ <entity-condition entity-name="MarketingCampaign"/>
+ </actions>
+ <field name="marketingCampaignId" widget-style="buttontext" title="${uiLabelMap.MarketingCampaignId}">
+ <hyperlink target="EditMarketingCampaign?marketingCampaignId=${marketingCampaignId}" description="${marketingCampaignId}" also-hidden="false"/>
+ </field>
+ <field name="campaignName" title="${uiLabelMap.MarketingCampaignName}"><display/></field>
+ <field name="parentCampaignId" title="${uiLabelMap.MarketingParentCampaignId}">
+ <display/>
+ </field>
+ <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <hyperlink target="deleteMarketingCampaign?marketingCampaignId=${marketingCampaignId}"
+ description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
+ </field>
+ </form>
+
+ <form name="ListMarketingCampaignRoles" default-title-style="tableheadtext"
+ default-tooltip-style="tabletext" default-widget-style="tabletext"
+ list-iterator-name="" target="" paginate-target="listMarketingCampaignGeo" title="" type="list">
+ <actions>
+ <entity-and entity-name="MarketingCampaignRole">
+ <field-map env-name="marketingCampaignId" />
+ </entity-and>
+ </actions>
+ <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}">
+ <display/>
+ </field>
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when=""${lastName}"!=null">
+ <display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" also-hidden="true">
+ <sub-hyperlink target="/partymgr/control/viewProfile?partyId=${partyId}" description="[${partyId}]" link-style="buttontext"/>
+ </display-entity>
+ </field>
+<!-- Currently not working for PartyGroup
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when=""${groupName}"!=null">
+ <display-entity entity-name="PartyNameView" description="${groupName}" also-hidden="true">
+ <sub-hyperlink target="/partymgr/control/viewProfile?partyId=${partyId}" description="[${partyId}]" link-style="buttontext"/>
+ </display-entity>
+ </field>
+ -->
+ <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
+ <display-entity entity-name="RoleType" description="${description}" also-hidden="true"/>
+<!-- <sub-hyperlink target="/partymgr/control/viewProfile?partyId=${partyId}" description="[${partyId}]" link-style="buttontext"/>
+ </display-entity>-->
+ </field>
+ <field name="editLink" title="&nbsp;" widget-style="buttontext">
+ <hyperlink target="EditMarketingCampaignRoles?marketingCampaignId=${marketingCampaignId}&roleTypeId=${roleTypeId}&partyId=${partyId}" description="${uiLabelMap.CommonEdit}" also-hidden="false"/>
+ </field>
+ <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <hyperlink target="deleteMarketingCampaignGeo?marketingCampaignId=${marketingCampaignId}&roleTypeId=${roleTypeId}&partyId=${partyId}"
+ description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
+ </field>
+ </form>
+
+ <form name="EditMarketingCampaignRoles" type="single"
+ target="updateMarketingCampaignRole" title="" default-map-name="marketingCampaignRole"
+ default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+ <alt-target use-when="marketingCampaignRole==null" target="createMarketingCampaignRole"/>
+ <auto-fields-service service-name="updateMarketingCampaignRole"/>
+
+ <field use-when="marketingCampaign!=null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field use-when="marketingCampaign==null&&marketingCampaignId==null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><ignored/></field>
+ <field use-when="marketingCampaign==null&&marketingCampaignId!=null" name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${marketingCampaignId}]"><display/></field>
+
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}">
+ <lookup target-form-name="LookupPartyName"/>
+ </field>
+ <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
+ <drop-down>
+ <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext"><submit button-type="text-link"/></field>
+ <field name="cancelLink" widget-style="buttontext" title="${uiLabelMap.CommonCancel}"><hyperlink target="${donePage}?marketingCampaignId=${marketingCampaignId}" also-hidden="false" description="[${uiLabelMap.CommonCancelDone}]"/></field>
+ </form>
+
+</forms>
\ No newline at end of file
Property changes on: trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Added: trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml 2005-10-15 05:43:54 UTC (rev 5967)
+++ trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml 2005-10-15 06:56:57 UTC (rev 5968)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2004-2005 The Open For Business Project - www.ofbiz.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * $Id: MarketingCampaignMenus.xml,v 1.1 2005/10/11 20:57:13 titanouk Exp $
+-->
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
+
+ <menu name="MarketingCampaignTabBar" default-menu-item-name="MarketingCampaign" default-selected-style="tabButtonSelected"
+ default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="tabButton"
+ orientation="horizontal" type="simple">
+ <menu-item name="MarketingCampaign" title="${uiLabelMap.MarketingCampaign}">
+ <link target="/EditMarketingCampaign?marketingCampaignId=${marketingCampaignId}"/>
+ </menu-item>
+ <menu-item name="MarketingCampaignRole" title="${uiLabelMap.PartyRoles}">
+ <link target="/FindMarketingCampaignRoles?marketingCampaignId=${marketingCampaignId}"/>
+ </menu-item>
+ </menu>
+</menus>
Property changes on: trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Added: trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignTabBar.ftl
===================================================================
--- trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignTabBar.ftl 2005-10-15 05:43:54 UTC (rev 5967)
+++ trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignTabBar.ftl 2005-10-15 06:56:57 UTC (rev 5968)
@@ -0,0 +1,48 @@
+<#--
+ * Copyright (c) 2002-2005 The Open For Business Project - www.ofbiz.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+-->
+<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
+
+<#assign unselectedClassName = "tabButton">
+<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
+
+<#if security.hasEntityPermission("MARKETING", "_VIEW", session)>
+<#if marketingCampaign?has_content>
+<#-- Main Heading -->
+<table width="100%" cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td align="right">
+ <div class="tabContainer">
+ <a href="<@ofbizUrl>/EditMarketingCampaign?marketingCampaignId=${marketingCampaignId}</@ofbizUrl>" class="${selectedClassMap.EditMarketingCampaign?default(unselectedClassName)}">${uiLabelMap.MarketingCampaign}</a>
+ <a href="<@ofbizUrl>/ListMarketingCampaignRole?marketingCampaignId=${marketingCampaignId}</@ofbizUrl>" class="${selectedClassMap.MarketingCampaignRole?default(unselectedClassName)}">${uiLabelMap.MarketingCampaignRole}</a>
+ </div>
+ </td>
+ </tr>
+ </table>
+
+<#else>
+ <div class="head2">${uiLabelMap.MarketingNoMarketingCampaignFoundWithId}: ${marketingCampaignId?if_exists}</div>
+</#if>
+<#else>
+ <div class="head2">${uiLabelMap.MarketingViewPermissionError}</div>
+</#if>
Property changes on: trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignTabBar.ftl
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Id Rev Author"
Name: svn:eol-style
+ native
Modified: trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml 2005-10-15 05:43:54 UTC (rev 5967)
+++ trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml 2005-10-15 06:56:57 UTC (rev 5968)
@@ -33,28 +33,28 @@
<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}]" widget-style="tabletext"><display/></field>
- <field name="contactListName" widget-style="inputBox"><text/></field>
- <field name="contactListTypeId">
+ <field name="contactListName" widget-style="inputBox" title="${uiLabelMap.ContactListContactListName}"><text/></field>
+ <field name="contactListTypeId" title="${uiLabelMap.ContactListContactListTypeId}">
<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">
+ <field name="isPublic" title="${uiLabelMap.ContactListIsPublic}">
<drop-down allow-empty="true">
<option key="Y"/><option key="N"/>
</drop-down>
</field>
- <field name="contactMechTypeId">
+ <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}">
<drop-down>
<entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="marketingCampaignId">
+ <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}">
<drop-down allow-empty="true">
<entity-options entity-name="MarketingCampaign" description="${campaignName}">
<entity-order-by field-name="campaignName"/>
@@ -62,12 +62,12 @@
</drop-down>
</field>
- <field name="ownerPartyId"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="ownerPartyId" title="${uiLabelMap.ContactListOwnerPartyId}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="verifyEmailFrom"><text size="40"/></field>
- <field name="verifyEmailScreen"><text size="60"/></field>
- <field name="verifyEmailSubject"><text size="60"/></field>
- <field name="verifyEmailWebSiteId">
+ <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}">
<drop-down allow-empty="true">
<entity-options entity-name="WebSite" key-field-name="webSiteId" description="${siteName} [${webSiteId}]">
<entity-order-by field-name="siteName"/>
@@ -89,12 +89,12 @@
<field name="contactListId" widget-style="buttontext" title="${uiLabelMap.ContactListContactListId}">
<hyperlink target="EditContactList?contactListId=${contactListId}" description="${contactListId}" also-hidden="false"/>
</field>
- <field name="contactListName"><display/></field>
- <field name="isPublic"><display/></field>
- <field name="contactListTypeId"><display-entity entity-name="ContactListType"/></field>
+ <field name="contactListName" title="${uiLabelMap.ContactListContactListName}"><display/></field>
+ <field name="isPublic" title="${uiLabelMap.ContactListIsPublic}"><display/></field>
+ <field name="contactListTypeId" title="${uiLabelMap.ContactListContactListTypeId}"><display-entity entity-name="ContactListType"/></field>
- <field name="contactMechTypeId"><display-entity entity-name="ContactMechType"/></field>
- <field name="marketingCampaignId"><display-entity entity-name="MarketingCampaign" description="${campaignName}"/></field>
+ <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><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=" " widget-style="buttontext">
<hyperlink target="removeContactList?contactListId=${contactListId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
@@ -108,11 +108,11 @@
<alt-target use-when="contactListParty==null" target="createContactListParty"/>
<field name="contactListId"><hidden/></field>
- <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
- <field name="fromDate"><date-time/></field>
- <field name="thruDate"><date-time/></field>
+ <field name="partyId" title="${uiLabelMap.ContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field>
+ <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
+ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
- <field name="statusId">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down no-current-selected-key="CLPT_PENDING">
<entity-options entity-name="StatusItem" description="${description}">
<entity-constraint name="statusTypeId" value="CONTACTLST_PARTY" operator="equals"/>
@@ -120,9 +120,9 @@
</entity-options>
</drop-down>
</field>
- <field name="optInVerifyCode" title="Opt-in Code" widget-style="inputBox" map-name="parameters"><text size="10"/></field>
+ <field name="optInVerifyCode" widget-style="inputBox" map-name="parameters" title="${uiLabelMap.ContactListOptInVerifyCode}"><text size="10"/></field>
- <field name="preferredContactMechId">
+ <field name="preferredContactMechId" title="${uiLabelMap.ContactListPreferredContactMech}">
<lookup target-form-name="LookupPreferredContactMech" target-parameter="partyId"/>
</field>
@@ -133,12 +133,12 @@
target="ListContactListParties" title=""
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
- <field name="contactListId"><text-find/></field>
- <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
- <field name="fromDate"><date-find/></field>
- <field name="thruDate"><date-find/></field>
+ <field name="contactListId" title="${uiLabelMap.ContactListContactListId}"><text-find/></field>
+ <field name="partyId" title="${uiLabelMap.ContactListPartyId}"><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="statusId">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
<entity-options entity-name="StatusItem" description="${description}">
<entity-constraint name="statusTypeId" operator="equals" value="CONTACTLST_PARTY"/>
@@ -146,7 +146,7 @@
</entity-options>
</drop-down>
</field>
- <field name="preferredContactMechId">
+ <field name="preferredContactMechId" title="${uiLabelMap.ContactListPreferredContactMech}">
<lookup target-form-name="LookupPreferredContactMech" target-parameter="partyId"/>
</field>
@@ -164,11 +164,11 @@
</actions>
<field name="contactListId"><hidden/></field>
- <field name="partyId"><display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${groupName} [${partyId}]"/></field>
- <field name="fromDate"><display/></field>
- <field name="thruDate"><display/></field>
- <field name="statusId"><display-entity entity-name="StatusItem"/></field>
- <field name="preferredContactMechId" title="Preferred ContactMech">
+ <field name="partyId" title="${uiLabelMap.ContactListPartyId}"><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}">
<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=" " widget-style="buttontext">
@@ -179,8 +179,8 @@
<form name="EditContactListCommEvent" default-map-name="communicationEvent" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" target="updateContactListCommEvent" title="" type="single">
<alt-target target="createContactListCommEvent" use-when="communicationEvent==null"/>
- <field name="communicationEventId" use-when="communicationEvent!=null"><display/></field>
- <field name="communicationEventTypeId">
+ <field name="communicationEventId" use-when="communicationEvent!=null" title="${uiLabelMap.ContactListCommEventId}"><display/></field>
+ <field name="communicationEventTypeId" title="${uiLabelMap.ContactListCommEventTypeId}">
<drop-down>
<entity-options entity-name="CommunicationEventType" description="${description}">
<entity-order-by field-name="description"/>
@@ -206,30 +206,30 @@
</drop-down>
</field>
- <field name="contactMechTypeId" use-when="commEventContactMechType!=null&&parentCommEventContactMechType==null">
+ <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}" 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" use-when="commEventContactMechType==null&&parentCommEventContactMechType!=null">
+ <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}" 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" use-when="commEventContactMechType==null&&parentCommEventContactMechType==null">
+ <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}" use-when="commEventContactMechType==null&&parentCommEventContactMechType==null">
<drop-down>
<entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
</drop-down>
</field>
- <field name="roleTypeIdFrom" use-when="commEventRoleTypeIdFrom!=null">
+ <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}" use-when="commEventRoleTypeIdFrom!=null">
<drop-down>
<entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="roleTypeIdTo" use-when="commEventRoleTypeIdTo!=null">
+ <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}" use-when="commEventRoleTypeIdTo!=null">
<drop-down>
<entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
<entity-order-by field-name="description"/>
@@ -245,20 +245,20 @@
</lookup>
</field>
-->
- <field name="contactListId"><lookup size="20" target-form-name="LookupContactList"/></field>
+ <field name="contactListId" title="${uiLabelMap.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"><text size="30"/></field>
+ <field name="subject" title="${uiLabelMap.PartyCommEventSubject}"><text size="30"/></field>
<field name="note" title="${uiLabelMap.CommonNote}"><textarea cols="60" rows="3"/></field>
<field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="60" rows="10"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/> </field>
- <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+ <field name="cancelLink" title="${uiLabelMap.CommonCancel}" widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
</form>
<form name="FindContactListCommEvents" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" target="ListContactListCommEvents" title="" type="single">
- <field name="contactListId"><text/></field>
- <field name="commEventId"><lookup target-form-name="LookupCommEvent"/></field>
- <field name="fromDate"><date-find/></field>
- <field name="thruDate"><date-find/></field>
+ <field name="contactListId" title="${uiLabelMap.ContactListContactListId}"><text/></field>
+ <field name="commEventId" title="${uiLabelMap.ContactListCommEventId}"><lookup target-form-name="LookupCommEvent"/></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}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
<form name="ListContactListCommEvents" list-iterator-name="listIt" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" title="" type="list">
@@ -268,7 +268,7 @@
<field-map env-name="entityName" field-name="entityName"/>
</service>
</actions>
- <field name="communicationEventId">
+ <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}">
<hyperlink description="${communicationEventId}" target="EditContactListCommEvent?communicationEventId=${communicationEventId}&DONE_PAGE=${donePage}" target-type="intra-app"/>
</field>
<field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}">
@@ -277,34 +277,34 @@
<field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}">
<display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>
</field>
- <field name="statusId"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
- <field name="contactMechTypeId"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
- <field name="roleTypeIdFrom"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
- <field name="roleTypeIdTo"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
- <field name="custReqestId" position="1"><text size="20"/></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="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="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
<field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
- <field map-name="subjectMap" name="subject"><text size="30"/></field>
+ <field map-name="subjectMap" name="subject" title="${uiLabelMap.PartyCommEventSubject}"><text size="30"/></field>
</form>
<form name="LookupContactList" default-map-name="contactList" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" target="LookupContactList" title="" type="single">
<field name="contactListId" title="${uiLabelMap.ContactListContactListId}"><text-find/></field>
- <field name="contactListName"><text-find/></field>
- <field name="contactListTypeId">
+ <field name="contactListName" title="${uiLabelMap.ContactListContactListName}"><text-find/></field>
+ <field name="contactListTypeId" title="${uiLabelMap.ContactListContactListTypeId}">
<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="contactMechTypeId">
+ <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}">
<drop-down>
<entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="marketingCampaignId">
+ <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}">
<drop-down allow-empty="true">
<entity-options description="${campaignName}" entity-name="MarketingCampaign">
<entity-order-by field-name="campaignName"/>
@@ -325,10 +325,10 @@
<field name="contactListId" title="${uiLabelMap.ContactListContactListId}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${contactListId}" target="javascript:set_value('${contactListId}')" target-type="plain"/>
</field>
- <field name="contactListName"><display/></field>
- <field name="contactListTypeId"><display-entity entity-name="ContactListType"/></field>
- <field name="contactMechTypeId"><display-entity entity-name="ContactMechType"/></field>
- <field name="marketingCampaignId"><display-entity description="${campaignName}" entity-name="MarketingCampaign"/></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="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity description="${campaignName}" entity-name="MarketingCampaign"/></field>
</form>
<form name="ListPreferredContactMech" default-title-style="tableheadtext"
@@ -340,10 +340,10 @@
</entity-and>
</actions>
- <field name="contactMechId" widget-style="buttontext" title="Contact Mech Id">
+ <field name="contactMechId" widget-style="buttontext" title="${uiLabelMap.PartyContactMechId}">
<hyperlink description="${contactMechId}" target-type="plain" target="javascript:set_value('${contactMechId}')" also-hidden="false"/>
</field>
- <field name="contactMechTypeId"><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>
+ <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>
</form>
</forms>
Modified: trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml 2005-10-15 05:43:54 UTC (rev 5967)
+++ trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml 2005-10-15 06:56:57 UTC (rev 5968)
@@ -28,7 +28,7 @@
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
<field name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}"><text-find/></field>
<field name="segmentGroupTypeId" title="${uiLabelMap.SegmentGroupSegmentGroupTypeId}"><text-find/></field>
- <field name="description" title="${uiLabelMap.SegmentGroupDescription}"><text-find/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
<field name="productStoreId" title="${uiLabelMap.SegmentGroupProductStoreId}"><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="Lookup" widget-style="smallSubmit"><submit button-type="button"/></field>
@@ -45,7 +45,7 @@
<hyperlink also-hidden="false" target-type="plain" description="${segmentGroupId}" target="javascript:set_value('${partyClassificationGroupId}')"/>
</field>
<field name="segmentGroupTypeId" title="${uiLabelMap.SegmentGroupSegmentGroupTypeId}"><display/></field>
- <field name="description" title="${uiLabelMap.SegmentGroupDescription}"><display/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="productStoreId" title="${uiLabelMap.SegmentGroupProductStoreId}"><display/></field>
</form>
Modified: trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml 2005-10-15 05:43:54 UTC (rev 5967)
+++ trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml 2005-10-15 06:56:57 UTC (rev 5968)
@@ -38,7 +38,7 @@
<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="description" title="${uiLabelMap.SegmentGroupDescription}"><display/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="productStoreId" title="${uiLabelMap.SegmentGroupProductStoreId}"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deleteSegmentGroup?segmentGroupId=${segmentGroupId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
@@ -54,14 +54,14 @@
<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}]" widget-style="tabletext"><display/></field>
- <field name="segmentGroupTypeId">
+ <field name="segmentGroupTypeId" title="${uiLabelMap.SegmentGroupSegmentGroupTypeId}">
<drop-down>
<entity-options description="${description}" entity-name="SegmentGroupType" key-field-name="segmentGroupTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="productStoreId">
+ <field name="productStoreId" title="${uiLabelMap.CatalogProductStoreId}">
<drop-down allow-empty="true">
<entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]">
<entity-order-by field-name="storeName"/>
@@ -69,7 +69,7 @@
<sub-hyperlink target="/catalog/control/EditProductStore?productStoreId=${segmentGroup.productStoreId}" target-type="inter-app" description="${segmentGroup.productStoreId}" link-style="buttontext"/>
</drop-down>
</field>
- <field name="description"><text size="55"/></field>
+ <field name="description" title="${uiLabelMap.ContactListDescription}"><text size="55"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
@@ -81,7 +81,7 @@
<field name="segmentGroupId"><hidden/></field>
- <field name="partyClassificationGroupId">
+ <field name="partyClassificationGroupId" title="${uiLabelMap.PartyPartyClassificationGroupId}">
<lookup target-form-name="LookupPartyClassificationGroup"/>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
@@ -109,7 +109,7 @@
<field name="segmentGroupId"><hidden/></field>
- <field name="geoId"><lookup target-form-name="LookupGeo"/></field>
+ <field name="geoId" title="${uiLabelMap.CommonGeoId}"><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"
@@ -156,12 +156,12 @@
</service>
</actions>
<field name="segmentGroupId"><hidden/></field>
- <field name="partyId" title="${uiLabelMap.SegmentGroupPartyId}">
+ <field name="partyId" title="${uiLabelMap.PartyPartyId}">
<display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${groupName}">
<sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" description="${partyId}" link-style="buttontext" target-type="inter-app"/>
</display-entity>
</field>
- <field name="roleTypeId" title="${uiLabelMap.SegmentGroupRoleTypeId}"><display-entity entity-name="RoleType"/></field>
+ <field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"><display-entity entity-name="RoleType"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deleteSegmentGroupRole?segmentGroupId=${segmentGroupId}&partyId=${partyId}&roleTypeId=${roleTypeId}"
description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
Added: trunk/applications/marketing/widget/MarketingCampaignScreens.xml
===================================================================
--- trunk/applications/marketing/widget/MarketingCampaignScreens.xml 2005-10-15 05:43:54 UTC (rev 5967)
+++ trunk/applications/marketing/widget/MarketingCampaignScreens.xml 2005-10-15 06:56:57 UTC (rev 5968)
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2004-2005 The Open For Business Project - www.ofbiz.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * $Id: MarketingCampaignScreens.xml,v 1.1 2005/10/11 20:57:13 titanouk Exp $
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
+ <screen name="CommonMarketingCampaignDecorator">
+ <section>
+ <actions>
+ <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="headerItem" value="contactlist"/>
+ <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/>
+ <entity-one entity-name="MarketingCampaign" value-name="marketingCampaign"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="component://marketing/widget/CommonScreens.xml">
+ <decorator-section name="body">
+ <section>
+ <!-- do check for MARKETING, _VIEW permission -->
+ <condition>
+ <if-has-permission permission="MARKETING" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <section>
+ <condition><not><if-empty field-name="marketingCampaignId"/></not></condition>
+ <widgets>
+ <include-menu name="MarketingCampaignTabBar" location="component://marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml"/>
+ </widgets>
+ </section>
+
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head3">${uiLabelMap.MarketingViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditMarketingCampaign">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditMarketingCampaign"/>
+ <set field="tabButtonItem" value="MarketingCampaign"/>
+ <set field="labelTitleProperty" value="PageTitleEditMarketingCampaign"/>
+
+ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListMarketingCampaign"/>
+ <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/>
+ <entity-one entity-name="MarketingCampaign" value-name="marketingCampaign"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonMarketingCampaignDecorator">
+ <decorator-section name="body">
+ <section>
+ <condition>
+ <not><if-empty field-name="marketingCampaign"/></not>
+ </condition>
+ <widgets>
+ <container><label style="head1">${uiLabelMap.PageTitleEditMarketingCampaign}</label></container>
+ <container><link text="${uiLabelMap.MarketingCampaignCreate}" target="/EditMarketingCampaign?DONE_PAGE=${donePage}" style="buttontext"/></container>
+ <include-form name="EditMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/>
+ </widgets>
+ <fail-widgets>
+ <label style="head1">${uiLabelMap.PageTitleAddMarketingCampaign}</label>
+ <include-form name="EditMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="ListMarketingCampaign">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleListMarketingCampaign"/>
+ <set field="tabButtonItem" value="MarketingCampaign"/>
+ <set field="labelTitleProperty" value="PageTitleListMarketingCampaign"/>
+
+ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListMarketingCampaign"/>
+ <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/>
+ <set field="entityName" value="MarketingCampaign"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonMarketingCampaignDecorator">
+ <decorator-section name="body">
+ <container><label style="head1">${uiLabelMap.PageTitleEditMarketingCampaign}</label></container>
+ <container><link text="${uiLabelMap.MarketingCampaignCreate}" target="/EditMarketingCampaign?DONE_PAGE=${donePage}" style="buttontext"/></container>
+ <include-form name="ListMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="EditMarketingCampaignRoles">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditMarketingCampaignRole"/>
+ <set field="tabButtonItem" value="MarketingCampaignRole"/>
+ <set field="labelTitleProperty" value="PageTitleEditMarketingCampaignRole"/>
+
+ <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/ListMarketingCampaign"/>
+ <set field="marketingCampaignId" from-field="parameters.marketingCampaignId"/>
+ <set field="roleTypeId" from-field="parameters.partyId"/>
+ <set field="fromDate" from-field="parameters.fromDat