You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2008/05/01 09:20:40 UTC

svn commit: r652443 - in /ofbiz/trunk/applications/marketing/widget/sfa: CommonScreens.xml forms/ContactForms.xml forms/LeadForms.xml

Author: apatel
Date: Thu May  1 00:20:40 2008
New Revision: 652443

URL: http://svn.apache.org/viewvc?rev=652443&view=rev
Log:
Removed unused decorator screens and added few looks enhancements. Jyotsna Rathore, Thanks for the patch.

Modified:
    ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
    ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
    ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml

Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=652443&r1=652442&r2=652443&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Thu May  1 00:20:40 2008
@@ -167,42 +167,6 @@
                                 <section>
                                     <condition><not><if-empty field-name="partyId"/></not></condition>
                                     <widgets>
-                                        <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
-                                        <container style="button-bar button-style-2">
-                                            <link target="FindBillingAccount?partyId=${partyId}" url-mode="inter-app" 
-                                                text="${uiLabelMap.AccountingBillingAccount}"/>
-                                            <section>
-                                                <condition><if-has-permission permission="ORDERMGR" action="_VIEW"/></condition>
-                                                <widgets>
-                                                    <link target="searchorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyId}&amp;externalLoginKey=${externalLoginKey}&amp;viewIndex=1&amp;viewSize=20" url-mode="inter-app" 
-                                                        text="${uiLabelMap.OrderOrders}"/>
-                                                    <link target="FindQuote?partyId=${partyId}&amp;externalLoginKey=${externalLoginKey}" url-mode="inter-app" 
-                                                        text="${uiLabelMap.OrderOrderQuotes}"/>
-                                                    <link target="FindRequest?lookupFlag=Y&amp;fromPartyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app" 
-                                                        text="${uiLabelMap.PartyPartyRequests}"/>
-                                                </widgets>
-                                            </section>
-                                            <section>
-                                                <condition><if-has-permission permission="ORDERMGR" action="_CREATE"/></condition>
-                                                <widgets>
-                                                    <link target="checkinits?partyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app" 
-                                                        text="${uiLabelMap.OrderNewOrder}"/>
-                                                    <link target="EditQuote?partyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app" 
-                                                        text="${uiLabelMap.OrderNewQuote}"/>
-                                                </widgets>
-                                            </section>
-                                            <section>
-                                                <condition><if-has-permission permission="ACCOUNTING" action="_VIEW"/></condition>
-                                                <widgets>
-                                                    <link target="findPayments?lookupFlag=Y&amp;hideFields=Y&amp;partyIdTo=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app" 
-                                                        text="${uiLabelMap.AccountingPaymentsSent}"/>
-                                                    <link target="findPayments?lookupFlag=Y&amp;hideFields=Y&amp;partyIdFrom=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app" 
-                                                        text="${uiLabelMap.AccountingPaymentsReceived}"/>
-                                                    <link target="FindFinAccount?ownerPartyId=${partyId}" url-mode="inter-app"
-                                                        text="${uiLabelMap.AccountingFinAccounts}"/>
-                                                </widgets>
-                                            </section>
-                                        </container>
                                         <container>
                                             <section>
                                                 <condition>
@@ -212,7 +176,6 @@
                                                     </or>
                                                 </condition>
                                                 <widgets>
-                                                    <label text="&amp;nbsp;&lt;br/&gt;"/>
                                                     <label style="h1" text="${uiLabelMap.PartyTheProfileOf} ${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName} ${lookupPerson.suffix} ${lookupGroup.groupName}"/>
                                                 </widgets>
                                                 <fail-widgets>
@@ -234,128 +197,4 @@
             </widgets>
         </section>
     </screen>
-
-    <screen name="CommonCommunicationEventDecorator">
-        <section>
-            <actions>
-                <set field="headerItem" value="comm"/>
-                <set field="communicationEventId" from-field="parameters.communicationEventId"/>
-                <entity-one entity-name="CommunicationEvent" value-name="communicationEvent"/>
-                <set field="okayToUpdate" value="true" type="Boolean" global="true"/>
-            </actions>
-            <widgets>
-                <section>
-                    <condition>
-                        <and>
-                            <not><if-empty field-name="communicationEvent.statusId"/></not>
-                            <or>
-                                <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_COMPLETE"/>
-                                <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_RESOLVED"/>
-                                <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_REFERRED"/>
-                                <if-compare field-name="communicationEvent.statusId" operator="equals" type="String" value="COM_CANCELLED"/>
-                            </or>
-                        </and>
-                    </condition>
-                    <actions>
-                        <set field="okayToUpdate" value="false" type="Boolean" global="true"/>
-                    </actions>
-                    <widgets/>
-                </section>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <condition>
-                                <if-has-permission action="_VIEW" permission="PARTYMGR"/>
-                            </condition>
-                            <widgets>
-                                <section>
-                                    <condition>
-                                        <not><if-empty field-name="partyId"/></not>
-                                    </condition>
-                                    <widgets>
-                                        <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/>
-                                        <container style="button-bar button-style-2">
-                                            <link target="/accounting/control/FindBillingAccount?partyId=${partyId}" url-mode="inter-app" 
-                                                text="${uiLabelMap.AccountingBillingAccount}"/>
-                                            <section>
-                                                <condition><if-has-permission permission="ORDERMGR" action="_VIEW"/></condition>
-                                                <widgets>
-                                                    <link target="/ordermgr/control/searchorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyId}&amp;viewIndex=1&amp;viewSize=20" url-mode="inter-app" 
-                                                        text="${uiLabelMap.OrderOrders}"/>
-                                                </widgets>
-                                            </section>
-                                            <section>
-                                                <condition><if-has-permission permission="ORDERMGR" action="_CREATE"/></condition>
-                                                <widgets>
-                                                    <link target="/ordermgr/control/checkinits?partyId=${partyId}" url-mode="inter-app" 
-                                                        text="${uiLabelMap.OrderNewOrder}"/>
-                                                </widgets>
-                                            </section>
-                                            <section>
-                                                <condition><if-has-permission permission="ACCOUNTING" action="_VIEW"/></condition>
-                                                <widgets>
-                                                    <link target="/accounting/control/findPayments?lookupFlag=Y&amp;hideFields=Y&amp;partyIdTo=${partyId}" url-mode="inter-app" 
-                                                        text="${uiLabelMap.AccountingPaymentsSent}"/>
-                                                    <link target="/accounting/control/findPayments?lookupFlag=Y&amp;hideFields=Y&amp;partyIdFrom=${partyId}" url-mode="inter-app" 
-                                                        text="${uiLabelMap.AccountingPaymentsReceived}"/>
-                                                </widgets>
-                                            </section>
-                                        </container>
-                                    </widgets>
-                                </section>
-                                <section>
-                                    <condition>
-                                        <not><if-empty field-name="communicationEvent"/></not>
-                                    </condition>
-                                    <widgets>
-                                        <include-menu location="component://party/webapp/partymgr/communication/CommMenus.xml" name="CommEventTabBar"/>
-                                    </widgets>
-                                </section>
-                                <section>
-                                    <widgets>
-                                        <decorator-section-include name="body"/>
-                                    </widgets>
-                                </section>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label>
-                            </fail-widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="CommonQuoteDecorator">
-        <section>
-            <actions>
-                <set field="headerItem" value="quote"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <!-- do check for ORDERMGR, _VIEW permission -->
-                            <condition>
-                                <if-has-permission permission="ORDERMGR" action="_VIEW"/>
-                            </condition>
-                            <widgets>
-                                <platform-specific>
-                                    <html><html-template location="component://order/webapp/ordermgr/quote/QuoteTabBar.ftl"/></html>
-                                </platform-specific>
-                                <container>
-                                    <label style="h1">[${uiLabelMap.CommonId}:${quote.quoteId}] ${quote.description}</label>
-                                </container>
-                                <decorator-section-include name="body"/>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.OrderViewPermissionError}</label>
-                            </fail-widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
 </screens>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml?rev=652443&r1=652442&r2=652443&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/ContactForms.xml Thu May  1 00:20:40 2008
@@ -21,7 +21,8 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     
-    <form name="ListConatcts" type="list" list-name="partyList" list-entry-name="partyRow" paginate-target="FindContact">
+    <form name="ListConatcts" type="list" list-name="partyList" list-entry-name="partyRow" paginate-target="FindContact"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true">
         <row-actions>
             <entity-one entity-name="PartyGroup" value-name="partyGroup">
                 <field-map field-name="partyId" env-name="partyRow.partyId"/>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=652443&r1=652442&r2=652443&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Thu May  1 00:20:40 2008
@@ -20,7 +20,8 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-    <form name="ListLeads" type="list" list-name="partyList" list-entry-name="partyRow" paginate-target="FindLead">
+    <form name="ListLeads" type="list" list-name="partyList" list-entry-name="partyRow" paginate-target="FindLead" 
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true">
         <row-actions>
             <entity-one entity-name="PartyGroup" value-name="partyGroup">
                 <field-map field-name="partyId" env-name="partyRow.partyId"/>