svn commit: r1158124 - in /ofbiz/trunk/themes: bizznesstime/includes/ bluelight/includes/ droppingcrumbs/includes/ flatgrey/includes/ tomahawk/includes/

Author: jleroux
Date: Tue Aug 16 06:24:26 2011
New Revision: 1158124

URL: http://svn.apache.org/viewvc?rev=1158124&view=rev
Log:
A patch from Leon "incorrect url of root webapp in menu" https://issues.apache.org/jira/browse/OFBIZ-4368

If I enable the "app-bar-display" for root webapp which is mounted to "/", the url of root webapp in menu is "https://control/main" and not the correct "https://localhost:8443/".

That's because, e.g. in themes/tomahawk/includes/appbarOpen.ftl, it uses expression  <#if thisApp != "/"> to judge whether the app is root or not, while the variable thisApp is java String and it'll be encoded as iso code "/", so the "if" expression mentioned above will always return false.

In the patch it use StringUtil.wrapString to wrap variable theApp to avoid encode.

Modified:
    ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl
    ofbiz/trunk/themes/bizznesstime/includes/secondary-appbar.ftl
    ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl
    ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl
    ofbiz/trunk/themes/flatgrey/includes/appbar.ftl
    ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl

Modified: ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl?rev=1158124&r1=1158123&r2=1158124&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl Tue Aug 16 06:24:26 2011
@@ -43,6 +43,7 @@ under the License.
                 <#if thisApp == contextPath || contextPath + "/" == thisApp>
                   <#assign selected = true>
                 </#if>
+                <#assign thisApp = StringUtil.wrapString(thisApp)>
                 <#assign thisURL = thisApp>
                 <#if thisApp != "/">
                   <#assign thisURL = thisURL + "/control/main">

Modified: ofbiz/trunk/themes/bizznesstime/includes/secondary-appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/secondary-appbar.ftl?rev=1158124&r1=1158123&r2=1158124&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/secondary-appbar.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/secondary-appbar.ftl Tue Aug 16 06:24:26 2011
@@ -42,6 +42,7 @@ under the License.
         <#if thisApp == contextPath || contextPath + "/" == thisApp>
           <#assign selected = true>
         </#if>
+        <#assign thisApp = StringUtil.wrapString(thisApp)>
         <#assign thisURL = thisApp>
         <#if thisApp != "/">
           <#assign thisURL = thisURL + "/control/main">

Modified: ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl?rev=1158124&r1=1158123&r2=1158124&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl Tue Aug 16 06:24:26 2011
@@ -54,6 +54,7 @@ under the License.
                 <#if thisApp == contextPath || contextPath + "/" == thisApp>
                   <#assign selected = true>
                 </#if>
+                <#assign thisApp = StringUtil.wrapString(thisApp)>
                 <#assign thisURL = thisApp>
                 <#if thisApp != "/">
                   <#assign thisURL = thisURL + "/control/main">
@@ -83,6 +84,7 @@ under the License.
                 <#if thisApp == contextPath || contextPath + "/" == thisApp>
                   <#assign selected = true>
                 </#if>
+                <#assign thisApp = StringUtil.wrapString(thisApp)>
                 <#assign thisURL = thisApp>
                 <#if thisApp != "/">
                   <#assign thisURL = thisURL + "/control/main">

Modified: ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl?rev=1158124&r1=1158123&r2=1158124&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl Tue Aug 16 06:24:26 2011
@@ -54,6 +54,7 @@ under the License.
                 <#if thisApp == contextPath || contextPath + "/" == thisApp>
                   <#assign selected = true>
                 </#if>
+                <#assign thisApp = StringUtil.wrapString(thisApp)>
                 <#assign thisURL = thisApp>
                 <#if thisApp != "/">
                   <#assign thisURL = thisURL + "/control/main">
@@ -83,6 +84,7 @@ under the License.
                 <#if thisApp == contextPath || contextPath + "/" == thisApp>
                   <#assign selected = true>
                 </#if>
+                <#assign thisApp = StringUtil.wrapString(thisApp)>
                 <#assign thisURL = thisApp>
                 <#if thisApp != "/">
                   <#assign thisURL = thisURL + "/control/main">

Modified: ofbiz/trunk/themes/flatgrey/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/appbar.ftl?rev=1158124&r1=1158123&r2=1158124&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/appbar.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/appbar.ftl Tue Aug 16 06:24:26 2011
@@ -44,6 +44,7 @@ under the License.
           <#if thisApp == contextPath || contextPath + "/" == thisApp>
             <#assign selected = true>
           </#if>
+          <#assign thisApp = StringUtil.wrapString(thisApp)>
           <#assign thisURL = thisApp>
           <#if thisApp != "/">
             <#assign thisURL = thisURL + "/control/main">
@@ -80,6 +81,7 @@ under the License.
         <#if thisApp == contextPath || contextPath + "/" == thisApp>
           <#assign selected = true>
         </#if>
+        <#assign thisApp = StringUtil.wrapString(thisApp)>
         <#assign thisURL = thisApp>
         <#if thisApp != "/">
           <#assign thisURL = thisURL + "/control/main">

Modified: ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl?rev=1158124&r1=1158123&r2=1158124&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl Tue Aug 16 06:24:26 2011
@@ -58,9 +58,10 @@ under the License.
                 <#if thisApp == contextPath || contextPath + "/" == thisApp>
                   <#assign selected = true>
                 </#if>
+                <#assign thisApp = StringUtil.wrapString(thisApp)>
                 <#assign thisURL = thisApp>
                 <#if thisApp != "/">
-                  <#assign thisURL = StringUtil.wrapString(thisURL) + "/control/main">
+                  <#assign thisURL = thisURL + "/control/main">
                 </#if>
                 <#if layoutSettings.suppressTab?exists && display.name == layoutSettings.suppressTab>
                   <!-- do not display this component-->
@@ -87,9 +88,10 @@ under the License.
                 <#if thisApp == contextPath || contextPath + "/" == thisApp>
                   <#assign selected = true>
                 </#if>
+                <#assign thisApp = StringUtil.wrapString(thisApp)>
                 <#assign thisURL = thisApp>
                 <#if thisApp != "/">
-                  <#assign thisURL = StringUtil.wrapString(thisURL) + "/control/main">
+                  <#assign thisURL = thisURL + "/control/main">
                 </#if>
                 <#if layoutSettings.suppressTab?exists && display.name == layoutSettings.suppressTab>
                   <!-- do not display this component-->