Author: adityasharma
Date: Fri Aug 2 11:13:43 2019
New Revision: 1864216
URL: http://svn.apache.org/viewvc?rev=1864216&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/trunk/themes/common-theme/template/includes/Lookup.ftl
ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/style.css
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Lookup.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Lookup.ftl?rev=1864216&r1=1864215&r2=1864216&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Lookup.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Lookup.ftl
Fri Aug 2 11:13:43 2019
@@ -27,6 +27,18 @@ 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)+".ico"}</@ofbizContentUrl>"
type="image/x-icon">
+ <link rel="icon"
href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)+".png"}</@ofbizContentUrl>"
type="image/png">
+ <link rel="icon" sizes="32x32"
href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)+"-32.png"}</@ofbizContentUrl>"
type="image/png">
+ <link rel="icon" sizes="64x64"
href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)+"-64.png"}</@ofbizContentUrl>"
type="image/png">
+ <link rel="icon" sizes="96x96"
href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)+"-96.png"}</@ofbizContentUrl>"
type="image/png">
+ </#if>
<#if layoutSettings.javaScripts?has_content>
<#--layoutSettings.javaScripts is a list of java scripts. -->
<#-- use a Set to make sure each javascript is declared only once, but
iterate the list to maintain the correct order -->
Modified: ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/style.css
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/style.css?rev=1864216&r1=1864215&r2=1864216&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/style.css
(original)
+++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/style.css Fri
Aug 2 11:13:43 2019
@@ -100,7 +100,7 @@ body, textarea, input, select {
}
html {
- background-image: url(/images/tile.gif);
+ background-image: url(/flatgrey/images/tile.gif);
}
body {
