[OFBiz] SVN: r5934 - in trunk/applications/marketing: webapp/marketing/WEB-INF webapp/marketing/contact webapp/marketing/includes webapp/marketing/lookup webapp/marketing/segment widget

jonesde at svn.ofbiz.org jonesde at svn.ofbiz.org
Sat Oct 8 04:49:05 EDT 2005


Author: jonesde
Date: 2005-10-08 03:48:55 -0500 (Sat, 08 Oct 2005)
New Revision: 5934

Added:
   trunk/applications/marketing/widget/LookupScreens.xml
Modified:
   trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
   trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
   trunk/applications/marketing/webapp/marketing/includes/appheader.ftl
   trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml
   trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml
   trunk/applications/marketing/webapp/marketing/segment/SegmentTabBar.ftl
   trunk/applications/marketing/widget/CommonScreens.xml
   trunk/applications/marketing/widget/MarketingMenus.xml
   trunk/applications/marketing/widget/SegmentScreens.xml
Log:
Major cleanup in the SegmentGroup area, now much more functional and easier to navigate; before this many things were simply not working, and the approach of splitting the list/add forms on different screens is confusing and difficult to navigate; hopefully the tendency to write UIs like this will naturally go away as the preferred alternative is used, and actually the pattern that has been around longer

Modified: trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml	2005-10-08 08:46:27 UTC (rev 5933)
+++ trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml	2005-10-08 08:48:55 UTC (rev 5934)
@@ -186,9 +186,9 @@
         <security https="true" auth="true"/>
         <response name="success" type="view" value="viewSegmentGroup"/>
     </request-map>
-    <request-map uri="LookupSegmentGroup">
+    <request-map uri="FindSegmentGroup">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="LookupSegmentGroup"/>
+        <response name="success" type="view" value="FindSegmentGroup"/>
     </request-map>
     <request-map uri="createSegmentGroup">
         <security https="true" auth="true"/>
@@ -210,10 +210,6 @@
     </request-map>
     
     <!--  SegmentGroupClassification requests -->
-    <request-map uri="viewSegmentGroupClass">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="viewSegmentGroupClass"/>
-    </request-map>
     <request-map uri="listSegmentGroupClass">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="listSegmentGroupClass"/>
@@ -221,14 +217,14 @@
     <request-map uri="createSegmentGroupClassification">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="createSegmentGroupClassification"/>
-        <response name="success" type="view" value="viewSegmentGroupClass"/>
-        <response name="error" type="view" value="viewSegmentGroupClass"/>
+        <response name="success" type="view" value="listSegmentGroupClass"/>
+        <response name="error" type="view" value="listSegmentGroupClass"/>
     </request-map>
     <request-map uri="updateSegmentGroupClassification">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="updateSegmentGroupClassification"/>
-        <response name="success" type="view" value="viewSegmentGroupClass"/>
-        <response name="error" type="view" value="viewSegmentGroupClass"/>
+        <response name="success" type="view" value="listSegmentGroupClass"/>
+        <response name="error" type="view" value="listSegmentGroupClass"/>
     </request-map>
     <request-map uri="deleteSegmentGroupClassification">
         <security https="true" auth="true"/>
@@ -239,10 +235,6 @@
     
     
     <!--  SegmentGroupGeo requests -->
-    <request-map uri="viewSegmentGroupGeo">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="viewSegmentGroupGeo"/>
-    </request-map>
     <request-map uri="listSegmentGroupGeo">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="listSegmentGroupGeo"/>
@@ -250,27 +242,23 @@
     <request-map uri="createSegmentGroupGeo">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="createSegmentGroupGeo"/>
-        <response name="success" type="view" value="viewSegmentGroupGeo"/>
-        <response name="error" type="view" value="viewSegmentGroupGeo"/>
+        <response name="success" type="view" value="listSegmentGroupGeo"/>
+        <response name="error" type="view" value="listSegmentGroupGeo"/>
     </request-map>
     <request-map uri="updateSegmentGroupGeo">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="updateSegmentGroupGeo"/>
-        <response name="success" type="view" value="viewSegmentGroupGeo"/>
-        <response name="error" type="view" value="viewSegmentGroupGeo"/>
+        <response name="success" type="view" value="listSegmentGroupGeo"/>
+        <response name="error" type="view" value="listSegmentGroupGeo"/>
     </request-map>
-   <request-map uri="deleteSegmentGroupGeo">
+    <request-map uri="deleteSegmentGroupGeo">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="deleteSegmentGroupGeo"/>
-        <response name="success" type="view" value="viewSegmentGroupGeo"/>
-        <response name="error" type="view" value="viewSegmentGroupGeo"/>
+        <response name="success" type="view" value="listSegmentGroupGeo"/>
+        <response name="error" type="view" value="listSegmentGroupGeo"/>
     </request-map>
     
     <!--  SegmentGroupRole requests -->
-    <request-map uri="viewSegmentGroupRole">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="viewSegmentGroupRole"/>
-    </request-map>
     <request-map uri="listSegmentGroupRole">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="listSegmentGroupRole"/>
@@ -278,20 +266,20 @@
     <request-map uri="createSegmentGroupRole">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="createSegmentGroupRole"/>
-        <response name="success" type="view" value="viewSegmentGroupRole"/>
-        <response name="error" type="view" value="viewSegmentGroupRole"/>
+        <response name="success" type="view" value="listSegmentGroupRole"/>
+        <response name="error" type="view" value="listSegmentGroupRole"/>
     </request-map>
     <request-map uri="updateSegmentGroupRole">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="updateSegmentGroupRole"/>
-        <response name="success" type="view" value="viewSegmentGroupRole"/>
-        <response name="error" type="view" value="viewSegmentGroupRole"/>
+        <response name="success" type="view" value="listSegmentGroupRole"/>
+        <response name="error" type="view" value="listSegmentGroupRole"/>
     </request-map>
-   <request-map uri="deleteSegmentGroupRole">
+    <request-map uri="deleteSegmentGroupRole">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="deleteSegmentGroupRole"/>
-        <response name="success" type="view" value="viewSegmentGroupRole"/>
-        <response name="error" type="view" value="viewSegmentGroupRole"/>
+        <response name="success" type="view" value="listSegmentGroupRole"/>
+        <response name="error" type="view" value="listSegmentGroupRole"/>
     </request-map>
     
    <!-- Lookup request mappings -->
@@ -453,12 +441,11 @@
     <view-map name="FindMarketingCampaign" type="region"/>
     <view-map name="EditMarketingCampaign" type="region"/>
     <view-map name="EditMarketingCampaignRoles" type="region"/>
+
+    <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"/>
-    <view-map name="viewSegmentGroupClass" type="screen" page="component://marketing/widget/SegmentScreens.xml#EditSegmentGroupClass"/>
     <view-map name="listSegmentGroupClass" type="screen" page="component://marketing/widget/SegmentScreens.xml#listSegmentGroupClass"/>
-    <view-map name="viewSegmentGroupGeo" type="screen" page="component://marketing/widget/SegmentScreens.xml#EditSegmentGroupGeo"/>
     <view-map name="listSegmentGroupGeo" type="screen" page="component://marketing/widget/SegmentScreens.xml#listSegmentGroupGeo"/>
-    <view-map name="viewSegmentGroupRole" type="screen" page="component://marketing/widget/SegmentScreens.xml#EditSegmentGroupRole"/>
     <view-map name="listSegmentGroupRole" type="screen" page="component://marketing/widget/SegmentScreens.xml#listSegmentGroupRole"/>
 
     <view-map name="ListContactLists" type="screen" page="component://marketing/widget/ContactListScreens.xml#ListContactLists"/>
@@ -470,29 +457,24 @@
     <view-map name="EditContactListCommEvent" type="screen" page="component://marketing/widget/ContactListScreens.xml#EditContactListCommEvent"/>
     <view-map name="FindContactListCommEvents" type="screen" page="component://marketing/widget/ContactListScreens.xml#FindContactListCommEvents"/>
 
-    <view-map name="LookupContactList" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupContactList"/>
-    <view-map name="LookupCommEvent" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupCommEvent"/>
-    <view-map name="LookupPreferredContactMech" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/>
-    
-    <view-map name="LookupSegmentGroup" type="screen" page="component://marketing/widget/SegmentScreens.xml#LookupSegmentGroup"/>
-    <view-map name="LookupProductStore" type="screen" page="component://marketing/widget/SegmentScreens.xml#LookupProductStore"/>
-    <view-map name="LookupPartyClassificationGroup" type="screen" page="component://marketing/widget/SegmentScreens.xml#LookupPartyClassificationGroup"/>
-    
-    <view-map name="LookupGeo" type="screen" page="component://marketing/widget/SegmentScreens.xml#LookupGeo"/>
-    <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
-    <view-map name="LookupRoleType" type="screen" page="component://marketing/widget/SegmentScreens.xml#LookupRoleType"/>
-
     <view-map name="ListContactLists" type="screen" page="component://marketing/widget/ContactListScreens.xml#ListContactLists"/>
     <view-map name="EditContactList" type="screen" page="component://marketing/widget/ContactListScreens.xml#EditContactList"/>
     <view-map name="ListContactListParty" type="screen" page="component://marketing/widget/ContactListScreens.xml#ListContactListParties"/>
     <view-map name="EditContactListParty" type="screen" page="component://marketing/widget/ContactListScreens.xml#EditContactListParty"/>
     <view-map name="FindContactListParties" type="screen" page="component://marketing/widget/ContactListScreens.xml#FindContactListParties"/>
-    <view-map name="LookupPreferredContactMech" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/>
-    <view-map name="LookupContactList" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupContactList"/>
-    <view-map name="LookupCommEvent" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupCommEvent"/>
 
     <view-map name="ListContactListCommEvents" type="screen" page="component://marketing/widget/ContactListScreens.xml#ListContactListCommEvents"/>
     <view-map name="EditContactListCommEvent" type="screen" page="component://marketing/widget/ContactListScreens.xml#EditContactListCommEvent"/>
     <view-map name="FindContactListCommEvents" type="screen" page="component://marketing/widget/ContactListScreens.xml#FindContactListCommEvents"/>
+
+    <view-map name="LookupSegmentGroup" type="screen" page="component://marketing/widget/LookupScreens.xml#LookupSegmentGroup"/>
+    <view-map name="LookupContactList" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupContactList"/>
+    <view-map name="LookupCommEvent" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupCommEvent"/>
+    <view-map name="LookupPreferredContactMech" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/>
+
+    <view-map name="LookupProductStore" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductStore"/>
+    <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/>
+    <view-map name="LookupPartyClassificationGroup" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyClassificationGroup"/>
+    <view-map name="LookupGeo" type="screen" page="component://common/widget/LookupScreens.xml#LookupGeo"/>
     <!-- end of view mappings -->
 </site-conf>

Modified: trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml	2005-10-08 08:46:27 UTC (rev 5933)
+++ trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml	2005-10-08 08:48:55 UTC (rev 5934)
@@ -96,7 +96,7 @@
         <field name="contactMechTypeId"><display-entity entity-name="ContactMechType"/></field>
         <field name="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="&amp;nbsp;" widget-style="buttontext">
+        <field name="deleteLink" title=" " widget-style="buttontext">
             <hyperlink target="removeContactList?contactListId=${contactListId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
         -->
@@ -171,7 +171,7 @@
         <field name="preferredContactMechId" title="Preferred ContactMech">
             <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="&amp;nbsp;" widget-style="buttontext">
+        <field name="editLink" title=" " widget-style="buttontext">
             <hyperlink target="EditContactListParty?contactListId=${contactListId}&amp;partyId=${partyId}&amp;fromDate=${fromDate}"
                 description="${uiLabelMap.CommonEdit}" also-hidden="false"/>
         </field>

Modified: trunk/applications/marketing/webapp/marketing/includes/appheader.ftl
===================================================================
--- trunk/applications/marketing/webapp/marketing/includes/appheader.ftl	2005-10-08 08:46:27 UTC (rev 5933)
+++ trunk/applications/marketing/webapp/marketing/includes/appheader.ftl	2005-10-08 08:48:55 UTC (rev 5934)
@@ -1,5 +1,5 @@
 <#--
- *  Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ *  Copyright (c) 2003-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"), 
@@ -31,7 +31,7 @@
   <div class="col"><a href="<@ofbizUrl>EditDataSources</@ofbizUrl>" class="headerButtonLeft">DataSource</a></div>
   <div class="col"><a href="<@ofbizUrl>FindMarketingCampaign</@ofbizUrl>" class="headerButtonLeft">Campaign</a></div>
   <div class="col"><a href="<@ofbizUrl>FindTrackingCode</@ofbizUrl>" class="headerButtonLeft">Tracking</a></div>
-  <div class="col"><a href="<@ofbizUrl>LookupSegmentGroup</@ofbizUrl>" class="headerButtonLeft">Segment</a></div>
+  <div class="col"><a href="<@ofbizUrl>FindSegmentGroup</@ofbizUrl>" class="headerButtonLeft">Segment</a></div>
   <div class="col"><a href="<@ofbizUrl>ListContactLists</@ofbizUrl>" class="headerButtonLeft">ContactList</a></div>
   <#if requestAttributes.userLogin?has_content>
     <div class="col-right"><a href="<@ofbizUrl>logout</@ofbizUrl>" class="headerButtonRight">Logout</a></div>

Modified: trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml	2005-10-08 08:46:27 UTC (rev 5933)
+++ trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml	2005-10-08 08:48:55 UTC (rev 5934)
@@ -24,9 +24,8 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
     <!-- SegmentGroup Lookup forms -->
-    <form name="LookupSegmentGroup" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="inputBox"
-        target="LookupSegmentGroup" title="" type="single">
+    <form name="LookupSegmentGroup" target="LookupSegmentGroup" title="" type="single"
+        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>
@@ -34,29 +33,24 @@
         <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>
     </form>
-   <form name="listLookupSegmentGroup" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="tabletext"
-        list-iterator-name="listIt" target="" paginate-target="LookupSegmentGroup" title="" type="list">
+    <form name="listLookupSegmentGroup" list-iterator-name="listIt" target="" paginate-target="LookupSegmentGroup" title="" type="list"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
-                <field-map field-name="inputFields" env-name="requestParameters"/>
-                <field-map field-name="entityName" env-name="entityName"/>
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" value="SegmentGroup"/>
             </service>
         </actions>
         <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.SegmentGroupSegmentGroupId}">
-            <hyperlink also-hidden="false" target-type="intra-app" description="${segmentGroupId}" target="viewSegmentGroup?segmentGroupId=${segmentGroupId}"/>
+            <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="productStoreId" title="${uiLabelMap.SegmentGroupProductStoreId}"><display/></field>
-        <field name="deleteLink" title="&amp;nbsp;" widget-style="buttontext">
-            <hyperlink target="deleteSegmentGroup?segmentGroupId=${segmentGroupId}" description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
-        </field>
     </form>
-     
-   <form name="listSegmentGroupClass" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="tabletext"
-        list-iterator-name="listIt" target="" paginate-target="listSegmentGroupClass" title="" type="list">
+    
+    <form name="listSegmentGroupClass" list-iterator-name="listIt" target="" paginate-target="listSegmentGroupClass" title="" type="list"
+        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
         <actions>
         <entity-and entity-name="SegmentGroupClassification">
             <field-map env-name="segmentGroupId" />
@@ -66,85 +60,9 @@
             <hyperlink also-hidden="false" target-type="intra-app" description="${segmentGroupId}" target="viewSegmentGroup?segmentGroupId=${segmentGroupId}"/>
         </field>
         <field name="partyClassificationGroupId" title="${uiLabelMap.SegmentGroupPartyClassificationGroupId}"><display/></field>
-        <field name="deleteLink" title="&amp;nbsp;" widget-style="buttontext">
+        <field name="deleteLink" title=" " widget-style="buttontext">
             <hyperlink target="deleteSegmentGroupClass?segmentGroupId=${segmentGroupId}&amp;partyClassificationGroupId=${partyClassificationGroupId}"
                 description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
         </field>
     </form>
-    
-    <form name="LookupProductStore" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox"
-        target="LookupProductStore" title="" type="single">
-        <auto-fields-entity entity-name="ProductStore" default-field-type="find" />
-        <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>
-    </form>
-    <form name="listLookupProductStore" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="display"
-        list-iterator-name="" target="" paginate-target="" 
-        title="" type="list">
-        <actions>
-            <entity-and entity-name="ProductStore"/>
-        </actions>
-        
-        <!-- <auto-fields-entity entity-name="ProductStore" default-field-type="display"/> -->
-        
-        <field name="productStoreId" title="&amp;nbsp;" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${productStoreId}" target="javascript:set_value('${productStoreId}')"/>
-        </field>
-        <field name="primaryStoreGroupId"><display/></field>
-        <field name="storeName"><display/></field>
-        <field name="companyName"><display/></field>
-    </form>
-    <form name="listLookupPartyClassificationGroup" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="display"
-        list-iterator-name="" target="" paginate-target="" 
-        title="" type="list">
-        <actions>
-            <entity-and entity-name="PartyClassificationGroup"/>
-        </actions>
-        
-        <field name="partyClassificationGroupId" title="&amp;nbsp;" widget-style="buttontext">
-            <hyperlink also-hidden="false" target-type="plain" description="${partyClassificationGroupId}" target="javascript:set_value('${partyClassificationGroupId}')"/>
-        </field>
-        <field name="partyClassificationTypeId"><display/></field>
-        <field name="parentGroupId"><display/></field>
-        <field name="description"><display/></field>
-    </form>
-    <!-- Geo Lookup forms -->
-    <form name="LookupGeo" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="inputBox"
-        target="LookupGeo" title="" type="single" >
-        <field name="geoId" title="${uiLabelMap.SegmentGroupGeoId}"><text-find/></field>
-        <field name="geoTypeId" title="${uiLabelMap.SegmentGroupGeoTypeId}">
-            <drop-down>
-               <entity-options key-field-name="geoTypeId" entity-name="GeoType" description="${description}"/>
-            </drop-down>
-        </field>
-        <field name="geoName" title="${uiLabelMap.SegmentGroupGeoName}"><text-find/></field>
-        <field name="geoCode" title="${uiLabelMap.SegmentGroupGeoCode}"><text-find/></field>
-        <field name="geoSecCode" title="${uiLabelMap.SegmentGroupGeoSecCode}"><text-find/></field>
-        <field name="geoAbbr" title="${uiLabelMap.SegmentGroupGeoAbbr}"><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>
-    </form>
-   <form name="listLookupGeo" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="tabletext"
-        list-iterator-name="listIt" target="" paginate-target="LookupGeo" title="" type="list">
-        <actions>
-            <service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
-                <field-map field-name="inputFields" env-name="requestParameters"/>
-                <field-map field-name="entityName" env-name="entityName"/>
-            </service>
-        </actions>
-        <field name="geoId"  widget-style="buttontext" title="${uiLabelMap.SegmentGroupGeoId}">
-            <hyperlink also-hidden="false" target-type="plain" description="${geoId}"  target="javascript:set_value('${geoId}')"/>
-        </field>
-        <field name="geoTypeId" title="${uiLabelMap.SegmentGroupGeoTypeId}">
-            <display-entity key-field-name="geoTypeId" entity-name="GeoType" description="${description}"/>
-        </field>
-        <field name="geoName" title="${uiLabelMap.SegmentGroupGeoName}"><display/></field>
-        <field name="geoCode" title="${uiLabelMap.SegmentGroupGeoCode}"><display/></field>
-        <field name="geoSecCode" title="${uiLabelMap.SegmentGroupGeoSecCode}"><display/></field>
-        <field name="geoAbbr" title="${uiLabelMap.SegmentGroupGeoAbbr}"><display/></field>
-    </form>
 </forms>

Modified: trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml
===================================================================
--- trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml	2005-10-08 08:46:27 UTC (rev 5933)
+++ trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml	2005-10-08 08:48:55 UTC (rev 5934)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- *  Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ *  Copyright (c) 2005-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"),
@@ -23,154 +23,148 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
+
+    <form name="FindSegmentGroup" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="tabletext"
+        list-iterator-name="listIt" target="" paginate-target="FindSegmentGroup" title="" type="list">
+        <actions>
+            <service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" value="SegmentGroup"/>
+                <field-map field-name="noConditionFind" value="Y"/>
+            </service>
+        </actions>
+        <field name="segmentGroupId" widget-style="buttontext" title="${uiLabelMap.SegmentGroupSegmentGroupId}">
+            <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="productStoreId" title="${uiLabelMap.SegmentGroupProductStoreId}"><display/></field>
+        <field name="deleteLink" title=" " widget-style="buttontext">
+            <hyperlink target="deleteSegmentGroup?segmentGroupId=${segmentGroupId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+        </field>
+    </form>
+
     <form name="EditSegmentGroup" type="single" 
             target="updateSegmentGroup" title="" default-map-name="segmentGroup"
             default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
         <alt-target use-when="segmentGroup==null" target="createSegmentGroup"/>
         
-        <field use-when="segmentGroup!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+        <field use-when="segmentGroup!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
         <field use-when="segmentGroup==null&amp;&amp;segmentGroupId==null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}"><ignored/></field>
-        <field use-when="segmentGroup==null&amp;&amp;segmentGroupId!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${segmentGroupId}]"><display/></field>
+        <field use-when="segmentGroup==null&amp;&amp;segmentGroupId!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${segmentGroupId}]" widget-style="tabletext"><display/></field>
 
         <field name="segmentGroupTypeId">
             <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" use-when="&quot;${parameters.productStoreId}&quot;.length()&gt;0" map-name="parameters">
-            <lookup target-form-name="LookupProductStore"/>
+        <field name="productStoreId">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="ProductStore" description="${storeName} [${productStoreId}]">
+                    <entity-order-by field-name="storeName"/>
+                </entity-options>
+                <sub-hyperlink target="/catalog/control/EditProductStore?productStoreId=${segmentGroup.productStoreId}" target-type="inter-app" description="${segmentGroup.productStoreId}" link-style="buttontext"/>
+            </drop-down>
         </field>
-        -->
-        <field name="productStoreId" >
-            <lookup target-form-name="LookupProductStore"/>
-        </field>
-        <field name="description" >
-            <text size="55"/>
-        </field>
+        <field name="description"><text size="55"/></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" title=" " widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="[${uiLabelMap.CommonCancelDone}]" target-type="inter-app"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
 
-    <form name="EditSegmentGroupClass" type="single" 
-            target="updateSegmentGroupClassification" title="" default-map-name="segmentGroupClass"
+    <form name="AddSegmentGroupClass" type="single" 
+            target="createSegmentGroupClassification" title="" default-map-name="segmentGroupClass"
             default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
-        <alt-target use-when="segmentGroupClassification==null" target="createSegmentGroupClassification"/>
-        <auto-fields-service service-name="updateSegmentGroupClassification"/>
+        <auto-fields-service service-name="createSegmentGroupClassification"/>
         
-        <field use-when="segmentGroup!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
-        <field use-when="segmentGroup==null&amp;&amp;segmentGroupId==null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}"><ignored/></field>
-        <field use-when="segmentGroup==null&amp;&amp;segmentGroupId!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${segmentGroupId}]"><display/></field>
+        <field name="segmentGroupId"><hidden/></field>
 
         <field name="partyClassificationGroupId">
             <lookup target-form-name="LookupPartyClassificationGroup"/>
         </field>
-        <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext"><submit button-type="text-link"/></field>
-        <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}?segmentGroupId=${segmentGroupId}" also-hidden="false" description="[${uiLabelMap.CommonCancelDone}]"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
-
-    <form name="EditSegmentGroupGeo" type="single" 
-            target="updateSegmentGroupGeo" title="" default-map-name="segmentGroupGeo"
+    <form name="listSegmentGroupClass" default-title-style="tableheadtext"
+        default-tooltip-style="tabletext" default-widget-style="tabletext"
+        list-name="segmentGroupClassList" target="" paginate-target="listSegmentGroupClass" title="" type="list">
+        <actions>
+            <entity-and entity-name="SegmentGroupClassification">
+                <field-map env-name="segmentGroupId"/>
+            </entity-and>
+        </actions>
+        <field name="segmentGroupId"><hidden/></field>
+        <field name="partyClassificationGroupId" title="${uiLabelMap.SegmentGroupPartyClassificationGroupId}"><display/></field>
+        <field name="deleteLink" title=" " widget-style="buttontext">
+            <hyperlink target="deleteSegmentGroupClassification?segmentGroupId=${segmentGroupId}&amp;partyClassificationGroupId=${partyClassificationGroupId}"
+                description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
+        </field>
+    </form>
+    
+    <form name="AddSegmentGroupGeo" type="single" 
+            target="createSegmentGroupGeo" title="" default-map-name="segmentGroupGeo"
             default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
-        <alt-target use-when="segmentGroupGeo==null" target="createSegmentGroupGeo"/>
-        <auto-fields-service service-name="updateSegmentGroupGeo"/>
+        <auto-fields-service service-name="createSegmentGroupGeo"/>
         
-        <field use-when="segmentGroup!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
-        <field use-when="segmentGroup==null&amp;&amp;segmentGroupId==null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}"><ignored/></field>
-        <field use-when="segmentGroup==null&amp;&amp;segmentGroupId!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${segmentGroupId}]"><display/></field>
-
-        <field name="geoId">
-            <lookup target-form-name="LookupGeo"/>
-        </field>
-        <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext"><submit button-type="text-link"/></field>
-        <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}?segmentGroupId=${segmentGroupId}" also-hidden="false" description="[${uiLabelMap.CommonCancelDone}]"/></field>
+        <field name="segmentGroupId"><hidden/></field>
+        
+        <field name="geoId"><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"
+    <form name="listSegmentGroupGeo" default-title-style="tableheadtext"
         default-tooltip-style="tabletext" default-widget-style="tabletext"
-        list-iterator-name="" target="" paginate-target="listSegmentGroupGeo" title="" type="list">
+        list-name="segmentGroupGeos" target="" paginate-target="listSegmentGroupGeo" title="" type="list">
         <actions>
-        <entity-and entity-name="SegmentGroupGeo">
-            <field-map env-name="segmentGroupId" />
-        </entity-and>
+            <entity-and entity-name="SegmentGroupGeo">
+                <field-map env-name="segmentGroupId"/>
+            </entity-and>
         </actions>
-        <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.SegmentGroupSegmentGroupId}">
-            <display/>
-        </field>
-        <field name="geoId" title="${uiLabelMap.SegmentGroupGeoId}"><display/></field>
-        <field name="deleteLink" title="&amp;nbsp;" widget-style="buttontext">
+        <field name="segmentGroupId"><hidden/></field>
+        <field name="geoId" title="${uiLabelMap.SegmentGroupGeoId}"><display-entity entity-name="Geo" description="${geoName} [Code:${geoCode}][ID:${geoId}]"/></field>
+        <field name="deleteLink" title=" " widget-style="buttontext">
             <hyperlink target="deleteSegmentGroupGeo?segmentGroupId=${segmentGroupId}&amp;geoId=${geoId}"
-                description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
+                description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
 
-    <form name="EditSegmentGroupRole" type="single" 
-            target="updateSegmentGroupRole" title="" default-map-name="segmentGroupRole"
+    <form name="AddSegmentGroupRole" type="single" 
+            target="createSegmentGroupRole" title="" default-map-name="segmentGroupRole"
             default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
-        <alt-target use-when="segmentGroupRole==null" target="createSegmentGroupRole"/>
-        <auto-fields-service service-name="updateSegmentGroupRole"/>
+        <auto-fields-service service-name="createSegmentGroupRole"/>
         
-        <field use-when="segmentGroup!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
-        <field use-when="segmentGroup==null&amp;&amp;segmentGroupId==null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}"><ignored/></field>
-        <field use-when="segmentGroup==null&amp;&amp;segmentGroupId!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${segmentGroupId}]"><display/></field>
-
-        <field name="partyId">
-            <lookup target-form-name="LookupParty"/>
-        </field>
+        <field name="segmentGroupId"><hidden/></field>
+        
+        <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
         <field name="roleTypeId">
             <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="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext"><submit button-type="text-link"/></field>
-        <field name="cancelLink" title=" " widget-style="buttontext"><hyperlink target="${donePage}?segmentGroupId=${segmentGroupId}" also-hidden="false" description="[${uiLabelMap.CommonCancelDone}]"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
-
-
-   <form name="listSegmentGroupRole" default-title-style="tableheadtext"
+    <form name="listSegmentGroupRole" default-title-style="tableheadtext"
         default-tooltip-style="tabletext" default-widget-style="tabletext"
-        list-iterator-name="" target="" paginate-target="listSegmentGroupRole" title="" type="list">
+        list-iterator-name="listIt" target="" paginate-target="listSegmentGroupRole" title="" type="list">
         <actions>
-        <entity-and entity-name="SegmentGroupRole">
-            <field-map env-name="segmentGroupId" />
-        </entity-and>
-        </actions>
-        <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.SegmentGroupSegmentGroupId}">
-            <display/>
-        </field>
-        <field name="partyId" title="${uiLabelMap.SegmentGroupPartyId}"><display/></field>
-        <field name="roleTypeId" title="${uiLabelMap.SegmentGroupRoleTypeId}"><display/></field>
-        <field name="deleteLink" title="&amp;nbsp;" widget-style="buttontext">
-            <hyperlink target="deleteSegmentGroupRole?segmentGroupId=${segmentGroupId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}"
-                description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
-        </field>
-    </form>
-    
-   <form name="listSegmentGroupClass" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="tabletext"
-        list-iterator-name="listIt" target="" paginate-target="listSegmentGroupClass" title="" type="list">
-        <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-iterator-name="listIt">
-                <field-map field-name="inputFields" env-name="requestParameters"/>
-                <field-map field-name="entityName" env-name="entityName"/>
+                <field-map field-name="inputFields" env-name="parameters"/>
+                <field-map field-name="entityName" value="SegmentGroupRole"/>
+                <field-map field-name="noConditionFind" value="Y"/>
             </service>
         </actions>
-        <field name="segmentGroupId"  widget-style="buttontext" title="${uiLabelMap.SegmentGroupSegmentGroupId}">
-            <display/>
+        <field name="segmentGroupId"><hidden/></field>
+        <field name="partyId" title="${uiLabelMap.SegmentGroupPartyId}">
+            <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="partyClassificationGroupId" title="${uiLabelMap.SegmentGroupPartyClassificationGroupId}"><display/></field>
-        <field name="deleteLink" title="&amp;nbsp;" widget-style="buttontext">
-            <hyperlink target="deleteSegmentGroupClassification?segmentGroupId=${segmentGroupId}&amp;partyClassificationGroupId=${partyClassificationGroupId}"
-                description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
+        <field name="roleTypeId" title="${uiLabelMap.SegmentGroupRoleTypeId}"><display-entity entity-name="RoleType"/></field>
+        <field name="deleteLink" title=" " widget-style="buttontext">
+            <hyperlink target="deleteSegmentGroupRole?segmentGroupId=${segmentGroupId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}"
+                description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
-    
-
-</forms>
\ No newline at end of file
+</forms>

Modified: trunk/applications/marketing/webapp/marketing/segment/SegmentTabBar.ftl
===================================================================
--- trunk/applications/marketing/webapp/marketing/segment/SegmentTabBar.ftl	2005-10-08 08:46:27 UTC (rev 5933)
+++ trunk/applications/marketing/webapp/marketing/segment/SegmentTabBar.ftl	2005-10-08 08:48:55 UTC (rev 5934)
@@ -19,35 +19,21 @@
  *  OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
  *  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * @author     Johan Isacsson
+ * @author     Al Byers
  * @author     David E. Jones
- * @author     Andy Zeneski
- * @created    May 26 2003
- *@author     Olivier Heintz (olivier.heintz at nereide.biz)
- * @version    1.0
- */
 -->
-<#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 segmentGroup?has_content>
 <#-- Main Heading -->
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-  <tr>
-    <td align="right">
-      <div class="tabContainer">
-        <a href="<@ofbizUrl>LookupSegmentGroup?segmentGroupId=${segmentGroupId}</@ofbizUrl>" class="${selectedClassMap.LookupSegmentGroup?default(unselectedClassName)}">${uiLabelMap.SegmentGroupSegmentGroupLookup}</a>
-        <a href="<@ofbizUrl>viewSegmentGroup?segmentGroupId=${segmentGroupId}</@ofbizUrl>" class="${selectedClassMap.viewSegmentGroup?default(unselectedClassName)}">${uiLabelMap.SegmentGroupSegmentGroup}</a>
-        <a href="<@ofbizUrl>listSegmentGroupClass?segmentGroupId=${segmentGroupId}</@ofbizUrl>" class="${selectedClassMap.listSegmentGroupClassification?default(unselectedClassName)}">${uiLabelMap.SegmentGroupSegmentGroupClassification}</a>
-        <a href="<@ofbizUrl>listSegmentGroupGeo?segmentGroupId=${segmentGroupId}</@ofbizUrl>" class="${selectedClassMap.listSegmentGroupGeo?default(unselectedClassName)}">${uiLabelMap.SegmentGroupSegmentGroupGeo}</a>
-        <a href="<@ofbizUrl>listSegmentGroupRole?segmentGroupId=${segmentGroupId}</@ofbizUrl>" class="${selectedClassMap.listSegmentGroupRole?default(unselectedClassName)}">${uiLabelMap.SegmentGroupSegmentGroupRole}</a>
-      </div>
-    </td>
-  </tr>
- </table>
+  <div class="tabContainer">
+    <a href="<@ofbizUrl>viewSegmentGroup?segmentGroupId=${segmentGroupId}</@ofbizUrl>" class="${selectedClassMap.viewSegmentGroup?default(unselectedClassName)}">${uiLabelMap.SegmentGroupSegmentGroup}</a>
+    <a href="<@ofbizUrl>listSegmentGroupClass?segmentGroupId=${segmentGroupId}</@ofbizUrl>" class="${selectedClassMap.listSegmentGroupClassification?default(unselectedClassName)}">${uiLabelMap.SegmentGroupSegmentGroupClassification}</a>
+    <a href="<@ofbizUrl>listSegmentGroupGeo?segmentGroupId=${segmentGroupId}</@ofbizUrl>" class="${selectedClassMap.listSegmentGroupGeo?default(unselectedClassName)}">${uiLabelMap.SegmentGroupSegmentGroupGeo}</a>
+    <a href="<@ofbizUrl>listSegmentGroupRole?segmentGroupId=${segmentGroupId}</@ofbizUrl>" class="${selectedClassMap.listSegmentGroupRole?default(unselectedClassName)}">${uiLabelMap.SegmentGroupSegmentGroupRole}</a>
+  </div>
 
 <#else>
   <div class="head2">${uiLabelMap.SegmentGroupNoSegmentGroupFoundWithId}: ${segmentGroupIdId?if_exists}</div>

Modified: trunk/applications/marketing/widget/CommonScreens.xml
===================================================================
--- trunk/applications/marketing/widget/CommonScreens.xml	2005-10-08 08:46:27 UTC (rev 5933)
+++ trunk/applications/marketing/widget/CommonScreens.xml	2005-10-08 08:48:55 UTC (rev 5934)
@@ -52,7 +52,7 @@
                     <platform-specific><html><html-template location="component://marketing/webapp/marketing/includes/appheader.ftl"/></html></platform-specific>
                    -->
                     <label style="apptitle">&amp;nbsp;Marketing Manager Application&amp;nbsp;</label>
-                    <include-menu name="MarketingAppBar" location="component://marketing/widget/MarketingMenus.xml" />
+                    <include-menu name="MarketingAppBar" location="component://marketing/widget/MarketingMenus.xml"/>
                      
                     <container style="contentarea">
                         <container style="column-main">

Added: trunk/applications/marketing/widget/LookupScreens.xml
===================================================================
--- trunk/applications/marketing/widget/LookupScreens.xml	2005-10-08 08:46:27 UTC (rev 5933)
+++ trunk/applications/marketing/widget/LookupScreens.xml	2005-10-08 08:48:55 UTC (rev 5934)
@@ -0,0 +1,78 @@
+<?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: SegmentScreens.xml 5865 2005-09-30 14:29:41Z jonesde $
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
+
+    <!-- SegmentGroup Lookup Screen -->
+    <screen name="LookupSegmentGroup">
+        <section>
+            <condition>
+                <or>
+                    <if-has-permission permission="MARKETING" action="_VIEW"/>
+                </or>
+            </condition>
+            <actions>
+                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
+
+                <set field="title" value="Lookup SegmentGroup"/>
+                <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="LookupSegmentGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
+                    <include-form name="listLookupSegmentGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
+                </decorator-section>
+              </decorator-screen>
+            </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>


Property changes on: trunk/applications/marketing/widget/LookupScreens.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + "Id Rev Author"
Name: svn:eol-style
   + native

Modified: trunk/applications/marketing/widget/MarketingMenus.xml
===================================================================
--- trunk/applications/marketing/widget/MarketingMenus.xml	2005-10-08 08:46:27 UTC (rev 5933)
+++ trunk/applications/marketing/widget/MarketingMenus.xml	2005-10-08 08:48:55 UTC (rev 5934)
@@ -25,25 +25,25 @@
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
     <menu name="MarketingAppBar" default-menu-item-name="main" default-selected-style="headerButtonLeftSelected" 
         default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="headerButtonLeft" 
-        default-align-style="col" menu-container-style="row"
+        default-align-style="col" menu-container-style="row" selected-menuitem-context-field-name="headerItem"
         fill-style="col-fill"
         orientation="horizontal" type="simple">
-        <menu-item name="main" title="Main"><link target="/main"/></menu-item>
-        <menu-item name="DataSource" title="DataSource"><link target="/EditDataSources"/></menu-item>
-        <menu-item name="Campaign" title="Campaign"><link target="/FindMarketingCampaign"/></menu-item>
-        <menu-item name="Tracking" title="Tracking"><link target="/FindTrackingCode"/></menu-item>
-        <menu-item name="Segment" title="Segment"><link target="/LookupSegmentGroup"/></menu-item>
-        <menu-item name="ContactList" title="ContactList"><link target="/ListContactLists"/></menu-item>
+        <menu-item name="main" title="Main"><link target="main"/></menu-item>
+        <menu-item name="DataSource" title="DataSource"><link target="EditDataSources"/></menu-item>
+        <menu-item name="Campaign" title="Campaign"><link target="FindMarketingCampaign"/></menu-item>
+        <menu-item name="Tracking" title="Tracking"><link target="FindTrackingCode"/></menu-item>
+        <menu-item name="Segment" title="Segment"><link target="FindSegmentGroup"/></menu-item>
+        <menu-item name="ContactList" title="ContactList"><link target="ListContactLists"/></menu-item>
         
         <menu-item name="Logout" title="Logout" align-style="col-right" >
             <condition>
-                <not><if-empty field-name="requestAttributes.userLogin" /></not>
+                <not><if-empty field-name="userLogin"/></not>
             </condition>
-            <link target="/logout"/>
+            <link target="logout"/>
         </menu-item>
         <menu-item name="Login" title="Login" align-style="col-right" >
             <condition>
-                <if-empty field-name="requestAttributes.userLogin" />
+                <if-empty field-name="userLogin"/>
             </condition>
             <link target="${requestAttributes.checkLoginUrl}"/>
         </menu-item>

Modified: trunk/applications/marketing/widget/SegmentScreens.xml
===================================================================
--- trunk/applications/marketing/widget/SegmentScreens.xml	2005-10-08 08:46:27 UTC (rev 5933)
+++ trunk/applications/marketing/widget/SegmentScreens.xml	2005-10-08 08:48:55 UTC (rev 5934)
@@ -26,13 +26,22 @@
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
 
-   <screen name="CommonSegmentGroupDecorator">
+    <!-- SegmentGroup Find Screen -->
+    <screen name="FindSegmentGroup">
         <section>
+            <condition>
+                <or>
+                    <if-has-permission permission="MARKETING" action="_VIEW"/>
+                </or>
+            </condition>
             <actions>
-                <set field="headerItem" value="segment"/>
+                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
                 
-                <set field="segmentGroupId" from-field="parameters.segmentGroupId"/>
-                <entity-one entity-name="SegmentGroup" value-name="segmentGroup"/>
+                <set field="titleProperty" value="PageTitleFindSegmentGroup"/>
+                <set field="headerItem" value="Segment"/>
+                <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="main-decorator" location="component://marketing/widget/CommonScreens.xml">
@@ -43,19 +52,12 @@
                                 <if-has-permission permission="MARKETING" action="_VIEW"/>
                             </condition>
                             <widgets>
-                                <section>
-                                    <condition><not><if-empty field-name="segmentGroupId"/></not></condition>
-                                    <widgets>
-                                        <platform-specific>
-                                            <html><html-template location="component://marketing/webapp/marketing/segment/SegmentTabBar.ftl"/></html>
-                                        </platform-specific>
-                                    </widgets>
-                                </section>
-
-                                <decorator-section-include name="body"/>
+                                <container><label style="head1">${uiLabelMap.PageTitleFindSegmentGroup}</label></container>
+                                <container><link text="${uiLabelMap.SegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container>
+                                <include-form name="FindSegmentGroup" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
                             </widgets>
                             <fail-widgets>
-                                <label style="head3">${uiLabelMap.MarketingViewPermissionError}</label>
+                                <label style="head3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label>
                             </fail-widgets>
                         </section>
                     </decorator-section>
@@ -64,68 +66,37 @@
         </section>
     </screen>
     
-    <screen name="EditSegmentGroup">
+    <screen name="CommonSegmentGroupDecorator">
         <section>
             <actions>
-                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="titleProperty" value="PageTitleEditSegmentGroup"/>
-                <set field="tabButtonItem" value="viewSegmentGroup"/>
-                <set field="labelTitleProperty" value="PageTitleEditSegmentGroup"/>
-
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/LookupSegmentGroup"/>
+                <set field="headerItem" value="Segment"/>
+                
                 <set field="segmentGroupId" from-field="parameters.segmentGroupId"/>
-                <set field="productStoreId" from-field="parameters.productStoreId"/>
                 <entity-one entity-name="SegmentGroup" value-name="segmentGroup"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonSegmentGroupDecorator">
+                <decorator-screen name="main-decorator" location="component://marketing/widget/CommonScreens.xml">
                     <decorator-section name="body">
-                        <container><label style="head1">${uiLabelMap.PageTitleEditSegmentGroup}</label></container>
-                        <container><link text="${uiLabelMap.SegmentGroupCreate}" target="viewSegmentGroup?DONE_PAGE=${donePage}" style="tabletext"/></container>
-                        <include-form name="EditSegmentGroup" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    
-    <!-- SegmentGroup Find Screen -->
-    <screen name="LookupSegmentGroup">
-        <section>
-            <condition>
-                <or>
-                    <if-has-permission permission="MARKETING" action="_VIEW"/>
-                </or>
-            </condition>
-            <actions>
-                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
-
-                <set field="title" value="Lookup Segment"/>
-                <set field="titleProperty" value="PageTitleFindSegmentGroup"/>
-                <set field="headerItem" value="find"/>
-                <set field="tabButtonItem" value="LookupSegmentGroup"/>
-                <set field="entityName" value="SegmentGroup"/>
-                <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"/>
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/LookupSegmentGroup"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonSegmentGroupDecorator">
-                    <decorator-section name="body">
                         <section>
                             <!-- do check for MARKETING, _VIEW permission -->
                             <condition>
                                 <if-has-permission permission="MARKETING" action="_VIEW"/>
                             </condition>
                             <widgets>
-                                <container><label style="head1">${uiLabelMap.PageTitleFindSegmentGroup}</label></container>
-                                <container><link text="${uiLabelMap.SegmentGroupCreate}" target="viewSegmentGroup" style="tabletext"/></container>
-                                <!-- <include-form name="LookupSegmentGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/> -->
-                                <include-form name="listLookupSegmentGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
+                                <section>
+                                    <condition><not><if-empty field-name="segmentGroupId"/></not></condition>
+                                    <widgets>
+                                        <platform-specific>
+                                            <html><html-template location="component://marketing/webapp/marketing/segment/SegmentTabBar.ftl"/></html>
+                                        </platform-specific>
+                                        <container><link text="${uiLabelMap.SegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container>
+                                    </widgets>
+                                </section>
+
+                                <decorator-section-include name="body"/>
                             </widgets>
                             <fail-widgets>
-                                <label style="head3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label>
+                                <label style="head3">${uiLabelMap.MarketingViewPermissionError}</label>
                             </fail-widgets>
                         </section>
                     </decorator-section>
@@ -134,81 +105,30 @@
         </section>
     </screen>
     
-    
-    <screen name="EditSegmentGroupClass">
+    <screen name="EditSegmentGroup">
         <section>
             <actions>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="titleProperty" value="PageTitleEditSegmentGroupClass"/>
-                <set field="tabButtonItem" value="listSegmentGroupClassification"/>
-                <set field="labelTitleProperty" value="PageTitleEditSegmentGroupClass"/>
+                <set field="titleProperty" value="PageTitleEditSegmentGroup"/>
+                <set field="tabButtonItem" value="viewSegmentGroup"/>
+                <set field="labelTitleProperty" value="PageTitleEditSegmentGroup"/>
 
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="listSegmentGroupClass"/>
+                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/LookupSegmentGroup"/>
                 <set field="segmentGroupId" from-field="parameters.segmentGroupId"/>
-                <set field="partyClassificationGroupId" from-field="parameters.partyClassificationGroupId"/>
-                <set field="donePage" value="listSegmentGroupClass" />
-                <entity-one entity-name="SegmentGroupClassification" value-name="segmentGroupClassification"/>
+                <set field="productStoreId" from-field="parameters.productStoreId"/>
+                <entity-one entity-name="SegmentGroup" value-name="segmentGroup"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonSegmentGroupDecorator">
                     <decorator-section name="body">
                         <container><label style="head1">${uiLabelMap.PageTitleEditSegmentGroup}</label></container>
-                        <container><link text="${uiLabelMap.SegmentGroupClassCreate}" target="viewSegmentGroupClass?segmentGroupId=${segmentGroupId}" style="tabletext"/></container>
-                        <include-form name="EditSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
+                        <include-form name="EditSegmentGroup" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-    <screen name="EditSegmentGroupGeo">
-        <section>
-            <actions>
-                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="titleProperty" value="PageTitleEditSegmentGroupGeo"/>
-                <set field="tabButtonItem" value="listSegmentGroupGeo"/>
-                <set field="labelTitleProperty" value="PageTitleEditSegmentGroupGeo"/>
-
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewSegmentGroupGeo"/>
-                <set field="segmentGroupId" from-field="parameters.segmentGroupId"/>
-                <set field="geoId" from-field="parameters.geoId"/>
-                <entity-one entity-name="SegmentGroupGeo" value-name="segmentGroupGeo"/>
-                <set field="donePage" value="listSegmentGroupGeo" />
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonSegmentGroupDecorator">
-                    <decorator-section name="body">
-                        <label style="head1">${uiLabelMap.PageTitleEditSegmentGroupGeo}</label>
-                        <include-form name="EditSegmentGroupGeo" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="EditSegmentGroupRole">
-        <section>
-            <actions>
-                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="titleProperty" value="PageTitleEditSegmentGroupRole"/>
-                <set field="tabButtonItem" value="listSegmentGroupRole"/>
-                <set field="labelTitleProperty" value="PageTitleEditSegmentGroupRole"/>
-
-                <set field="donePage" from-field="parameters.DONE_PAGE" default-value="viewSegmentGroupRole"/>
-                <set field="segmentGroupId" from-field="parameters.segmentGroupId"/>
-                <set field="partyId" from-field="parameters.partyId"/>
-                <set field="roleTypeId" from-field="parameters.roleTypeId"/>
-                <set field="donePage" value="listSegmentGroupRole" />
-                <entity-one entity-name="SegmentGroupRole" value-name="segmentGroupRole"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonSegmentGroupDecorator">
-                    <decorator-section name="body">
-                        <label style="head1">${uiLabelMap.PageTitleEditSegmentGroupRole}</label>
-                        <include-form name="EditSegmentGroupRole" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
+    
     <!-- SegmentGroupClass list Screen -->
     <screen name="listSegmentGroupClass">
         <section>
@@ -220,16 +140,13 @@
             <actions>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
 
-                <set field="title" value="Lookup Segment"/>
                 <set field="titleProperty" value="PageTitleFindSegmentGroup"/>
-                <set field="headerItem" value="find"/>
                 <set field="tabButtonItem" value="listSegmentGroupClassification"/>
-                <set field="entityName" value="SegmentGroupClassification"/>
+
                 <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"/>
                 <set field="segmentGroupId" from-field="parameters.segmentGroupId"/>
-                <set field="donePage" value="viewSegmentGroup?segmentGroupId=${segmentGroupId}" />
             </actions>
             <widgets>
                 <decorator-screen name="CommonSegmentGroupDecorator">
@@ -241,8 +158,9 @@
                             </condition>
                             <widgets>
                                 <container><label style="head1">${uiLabelMap.PageTitleListSegmentGroupClass}</label></container>
-                                <container><link text="${uiLabelMap.SegmentGroupClassCreate}" target="viewSegmentGroupClass?segmentGroupId=${segmentGroupId}" style="tabletext"/></container>
                                 <include-form name="listSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
+                                <container><label style="head1">${uiLabelMap.SegmentGroupClassCreate}</label></container>
+                                <include-form name="AddSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
                             </widgets>
                             <fail-widgets>
                                 <label style="head3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label>
@@ -265,16 +183,12 @@
             <actions>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
 
-                <set field="title" value="Lookup Segment"/>
                 <set field="titleProperty" value="PageTitleListSegmentGroupGeo"/>
-                <set field="headerItem" value="find"/>
                 <set field="tabButtonItem" value="listSegmentGroupGeo"/>
-                <set field="entityName" value="SegmentGroupGeo"/>
                 <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"/>
                 <set field="segmentGroupId" from-field="parameters.segmentGroupId"/>
-                <set field="donePage" value="viewSegmentGroup?segmentGroupId=${segmentGroupId}" />
             </actions>
             <widgets>
                 <decorator-screen name="CommonSegmentGroupDecorator">
@@ -286,8 +200,9 @@
                             </condition>
                             <widgets>
                                 <container><label style="head1">${uiLabelMap.PageTitleListSegmentGroupGeo}</label></container>
-                                <container><link text="${uiLabelMap.SegmentGroupGeoCreate}" target="viewSegmentGroupGeo?segmentGroupId=${segmentGroupId}" style="tabletext"/></container>
                                 <include-form name="listSegmentGroupGeo" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
+                                <label style="head1">${uiLabelMap.PageTitleEditSegmentGroupGeo}</label>
+                                <include-form name="AddSegmentGroupGeo" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
                             </widgets>
                             <fail-widgets>
                                 <label style="head3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label>
@@ -310,16 +225,12 @@
             <actions>
                 <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
 
-                <set field="title" value="Lookup Segment"/>
                 <set field="titleProperty" value="PageTitleListSegmentGroupRole"/>
-                <set field="headerItem" value="find"/>
                 <set field="tabButtonItem" value="listSegmentGroupRole"/>
-                <set field="entityName" value="SegmentGroupRole"/>
                 <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"/>
                 <set field="segmentGroupId" from-field="parameters.segmentGroupId"/>
-                <set field="donePage" value="viewSegmentGroup?segmentGroupId=${segmentGroupId}" />
             </actions>
             <widgets>
                 <decorator-screen name="CommonSegmentGroupDecorator">
@@ -331,8 +242,9 @@
                             </condition>
                             <widgets>
                                 <container><label style="head1">${uiLabelMap.PageTitleListSegmentGroupRole}</label></container>
-                                <container><link text="${uiLabelMap.SegmentGroupRoleCreate}" target="viewSegmentGroupRole?segmentGroupId=${segmentGroupId}" style="tabletext"/></container>
                                 <include-form name="listSegmentGroupRole" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
+                                <label style="head1">${uiLabelMap.PageTitleEditSegmentGroupRole}</label>
+                                <include-form name="AddSegmentGroupRole" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
                             </widgets>
                             <fail-widgets>
                                 <label style="head3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label>
@@ -343,115 +255,4 @@
             </widgets>
         </section>
     </screen>
-    <!-- ProductStore Lookup Screen -->
-    <screen name="LookupProductStore">
-        <section>
-            <condition>
-                <or>
-                    <if-has-permission permission="PARTYMGR" action="_VIEW"/>
-                </or>
-            </condition>
-            <actions>
-                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
-
-                <set field="title" value="Lookup ProductStore"/>
-                <set field="entityName" value="ProductStore"/>
-                <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="LookupProductStore" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>-->
-                    <include-form name="listLookupProductStore" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
-                </decorator-section>
-              </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    
-    <!-- PartyClassificationGroup Lookup Screen -->
-    <screen name="LookupPartyClassificationGroup">
-        <section>
-            <condition>
-                <or>
-                    <if-has-permission permission="PARTYMGR" action="_VIEW"/>
-                </or>
-            </condition>
-            <actions>
-                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
-
-                <set field="title" value="Lookup PartyClassificationGroup"/>
-                <set field="entityName" value="PartyClassificationGroup"/>
-                <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="LookupPartyClassificationGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>-->
-                    <include-form name="listLookupPartyClassificationGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
-                </decorator-section>
-              </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-    
-    <!-- Party Lookup Screen -->
-    <screen name="LookupParty">
-        <section>
-            <condition>
-                <or>
-                    <if-has-permission permission="PARTYMGR" action="_VIEW"/>
-                </or>
-            </condition>
-            <actions>
-                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
-
-                <set field="title" value="Lookup Party"/>
-                <set field="entityName" value="Party"/>
-                <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="LookupParty" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
-                    <include-form name="listLookupParty" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
-                </decorator-section>
-              </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-   <!-- Geo Lookup Screen -->
-    <screen name="LookupGeo">
-        <section>
-            <condition>
-                <or>
-                    <if-has-permission permission="PARTYMGR" action="_VIEW"/>
-                </or>
-            </condition>
-            <actions>
-                <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/>
-
-                <set field="title" value="Lookup Geo"/>
-                <set field="entityName" value="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