Author: adrianc
Date: Wed Oct 23 19:31:52 2013
New Revision: 1535127
URL: http://svn.apache.org/r1535127
Log:
Use the new URL generation classes to replace the hard-coded servlet path in
the Flat Grey visual theme.
Modified:
ofbiz/trunk/themes/flatgrey/includes/appbar.ftl
Modified: ofbiz/trunk/themes/flatgrey/includes/appbar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/appbar.ftl?rev=1535127&r1=1535126&r2=1535127&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/appbar.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/appbar.ftl Wed Oct 23 19:31:52 2013
@@ -44,10 +44,10 @@ under the License.
<#if thisApp == contextPath || contextPath + "/" == thisApp>
<#assign selected = true>
</#if>
- <#assign thisApp = StringUtil.wrapString(thisApp)>
- <#assign thisURL = thisApp>
+ <#assign servletPath =
Static["org.ofbiz.webapp.WebAppUtil"].getControlServletPath(display)>
+ <#assign thisURL = StringUtil.wrapString(servletPath)>
<#if thisApp != "/">
- <#assign thisURL = thisURL + "/control/main">
+ <#assign thisURL = thisURL + "main">
</#if>
<#if layoutSettings.suppressTab?exists && display.name ==
layoutSettings.suppressTab>
<#-- do not display this component-->
@@ -81,11 +81,11 @@ 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">
- </#if>
+ <#assign servletPath =
Static["org.ofbiz.webapp.WebAppUtil"].getControlServletPath(display)>
+ <#assign thisURL = StringUtil.wrapString(servletPath)>
+ <#if thisApp != "/">
+ <#assign thisURL = thisURL + "main">
+ </#if>
<#if appCount % 4 == 0>
<#if firstApp>
<li class="first">
