From c0607222a815a4fb92e3d8d2fbd197aea6dd60ca Mon Sep 17 00:00:00 2001 From: Aditya Sharma Date: Fri, 2 Aug 2019 11:15:37 +0000 Subject: [PATCH] Applied fix from trunk for revision: 1864216 === 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 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release18.12@1864217 13f79535-47bb-0310-9956-ffa450edef68 --- themes/common-theme/template/includes/Lookup.ftl | 12 ++++++++++++ themes/flatgrey/webapp/flatgrey/style.css | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/themes/common-theme/template/includes/Lookup.ftl b/themes/common-theme/template/includes/Lookup.ftl index 45ac48a20c..a8a6ab45d7 100644 --- a/themes/common-theme/template/includes/Lookup.ftl +++ b/themes/common-theme/template/includes/Lookup.ftl @@ -27,6 +27,18 @@ under the License. ${title!} + <#if layoutSettings.shortcutIcon?has_content> + <#assign shortcutIcon = layoutSettings.shortcutIcon/> + <#elseif layoutSettings.VT_SHORTCUT_ICON?has_content> + <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON /> + + <#if shortcutIcon?has_content> + " type="image/x-icon"> + " type="image/png"> + " type="image/png"> + " type="image/png"> + " type="image/png"> + <#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 --> diff --git a/themes/flatgrey/webapp/flatgrey/style.css b/themes/flatgrey/webapp/flatgrey/style.css index 5020d00381..3aa2e55c3a 100644 --- a/themes/flatgrey/webapp/flatgrey/style.css +++ b/themes/flatgrey/webapp/flatgrey/style.css @@ -100,7 +100,7 @@ body, textarea, input, select { } html { - background-image: url(/images/tile.gif); + background-image: url(/flatgrey/images/tile.gif); } body {