svn commit: r552486 - in /ofbiz/trunk/applications/accounting: webapp/accounting/admin/AdminTabBar.ftl widget/AdminScreens.xml

[jacopoc]

Author: jacopoc
Date: Mon Jul  2 06:06:52 2007
New Revision: 552486

URL: http://svn.apache.org/viewvc?view=rev&rev=552486
Log:
Applied patch by Wickersheimer Jeremy (OFBIZ-1105) to fix subtab highilight in accounting screens.

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl
    ofbiz/trunk/applications/accounting/widget/AdminScreens.xml

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl?view=diff&rev=552486&r1=552485&r2=552486
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl Mon Jul  2 06:06:52 2007
@@ -18,6 +18,7 @@
 -->
 <#if (parameters.organizationPartyId)?exists><#assign organizationPartyId = parameters.organizationPartyId></#if>
 <#assign selected = page.tabButtonItem?default("void")>
+<#assign selected2 = page.tabButtonItem2?default("void")>
 <h1>${title?if_exists} ${labelTitleProperty?if_exists} ${uiLabelMap.CommonFor} ${uiLabelMap.Organization}: ${organizationPartyId}</h1>
 <div class="button-bar button-style-1">
   <ul>
@@ -34,10 +35,10 @@
 <#if selected == "GlAccountAssignment">
   <div class="button-bar button-style-2">
     <ul>
-      <li><a href="<@ofbizUrl>GlAccountSalInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingInvoiceSales}</a></li>
-      <li><a href="<@ofbizUrl>GlAccountPurInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingInvoicePurchase}</a></li>
-      <li><a href="<@ofbizUrl>GlAccountTypePaymentType?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingPaymentType}/${uiLabelMap.FormFieldTitle_glAccountTypeId}</a></li>
-      <li><a href="<@ofbizUrl>GlAccountNrPaymentMethod?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingPaymentMethodId}/${uiLabelMap.AccountingGlAccountId}</a></li>
+      <li<#if selected2 == "GlAccountSalInvoice"> class="selected"</#if>><a href="<@ofbizUrl>GlAccountSalInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingInvoiceSales}</a></li>
+      <li<#if selected2 == "GlAccountPurInvoice"> class="selected"</#if>><a href="<@ofbizUrl>GlAccountPurInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingInvoicePurchase}</a></li>
+      <li<#if selected2 == "GlAccountTypePaymentType"> class="selected"</#if>><a href="<@ofbizUrl>GlAccountTypePaymentType?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingPaymentType}/${uiLabelMap.FormFieldTitle_glAccountTypeId}</a></li>
+      <li<#if selected2 == "GlAccountNrPaymentMethod"> class="selected"</#if>><a href="<@ofbizUrl>GlAccountNrPaymentMethod?organizationPartyId=${organizationPartyId}</@ofbizUrl>">${uiLabelMap.AccountingPaymentMethodId}/${uiLabelMap.AccountingGlAccountId}</a></li>
     </ul>
     <br class="clear"/>
   </div>

Modified: ofbiz/trunk/applications/accounting/widget/AdminScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AdminScreens.xml?view=diff&rev=552486&r1=552485&r2=552486
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AdminScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AdminScreens.xml Mon Jul  2 06:06:52 2007
@@ -158,6 +158,7 @@
                 <set field="titleProperty" value="AccountingGlAccountAssignments"/>
                 <set field="labelTitleProperty" value="${uiLabelMap.AccountingGlAccountAssignments}"/>
                 <set field="tabButtonItem" value="GlAccountAssignment"/>
+                <set field="tabButtonItem2" value="GlAccountSalInvoice"/>
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
             </actions>
             <widgets>
@@ -180,6 +181,7 @@
             <actions>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="tabButtonItem" value="GlAccountAssignment"/>
+                <set field="tabButtonItem2" value="GlAccountPurInvoice"/>
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
             </actions>
             <widgets>
@@ -203,6 +205,7 @@
             <actions>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="tabButtonItem" value="GlAccountAssignment"/>
+                <set field="tabButtonItem2" value="GlAccountTypePaymentType"/>
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
             </actions>
             <widgets>
@@ -224,6 +227,7 @@
             <actions>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="tabButtonItem" value="GlAccountAssignment"/>
+                <set field="tabButtonItem2" value="GlAccountNrPaymentMethod"/>
                 <set field="organizationPartyId" from-field="parameters.organizationPartyId" />
             </actions>
             <widgets>