Author: adityasharma
Date: Fri Aug 2 12:51:48 2019
New Revision: 1864221
URL: http://svn.apache.org/viewvc?rev=1864221&view=rev
Log:
Fixed: favicon.ico missing for LookupDecorator
(OFBIZ-11146)
The ListVisualTheme page uses LookupDecorator and in the absence of any
shortcut icon the browser hits favicon.ico file by default.
Additional change: Fixed path for title.gif specific to Flatgrey theme
Modified:
ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/Lookup.ftl
ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/webapp/flatgrey/style.css
Modified:
ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/Lookup.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/Lookup.ftl?rev=1864221&r1=1864220&r2=1864221&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/Lookup.ftl
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/Lookup.ftl
Fri Aug 2 12:51:48 2019
@@ -27,6 +27,14 @@ under the License.
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title!}</title>
+ <#if layoutSettings.shortcutIcon?has_content>
+ <#assign shortcutIcon = layoutSettings.shortcutIcon/>
+ <#elseif layoutSettings.VT_SHORTCUT_ICON?has_content>
+ <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON/>
+ </#if>
+ <#if shortcutIcon?has_content>
+ <link rel="shortcut icon"
href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@ofbizContentUrl>"
/>
+ </#if>
<#-- the trick "<scr" + "ipt below is because browsers should not parse the
contents of CDATA elements, but apparently they do. -->
<script language="JavaScript" type="text/javascript">//<
