svn commit: r660451 - in /ofbiz/trunk/applications/party/widget/partymgr: CommonScreens.xml PartyMenus.xml

[ha...@apache.org]

Author: hansbak
Date: Tue May 27 02:53:16 2008
New Revision: 660451

URL: http://svn.apache.org/viewvc?rev=660451&view=rev
Log:
replace widgets links with a proper menu

Modified:
    ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=660451&r1=660450&r2=660451&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Tue May 27 02:53:16 2008
@@ -87,42 +87,7 @@
                                 <section>
                                     <condition><not><if-empty field-name="partyId"/></not></condition>
                                     <widgets>
-                                        <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;externalLoginKey=${externalLoginKey}&amp;viewIndex=1&amp;viewSize=20" url-mode="inter-app" 
-                                                        text="${uiLabelMap.OrderOrders}"/>
-                                                    <link target="/ordermgr/control/FindQuote?partyId=${partyId}&amp;externalLoginKey=${externalLoginKey}" url-mode="inter-app" 
-                                                        text="${uiLabelMap.OrderOrderQuotes}"/>
-                                                    <link target="/ordermgr/control/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="/ordermgr/control/checkinits?partyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app" 
-                                                        text="${uiLabelMap.OrderNewOrder}"/>
-                                                    <link target="/ordermgr/control/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="/accounting/control/findPayments?lookupFlag=Y&amp;hideFields=Y&amp;partyIdTo=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app" 
-                                                        text="${uiLabelMap.AccountingPaymentsSent}"/>
-                                                    <link target="/accounting/control/findPayments?lookupFlag=Y&amp;hideFields=Y&amp;partyIdFrom=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app" 
-                                                        text="${uiLabelMap.AccountingPaymentsReceived}"/>
-                                                    <link target="/accounting/control/FindFinAccount?ownerPartyId=${partyId}" url-mode="inter-app"
-                                                        text="${uiLabelMap.AccountingFinAccounts}"/>
-                                                </widgets>
-                                            </section>
-                                        </container>
-                                        
+                                        <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileSubTabBar"/>
                                         <container style="h1">
                                             <section>
                                                 <condition>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=660451&r1=660450&r2=660451&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Tue May 27 02:53:16 2008
@@ -74,7 +74,62 @@
             <link target="FindEmploymentApp?partyId=${partyId}&amp;&amp;referredByPartyId=${partyId}"/>
         </menu-item>
     </menu>
-
+    <menu name="ProfileSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">  
+        <menu-item name="createNew" title="${uiLabelMap.AccountingBillingAccount}" >
+            <condition>
+                <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+            </condition>
+            <link target="/accounting/control/FindBillingAccount?partyId=${partyId}" url-mode="inter-app"/>
+        </menu-item>
+        <menu-item name="searchOrder" title="${uiLabelMap.OrderOrders}" >
+            <condition>
+                <if-has-permission permission="ORDERMGR" action="_VIEW"/>
+            </condition>
+            <link target="/ordermgr/control/searchorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyId}&amp;externalLoginKey=${externalLoginKey}&amp;viewIndex=1&amp;viewSize=20" url-mode="inter-app"/> 
+        </menu-item>
+        <menu-item name="findQuote" title="${uiLabelMap.OrderOrderQuotes}" >
+            <condition>
+                <if-has-permission permission="ORDERMGR" action="_VIEW"/>
+            </condition>
+            <link target="/ordermgr/control/FindQuote?partyId=${partyId}&amp;externalLoginKey=${externalLoginKey}" url-mode="inter-app"/> 
+        </menu-item>
+        <menu-item name="findRequest" title="${uiLabelMap.PartyPartyRequests}" >
+            <condition>
+                <if-has-permission permission="ORDERMGR" action="_VIEW"/>
+            </condition>
+            <link target="/ordermgr/control/FindRequest?lookupFlag=Y&amp;fromPartyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app"/> 
+        </menu-item>
+        <menu-item name="newOrder" title="${uiLabelMap.OrderNewOrder}">
+            <condition>
+                <if-has-permission permission="ORDERMGR" action="_CREATE"/>
+            </condition>
+            <link target="/ordermgr/control/checkinits?partyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app"/> 
+        </menu-item>
+        <menu-item name="newQuote" title="${uiLabelMap.OrderNewQuote}">
+            <condition>
+                <if-has-permission permission="ORDERMGR" action="_CREATE"/>
+            </condition>
+            <link target="/ordermgr/control/EditQuote?partyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app"/> 
+        </menu-item>
+        <menu-item name="paymentsSent" title="${uiLabelMap.AccountingPaymentsSent}">
+            <condition>
+                <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+            </condition>
+            <link target="/accounting/control/findPayments?lookupFlag=Y&amp;hideFields=Y&amp;partyIdTo=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app"/> 
+        </menu-item>
+        <menu-item name="paymentsReceived" title="${uiLabelMap.AccountingPaymentsReceived}">
+            <condition>
+                <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+            </condition>
+            <link target="/accounting/control/findPayments?lookupFlag=Y&amp;hideFields=Y&amp;partyIdFrom=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app"/> 
+        </menu-item>
+        <menu-item name="finAccounts" title="${uiLabelMap.AccountingFinAccounts}">
+            <condition>
+                <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
+            </condition>
+            <link target="/accounting/control/FindFinAccount?ownerPartyId=${partyId}" url-mode="inter-app"/> 
+        </menu-item>
+    </menu>
     <menu name="create-new-party" type="simple" menu-container-style="basic-nav">
         <menu-item name="create-party-group" title="${uiLabelMap.PartyCreateNewPartyGroup}">
             <link target="editpartygroup?create_new=Y"/>