svn commit: r1865034 - in /ofbiz/ofbiz-framework/branches/release17.12/themes: bluelight/template/ common/template/includes/ common/webapp/images/ common/widget/ flatgrey/template/ flatgrey/webapp/flatgrey/ flatgrey/widget/ rainbowstone/template/includ...

Tue, 13 Aug 2019 05:27:29 -0700 

Author: adityasharma
Date: Tue Aug 13 12:26:54 2019
New Revision: 1865034

URL: http://svn.apache.org/viewvc?rev=1865034&view=rev
Log:
Applied fix from trunk for revision: 1838074
===
Improved: Change the uggly favicon with the new one ! | Using new OFBiz logo
(OFBIZ-10522)

The unreleased branch 17.12 uses new logo, but old favicon icon. Backported the 
changes from trunk.

Additional change: 
1. Fixed broken logo image URL for flatgrey theme along with some custom css to 
fix its height and width
2. Replaced new logo with old in tomahawk theme along with some custom css to 
fix its height and width

Added:
    
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/images/favicon-32.png
      - copied unchanged from r1864216, 
ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/images/favicon-32.png
    
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/images/favicon-64.png
      - copied unchanged from r1864216, 
ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/images/favicon-64.png
    
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/images/favicon-96.png
      - copied unchanged from r1864216, 
ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/images/favicon-96.png
    
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/images/favicon.ico
      - copied unchanged from r1864216, 
ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/images/favicon.ico
    
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/images/favicon.png
      - copied unchanged from r1864216, 
ofbiz/ofbiz-framework/branches/release18.12/themes/common-theme/webapp/images/favicon.png
Modified:
    
ofbiz/ofbiz-framework/branches/release17.12/themes/bluelight/template/Header.ftl
    
ofbiz/ofbiz-framework/branches/release17.12/themes/common/template/includes/Lookup.ftl
    ofbiz/ofbiz-framework/branches/release17.12/themes/common/widget/Theme.xml
    
ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/template/Header.ftl
    
ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/webapp/flatgrey/style.css
    ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/widget/Theme.xml
    
ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Header.ftl
    
ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/template/Header.ftl
    
ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/webapp/tomahawk/css/style.css

Modified: 
ofbiz/ofbiz-framework/branches/release17.12/themes/bluelight/template/Header.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/bluelight/template/Header.ftl?rev=1865034&r1=1865033&r2=1865034&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/branches/release17.12/themes/bluelight/template/Header.ftl
 (original)
+++ 
ofbiz/ofbiz-framework/branches/release17.12/themes/bluelight/template/Header.ftl
 Tue Aug 13 12:26:54 2019
@@ -35,7 +35,11 @@ under the License.
       <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON   />
     </#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">
     </#if>
     <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
         <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>

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=1865034&r1=1865033&r2=1865034&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
 Tue Aug 13 12:26:54 2019
@@ -28,13 +28,17 @@ under the License.
   <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>
+        <#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>
+      <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>
   <#-- 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">//<![CDATA[
       var jQueryLibLoaded = false;

Modified: 
ofbiz/ofbiz-framework/branches/release17.12/themes/common/widget/Theme.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/common/widget/Theme.xml?rev=1865034&r1=1865033&r2=1865034&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/themes/common/widget/Theme.xml 
(original)
+++ ofbiz/ofbiz-framework/branches/release17.12/themes/common/widget/Theme.xml 
Tue Aug 13 12:26:54 2019
@@ -51,7 +51,7 @@ under the License.
         <property name="jgrowlHeight" value="" type="Integer"/>
         <property name="jgrowlSpeed" value="100" type="Integer"/>
         <!--templates location-->
-        <property name="VT_SHORTCUT_ICON" value="/images/ofbiz.ico"/>
+        <property name="VT_SHORTCUT_ICON" value="/images/favicon"/>
         <property name="VT_HDR_TMPLT_LOC" 
value="component://flatgrey/template/Header.ftl"/><!--use flatgrey to wait the 
new design-->
         <property name="VT_FTR_TMPLT_LOC" 
value="component://flatgrey/template/Footer.ftl"/>
         <property name="VT_NAV_TMPLT_LOC" 
value="component://flatgrey/template/AppBar.ftl"/>

Modified: 
ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/template/Header.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/template/Header.ftl?rev=1865034&r1=1865033&r2=1865034&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/template/Header.ftl 
(original)
+++ 
ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/template/Header.ftl 
Tue Aug 13 12:26:54 2019
@@ -31,7 +31,11 @@ under the License.
       <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON/>
     </#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">
     </#if>
     <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
         <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>

Modified: 
ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/webapp/flatgrey/style.css
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/webapp/flatgrey/style.css?rev=1865034&r1=1865033&r2=1865034&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/webapp/flatgrey/style.css
 (original)
+++ 
ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/webapp/flatgrey/style.css
 Tue Aug 13 12:26:54 2019
@@ -286,6 +286,10 @@ th, th a {
 #masthead ul .logo-area {
     padding: 0.1em 0.8em;
 }
+#masthead ul .logo-area img {
+    height: 60px;
+    width: 129px;
+}
 
 #masthead ul .org-logo-area {
     padding: 0.1em 0.8em;

Modified: 
ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/widget/Theme.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/widget/Theme.xml?rev=1865034&r1=1865033&r2=1865034&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/widget/Theme.xml 
(original)
+++ 
ofbiz/ofbiz-framework/branches/release17.12/themes/flatgrey/widget/Theme.xml 
Tue Aug 13 12:26:54 2019
@@ -31,7 +31,7 @@ under the License.
 
     <theme-properties>
         <!--header image -->
-        <property name="VT_HDR_IMAGE_URL" 
value="/flatgrey/images/ofbiz_logo.png"/>
+        <property name="VT_HDR_IMAGE_URL" value="/images/ofbiz_logo.png"/>
         <!--template location-->
         <property name="VT_HDR_TMPLT_LOC" 
value="component://flatgrey/template/Header.ftl"/>
         <property name="VT_FTR_TMPLT_LOC" 
value="component://flatgrey/template/Footer.ftl"/>

Modified: 
ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Header.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Header.ftl?rev=1865034&r1=1865033&r2=1865034&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Header.ftl
 (original)
+++ 
ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Header.ftl
 Tue Aug 13 12:26:54 2019
@@ -31,7 +31,11 @@ under the License.
     <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON/>
 </#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">
 </#if>
 <#if layoutSettings.VT_STYLESHEET_LESS?has_content>
     <#list layoutSettings.VT_STYLESHEET_LESS as styleSheet>

Modified: 
ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/template/Header.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/template/Header.ftl?rev=1865034&r1=1865033&r2=1865034&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/template/Header.ftl 
(original)
+++ 
ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/template/Header.ftl 
Tue Aug 13 12:26:54 2019
@@ -35,7 +35,11 @@ under the License.
       <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON/>
     </#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">
     </#if>
 
     <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>

Modified: 
ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/webapp/tomahawk/css/style.css
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1865034&r1=1865033&r2=1865034&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/webapp/tomahawk/css/style.css
 (original)
+++ 
ofbiz/ofbiz-framework/branches/release17.12/themes/tomahawk/webapp/tomahawk/css/style.css
 Tue Aug 13 12:26:54 2019
@@ -953,9 +953,10 @@ in contained elements. */
 /* ===== Masthead (Header) Styles ===== */
 /* ==================================== */
 #logo-area {
-    background: url(../images/ofbiz_logo.png) no-repeat;
+    background: url(/images/ofbiz_logo.png) no-repeat;
     width: 385px;
     height: 50px;
+    background-size: 119px 50px;
 }
 
 #logo-area a {

Reply via email to