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/18 19:37:01 UTC
svn commit: r826472 [2/2] - in /ofbiz/trunk/applications/marketing/widget:
./ sfa/
Modified: ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml?rev=826472&r1=826471&r2=826472&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml Sun Oct 18 17:37:00 2009
@@ -65,20 +65,9 @@
<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="${uiLabelMap.PageTitleCreateAccount}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="NewAccount" location="component://marketing/widget/sfa/forms/AccountForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleCreateAccount}">
+ <include-form name="NewAccount" location="component://marketing/widget/sfa/forms/AccountForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=826472&r1=826471&r2=826472&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Sun Oct 18 17:37:00 2009
@@ -55,14 +55,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.SfaManagerApplication}"/>
- </container>
- <container style="screenlet-body">
- <container><label style="label" text="${uiLabelMap.SfaManagerWelcome}"/></container>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.SfaManagerApplication}">
+ <container><label style="label" text="${uiLabelMap.SfaManagerWelcome}"/></container>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml?rev=826472&r1=826471&r2=826472&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml Sun Oct 18 17:37:00 2009
@@ -60,18 +60,9 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3"><label text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaContact}"/></container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="NewContact" location="component://marketing/widget/sfa/forms/ContactForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaContact}">
+ <include-form name="NewContact" location="component://marketing/widget/sfa/forms/ContactForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -88,41 +79,29 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.SfaMergeContacts}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <label><br/></label>
- <include-form name="MergeContacts" location="component://marketing/widget/sfa/forms/ContactForms.xml"/>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3"><label text="${uiLabelMap.SfaMergeContacts}"/></container>
- </container>
- <container style="screenlet-body">
- <section>
- <condition>
- <if-compare-field field="parameters.partyIdFrom" operator="not-equals" to-field="parameters.partyIdTo"/>
- </condition>
- <widgets>
- <platform-specific>
- <html><html-template location="component://marketing/webapp/sfa/contact/mergeContacts.ftl"/></html>
- </platform-specific>
- </widgets>
- <fail-widgets>
- <label text="${uiLabelMap.SfaCanNotMergeSameContact}" style="h3"></label>
- </fail-widgets>
- </section>
- </container>
- </container>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
+ <screenlet title="${uiLabelMap.SfaMergeContacts}">
+ <label><br/></label>
+ <include-form name="MergeContacts" location="component://marketing/widget/sfa/forms/ContactForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.SfaMergeContacts}">
+ <section>
+ <condition>
+ <if-compare-field field="parameters.partyIdFrom" operator="not-equals" to-field="parameters.partyIdTo"/>
+ </condition>
+ <widgets>
+ <platform-specific>
+ <html><html-template location="component://marketing/webapp/sfa/contact/mergeContacts.ftl"/></html>
+ </platform-specific>
+ </widgets>
+ <fail-widgets>
+ <label text="${uiLabelMap.SfaCanNotMergeSameContact}" style="h3"></label>
+ </fail-widgets>
+ </section>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
</screen>
<screen name="NewContactFromVCard">
@@ -134,19 +113,10 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3"><label text="${uiLabelMap.PageTitleCreateContactFromVCard}"/></container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleCreateContactFromVCard}">
<container><label style="h3" text="${uiLabelMap.SfaAutoCreateContactByImportingVCard}"/></container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="NewContactFromVCard" location="component://marketing/widget/sfa/forms/ContactForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <include-form name="NewContactFromVCard" location="component://marketing/widget/sfa/forms/ContactForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/ForecastScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/ForecastScreens.xml?rev=826472&r1=826471&r2=826472&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/ForecastScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/ForecastScreens.xml Sun Oct 18 17:37:00 2009
@@ -93,24 +93,17 @@
<widgets>
<decorator-screen name="CommonSalesForecastDecorator">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.SfaEditSalesForecast}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <condition><not><if-empty field="salesForecastId"/></not></condition>
- <widgets>
- <container style="button-bar">
- <link target="EditSalesForecast" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.SfaSalesForecast}" style="buttontext"/>
- </container>
- </widgets>
- </section>
- <include-form name="EditSalesForecast" location="component://marketing/widget/sfa/forms/ForecastForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.SfaEditSalesForecast}">
+ <section>
+ <condition><not><if-empty field="salesForecastId"/></not></condition>
+ <widgets>
+ <container style="button-bar">
+ <link target="EditSalesForecast" text="${uiLabelMap.CommonCreateNew} ${uiLabelMap.SfaSalesForecast}" style="buttontext"/>
+ </container>
+ </widgets>
+ </section>
+ <include-form name="EditSalesForecast" location="component://marketing/widget/sfa/forms/ForecastForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -129,22 +122,12 @@
<decorator-section name="body">
<section>
<widgets>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3"><label text="${uiLabelMap.SfaAddSalesForecastDetail} ${uiLabelMap.CommonFor} [${salesForecastId}]"/></container>
- </container>
- <container style="screenlet-body">
- <include-form name="AddSalesForecastDetail" location="component://marketing/widget/sfa/forms/ForecastForms.xml"/>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3"><label text="${uiLabelMap.SfaListSalesForecastDetail}"/></container>
- </container>
- <container style="screenlet-body">
- <include-form name="ListSalesForecastDetails" location="component://marketing/widget/sfa/forms/ForecastForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.SfaAddSalesForecastDetail} ${uiLabelMap.CommonFor} [${salesForecastId}]">
+ <include-form name="AddSalesForecastDetail" location="component://marketing/widget/sfa/forms/ForecastForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.SfaListSalesForecastDetail}">
+ <include-form name="ListSalesForecastDetails" location="component://marketing/widget/sfa/forms/ForecastForms.xml"/>
+ </screenlet>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=826472&r1=826471&r2=826472&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Sun Oct 18 17:37:00 2009
@@ -61,22 +61,9 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar boxhead">
- <section>
- <widgets>
- <label text="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLead}"/>
- </widgets>
- </section>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="createLead" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.CommonCreate} ${uiLabelMap.SfaLead}">
+ <include-form name="createLead" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -92,22 +79,9 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar boxhead">
- <section>
- <widgets>
- <label text="${uiLabelMap.SfaConvertLead}"/>
- </widgets>
- </section>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ConvertLead" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.SfaConvertLead}">
+ <include-form name="ConvertLead" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -124,22 +98,9 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar boxhead">
- <section>
- <widgets>
- <label text="${uiLabelMap.SfaCloneLead}"/>
- </widgets>
- </section>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="createLead" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.SfaCloneLead}">
+ <include-form name="createLead" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -155,15 +116,10 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3"><label text="${uiLabelMap.SfaMergeLeads}"/></container>
- </container>
- <container style="screenlet-body">
- <label><br/></label>
- <include-form name="MergeLeads" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.SfaMergeLeads}">
+ <label><br/></label>
+ <include-form name="MergeLeads" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
+ </screenlet>
<section>
<condition>
<if-compare-field field="parameters.partyIdFrom" operator="not-equals" to-field="parameters.partyIdTo"/>
@@ -192,20 +148,11 @@
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3"><label text="${uiLabelMap.PageTitleCreateLeadFromVCard}"/></container>
- </container>
+ <screenlet title="${uiLabelMap.PageTitleCreateLeadFromVCard}">
<container><label style="h3" text="${uiLabelMap.SfaAutoCreateLeadByImportingVCard}"/></container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <label><br/></label>
- <include-form name="NewLeadFromVCard" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <label><br/></label>
+ <include-form name="NewLeadFromVCard" location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml?rev=826472&r1=826471&r2=826472&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml Sun Oct 18 17:37:00 2009
@@ -30,37 +30,13 @@
<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="${uiLabelMap.SfaFindOpportunities}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <container><link target="EditSalesOpportunity" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container>
- <include-form name="FindSalesOpportunity" location="component://marketing/widget/sfa/forms/OpportunityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.SfaFindResults}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <container>
- <section>
- <widgets>
- <include-form name="ListSalesOpportunity" location="component://marketing/widget/sfa/forms/OpportunityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.SfaFindOpportunities}">
+ <container><link target="EditSalesOpportunity" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/></container>
+ <include-form name="FindSalesOpportunity" location="component://marketing/widget/sfa/forms/OpportunityForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.SfaFindResults}">
+ <include-form name="ListSalesOpportunity" location="component://marketing/widget/sfa/forms/OpportunityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -94,20 +70,9 @@
<widgets>
<decorator-screen name="CommonOpportunityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.SfaEditOpportunity}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="EditSalesOpportunity" location="component://marketing/widget/sfa/forms/OpportunityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.SfaEditOpportunity}">
+ <include-form name="EditSalesOpportunity" location="component://marketing/widget/sfa/forms/OpportunityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
@@ -135,20 +100,9 @@
<widgets>
<decorator-screen name="CommonOpportunityDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <container style="screenlet">
- <container style="screenlet-title-bar">
- <container style="h3">
- <label text="${uiLabelMap.SfaOpportunityInfo}"/>
- </container>
- </container>
- <container style="screenlet-body">
- <section>
- <widgets>
- <include-form name="ViewSalesOpportunity" location="component://marketing/widget/sfa/forms/OpportunityForms.xml"/>
- </widgets>
- </section>
- </container>
- </container>
+ <screenlet title="${uiLabelMap.SfaOpportunityInfo}">
+ <include-form name="ViewSalesOpportunity" location="component://marketing/widget/sfa/forms/OpportunityForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>