svn commit: r1865035 - in /ofbiz/ofbiz-plugins/branches/release17.12: ./ ecommerce/template/includes/HeaderHead.ftl ecommerce/widget/Theme.xml

[adityasharma]

Author: adityasharma
Date: Tue Aug 13 12:27:53 2019
New Revision: 1865035

URL: http://svn.apache.org/viewvc?rev=1865035&view=rev
Log:
Applied fix from trunk for revision: 1838797
===

Improved: Change the uggly favicon with the new one ! | Using new OFBiz logo
(OFBIZ-10522)
Updated the icon for the ecommerce.

Modified:
    ofbiz/ofbiz-plugins/branches/release17.12/   (props changed)
    ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/includes/HeaderHead.ftl
    ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/Theme.xml

Propchange: ofbiz/ofbiz-plugins/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 13 12:27:53 2019
@@ -11,4 +11,4 @@
 /ofbiz/branches/multitenant20100310/plugins:921280-927264
 /ofbiz/branches/release13.07/plugins:1547657
 /ofbiz/ofbiz-framework/trunk:1836107
-/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135,1851185,1852988,1855082,1856802,1856917,1857120,1857173,1858141,1858244,1858285,1858312,1859012,1859735,1859893,1859906,1860648,1860801,1861824,1861904,1861986,1862466
+/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838797,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135,1851185,1852988,1855082,1856802,1856917,1857120,1857173,1858141,1858244,1858285,1858312,1859012,1859735,1859893,1859906,1860648,1860801,1861824,1861904,1861986,1862466

Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/includes/HeaderHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/includes/HeaderHead.ftl?rev=1865035&r1=1865034&r2=1865035&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/includes/HeaderHead.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/includes/HeaderHead.ftl Tue Aug 13 12:27:53 2019
@@ -34,7 +34,12 @@ under the License.
     <#assign shortcutIcon = layoutSettings.shortcutIcon/>
   </#if>
   <#if shortcutIcon?has_content>
-    <link rel="shortcut icon" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@ofbizContentUrl>"/>
+    <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">
+    <#--<link rel="shortcut icon" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@ofbizContentUrl>"/>-->
   </#if>
   <#if layoutSettings.styleSheets?has_content>
   <#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet,

Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/Theme.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/Theme.xml?rev=1865035&r1=1865034&r2=1865035&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/Theme.xml (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/widget/Theme.xml Tue Aug 13 12:27:53 2019
@@ -47,7 +47,7 @@ under the License.
 
         <!--header image -->
         <property name="VT_HDR_IMAGE_URL" value="/images/ofbiz_logo.png"/>
-        <property name="VT_SHORTCUT_ICON" value="/images/ofbiz.ico"/>
+        <property name="VT_SHORTCUT_ICON" value="/images/favicon"/>
         <!--template location-->
         <property name="VT_HDR_TMPLT_LOC" value="component://ecommerce/template/includes/Header.ftl"/>
         <property name="VT_FTR_TMPLT_LOC" value="component://ecommerce/template/includes/Footer.ftl"/>