svn commit: r726655 - in /ofbiz/trunk: applications/accounting/widget/ applications/content/widget/ applications/content/widget/forum/ applications/humanres/widget/ applications/marketing/webapp/marketing/campaign/ applications/marketing/webapp/marketi...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r726655 - in /ofbiz/trunk: applications/accounting/widget/ applications/content/widget/ applications/content/widget/forum/ applications/humanres/widget/ applications/marketing/webapp/marketing/campaign/ applications/marketing/webapp/marketi...

bibryam
Author: bibryam
Date: Mon Dec 15 00:56:52 2008
New Revision: 726655

URL: http://svn.apache.org/viewvc?rev=726655&view=rev
Log:
A patch from Bruno Busco " Extending TabBar menus from CommonTabBar" - OFBIZ-2069

Modified:
    ofbiz/trunk/applications/accounting/widget/Menus.xml
    ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml
    ofbiz/trunk/applications/content/widget/SurveyMenus.xml
    ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml
    ofbiz/trunk/applications/humanres/widget/Menus.xml
    ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml
    ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml
    ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml
    ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml
    ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml
    ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
    ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml
    ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
    ofbiz/trunk/applications/product/widget/catalog/Menus.xml
    ofbiz/trunk/applications/product/widget/facility/Menus.xml
    ofbiz/trunk/applications/workeffort/widget/TimesheetMenus.xml
    ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
    ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/Menus.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Mon Dec 15 00:56:52 2008
@@ -21,7 +21,7 @@
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
     
-    <menu name="InvoiceTabBar" menu-container-style="button-bar tab-bar" default-selected-style="selected" type="simple" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="InvoiceTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="invoiceOverview" title="${uiLabelMap.AccountingInvoiceOverview}">
             <condition>
                 <not><if-empty field-name="invoice.invoiceId"/></not>
@@ -245,10 +245,9 @@
             </condition>
             <link target="copyInvoiceToTemplate?invoiceId=${invoice.invoiceId}&amp;invoiceTypeId=${invoice.invoiceTypeId}"/>
         </menu-item>
-
     </menu>
 
-    <menu name="PaymentTabBar"  menu-container-style="button-bar tab-bar" default-selected-style="selected" type="simple" selected-menuitem-context-field-name="tabButtonItem">  
+    <menu name="PaymentTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="find" title="${uiLabelMap.CommonFind}" >
             <condition>
                 <if-compare field-name="tabButtonItem" operator="not-equals" value="find"/>
@@ -290,7 +289,8 @@
         </menu-item>
     </menu>  
           
-    <menu name="PaymentSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">
+    <menu name="PaymentSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          menu-container-style="button-bar button-style-2">
         <actions>
             <set field="isDisbursement" value="${bsh:org.ofbiz.accounting.util.UtilAccounting.isDisbursement(payment)}"/>
         </actions>
@@ -352,8 +352,8 @@
         </menu-item>
     </menu>
 
-    <menu name="FixedAssetMaintTabBar" selected-menuitem-context-field-name="tabButtonItemFixedAssetMaint" default-menu-item-name="EditFixedAssetMaint"
-        menu-container-style="button-bar tab-bar" type="simple">
+    <menu name="FixedAssetMaintTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="tabButtonItemFixedAssetMaint" default-menu-item-name="EditFixedAssetMaint">
         <menu-item name="EditFixedAssetMaint" title="${uiLabelMap.AccountingFixedAssetMaint}">
             <link target="EditFixedAssetMaint?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/>
         </menu-item>
@@ -365,8 +365,8 @@
         </menu-item>
     </menu>
 
-    <menu name="FixedAssetTabBar" default-menu-item-name="EditFixedAsset" default-selected-style="selected"
-        menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="FixedAssetTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="EditFixedAsset">
         <menu-item name="EditFixedAsset" title="${uiLabelMap.AccountingFixedAsset}">
             <link target="EditFixedAsset?fixedAssetId=${fixedAssetId}"/>
         </menu-item>
@@ -402,8 +402,8 @@
         </menu-item>
     </menu>
     
-    <menu name="FixedAssetCalendarTabBar" selected-menuitem-context-field-name="parameters.viewMode"
-         type="simple" default-selected-style="selected" menu-container-style="button-bar tab-bar">
+    <menu name="FixedAssetCalendarTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="parameters.viewMode">
         <menu-item name="D" title="${uiLabelMap.CommonDay}">
             <link target="day?fixedAssetId=${fixedAssetId}"/>
         </menu-item>
@@ -415,8 +415,8 @@
         </menu-item>
     </menu>
 
-    <menu name="FinAccountTabBar" default-menu-item-name="EditFinAccount" default-selected-style="selected"
-        menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem">  
+    <menu name="FinAccountTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="EditFinAccount">
         <menu-item name="EditFinAccount" title="${uiLabelMap.AccountingFinAccount}">
             <link target="EditFinAccount?finAccountId=${finAccountId}"/>
         </menu-item>
@@ -431,8 +431,8 @@
         </menu-item>
     </menu>
     
-    <menu name="PartyTopTabBar" selected-menuitem-context-field-name="tabButtonItemTop" default-menu-item-name="PartyAccountsSummary" default-selected-style="selected"
-        menu-container-style="button-bar tab-bar" type="simple">
+    <menu name="PartyTopTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="tabButtonItemTop" default-menu-item-name="PartyAccountsSummary">
         <menu-item name="Admin" title="${uiLabelMap.AccountingSetup}">
             <condition>
                 <if-service-permission service-name="acctgPrefPermissionCheck" main-action="UPDATE"/>
@@ -446,8 +446,8 @@
             <link target="PartyAccountsSummary?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
     </menu>
-    <menu name="OrganizationAccountingTabBar" default-menu-item-name="PartyAccountsSummary" default-selected-style="selected"
-        menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="OrganizationAccountingTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="PartyAccountsSummary">
         <menu-item name="PartyAccountsSummary" title="${uiLabelMap.AcctgPartyGlJournalSummary}">
             <link target="PartyAccountsSummary?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
@@ -470,8 +470,8 @@
             <link target="listChecksToPrint?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
     </menu>
-    <menu name="OrganizationAccountingReportsTabBar" selected-menuitem-context-field-name="tabButtonItem2" default-menu-item-name="TrialBalance" default-selected-style="selected"
-        menu-container-style="button-bar tab-bar" type="simple">
+    <menu name="OrganizationAccountingReportsTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="tabButtonItem2" default-menu-item-name="TrialBalance">
         <menu-item name="TrialBalance" title="${uiLabelMap.AccountingTrialBalance}">
             <link target="TrialBalance?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
@@ -488,8 +488,8 @@
             <link target="TransactionTotals?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
     </menu>
-    <menu name="PartyAdminTabBar" default-menu-item-name="PartyAcctgPreference" default-selected-style="selected"
-        menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem">  
+    <menu name="PartyAdminTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="PartyAcctgPreference">
         <menu-item name="PartyAcctgPreference" title="${uiLabelMap.AccountingPreference}">
             <link target="PartyAcctgPreference?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
@@ -512,8 +512,8 @@
             <link target="viewFXConversions?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
     </menu>
-    <menu name="PartyAdminAssignTabBar" selected-menuitem-context-field-name="tabButtonItem2" default-menu-item-name="GlAccountSalInvoice" default-selected-style="selected"
-        menu-container-style="button-bar tab-bar" type="simple">
+    <menu name="PartyAdminAssignTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="tabButtonItem2" default-menu-item-name="GlAccountSalInvoice">
         <menu-item name="GlAccountTypeDefaults" title="${uiLabelMap.AccountingGlAccountTypeDefaults}">
             <link target="GlAccountTypeDefaults?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
@@ -551,8 +551,8 @@
             <link target="editPartyGlAccounts?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
     </menu>
-    <menu name="PartyAccountingChecksTabBar" selected-menuitem-context-field-name="tabButtonItem2" default-menu-item-name="GlAccountSalInvoice" default-selected-style="selected"
-        menu-container-style="button-bar tab-bar" type="simple">  
+    <menu name="PartyAccountingChecksTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="tabButtonItem2" default-menu-item-name="GlAccountSalInvoice">
         <menu-item name="PrintChecksTabButton" title="${uiLabelMap.AccountingPrintChecks}">
             <link target="listChecksToPrint?organizationPartyId=${organizationPartyId}"/>
         </menu-item>
@@ -561,8 +561,8 @@
         </menu-item>
     </menu>
     
-    <menu name="GlobalGLSettingMenus" selected-menuitem-context-field-name="tabButtonItem" default-menu-item-name="chartofaccounts"
-        menu-container-style="button-bar tab-bar" default-selected-style="selected">
+    <menu name="GlobalGLSettingMenus" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="chartofaccounts">
         <menu-item name="Chartofaccounts" title="${uiLabelMap.AccountingChartOfAcctsMenu}">
             <link target="FindGlobalGlAccount"/>
         </menu-item>        
@@ -595,7 +595,8 @@
         </menu-item>
     </menu>
 
-    <menu name="AgreementItemTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="buttonBarItem">
+    <menu name="AgreementItemTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="buttonBarItem">
         <menu-item name="EditAgreementItem" title="${uiLabelMap.AccountingAgreementItem}">
             <link target="EditAgreementItem?agreementId=${agreementItem.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}"/>
         </menu-item>
@@ -661,7 +662,8 @@
         </menu-item>
     </menu>
 
-    <menu name="GlSettingTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="tabButtonItem2">
+    <menu name="GlSettingTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="tabButtonItem2">
         <menu-item name="GlAccountNavigate" title="${uiLabelMap.AcctgNavigateAccts}">
             <link target="GlAccountNavigate?trail=null"/>
         </menu-item>

Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml Mon Dec 15 00:56:52 2008
@@ -19,8 +19,8 @@
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
-    <menu name="TaxAuthorityTabBar" default-menu-item-name="EditTaxAuthority" type="simple"
-        menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="TaxAuthorityTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="EditTaxAuthority">
                 
         <menu-item name="EditTaxAuthority" title="${uiLabelMap.AccountingTaxAuthority}">
             <link target="EditTaxAuthority?taxAuthPartyId=${taxAuthPartyId}&amp;taxAuthGeoId=${taxAuthGeoId}"/>

Modified: ofbiz/trunk/applications/content/widget/SurveyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/SurveyMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/SurveyMenus.xml Mon Dec 15 00:56:52 2008
@@ -19,8 +19,8 @@
 -->
 
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="SurveyTabBar" default-menu-item-name="Survey" default-selected-style="selected"
-        menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="SurveyTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="Survey">
         <menu-item name="Survey" title="${uiLabelMap.SurveySurveyId}">
             <link target="EditSurvey?surveyId=${surveyId}"/>
         </menu-item>

Modified: ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml Mon Dec 15 00:56:52 2008
@@ -19,15 +19,16 @@
 -->
 
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="ForumGroupTabBar" menu-container-style="button-bar tab-bar" default-selected-style="selected" type="simple" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="ForumGroupTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="forumGroups" title="${uiLabelMap.FormFieldTitle_forumGroups}"><link target="findForumGroups"/></menu-item>
         <menu-item name="forums" title="${uiLabelMap.FormFieldTitle_forums}"><link target="findForums?forumGroupId=${parameters.forumGroupId}"/></menu-item>
         <menu-item name="purposes" title="${uiLabelMap.FormFieldTitle_purposes}"><link target="forumGroupPurposes?forumGroupId=${parameters.forumGroupId}"/></menu-item>
         <menu-item name="roles" title="${uiLabelMap.FormFieldTitle_roles}"><link target="forumGroupRoles?forumGroupId=${parameters.forumGroupId}"/></menu-item>
     </menu>
-    <menu name="ForumTabBar" default-menu-item-name="Survey" type="simple">
+    <menu name="ForumTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="Survey">
     </menu>
-    <menu name="ForumMessagesTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="ForumMessagesTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="forumGroups" title="${uiLabelMap.FormFieldTitle_forumGroups}"><link target="findForumGroups"/></menu-item>
         <menu-item name="forums" title="${uiLabelMap.FormFieldTitle_forums}"><link target="findForums?forumGroupId=${parameters.forumGroupId}"/></menu-item>
         <menu-item name="messageList" title="${uiLabelMap.FormFieldTitle_messageList}"><link target="findForumMessages?forumGroupId=${parameters.forumGroupId}&amp;forumId=${parameters.forumId}"/></menu-item>

Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/Menus.xml Mon Dec 15 00:56:52 2008
@@ -108,8 +108,8 @@
         </menu-item>
     </menu>
     
-    <menu name="EmployeeProfileTabBar" default-menu-item-name="EditEmployeeSkills" default-selected-style="selected"
-        type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="EmployeeProfileTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="EditEmployeeSkills">
         <menu-item name="EmployeeProfile" title="${uiLabelMap.PartyProfile}">
             <link target="EmployeeProfile?partyId=${partyId}"/>
         </menu-item>
@@ -137,8 +137,8 @@
         </menu-item>
     </menu>
     
-    <menu name="EmplPositionTypeTabBar" default-menu-item-name="EditEmplPositionType" default-selected-style="selected"
-        menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem2">
+    <menu name="EmplPositionTypeTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="EditEmplPositionType" selected-menuitem-context-field-name="tabButtonItem2">
         <menu-item name="EditEmplPositionType" title="${uiLabelMap.HumanResEmplPositionType}">
             <link target="EditEmplPositionTypes?emplPositionTypeId=${emplPositionTypeId}"/>
         </menu-item>

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml Mon Dec 15 00:56:52 2008
@@ -19,8 +19,8 @@
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
-    <menu name="MarketingCampaignTabBar" default-menu-item-name="MarketingCampaign" type="simple" selected-menuitem-context-field-name="campaignTabButtonItem"
-        default-selected-style="selected" menu-container-style="button-bar tab-bar">
+    <menu name="MarketingCampaignTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="MarketingCampaign" selected-menuitem-context-field-name="campaignTabButtonItem">
         <menu-item name="MarketingCampaign" title="${uiLabelMap.MarketingCampaign}">
             <link target="/EditMarketingCampaign?marketingCampaignId=${marketingCampaignId}"/>
         </menu-item>

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml Mon Dec 15 00:56:52 2008
@@ -19,9 +19,8 @@
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
-    <menu name="ContactListTabBar" default-menu-item-name="ContactList" type="simple"
-        selected-menuitem-context-field-name="contactListTabButtonItem"
-        default-selected-style="selected" menu-container-style="button-bar tab-bar">
+    <menu name="ContactListTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="ContactList" selected-menuitem-context-field-name="contactListTabButtonItem">
         <menu-item name="ContactList" title="${uiLabelMap.ContactList}">
             <link target="/EditContactList?contactListId=${contactListId}"/>
         </menu-item>

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml Mon Dec 15 00:56:52 2008
@@ -19,9 +19,8 @@
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
-    <menu name="DataSourceTabBar" default-menu-item-name="DataSource" type="simple"
-        default-selected-style="selected" menu-container-style="button-bar tab-bar"
-        selected-menuitem-context-field-name="dataSourceTabButtonItem">
+    <menu name="DataSourceTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="DataSource" selected-menuitem-context-field-name="dataSourceTabButtonItem">
         <menu-item name="DataSource" title="${uiLabelMap.DataSource}">
             <link target="/FindDataSource"/>
         </menu-item>

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml Mon Dec 15 00:56:52 2008
@@ -19,8 +19,8 @@
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
-    <menu name="SegmentGroupTabBar" default-menu-item-name="Segment" type="simple" selected-menuitem-context-field-name="segmentTabButtonItem"
-        default-selected-style="selected" menu-container-style="button-bar tab-bar">
+    <menu name="SegmentGroupTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="Segment" selected-menuitem-context-field-name="segmentTabButtonItem">
         <menu-item name="SegmentGroup" title="${uiLabelMap.SegmentGroupSegmentGroup}">
             <link target="viewSegmentGroup?segmentGroupId=${segmentGroupId}"/>
         </menu-item>

Modified: ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml Mon Dec 15 00:56:52 2008
@@ -19,8 +19,8 @@
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
-    <menu name="TrackingCodeTabBar" default-menu-item-name="TrackingCode" type="simple" selected-menuitem-context-field-name="trackingCodeTabButtonItem"
-        default-selected-style="selected" menu-container-style="button-bar tab-bar">
+    <menu name="TrackingCodeTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="TrackingCode" selected-menuitem-context-field-name="trackingCodeTabButtonItem">
         <menu-item name="TrackingCode" title="${uiLabelMap.TrackingCode}">
             <link target="/FindTrackingCode"/>
         </menu-item>

Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Mon Dec 15 00:56:52 2008
@@ -29,7 +29,7 @@
         <menu-item name="Opportunities" title="${uiLabelMap.SfaOpportunities}"><link target="FindOpportunity"/></menu-item>
     </menu>
     
-    <menu name="OpportunityTabBar" type="simple" menu-container-style="button-bar tab-bar no-clear" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="OpportunityTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="ViewOpportunity" title="${uiLabelMap.SfaOpportunitySummary}">
             <link target="ViewOpportunity?salesOpportunityId=${parameters.salesOpportunityId}"/>
         </menu-item>
@@ -38,18 +38,19 @@
         </menu-item>
     </menu>
     
-    <menu name="AccountTabBar" type="simple" menu-container-style="button-bar tab-bar no-clear" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">  
+    <menu name="AccountTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <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 no-clear" default-selected-style="selected">  
+    <menu name="AccountSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          menu-container-style="button-bar button-style-2 no-clear">
         <menu-item name="NewAccounts" title="${uiLabelMap.PageTitleCreateAccount}">
             <link target="NewAccounts"/>
         </menu-item>
     </menu>    
     
-    <menu name="LeadTabBar" menu-container-style="button-bar tab-bar no-clear" default-selected-style="selected" type="simple" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="LeadTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="profile" title="${uiLabelMap.PartyProfile}">
             <link target="viewprofile?partyId=${parameters.partyId}&amp;partyGroupId=${parameters.partyGroupId}"/>
         </menu-item>
@@ -64,7 +65,8 @@
         </menu-item>      
     </menu>
     
-    <menu name="LeadSubTabBar" menu-container-style="button-bar button-style-2 no-clear" default-selected-style="selected">
+    <menu name="LeadSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          menu-container-style="button-bar button-style-2 no-clear">
         <menu-item name="CreateLead" title="${uiLabelMap.CommonCreateNew}">
             <link target="CreateLead"/>
         </menu-item>
@@ -73,7 +75,7 @@
         </menu-item>
     </menu>    
 
-    <menu name="ContactTabBar" type="simple" menu-container-style="button-bar tab-bar no-clear" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="ContactTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="profile" title="${uiLabelMap.PartyProfile}">
             <link target="viewprofile?partyId=${parameters.partyId}"/>
         </menu-item>
@@ -81,7 +83,8 @@
             <link target="MergeContacts"/>
         </menu-item>
     </menu>    
-    <menu name="ContactSubTabBar" menu-container-style="button-bar button-style-2 no-clear" default-selected-style="selected">  
+    <menu name="ContactSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          menu-container-style="button-bar button-style-2 no-clear">
         <menu-item name="CreateContact" title="${uiLabelMap.CommonCreateNew}">
             <link target="CreateContact"/>
         </menu-item>
@@ -89,8 +92,7 @@
             <link target="CreateContactFromVCard"/>
         </menu-item>
     </menu>    
-    <menu name="SalesForecastTabBar" default-selected-style="selected" type="simple"
-            menu-container-style="button-bar tab-bar no-clear" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="SalesForecastTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="EditSalesForecast" title="${uiLabelMap.SfaSalesForecast}">
             <link target="EditSalesForecast?salesForecastId=${parameters.salesForecastId}"/>
         </menu-item>

Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml Mon Dec 15 00:56:52 2008
@@ -46,7 +46,8 @@
         </menu-item>
     </menu>
 
-    <menu name="RequestSubTabBar" type="simple" menu-container-style="button-bar button-style-2">
+    <menu name="RequestSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          menu-container-style="button-bar button-style-2 no-clear">
         <menu-item name="newRequest" title="${uiLabelMap.OrderNewRequest}">
             <link target="request"/>
         </menu-item>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml Mon Dec 15 00:56:52 2008
@@ -18,8 +18,7 @@
 under the License.
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="CommEventTabBar" default-selected-style="selected" type="simple"
-        menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="CommEventTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="Find" title="${uiLabelMap.CommonFind}">
             <condition><if-compare field-name="tabButtonItem" operator="not-equals" value="Find"/></condition>
             <link target="FindCommunicationEvents"/>
@@ -57,7 +56,8 @@
             <link target="listUnknownPartyComms"/>
         </menu-item>
     </menu>
-    <menu name="CommFindTabBar" default-menu-item-name="find" type="simple">
+    <menu name="CommFindTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="find">
         <menu-item name="find" title="${uiLabelMap.CommonFind}">
             <link target="findCommunications?partyId=${partyId}&amp;communicationEventId=${communicationEventId}" url-mode="intra-app"/>
         </menu-item>
@@ -69,7 +69,8 @@
         </menu-item>
     </menu>
     
-    <menu name="CommSubTabBar" menu-container-style="button-bar button-style-2">
+    <menu name="CommSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          menu-container-style="button-bar button-style-2 no-clear">
         <menu-item name="new" title="${uiLabelMap.PartyNewCommunication}">
             <link target="EditCommunicationEvent?donePage=${parameters.donePage}"/>
         </menu-item>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Mon Dec 15 00:56:52 2008
@@ -20,8 +20,8 @@
 
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
-    <menu name="ProfileTabBar" default-menu-item-name="viewprofile" default-selected-style="selected"
-        type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="ProfileTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="viewprofile">
         <menu-item name="viewprofile" title="${uiLabelMap.PartyProfile}">
             <link target="viewprofile?partyId=${partyId}"/>
         </menu-item>
@@ -80,7 +80,8 @@
             <link target="PartyFinancialHistory?partyId=${partyId}"/>
         </menu-item>
     </menu>
-    <menu name="ProfileSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">  
+    <menu name="ProfileSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          menu-container-style="button-bar button-style-2">
         <menu-item name="createNew" title="${uiLabelMap.AccountingBillingAccount}" >
             <condition>
                 <if-has-permission permission="ACCOUNTING" action="_VIEW"/>
@@ -157,8 +158,7 @@
         </menu-item>
     </menu>
 
-    <menu name="PartyInvitationTabBar" default-selected-style="selected" type="simple"
-        menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="PartyInvitationTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="EditPartyInvitation" title="${uiLabelMap.PartyInvitation}">
             <link target="editPartyInvitation?partyInvitationId=${partyInvitationId}"/>
         </menu-item>

Modified: ofbiz/trunk/applications/product/widget/catalog/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/Menus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/Menus.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/Menus.xml Mon Dec 15 00:56:52 2008
@@ -30,9 +30,7 @@
         <menu-item name="shipping" title="${uiLabelMap.ProductShipping}"><link target="ListShipmentMethodTypes"/></menu-item>
     </menu>
 
-    <menu name="TabBarMenu" menu-container-style="button-bar tab-bar no-clear" default-selected-style="selected" type="simple" selected-menuitem-context-field-name="tabButtonItem"/>
-
-    <menu name="FeaturesTabBar" extends="TabBarMenu">
+    <menu name="FeaturesTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="FeatureType" title="${uiLabelMap.ProductFeatureType}">
             <link target="EditFeatureTypes"/>
         </menu-item>
@@ -47,7 +45,7 @@
         </menu-item>
     </menu>
 
-    <menu name="ShippingTabBar" extends="TabBarMenu">
+    <menu name="ShippingTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="ListShipmentMethodTypes" title="${uiLabelMap.ProductShipmentMethodTypes}">
             <link target="ListShipmentMethodTypes"/>
         </menu-item>
@@ -59,7 +57,7 @@
         </menu-item>
     </menu>
 
-    <menu name="CategoryTabBar" extends="TabBarMenu">
+    <menu name="CategoryTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="EditCategory" title="${uiLabelMap.ProductCategory}">
             <link target="EditCategory?productCategoryId=${productCategoryId}"/>
         </menu-item>
@@ -89,7 +87,7 @@
         </menu-item>
     </menu>
 
-    <menu name="ProductStoreTabBar" extends="TabBarMenu">
+    <menu name="ProductStoreTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="EditProductStore" title="${uiLabelMap.ProductStore}">
             <link target="EditProductStore?productStoreId=${productStoreId}"/>
         </menu-item>
@@ -142,7 +140,7 @@
         </menu-item>
     </menu>
 
-    <menu name="CatalogTabBar" extends="TabBarMenu">
+    <menu name="CatalogTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="ProductCatalog" title="${uiLabelMap.ProductCatalog}">
             <link target="EditProdCatalog?prodCatalogId=${prodCatalogId}"/>
         </menu-item>
@@ -157,7 +155,7 @@
         </menu-item>
     </menu>
 
-    <menu name="PromoTabBar" extends="TabBarMenu">
+    <menu name="PromoTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="EditProductPromo" title="${uiLabelMap.ProductPromotion}">
             <link target="EditProductPromo?productPromoId=${productPromoId}"/>
         </menu-item>
@@ -172,7 +170,7 @@
         </menu-item>
     </menu>
 
-    <menu name="ProductTabBar" extends="TabBarMenu">
+    <menu name="ProductTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="EditProduct" title="${uiLabelMap.ProductProduct}">
             <link target="EditProduct?productId=${productId}"/>
         </menu-item>
@@ -271,7 +269,7 @@
         </menu-item>
     </menu>
 
-    <menu name="ConfigItemTabBar" extends="TabBarMenu">
+    <menu name="ConfigItemTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="EditProductConfigItem" title="${uiLabelMap.ProductConfigItem}">
             <link target="EditProductConfigItem?configItemId=${configItemId}"/>
         </menu-item>

Modified: ofbiz/trunk/applications/product/widget/facility/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/Menus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/Menus.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/Menus.xml Mon Dec 15 00:56:52 2008
@@ -21,8 +21,8 @@
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
     
-    <menu name="FacilityTabBar" default-menu-item-name="EditFacility" default-selected-style="selected"
-        menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="FacilityTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="EditFacility">
         <menu-item name="EditFacility" title="${uiLabelMap.ProductFacility}">
             <link target="EditFacility?facilityId=${facilityId}"/>
         </menu-item>
@@ -84,7 +84,8 @@
             <link target="FindShipment?originFacilityId=${facilityId}&amp;lookupFlag=Y"/>
         </menu-item>
     </menu>
-    <menu name="InventoryItemLabelsTabBar" default-menu-item-name="FindInventoryItemLabels">
+    <menu name="InventoryItemLabelsTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="FindInventoryItemLabels">
         <menu-item name="FindInventoryItemLabels" title="${uiLabelMap.ProductInventoryItemLabels}">
             <link target="FindInventoryItemLabels"/>
         </menu-item>
@@ -92,7 +93,8 @@
             <link target="EditInventoryItemLabelTypes"/>
         </menu-item>
     </menu>
-    <menu name="InventoryItemLabelTabBar" default-menu-item-name="EditInventoryItemLabel" selected-menuitem-context-field-name="subTabButtonItem">
+    <menu name="InventoryItemLabelTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="EditInventoryItemLabel" selected-menuitem-context-field-name="subTabButtonItem">
         <menu-item name="EditInventoryItemLabel" title="${uiLabelMap.ProductInventoryItemLabel}">
             <link target="EditInventoryItemLabel?inventoryItemLabelId=${inventoryItemLabelId}"/>
         </menu-item>
@@ -100,8 +102,8 @@
             <link target="EditInventoryItemLabelAppls?inventoryItemLabelId=${inventoryItemLabelId}"/>
         </menu-item>
     </menu>
-    <menu name="InventoryItemTabBar" default-menu-item-name="EditInventoryItem" selected-menuitem-context-field-name="subTabButtonItem"
-        menu-container-style="button-bar tab-bar" default-selected-style="selected">
+    <menu name="InventoryItemTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="EditInventoryItem" selected-menuitem-context-field-name="subTabButtonItem">
         <menu-item name="EditInventoryItem" title="${uiLabelMap.ProductInventoryItem}">
             <link target="EditInventoryItem?inventoryItemId=${inventoryItemId}&amp;facilityId=${facilityId}"/>
         </menu-item>

Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/TimesheetMenus.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/TimesheetMenus.xml Mon Dec 15 00:56:52 2008
@@ -19,8 +19,8 @@
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
 
-    <menu name="TimesheetTabBar" default-menu-item-name="Timesheet" type="simple" default-selected-style="selected"
-        menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="TimesheetTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="Timesheet">
         <menu-item name="Timesheet" title="${uiLabelMap.Timesheet}">
             <link target="EditTimesheet?timesheetId=${timesheetId}"/>
         </menu-item>

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Mon Dec 15 00:56:52 2008
@@ -39,8 +39,8 @@
             <link target="${checkLoginUrl}"/>
         </menu-item>
     </menu>
-    <menu name="WorkEffortTabBar" default-menu-item-name="WorkEffort" default-selected-style="selected"
-        type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="WorkEffortTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="WorkEffort">
         <menu-item name="WorkEffortRelatedSummary" title="${uiLabelMap.WorkEffortSummary}">
             <link target="WorkEffortSummary?workEffortId=${workEffortId}"/>
         </menu-item>

Modified: ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml Mon Dec 15 00:56:52 2008
@@ -54,8 +54,8 @@
         </menu-item>
     </menu>
 
-    <menu name="LoggingTabBar" type="simple" menu-container-style="button-bar tab-bar"
-        default-selected-style="selected" selected-menuitem-context-field-name="logMenuItem">
+    <menu name="LoggingTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="logMenuItem">
         <menu-item name="viewLog" title="${uiLabelMap.WebtoolsViewLog}">
             <link target="LogView"/>
         </menu-item>
@@ -64,8 +64,8 @@
         </menu-item>
     </menu>
 
-    <menu name="TempExprTabBar" type="simple" menu-container-style="button-bar tab-bar"
-        default-selected-style="selected" selected-menuitem-context-field-name="tabMenuItem">
+    <menu name="TempExprTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="tabMenuItem">
         <menu-item name="findExpression" title="${uiLabelMap.CommonFind}">
             <link target="findTemporalExpression"/>
         </menu-item>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml Mon Dec 15 00:56:52 2008
@@ -43,8 +43,8 @@
         </menu-item>
     </menu>  
     
-    <menu name="FacilityTabBar" default-menu-item-name="ViewFacilityInventoryByProduct"
-         default-selected-style="selected" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="FacilityTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="ViewFacilityInventoryByProduct">
         <menu-item name="EditFacility" title="${uiLabelMap.ProductFacility}">
             <link target="EditFacility?facilityId=${facilityId}"/>
         </menu-item>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/Menus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/Menus.xml Mon Dec 15 00:56:52 2008
@@ -28,7 +28,8 @@
     </menu>
 
 
-    <menu name="FixedAssetSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">
+    <menu name="FixedAssetSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          menu-container-style="button-bar button-style-2">
         <menu-item name="createNewComputerHardware" title="${uiLabelMap.IsMgrNewComputerHardware}" >
             <condition>
                 <and>
@@ -47,8 +48,8 @@
         </menu-item>
     </menu>
         
-    <menu name="ComputerHardwareTabBar" default-menu-item-name="EditComputerHardware" default-selected-style="selected"
-        menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="ComputerHardwareTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="EditComputerHardware">
         <!-- Tab Bar customized for Fixed Assets of type Computer Hardware  -->
         <menu-item name="EditComputerHardware" title="${uiLabelMap.IsMgrComputerHardware}">
             <link target="EditComputerHardware?fixedAssetId=${fixedAssetId}"/>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Mon Dec 15 00:56:52 2008
@@ -200,7 +200,8 @@
         </menu-item>
         <menu-item name="myTime" title="${uiLabelMap.TimesheetMyTime}"><link target="/projectmgr/control/MyTimesheet" url-mode="inter-app"/></menu-item>
     </menu>
-    <menu name="CommSubTabBar" menu-container-style="button-bar button-style-2">
+    <menu name="CommSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          menu-container-style="button-bar button-style-2">
         <menu-item name="new" title="${uiLabelMap.PartyNewCommunication}">
             <condition>
                 <and>
@@ -294,7 +295,8 @@
             <link target="EditCustRequestContent?custRequestId=${custRequest.custRequestId}"/>
         </menu-item>
     </menu>
-    <menu name="RequestSubTabBar" type="simple" menu-container-style="button-bar button-style-2">
+    <menu name="RequestSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          menu-container-style="button-bar button-style-2">
         <menu-item name="cancelledRequest" title="Cancel request" >
             <condition>
                 <and>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=726655&r1=726654&r2=726655&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Mon Dec 15 00:56:52 2008
@@ -56,7 +56,7 @@
             <link target="http://docs.ofbiz.org/display/OFBENDUSER/Project+Manager+Application+Roles?decorator=printable" url-mode="plain" target-window="new"/>
         </menu-item>
     </menu>
-    <menu name="ProjectTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="ProjectTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <actions>
             <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
             <set field="hasUpdatePermission" value="${bsh:
@@ -179,7 +179,8 @@
             <link target="projectBilling?projectId=${projectId}"/>
         </menu-item>
     </menu>
-    <menu name="ProjectSubTabBar" type="simple" menu-container-style="button-bar button-style-2" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="ProjectSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          menu-container-style="button-bar button-style-2">
         <actions>
             <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
             <set field="hasUpdatePermission" value="${bsh:
@@ -245,7 +246,7 @@
             <link target="javascript:confirmActionLink('Are you sure you want to close this project?','updateProject?workEffortId=${parameters.projectId}&amp;currentStatusId=PRJ_CLOSED')" url-mode="plain"/>
         </menu-item>
     </menu>
-    <menu name="TaskTabBar" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="TaskTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="taskView" title="${uiLabelMap.ProjectMgrTaskSummary}">
             <condition>
                <not><if-empty field-name="workEffort"/></not>
@@ -325,7 +326,8 @@
             <link target="EditTaskNotes?workEffortId=${workEffortId}"/>
         </menu-item>
     </menu>
-    <menu name="TaskSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">  
+    <menu name="TaskSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          menu-container-style="button-bar button-style-2">
         <menu-item name="new" title="${uiLabelMap.CommonNew}">
             <condition>
                 <or>
@@ -378,7 +380,7 @@
             <link target="EditCustRequestContent?custRequestId=${custRequest.custRequestId}"/>
         </menu-item>
     </menu>
-    <menu name="TimesheetTabBar" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="TimesheetTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="findtimesheet" title="${uiLabelMap.CommonFind}">
             <link target="FindTimeSheet"/>
         </menu-item>
@@ -386,7 +388,8 @@
             <link target="addWeeklyTimesheet"/>
         </menu-item>
     </menu>
-    <menu name="TimesheetSubTabBar" menu-container-style="button-bar button-style-2" default-menu-item-name="StatustoProgress" selected-menuitem-context-field-name="tabButtonItem">  
+    <menu name="TimesheetSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          menu-container-style="button-bar button-style-2" default-menu-item-name="StatustoProgress">
         <menu-item name="addTimesheet" title="${uiLabelMap.CommonNew}">
             <link target="addWeeklyTimesheet"/>
         </menu-item>
@@ -409,7 +412,8 @@
             <link target="TimeSheetStatustoProgress?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_IN_PROCESS"/>
         </menu-item>
     </menu>
-    <menu name="MyTimeSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">  
+    <menu name="MyTimeSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          menu-container-style="button-bar button-style-2">
         <menu-item name="TimeSheetStatusToComplete" title="${uiLabelMap.CommonStatustoComplete}">
             <condition>
                 <and>
@@ -420,7 +424,8 @@
             <link target="myTimeSheetStatusToComplete?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_COMPLETED"/>
         </menu-item>
     </menu>
-    <menu name="ResourceTabBar" menu-container-style="button-bar tab-bar" default-menu-item-name="edittimesheet" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="ResourceTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          default-menu-item-name="edittimesheet">
         <menu-item name="ResourcesProfile" title="${uiLabelMap.PartyProfile}">
             <link target="viewprofile?partyId=${partyId}"/>
         </menu-item>
@@ -440,7 +445,7 @@
             <link target="ListResourcesUnBilledHours?partyId=${partyId}"></link>
         </menu-item>
     </menu>
-    <menu name="RequestTabBar" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
+    <menu name="RequestTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="ViewRequest" title="${uiLabelMap.ProjectMgrView}">
             <condition>
                 <not><if-empty field-name="custRequest"/></not>
@@ -476,7 +481,8 @@
             <link target="${my}StatusToComplete?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_COMPLETED"/>
         </menu-item>
     </menu>
-    <menu name="RequestSubTabBar" type="simple" menu-container-style="button-bar button-style-2">
+    <menu name="RequestSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          menu-container-style="button-bar button-style-2">
         <menu-item name="cancelledRequest" title="Cancel request" >
             <condition>
                 <and>