svn commit: r564940 - /ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl

Author: jleroux
Date: Sat Aug 11 10:05:21 2007
New Revision: 564940

URL: http://svn.apache.org/viewvc?view=rev&rev=564940
Log:
A patch from Adrian Crum "Recent Change To appbar.ftl Breaks App Navigation" (https://issues.apache.org/jira/browse/OFBIZ-1197)


Modified:
    ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl

Modified: ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl?view=diff&rev=564940&r1=564939&r2=564940
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl Sat Aug 11 10:05:21 2007
@@ -37,10 +37,14 @@
           </#if>
         </#list>
         <#if permission == true>
-          <#if thisApp == contextPath>
+          <#if thisApp == contextPath || contextPath + "/" == thisApp>
             <#assign selected = true>
           </#if>
-          <li<#if selected> class="selected"</#if>><a href="${response.encodeURL(thisApp + externalKeyParam)}" title=""><#if uiLabelMap?exists>${uiLabelMap[display.title]}<#else>${display.title}</#if></a></li>
+          <#assign thisURL = thisApp>
+          <#if thisApp != "/">
+            <#assign thisURL = thisURL + "/control/main">
+          </#if>
+          <li<#if selected> class="selected"</#if>><a href="${response.encodeURL(thisURL + externalKeyParam)}" title=""><#if uiLabelMap?exists>${uiLabelMap[display.title]}<#else>${display.title}</#if></a></li>
         </#if>
       </#list>
     </ul>