You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2008/05/27 09:15:44 UTC
svn commit: r660409 - in /ofbiz/trunk/applications/marketing/widget/sfa:
AccountScreens.xml CommonScreens.xml ContactScreens.xml LeadScreens.xml
OpportunityScreens.xml SfaMenus.xml
Author: hansbak
Date: Tue May 27 00:15:43 2008
New Revision: 660409
URL: http://svn.apache.org/viewvc?rev=660409&view=rev
Log:
clean up the buttonbars in the sfa application
Modified:
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/LeadScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
Modified: ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml?rev=660409&r1=660408&r2=660409&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/AccountScreens.xml Tue May 27 00:15:43 2008
@@ -25,7 +25,7 @@
<actions>
<set field="titleProperty" value="MarketingFindAccounts"/>
<set field="roleTypeId" value="ACCOUNT"/>
- <set field="tabButtonItem" value="Accounts"/>
+ <set field="headerItem" value="Accounts"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -35,7 +35,7 @@
<service service-name="findParty" auto-field-map="true"/>
</actions>
<widgets>
- <container><link target="NewAccounts" text="${uiLabelMap.PageTitleCreateAccount}" style="buttontext"/></container>
+ <include-menu name="AccountSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/>
<section>
<widgets>
<platform-specific>
@@ -77,7 +77,7 @@
<screen name="NewAccounts">
<section>
<actions>
- <set field="tabButtonItem" value="Accounts"/>
+ <set field="headerItem" value="Accounts"/>
<set field="titleProperty" value="PageTitleCreateAccount"/>
<set field="accountType" from-field="parameters.accountType"/>
</actions>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=660409&r1=660408&r2=660409&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Tue May 27 00:15:43 2008
@@ -48,7 +48,7 @@
<screen name="main">
<section>
<actions>
- <set field="tabButtonItem" value="Main"/>
+ <set field="headerItem" value="Main"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -133,7 +133,15 @@
<widgets>
<section>
<condition>
- <if-compare field-name="tabButtonItem" operator="equals" value="Leads"/>
+ <if-compare field-name="headerItem" operator="equals" value="Accounts"/>
+ </condition>
+ <widgets>
+ <include-menu name="AccountTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <if-compare field-name="headerItem" operator="equals" value="Leads"/>
</condition>
<widgets>
<include-menu name="LeadTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/>
@@ -141,29 +149,50 @@
</section>
<section>
<condition>
- <if-compare field-name="tabButtonItem" operator="equals" value="Contacts"/>
+ <if-compare field-name="headerItem" operator="equals" value="Contacts"/>
</condition>
<widgets>
<include-menu name="ContactTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/>
</widgets>
</section>
- <container>
- <section>
- <condition>
- <or>
- <not><if-empty field-name="lookupPerson"/></not>
- <not><if-empty field-name="lookupGroup"/></not>
- </or>
- </condition>
- <widgets>
- <label style="h1" text="${uiLabelMap.PartyTheProfileOf} ${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName} ${lookupPerson.suffix} ${lookupGroup.groupName}"/>
- </widgets>
- <fail-widgets>
- <label style="h1" text="${uiLabelMap.PartyNewUser}"/>
- </fail-widgets>
- </section>
- <label style="h1" text="[${partyId}]"/>
- </container>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <if-compare field-name="headerItem" operator="equals" value="Contacts"/>
+ </condition>
+ <widgets>
+ <include-menu name="ContactSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <if-compare field-name="headerItem" operator="equals" value="Accounts"/>
+ </condition>
+ <widgets>
+ <include-menu name="AccountSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <if-compare field-name="headerItem" operator="equals" value="Leads"/>
+ </condition>
+ <widgets>
+ <include-menu name="LeadSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/>
+ </widgets>
+ </section>
+ <section>
+ <condition>
+ <and>
+ <not><if-empty field-name="party"/></not>
+ <or>
+ <not><if-empty field-name="lookupPerson"/></not>
+ <not><if-empty field-name="lookupGroup"/></not>
+ </or>
+ </and>
+ </condition>
+ <widgets>
+ <label style="h1" text="${uiLabelMap.PartyTheProfileOf} ${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName} ${lookupPerson.suffix} ${lookupGroup.groupName} [${partyId}]"/>
</widgets>
</section>
<decorator-section-include name="body"/>
@@ -181,8 +210,7 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleViewPartyProfile"/>
- <set field="tabButtonItem" value="viewprofile"/>
- <set field="headerItem" value="find"/>
+ <set field="tabButtonItem" value="profile"/>
<set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
<set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/>
@@ -200,7 +228,7 @@
<not><if-empty field-name="leadDescription"/></not>
</condition>
<actions>
- <set field="tabButtonItem" value="Leads"/>
+ <set field="headerItem" value="Leads"/>
</actions>
<widgets/>
</section>
@@ -209,7 +237,7 @@
<not><if-empty field-name="contactDescription"/></not>
</condition>
<actions>
- <set field="tabButtonItem" value="Contacts"/>
+ <set field="headerItem" value="Contacts"/>
</actions>
<widgets/>
</section>
@@ -218,7 +246,7 @@
<not><if-empty field-name="accountDescription"/></not>
</condition>
<actions>
- <set field="tabButtonItem" value="Accounts"/>
+ <set field="headerItem" value="Accounts"/>
</actions>
<widgets/>
</section>
@@ -249,7 +277,7 @@
<not><if-empty field-name="accountDescription"/></not>
</condition>
<widgets>
- <label style="h1" text="Party ${party.partyId} in the Role of ${accountDescription}"/>
+ <!--label style="h1" text="Party ${party.partyId} in the Role of ${accountDescription}"/-->
<container style="profile-left">
<include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/>
<include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml?rev=660409&r1=660408&r2=660409&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/ContactScreens.xml Tue May 27 00:15:43 2008
@@ -25,7 +25,7 @@
<actions>
<set field="roleTypeId" value="CONTACT"/>
<set field="partyTypeId" value="PERSON"/>
- <set field="tabButtonItem" value="Contacts"/>
+ <set field="headerItem" value="Contacts"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
@@ -35,10 +35,7 @@
<service service-name="findParty" auto-field-map="true"/>
</actions>
<widgets>
- <container style="button-bar button-style-2">
- <link target="CreateContact" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/>
- <link target="CreateContactFromVCard" text="${uiLabelMap.SfaCreateContactFromVCard}" style="buttontext"/>
- </container>
+ <include-menu name="ContactSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/>
<platform-specific>
<html><html-template location="component://marketing/webapp/sfa/party/findSfaParty.ftl"/></html>
</platform-specific>
@@ -73,11 +70,11 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleCreateContact"/>
- <set field="tabButtonItem" value="Contacts"/>
+ <set field="headerItem" value="Contacts"/>
<property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
@@ -100,11 +97,12 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleCreateContact"/>
- <set field="tabButtonItem" value="Contacts"/>
+ <set field="headerItem" value="Contacts"/>
+ <set field="tabButtonItem" value="MergeContacts"/>
<script location="component://marketing/webapp/sfa/WEB-INF/action/mergeContacts.bsh"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
@@ -147,10 +145,10 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleCreateContactFromVCard"/>
- <set field="tabButtonItem" value="Contacts"/>
+ <set field="headerItem" value="Contacts"/>
</actions>
<widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="screenlet">
<container style="screenlet-title-bar">
Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=660409&r1=660408&r2=660409&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Tue May 27 00:15:43 2008
@@ -25,18 +25,15 @@
<actions>
<set field="roleTypeId" value="LEAD"/>
<set field="partyTypeId" value="PERSON"/>
- <set field="tabButtonItem" value="Leads"/>
+ <set field="headerItem" value="Leads"/>
<service service-name="findParty" auto-field-map="true"/>
</actions>
<widgets>
- <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<widgets>
- <container style="button-bar button-style-2">
- <link target="CreateLead" text="${uiLabelMap.CommonCreateNew}" style="buttontext"/>
- <link target="CreateLeadFromVCard" text="${uiLabelMap.SfaImportLead}" style="buttontext"/>
- </container>
+ <include-menu name="LeadSubTabBar" location="component://marketing/widget/sfa/SfaMenus.xml"/>
<section>
<widgets>
<platform-specific>
@@ -80,7 +77,7 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleCreateLead"/>
- <set field="tabButtonItem" value="Leads"/>
+ <set field="headerItem" value="Leads"/>
<property-to-field field="defaultCountryGeoId" resource="general" property="country.geo.id.default" default="USA"/>
</actions>
<widgets>
@@ -110,6 +107,9 @@
<screen name="ConvertLead">
<section>
+ <actions>
+ <set field="headerItem" value="Leads"/>
+ </actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
@@ -138,6 +138,7 @@
<screen name="CloneLead">
<section>
<actions>
+ <set field="headerItem" value="Leads"/>
<script location="component://marketing/webapp/sfa/WEB-INF/action/cloneLead.bsh"/>
</actions>
<widgets>
@@ -168,7 +169,7 @@
<screen name="MergeLeads">
<section>
<actions>
- <set field="tabButtonItem" value="Leads"/>
+ <set field="headerItem" value="Leads"/>
<script location="component://marketing/webapp/sfa/WEB-INF/action/mergeContacts.bsh"/>
</actions>
<widgets>
@@ -206,7 +207,7 @@
<section>
<actions>
<set field="titleProperty" value="PageTitleCreateLeadFromVCard"/>
- <set field="tabButtonItem" value="Leads"/>
+ <set field="headerItem" value="Leads"/>
</actions>
<widgets>
<decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml?rev=660409&r1=660408&r2=660409&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml Tue May 27 00:15:43 2008
@@ -26,6 +26,7 @@
<actions>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/>
+ <set field="headerItem" value="Opportunities"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=660409&r1=660408&r2=660409&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Tue May 27 00:15:43 2008
@@ -19,7 +19,7 @@
-->
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
<menu name="SfaAppBar" default-menu-item-name="main" id="app-navigation" type="simple" title="${uiLabelMap.SfaManagerApplication}"
- default-selected-style="selected" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+ default-selected-style="selected" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="headerItem">
<menu-item name="Main" title="${uiLabelMap.MarketingMainPage}"><link target="main"/></menu-item>
<menu-item name="Accounts" title="${uiLabelMap.SfaAcccounts}"><link target="FindAccounts"/></menu-item>
<menu-item name="Contacts" title="${uiLabelMap.SfaContacts}"><link target="FindContacts"/></menu-item>
@@ -39,7 +39,7 @@
</menu-item>
</menu>
- <menu name="OpportunityTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected">
+ <menu name="OpportunityTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
<menu-item name="opportunityView" title="${uiLabelMap.SfaOpportunitySummary}">
<link target="viewOpportunity?salesOpportunityId=${parameters.salesOpportunityId}"/>
</menu-item>
@@ -48,13 +48,25 @@
</menu-item>
</menu>
- <menu name="LeadTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected">
+ <menu name="AccountTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
+ <menu-item name="profile" title="${uiLabelMap.PartyProfile}">
+ <link target="viewprofile?partyId=${parameters.partyId}"/>
+ </menu-item>
+ </menu>
+ <menu name="AccountSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">
+ <menu-item name="NewAccounts" title="${uiLabelMap.PageTitleCreateAccount}">
+ <link target="NewAccounts"/>
+ </menu-item>
+ </menu>
+
+ <menu name="LeadTabBar" menu-container-style="button-bar tab-bar" default-selected-style="selected" type="simple" selected-menuitem-context-field-name="tabButtonItem">
+ <menu-item name="profile" title="${uiLabelMap.PartyProfile}">
+ <link target="viewprofile?partyId=${parameters.partyId}"/>
+ </menu-item>
<menu-item name="ConvertLead" title="${uiLabelMap.SfaConvertLead}">
- <condition><not><if-empty field-name="parameters.partyId"/></not></condition>
<link target="ConvertLead?leadPartyId=${parameters.partyId}"/>
</menu-item>
<menu-item name="CloneLead" title="${uiLabelMap.SfaCloneLead}">
- <condition><not><if-empty field-name="parameters.partyId"/></not></condition>
<link target="CloneLead?leadPartyId=${parameters.partyId}"/>
</menu-item>
<menu-item name="MergeLeads" title="${uiLabelMap.SfaMergeLeads}">
@@ -62,9 +74,29 @@
</menu-item>
</menu>
- <menu name="ContactTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected">
+ <menu name="LeadSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">
+ <menu-item name="CreateLead" title="${uiLabelMap.CommonCreateNew}">
+ <link target="CreateLead"/>
+ </menu-item>
+ <menu-item name="CreateLeadFromVCard" title="${uiLabelMap.SfaImportLead}">
+ <link target="CreateLeadFromVCard"/>
+ </menu-item>
+ </menu>
+
+ <menu name="ContactTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
+ <menu-item name="profile" title="${uiLabelMap.PartyProfile}">
+ <link target="viewprofile?partyId=${parameters.partyId}"/>
+ </menu-item>
<menu-item name="MergeContacts" title="${uiLabelMap.SfaMergeContacts}">
<link target="MergeContacts"/>
</menu-item>
</menu>
+ <menu name="ContactSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">
+ <menu-item name="CreateContact" title="${uiLabelMap.CommonCreateNew}">
+ <link target="CreateContact"/>
+ </menu-item>
+ <menu-item name="CreateContactFromVCard" title="${uiLabelMap.SfaCreateContactFromVCard}">
+ <link target="CreateContactFromVCard"/>
+ </menu-item>
+ </menu>
</menus>