svn commit: r826472 [1/2] - in /ofbiz/trunk/applications/mark
Locked
 
|
Author: buscob
Date: Sun Oct 18 17:37:00 2009 New Revision: 826472 URL: http://svn.apache.org/viewvc?rev=826472&view=rev Log: Changed <container style="screenlet"> pattern to <screenlet...>. 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/MarketingCampaignScreens.xml ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/ForecastScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml Modified: ofbiz/trunk/applications/marketing/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?rev=826472&r1=826471&r2=826472&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Sun Oct 18 17:37:00 2009 @@ -93,14 +93,9 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-header"> - <label style="boxhead" text="${uiLabelMap.MarketingManagerApplication}"/> - </container> - <container style="screenlet-body"> - <container><label style="label" text="${uiLabelMap.MarketingManagerWelcome}"/></container> - </container> - </container> + <screenlet title="${uiLabelMap.MarketingManagerApplication}"> + <container><label style="label" text="${uiLabelMap.MarketingManagerWelcome}"/></container> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=826472&r1=826471&r2=826472&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Sun Oct 18 17:37:00 2009 @@ -32,25 +32,14 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.MarketingContactListFindContactLists}"/> - </container> + <screenlet title="${uiLabelMap.MarketingContactListFindContactLists}"> + <container> + <link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList" style="buttontext"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="FindContactLists" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> - </widgets> - </section> - </container> - </container> + <include-form name="FindContactLists" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -76,41 +65,19 @@ <not><if-empty field="contactList"/></not> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditContactList}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="EditContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> - </widgets> - </section> + <screenlet title="${uiLabelMap.PageTitleEditContactList}"> + <container> + <link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList" style="buttontext"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - </container> + <include-form name="EditContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </screenlet> </widgets> <fail-widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddContactList}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleAddContactList}"> + <include-form name="EditContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </screenlet> </fail-widgets> </section> </decorator-section> @@ -137,25 +104,14 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListContactList}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="ListContactLists" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> - </widgets> - </section> + <screenlet title="${uiLabelMap.PageTitleListContactList}"> + <container> + <link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList" style="buttontext"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - </container> + <include-form name="ListContactLists" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -186,34 +142,23 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditContactListParty}"/> - </container> - </container> - <container style="screenlet-body"> + <screenlet title="${uiLabelMap.PageTitleEditContactListParty}"> + <container> + <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty"> + <parameter param-name="contactListId"/> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> + </container> + <include-form name="EditContactListParty" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + <container><label style="h2" text="${uiLabelMap.CommonStatusHistory}"/></container> + <iterate-section entry="contactListPartyStatus" list="contactListPartyStatusList"> <section> <widgets> - <container> - <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty"> - <parameter param-name="contactListId"/> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="EditContactListParty" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> - <container><label style="h2" text="${uiLabelMap.CommonStatusHistory}"/></container> - <iterate-section entry="contactListPartyStatus" list="contactListPartyStatusList"> - <section> - <widgets> - <container><label text="${contactListPartyStatus.statusDate} ${contactListPartyStatus.description} [by: ${contactListPartyStatus.setByUserLoginId}] [code: ${contactListPartyStatus.optInVerifyCode}]"/></container> - </widgets> - </section> - </iterate-section> + <container><label text="${contactListPartyStatus.statusDate} ${contactListPartyStatus.description} [by: ${contactListPartyStatus.setByUserLoginId}] [code: ${contactListPartyStatus.optInVerifyCode}]"/></container> </widgets> </section> - </container> - </container> + </iterate-section> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -237,26 +182,15 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListContactListParty}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty"> - <parameter param-name="contactListId"/> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="ListContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> - </widgets> - </section> + <screenlet title="${uiLabelMap.PageTitleListContactListParty}"> + <container> + <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty"> + <parameter param-name="contactListId"/> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - </container> + <include-form name="ListContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -275,27 +209,16 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleFindContactListParty}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty"> - <parameter param-name="contactListId"/> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="FindContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> - </widgets> - </section> + <screenlet title="${uiLabelMap.PageTitleFindContactListParty}"> + <container> + <link text="${uiLabelMap.MarketingContactListPartyCreate}" target="EditContactListParty"> + <parameter param-name="contactListId"/> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - </container> - </decorator-section> + <include-form name="FindContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </screenlet> + </decorator-section> </decorator-screen> </widgets> </section> @@ -327,27 +250,16 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditContactList}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-menu location="component://marketing/webapp/marketing/contact/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"/> - </widgets> - </section> + <screenlet title="${uiLabelMap.PageTitleEditContactList}"> + <include-menu location="component://marketing/webapp/marketing/contact/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> - </container> + <include-form name="EditContactListCommEvent" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -370,27 +282,16 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListContactList} ${uiLabelMap.CommonFor} contactListId=${contactListId}"/> - </container> + <screenlet title="${uiLabelMap.PageTitleListContactList} ${uiLabelMap.CommonFor} contactListId=${contactListId}"> + <container> + <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent"> + <parameter param-name="contactListId"/> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent"> - <parameter param-name="contactListId"/> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="ListContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> - </widgets> - </section> - </container> - </container> - </decorator-section> + <include-form name="ListContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </screenlet> + </decorator-section> </decorator-screen> </widgets> </section> @@ -408,26 +309,15 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleFindContactListCommEvents}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent"> - <parameter param-name="contactListId"/> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="FindContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> - </widgets> - </section> + <screenlet title="${uiLabelMap.PageTitleFindContactListCommEvents}"> + <container> + <link text="${uiLabelMap.MarketingContactListCommEventCreate}" target="EditContactListCommEvent"> + <parameter param-name="contactListId"/> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - </container> + <include-form name="FindContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -511,22 +401,11 @@ <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="Opt-Out Results"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <label text="You have been successfully removed from the ${contactList.contactListName} mailing list!"/> - </container> - </widgets> - </section> - </container> - </container> + <screenlet title="Opt-Out Results"> + <container> + <label text="You have been successfully removed from the ${contactList.contactListName} mailing list!"/> + </container> + </screenlet> </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=826472&r1=826471&r2=826472&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml Sun Oct 18 17:37:00 2009 @@ -74,41 +74,19 @@ <not><if-empty field="dataSource"/></not> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditDataSource}"/> - </container> + <screenlet title="${uiLabelMap.PageTitleEditDataSource}"> + <container> + <link text="${uiLabelMap.DataSourceCreate}" target="/EditDataSource" style="buttontext"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.DataSourceCreate}" target="/EditDataSource" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="EditDataSource" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> - </widgets> - </section> - </container> - </container> + <include-form name="EditDataSource" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + </screenlet> </widgets> <fail-widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddDataSource}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditDataSource" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleAddDataSource}"> + <include-form name="EditDataSource" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + </screenlet> </fail-widgets> </section> </decorator-section> @@ -131,25 +109,14 @@ <widgets> <decorator-screen name="CommonDataSourceDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListDataSource}"/> - </container> + <screenlet title="${uiLabelMap.PageTitleListDataSource}"> + <container> + <link text="${uiLabelMap.DataSourceCreate}" target="/EditDataSource" style="buttontext"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.DataSourceCreate}" target="/EditDataSource" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="ListDataSource" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> - </widgets> - </section> - </container> - </container> + <include-form name="ListDataSource" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -175,42 +142,20 @@ <not><if-empty field="dataSourceType"/></not> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditDataSourceType}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.DataSourceTypeCreate}" target="/EditDataSourceType" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="EditDataSourceType" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> - </widgets> - </section> + <screenlet title="${uiLabelMap.PageTitleEditDataSourceType}"> + <container> + <link text="${uiLabelMap.DataSourceTypeCreate}" target="/EditDataSourceType" style="buttontext"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - </container> + <include-form name="EditDataSourceType" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + </screenlet> </widgets> <fail-widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddDataSourceType}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditDataSourceType" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> - </widgets> - </section> - </container> - </container> - </fail-widgets> + <screenlet title="${uiLabelMap.PageTitleAddDataSourceType}"> + <include-form name="EditDataSourceType" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + </screenlet> + </fail-widgets> </section> </decorator-section> </decorator-screen> @@ -233,25 +178,14 @@ <widgets> <decorator-screen name="CommonDataSourceDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListDataSourceType}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.DataSourceTypeCreate}" target="/EditDataSourceType" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="ListDataSourceType" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> - </widgets> - </section> + <screenlet title="${uiLabelMap.PageTitleListDataSourceType}"> + <container> + <link text="${uiLabelMap.DataSourceTypeCreate}" target="/EditDataSourceType" style="buttontext"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - </container> + <include-form name="ListDataSourceType" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + </screenlet> </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=826472&r1=826471&r2=826472&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Sun Oct 18 17:37:00 2009 @@ -76,41 +76,19 @@ <not><if-empty field="marketingCampaign"/></not> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditMarketingCampaign}"/> - </container> + <screenlet title="${uiLabelMap.PageTitleEditMarketingCampaign}"> + <container> + <link text="${uiLabelMap.MarketingCampaignCreate}" target="/EditMarketingCampaign" style="buttontext"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.MarketingCampaignCreate}" target="/EditMarketingCampaign" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="EditMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> - </widgets> - </section> - </container> - </container> + <include-form name="EditMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + </screenlet> </widgets> <fail-widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddMarketingCampaign}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleAddMarketingCampaign}"> + <include-form name="EditMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + </screenlet> </fail-widgets> </section> </decorator-section> @@ -132,25 +110,14 @@ <widgets> <decorator-screen name="CommonMarketingCampaignDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListMarketingCampaign}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.MarketingCampaignCreate}" target="/EditMarketingCampaign" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="ListMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> - </widgets> - </section> + <screenlet title="${uiLabelMap.PageTitleListMarketingCampaign}"> + <container> + <link text="${uiLabelMap.MarketingCampaignCreate}" target="/EditMarketingCampaign" style="buttontext"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - </container> + <include-form name="ListMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -173,27 +140,16 @@ <widgets> <decorator-screen name="CommonMarketingCampaignDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditMarketingCampaignRole}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles"> - <parameter param-name="marketingCampaignId"/> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="EditMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> - <container><label style="h2" text="${uiLabelMap.CommonStatusHistory}"/></container> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditMarketingCampaignRole}"> + <container> + <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles"> + <parameter param-name="marketingCampaignId"/> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> + </container> + <include-form name="EditMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + <container><label style="h2" text="${uiLabelMap.CommonStatusHistory}"/></container> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -212,26 +168,15 @@ <widgets> <decorator-screen name="CommonMarketingCampaignDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListMarketingCampaignRole}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles"> - <parameter param-name="marketingCampaignId"/> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="ListMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> - </widgets> - </section> + <screenlet title="${uiLabelMap.PageTitleListMarketingCampaignRole}"> + <container> + <link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles"> + <parameter param-name="marketingCampaignId"/> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - </container> + <include-form name="ListMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml?rev=826472&r1=826471&r2=826472&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml Sun Oct 18 17:37:00 2009 @@ -57,64 +57,20 @@ <label text="${uiLabelMap.MarketingReports}"/> </container> <container style="lefthalf"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.MarketingTrackingCodeReportTitle}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="TrackingCodeReportOptions" location="component://marketing/widget/ReportForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.MarketingEmailStatusReport}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EmailStatusOptions" location="component://marketing/widget/ReportForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.MarketingTrackingCodeReportTitle}"> + <include-form name="TrackingCodeReportOptions" location="component://marketing/widget/ReportForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.MarketingEmailStatusReport}"> + <include-form name="EmailStatusOptions" location="component://marketing/widget/ReportForms.xml"/> + </screenlet> </container> <container style="righthalf"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.MarketingCampaignReportTitle}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="MarketingCampaignOptions" location="component://marketing/widget/ReportForms.xml"/> - </widgets> - </section> - </container> - </container> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.MarketingPartyStatusReport}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="PartyStatusOptions" location="component://marketing/widget/ReportForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.MarketingCampaignReportTitle}"> + <include-form name="MarketingCampaignOptions" location="component://marketing/widget/ReportForms.xml"/> + </screenlet> + <screenlet title="${uiLabelMap.MarketingPartyStatusReport}"> + <include-form name="PartyStatusOptions" location="component://marketing/widget/ReportForms.xml"/> + </screenlet> </container> </decorator-section> </decorator-screen> @@ -135,20 +91,9 @@ <widgets> <decorator-screen name="CommonMarketReportDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.MarketingTrackingCodeReportTitle} ${uiLabelMap.CommonFrom} ${parameters.fromDate} ${uiLabelMap.CommonThru} ${parameters.thruDate}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="TrackingCodeReport" location="component://marketing/widget/ReportForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.MarketingTrackingCodeReportTitle} ${uiLabelMap.CommonFrom} ${parameters.fromDate} ${uiLabelMap.CommonThru} ${parameters.thruDate}"> + <include-form name="TrackingCodeReport" location="component://marketing/widget/ReportForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -168,20 +113,9 @@ <widgets> <decorator-screen name="CommonMarketReportDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.MarketingCampaignReportTitle} ${uiLabelMap.CommonFrom} ${parameters.fromDate} ${uiLabelMap.CommonThru} ${parameters.thruDate}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="MarketCampaignReport" location="component://marketing/widget/ReportForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.MarketingCampaignReportTitle} ${uiLabelMap.CommonFrom} ${parameters.fromDate} ${uiLabelMap.CommonThru} ${parameters.thruDate}"> + <include-form name="MarketCampaignReport" location="component://marketing/widget/ReportForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -202,20 +136,9 @@ <widgets> <decorator-screen name="CommonMarketReportDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.MarketingEmailStatusReport}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EmailStatusReport" location="component://marketing/widget/ReportForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.MarketingEmailStatusReport}"> + <include-form name="EmailStatusReport" location="component://marketing/widget/ReportForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -235,20 +158,9 @@ <widgets> <decorator-screen name="CommonMarketReportDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.MarketingPartyStatusReport}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="PartyStatusReport" location="component://marketing/widget/ReportForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.MarketingPartyStatusReport}"> + <include-form name="PartyStatusReport" location="component://marketing/widget/ReportForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml?rev=826472&r1=826471&r2=826472&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml Sun Oct 18 17:37:00 2009 @@ -48,21 +48,10 @@ <if-has-permission permission="MARKETING" action="_VIEW"/> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleFindSegmentGroup}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container><link text="${uiLabelMap.MarketingSegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container> - <include-form name="FindSegmentGroup" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> - </widgets> - </section> - </container> - </container> + <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"/> + </screenlet> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.MarketingSegmentGroupMgrViewPermissionError}</label> @@ -128,20 +117,9 @@ <widgets> <decorator-screen name="CommonSegmentGroupDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditSegmentGroup}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditSegmentGroup" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditSegmentGroup}"> + <include-form name="EditSegmentGroup" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml?rev=826472&r1=826471&r2=826472&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml Sun Oct 18 17:37:00 2009 @@ -74,41 +74,19 @@ <not><if-empty field="trackingCode"/></not> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditTrackingCode}"/> - </container> + <screenlet title="${uiLabelMap.PageTitleEditTrackingCode}"> + <container> + <link text="${uiLabelMap.MarketingTrackingCodeCreate}" target="/EditTrackingCode" style="buttontext"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.MarketingTrackingCodeCreate}" target="/EditTrackingCode" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="EditTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> - </widgets> - </section> - </container> - </container> + <include-form name="EditTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> + </screenlet> </widgets> <fail-widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddTrackingCode}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleAddTrackingCode}"> + <include-form name="EditTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> + </screenlet> </fail-widgets> </section> </decorator-section> @@ -130,25 +108,14 @@ <widgets> <decorator-screen name="CommonTrackingCodeDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListTrackingCode}"/> - </container> + <screenlet title="${uiLabelMap.PageTitleListTrackingCode}"> + <container> + <link text="${uiLabelMap.MarketingTrackingCodeCreate}" target="/EditTrackingCode" style="buttontext"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.MarketingTrackingCodeCreate}" target="/EditTrackingCode" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="ListTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> - </widgets> - </section> - </container> - </container> + <include-form name="ListTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -163,20 +130,9 @@ <widgets> <decorator-screen name="CommonTrackingCodeDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleFindTrackingCode}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="FindTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleFindTrackingCode}"> + <include-form name="FindTrackingCode" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -200,20 +156,9 @@ <widgets> <decorator-screen name="CommonTrackingCodeDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditTrackingCodeOrder}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditTrackingCodeOrder" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditTrackingCodeOrder}"> + <include-form name="EditTrackingCodeOrder" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -237,20 +182,9 @@ <widgets> <decorator-screen name="CommonTrackingCodeDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListTrackingCodeOrdersFor} ${uiLabelMap.MarketingTrackingCodeTrackingCodeId}=${trackingCodeId}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListTrackingCodeOrders" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleListTrackingCodeOrdersFor} ${uiLabelMap.MarketingTrackingCodeTrackingCodeId}=${trackingCodeId}"> + <include-form name="ListTrackingCodeOrders" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -270,20 +204,9 @@ <widgets> <decorator-screen name="CommonTrackingCodeDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleFindTrackingCodeOrder}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="FindTrackingCodeOrders" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleFindTrackingCodeOrder}"> + <include-form name="FindTrackingCodeOrders" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -305,20 +228,9 @@ <widgets> <decorator-screen name="CommonTrackingCodeDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditTrackingCodeVisit}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditTrackingCodeVisit" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleEditTrackingCodeVisit}"> + <include-form name="EditTrackingCodeVisit" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -342,20 +254,9 @@ <widgets> <decorator-screen name="CommonTrackingCodeDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListTrackingCodeFor} ${uiLabelMap.MarketingTrackingCodeTrackingCodeId}=${trackingCodeId}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="ListTrackingCodeVisits" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleListTrackingCodeFor} ${uiLabelMap.MarketingTrackingCodeTrackingCodeId}=${trackingCodeId}"> + <include-form name="ListTrackingCodeVisits" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -374,20 +275,9 @@ <widgets> <decorator-screen name="CommonTrackingCodeDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleFindTrackingCodeVisit}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="FindTrackingCodeVisits" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleFindTrackingCodeVisit}"> + <include-form name="FindTrackingCodeVisits" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> @@ -455,41 +345,19 @@ <not><if-empty field="trackingCodeType"/></not> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditTrackingCodeType}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.MarketingTrackingCodeTypeCreate}" target="/EditTrackingCodeType" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="EditTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> - </widgets> - </section> + <screenlet title="${uiLabelMap.PageTitleEditTrackingCodeType}"> + <container> + <link text="${uiLabelMap.MarketingTrackingCodeTypeCreate}" target="/EditTrackingCodeType" style="buttontext"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - </container> + <include-form name="EditTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> + </screenlet> </widgets> <fail-widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddTrackingCodeType}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> - </widgets> - </section> - </container> - </container> + <screenlet title="${uiLabelMap.PageTitleAddTrackingCodeType}"> + <include-form name="EditTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> + </screenlet> </fail-widgets> </section> </decorator-section> @@ -512,25 +380,14 @@ <widgets> <decorator-screen name="CommonTrackingCodeDecorator"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleListTrackingCodeType}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.MarketingTrackingCodeTypeCreate}" target="/EditTrackingCodeType" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="ListTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> - </widgets> - </section> + <screenlet title="${uiLabelMap.PageTitleListTrackingCodeType}"> + <container> + <link text="${uiLabelMap.MarketingTrackingCodeTypeCreate}" target="/EditTrackingCodeType" style="buttontext"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> - </container> + <include-form name="ListTrackingCodeType" location="component://marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml"/> + </screenlet> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |