You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bu...@apache.org on 2009/10/24 15:40:12 UTC
svn commit: r829365 - in /ofbiz/trunk/applications:
marketing/webapp/marketing/campaign/ marketing/webapp/marketing/contact/
marketing/webapp/marketing/datasource/ marketing/webapp/marketing/lookup/
marketing/webapp/marketing/segment/ marketing/webapp/...
Author: buscob
Date: Sat Oct 24 13:40:11 2009
New Revision: 829365
URL: http://svn.apache.org/viewvc?rev=829365&view=rev
Log:
Part of OFBIZ-3067 - Menus and form widget files location
Marketing component
Moved forms and menus from webapp to widget folder
Removed empty folders
Added:
ofbiz/trunk/applications/marketing/widget/ContactListForms.xml
- copied unchanged from r829330, ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
ofbiz/trunk/applications/marketing/widget/ContactListMenus.xml
- copied unchanged from r829330, ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml
ofbiz/trunk/applications/marketing/widget/DataSourceForms.xml
- copied unchanged from r829330, ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml
ofbiz/trunk/applications/marketing/widget/DataSourceMenus.xml
- copied unchanged from r829330, ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml
ofbiz/trunk/applications/marketing/widget/LookupForms.xml
- copied unchanged from r829330, ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml
ofbiz/trunk/applications/marketing/widget/MarketingCampaignForms.xml
- copied unchanged from r829330, ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml
ofbiz/trunk/applications/marketing/widget/MarketingCampaignMenus.xml
- copied unchanged from r829330, ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml
ofbiz/trunk/applications/marketing/widget/SegmentForms.xml
- copied unchanged from r829330, ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml
ofbiz/trunk/applications/marketing/widget/SegmentMenus.xml
- copied unchanged from r829330, ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml
ofbiz/trunk/applications/marketing/widget/TrackingCodeForms.xml
- copied unchanged from r829330, ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml
ofbiz/trunk/applications/marketing/widget/TrackingCodeMenus.xml
- copied unchanged from r829330, ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml
Removed:
ofbiz/trunk/applications/marketing/webapp/marketing/campaign/
ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml
ofbiz/trunk/applications/marketing/webapp/marketing/datasource/
ofbiz/trunk/applications/marketing/webapp/marketing/lookup/
ofbiz/trunk/applications/marketing/webapp/marketing/segment/
ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/
Modified:
ofbiz/trunk/applications/marketing/widget/CommonScreens.xml
ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml
ofbiz/trunk/applications/marketing/widget/LookupScreens.xml
ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml
ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml
ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
Modified: ofbiz/trunk/applications/marketing/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?rev=829365&r1=829364&r2=829365&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Sat Oct 24 13:40:11 2009
@@ -68,7 +68,7 @@
<section>
<condition><not><if-empty field="contactListId"/></not></condition>
<widgets>
- <include-menu name="ContactListTabBar" location="component://marketing/webapp/marketing/contact/ContactListMenus.xml"/>
+ <include-menu name="ContactListTabBar" location="component://marketing/widget/ContactListMenus.xml"/>
<container>
<label style="h1">${uiLabelMap.MarketingContactList} ${contactList.contactListName} [${contactListId}]</label>
</container>
Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=829365&r1=829364&r2=829365&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Sat Oct 24 13:40:11 2009
@@ -38,7 +38,7 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="FindContactLists" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ <include-form name="FindContactLists" location="component://marketing/widget/ContactListForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -71,12 +71,12 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="EditContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ <include-form name="EditContactList" location="component://marketing/widget/ContactListForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
<screenlet title="${uiLabelMap.PageTitleAddContactList}">
- <include-form name="EditContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ <include-form name="EditContactList" location="component://marketing/widget/ContactListForms.xml"/>
</screenlet>
</fail-widgets>
</section>
@@ -110,7 +110,7 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="ListContactLists" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ <include-form name="ListContactLists" location="component://marketing/widget/ContactListForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -149,7 +149,7 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="EditContactListParty" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ <include-form name="EditContactListParty" location="component://marketing/widget/ContactListForms.xml"/>
<container><label style="h2" text="${uiLabelMap.CommonStatusHistory}"/></container>
<iterate-section entry="contactListPartyStatus" list="contactListPartyStatusList">
<section>
@@ -189,7 +189,7 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="ListContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ <include-form name="ListContactListParties" location="component://marketing/widget/ContactListForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -216,7 +216,7 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="FindContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ <include-form name="FindContactListParties" location="component://marketing/widget/ContactListForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -251,14 +251,14 @@
<decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleEditContactList}">
- <include-menu location="component://marketing/webapp/marketing/contact/ContactListMenus.xml" name="ContactListCommBar"/>
+ <include-menu location="component://marketing/widget/ContactListMenus.xml" name="ContactListCommBar"/>
<container>
<link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent">
<parameter param-name="contactListId"/>
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="EditContactListCommEvent" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ <include-form name="EditContactListCommEvent" location="component://marketing/widget/ContactListForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -289,7 +289,7 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="ListContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ <include-form name="ListContactListCommEvents" location="component://marketing/widget/ContactListForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -316,7 +316,7 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="FindContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ <include-form name="FindContactListCommEvents" location="component://marketing/widget/ContactListForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -336,10 +336,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="LookupContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ <include-form name="LookupContactList" location="component://marketing/widget/ContactListForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="ListLookupContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ <include-form name="ListLookupContactList" location="component://marketing/widget/ContactListForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -361,7 +361,7 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-results">
- <include-form name="ListPreferredContactMech" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ <include-form name="ListPreferredContactMech" location="component://marketing/widget/ContactListForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml?rev=829365&r1=829364&r2=829365&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml Sat Oct 24 13:40:11 2009
@@ -40,7 +40,7 @@
<widgets>
<section>
<widgets>
- <include-menu name="DataSourceTabBar" location="component://marketing/webapp/marketing/datasource/DataSourceMenus.xml"/>
+ <include-menu name="DataSourceTabBar" location="component://marketing/widget/DataSourceMenus.xml"/>
</widgets>
</section>
@@ -80,12 +80,12 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="EditDataSource" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/>
+ <include-form name="EditDataSource" location="component://marketing/widget/DataSourceForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
<screenlet title="${uiLabelMap.PageTitleAddDataSource}">
- <include-form name="EditDataSource" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/>
+ <include-form name="EditDataSource" location="component://marketing/widget/DataSourceForms.xml"/>
</screenlet>
</fail-widgets>
</section>
@@ -115,7 +115,7 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="ListDataSource" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/>
+ <include-form name="ListDataSource" location="component://marketing/widget/DataSourceForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -148,12 +148,12 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="EditDataSourceType" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/>
+ <include-form name="EditDataSourceType" location="component://marketing/widget/DataSourceForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
<screenlet title="${uiLabelMap.PageTitleAddDataSourceType}">
- <include-form name="EditDataSourceType" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/>
+ <include-form name="EditDataSourceType" location="component://marketing/widget/DataSourceForms.xml"/>
</screenlet>
</fail-widgets>
</section>
@@ -184,7 +184,7 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="ListDataSourceType" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/>
+ <include-form name="ListDataSourceType" location="component://marketing/widget/DataSourceForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/marketing/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/LookupScreens.xml?rev=829365&r1=829364&r2=829365&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/LookupScreens.xml Sat Oct 24 13:40:11 2009
@@ -40,10 +40,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="LookupSegmentGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
+ <include-form name="LookupSegmentGroup" location="component://marketing/widget/LookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="listLookupSegmentGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
+ <include-form name="listLookupSegmentGroup" location="component://marketing/widget/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -66,10 +66,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="LookupSalesForecast" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
+ <include-form name="LookupSalesForecast" location="component://marketing/widget/LookupForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="ListLookupSalesForecast" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/>
+ <include-form name="ListLookupSalesForecast" location="component://marketing/widget/LookupForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml?rev=829365&r1=829364&r2=829365&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Sat Oct 24 13:40:11 2009
@@ -40,7 +40,7 @@
<section>
<condition><not><if-empty field="marketingCampaignId"/></not></condition>
<widgets>
- <include-menu name="MarketingCampaignTabBar" location="component://marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml"/>
+ <include-menu name="MarketingCampaignTabBar" location="component://marketing/widget/MarketingCampaignMenus.xml"/>
</widgets>
</section>
@@ -82,12 +82,12 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="EditMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/>
+ <include-form name="EditMarketingCampaign" location="component://marketing/widget/MarketingCampaignForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
<screenlet title="${uiLabelMap.PageTitleAddMarketingCampaign}">
- <include-form name="EditMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/>
+ <include-form name="EditMarketingCampaign" location="component://marketing/widget/MarketingCampaignForms.xml"/>
</screenlet>
</fail-widgets>
</section>
@@ -116,7 +116,7 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="ListMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/>
+ <include-form name="ListMarketingCampaign" location="component://marketing/widget/MarketingCampaignForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -147,7 +147,7 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="EditMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/>
+ <include-form name="EditMarketingCampaignRoles" location="component://marketing/widget/MarketingCampaignForms.xml"/>
<container><label style="h2" text="${uiLabelMap.CommonStatusHistory}"/></container>
</screenlet>
</decorator-section>
@@ -175,7 +175,7 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="ListMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/>
+ <include-form name="ListMarketingCampaignRoles" location="component://marketing/widget/MarketingCampaignForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
Modified: ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml?rev=829365&r1=829364&r2=829365&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml Sat Oct 24 13:40:11 2009
@@ -50,7 +50,7 @@
<widgets>
<screenlet title="${uiLabelMap.PageTitleFindSegmentGroup}">
<container><link text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container>
- <include-form name="FindSegmentGroup" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
+ <include-form name="FindSegmentGroup" location="component://marketing/widget/SegmentForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
@@ -84,7 +84,7 @@
<section>
<condition><not><if-empty field="segmentGroupId"/></not></condition>
<widgets>
- <include-menu location="component://marketing/webapp/marketing/segment/SegmentMenus.xml" name="SegmentGroupTabBar"/>
+ <include-menu location="component://marketing/widget/SegmentMenus.xml" name="SegmentGroupTabBar"/>
<container><link text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container>
</widgets>
</section>
@@ -118,7 +118,7 @@
<decorator-screen name="CommonSegmentGroupDecorator">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleEditSegmentGroup}">
- <include-form name="EditSegmentGroup" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
+ <include-form name="EditSegmentGroup" location="component://marketing/widget/SegmentForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -155,9 +155,9 @@
</condition>
<widgets>
<screenlet id="AddSegmentGroupClassPanel" title="${uiLabelMap.MarketingSegmentGroupClassCreate}" collapsible="true">
- <include-form name="AddSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
+ <include-form name="AddSegmentGroupClass" location="component://marketing/widget/SegmentForms.xml"/>
</screenlet>
- <include-form name="listSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
+ <include-form name="listSegmentGroupClass" location="component://marketing/widget/SegmentForms.xml"/>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.MarketingSegmentGroupMgrViewPermissionError}</label>
@@ -197,9 +197,9 @@
</condition>
<widgets>
<screenlet id="AddSegmentGroupGeoPanel" title="${uiLabelMap.PageTitleEditSegmentGroupGeo}" collapsible="true">
- <include-form name="AddSegmentGroupGeo" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
+ <include-form name="AddSegmentGroupGeo" location="component://marketing/widget/SegmentForms.xml"/>
</screenlet>
- <include-form name="listSegmentGroupGeo" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
+ <include-form name="listSegmentGroupGeo" location="component://marketing/widget/SegmentForms.xml"/>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.MarketingSegmentGroupMgrViewPermissionError}</label>
@@ -239,9 +239,9 @@
</condition>
<widgets>
<screenlet id="AddSegmentGroupRolePanel" title="${uiLabelMap.PageTitleEditSegmentGroupRole}" collapsible="true">
- <include-form name="AddSegmentGroupRole" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
+ <include-form name="AddSegmentGroupRole" location="component://marketing/widget/SegmentForms.xml"/>
</screenlet>
- <include-form name="listSegmentGroupRole" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/>
+ <include-form name="listSegmentGroupRole" location="component://marketing/widget/SegmentForms.xml"/>
</widgets>
<fail-widgets>
<label style="h3">${uiLabelMap.MarketingSegmentGroupMgrViewPermissionError}</label>
Modified: ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml?rev=829365&r1=829364&r2=829365&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml Sat Oct 24 13:40:11 2009
@@ -39,7 +39,7 @@
<widgets>
<section>
<widgets>
- <include-menu name="TrackingCodeTabBar" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml"/>
+ <include-menu name="TrackingCodeTabBar" location="component://marketing/widget/TrackingCodeMenus.xml"/>
</widgets>
</section>
@@ -80,12 +80,12 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="EditTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="EditTrackingCode" location="component://marketing/widget/TrackingCodeForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
<screenlet title="${uiLabelMap.PageTitleAddTrackingCode}">
- <include-form name="EditTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="EditTrackingCode" location="component://marketing/widget/TrackingCodeForms.xml"/>
</screenlet>
</fail-widgets>
</section>
@@ -114,7 +114,7 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="ListTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="ListTrackingCode" location="component://marketing/widget/TrackingCodeForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -131,7 +131,7 @@
<decorator-screen name="CommonTrackingCodeDecorator">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleFindTrackingCode}">
- <include-form name="FindTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="FindTrackingCode" location="component://marketing/widget/TrackingCodeForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -157,7 +157,7 @@
<decorator-screen name="CommonTrackingCodeDecorator">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleEditTrackingCodeOrder}">
- <include-form name="EditTrackingCodeOrder" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="EditTrackingCodeOrder" location="component://marketing/widget/TrackingCodeForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -183,7 +183,7 @@
<decorator-screen name="CommonTrackingCodeDecorator">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleListTrackingCodeOrdersFor} ${uiLabelMap.MarketingTrackingCodeTrackingCodeId}=${trackingCodeId}">
- <include-form name="ListTrackingCodeOrders" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="ListTrackingCodeOrders" location="component://marketing/widget/TrackingCodeForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -205,7 +205,7 @@
<decorator-screen name="CommonTrackingCodeDecorator">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleFindTrackingCodeOrder}">
- <include-form name="FindTrackingCodeOrders" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="FindTrackingCodeOrders" location="component://marketing/widget/TrackingCodeForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -229,7 +229,7 @@
<decorator-screen name="CommonTrackingCodeDecorator">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleEditTrackingCodeVisit}">
- <include-form name="EditTrackingCodeVisit" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="EditTrackingCodeVisit" location="component://marketing/widget/TrackingCodeForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -255,7 +255,7 @@
<decorator-screen name="CommonTrackingCodeDecorator">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleListTrackingCodeFor} ${uiLabelMap.MarketingTrackingCodeTrackingCodeId}=${trackingCodeId}">
- <include-form name="ListTrackingCodeVisits" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="ListTrackingCodeVisits" location="component://marketing/widget/TrackingCodeForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -276,7 +276,7 @@
<decorator-screen name="CommonTrackingCodeDecorator">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleFindTrackingCodeVisit}">
- <include-form name="FindTrackingCodeVisits" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="FindTrackingCodeVisits" location="component://marketing/widget/TrackingCodeForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -296,10 +296,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="LookupVisit" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="LookupVisit" location="component://marketing/widget/TrackingCodeForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="ListLookupVisit" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="ListLookupVisit" location="component://marketing/widget/TrackingCodeForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -317,10 +317,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="LookupTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="LookupTrackingCode" location="component://marketing/widget/TrackingCodeForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="ListLookupTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="ListLookupTrackingCode" location="component://marketing/widget/TrackingCodeForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
@@ -351,12 +351,12 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="EditTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="EditTrackingCodeType" location="component://marketing/widget/TrackingCodeForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
<screenlet title="${uiLabelMap.PageTitleAddTrackingCodeType}">
- <include-form name="EditTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="EditTrackingCodeType" location="component://marketing/widget/TrackingCodeForms.xml"/>
</screenlet>
</fail-widgets>
</section>
@@ -386,7 +386,7 @@
<parameter param-name="DONE_PAGE" from-field="donePage"/>
</link>
</container>
- <include-form name="ListTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="ListTrackingCodeType" location="component://marketing/widget/TrackingCodeForms.xml"/>
</screenlet>
</decorator-section>
</decorator-screen>
@@ -405,10 +405,10 @@
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
- <include-form name="LookupTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="LookupTrackingCodeType" location="component://marketing/widget/TrackingCodeForms.xml"/>
</decorator-section>
<decorator-section name="search-results">
- <include-form name="ListLookupTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/>
+ <include-form name="ListLookupTrackingCodeType" location="component://marketing/widget/TrackingCodeForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml?rev=829365&r1=829364&r2=829365&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ForecastForms.xml Sat Oct 24 13:40:11 2009
@@ -22,7 +22,7 @@
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="FindSalesForecast" type="single" target="FindSalesForecast" extends="LookupSalesForecast"
- extends-resource="component://marketing/webapp/marketing/lookup/LookupForms.xml"
+ extends-resource="component://marketing/widget/LookupForms.xml"
header-row-style="header-row" default-table-style="basic-table">
<field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
</form>
Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?rev=829365&r1=829364&r2=829365&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Sat Oct 24 13:40:11 2009
@@ -334,7 +334,7 @@
</widgets>
<fail-widgets>
<screenlet title="${uiLabelMap.MarketingContactListCommStatus}">
- <include-form name="ListContactListCommStatuses" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/>
+ <include-form name="ListContactListCommStatuses" location="component://marketing/widget/ContactListForms.xml"/>
</screenlet>
</fail-widgets>
</section>