svn commit: r1748974 - /ofbiz/branches/release15.12/themes/tomahawk/includes/header.ftl

[Mridul Pathak-5]

Author: mridulpathak
Date: Sat Jun 18 12:15:12 2016
New Revision: 1748974

URL: http://svn.apache.org/viewvc?rev=1748974&view=rev
Log:
[OFBIZ-7407] Hovering over logo section show layout settings markup in Tomahawk theme. Displayed company name instead. Thanks Vishal Chhabria for your contribution. Migrating fix from trunk r1748960.

Modified:
    ofbiz/branches/release15.12/themes/tomahawk/includes/header.ftl

Modified: ofbiz/branches/release15.12/themes/tomahawk/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/themes/tomahawk/includes/header.ftl?rev=1748974&r1=1748973&r2=1748974&view=diff
==============================================================================
--- ofbiz/branches/release15.12/themes/tomahawk/includes/header.ftl (original)
+++ ofbiz/branches/release15.12/themes/tomahawk/includes/header.ftl Sat Jun 18 12:15:12 2016
@@ -121,7 +121,7 @@ under the License.
             <#if organizationLogoLinkURL?has_content>
                 <li id="org-logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${StringUtil.wrapString(organizationLogoLinkURL)}</@ofbizContentUrl>"></a></li>
                 <#else>
-                <li id="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>" title="${layoutSettings}"></a></li>
+                <li id="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>" title="${layoutSettings.companyName!}"></a></li>
             </#if>
           </#if>
           <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " ">