svn commit: r685969 - in /ofbiz/trunk/framework/common: webcommon/includes/header.ftl widget/CommonScreens.xml

[adrianc]

Author: adrianc
Date: Thu Aug 14 10:33:29 2008
New Revision: 685969

URL: http://svn.apache.org/viewvc?rev=685969&view=rev
Log:
Better handling of the masthead logo image link.

Modified:
    ofbiz/trunk/framework/common/webcommon/includes/header.ftl
    ofbiz/trunk/framework/common/widget/CommonScreens.xml

Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?rev=685969&r1=685968&r2=685969&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Thu Aug 14 10:33:29 2008
@@ -74,11 +74,10 @@
       <#else>
         <#assign logoLinkURL = "${layoutSettings.commonHeaderImageLinkUrl}">
       </#if>
-
       <#if layoutSettings.headerImageUrl?exists>
-        <li class="logo-area"><a href="${logoLinkURL}"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${layoutSettings.headerImageUrl}</@ofbizContentUrl>"/></a></li>
+        <li class="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${layoutSettings.headerImageUrl}</@ofbizContentUrl>"/></a></li>
       <#else>
-        <li class="logo-area"><a href="${logoLinkURL}"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${layoutSettings.commonHeaderImageUrl}</@ofbizContentUrl>"/></a></li>
+        <li class="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${layoutSettings.commonHeaderImageUrl}</@ofbizContentUrl>"/></a></li>
       </#if>
       <li class="control-area"<#if layoutSettings.headerRightBackgroundUrl?has_content> background="${layoutSettings.headerRightBackgroundUrl}"</#if>>
         <p>

Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=685969&r1=685968&r2=685969&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Thu Aug 14 10:33:29 2008
@@ -127,7 +127,7 @@
                 <set field="layoutSettings.shortcutIcon" value="/images/ofbiz.ico" global="true"/>
                 <!-- The default (global) logo -->
                 <set field="layoutSettings.commonHeaderImageUrl" value="/images/ofbiz_logo.jpg" global="true"/>
-                <set field="layoutSettings.commonHeaderImageLinkUrl" value="/webtools/control/main" global="true"/>
+                <set field="layoutSettings.commonHeaderImageLinkUrl" from-field="layoutSettings.commonHeaderImageLinkUrl" default-value="main" global="true"/>
             </actions>
             <widgets>
                 <!-- render header -->