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

Author: jleroux
Date: Mon Jun  9 15:14:56 2008
New Revision: 665919

URL: http://svn.apache.org/viewvc?rev=665919&view=rev
Log:
A patch from Bruno Busco "ERP header logo should link to home url" (https://issues.apache.org/jira/browse/OFBIZ-1834) - OFBIZ-1834
I changed the default link from "/" to "/catalog/control/main" which makes more sense OOTB

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=665919&r1=665918&r2=665919&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Mon Jun  9 15:14:56 2008
@@ -69,13 +69,18 @@
   </div>
   <div id="masthead">
     <ul>
+      <#if layoutSettings.headerImageLinkUrl?exists>
+        <#assign logoLinkURL = "${layoutSettings.headerImageLinkUrl}">
+      <#else>
+        <#assign logoLinkURL = "${layoutSettings.commonHeaderImageLinkUrl}">
+      </#if>
+
       <#if layoutSettings.headerImageUrl?exists>
-        <li class="logo-area"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${layoutSettings.headerImageUrl}</@ofbizContentUrl>"/></li>
+        <li class="logo-area"><a href="${logoLinkURL}"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${layoutSettings.headerImageUrl}</@ofbizContentUrl>"/></a></li>
       <#else>
-        <li class="logo-area"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${layoutSettings.commonHeaderImageUrl}</@ofbizContentUrl>"/></li>
+        <li class="logo-area"><a href="${logoLinkURL}"><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>>
-        <br />
         <p>
         <#if person?has_content>
           ${uiLabelMap.CommonWelcome} ${person.firstName?if_exists} ${person.lastName?if_exists} [${userLogin.userLoginId}]

Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=665919&r1=665918&r2=665919&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Mon Jun  9 15:14:56 2008
@@ -127,6 +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="/catalog/control/main" global="true"/>
             </actions>
             <widgets>
                 <!-- render header -->