svn commit: r1838074 - in /ofbiz/ofbiz-framework/trunk/t
Locked
 
|
Author: jnicolas
Date: Wed Aug 15 09:15:13 2018 New Revision: 1838074 URL: http://svn.apache.org/viewvc?rev=1838074&view=rev Log: Improve: Change the uggly favicon with the new one ! | Using new OFBiz logo (OFBIZ-10522) Added: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-32.png (with props) ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-64.png (with props) ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-96.png (with props) ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon.ico (with props) ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon.png (with props) Modified: ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Simple.ftl ofbiz/ofbiz-framework/trunk/themes/common-theme/widget/CommonScreens.xml ofbiz/ofbiz-framework/trunk/themes/common-theme/widget/Theme.xml ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Header.ftl ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl Modified: ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl?rev=1838074&r1=1838073&r2=1838074&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl (original) +++ ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl Wed Aug 15 09:15:13 2018 @@ -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/trunk/themes/common-theme/template/includes/Simple.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Simple.ftl?rev=1838074&r1=1838073&r2=1838074&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Simple.ftl (original) +++ ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/Simple.ftl Wed Aug 15 09:15:13 2018 @@ -29,7 +29,13 @@ under the License. <title>${layoutSettings.companyName!} : <#if (titleProperty)?has_content>${uiLabelMap[titleProperty]}<#else>${title!}</#if></title> <#if layoutSettings.shortcutIcon?has_content> - <link rel="shortcut icon" href="<@ofbizContentUrl>${layoutSettings.shortcutIcon}</@ofbizContentUrl>"/> + <#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> <#if layoutSettings.javaScripts?has_content> <#--layoutSettings.javaScripts is a list of java scripts. --> Added: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-32.png URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-32.png?rev=1838074&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-32.png ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-32.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-64.png URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-64.png?rev=1838074&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-64.png ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-64.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-96.png URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-96.png?rev=1838074&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-96.png ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon-96.png ------------------------------------------------------------------------------ svn:mime-type = image/png Added: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon.ico URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon.ico?rev=1838074&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon.png URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon.png?rev=1838074&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon.png ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/ofbiz-framework/trunk/themes/common-theme/webapp/images/favicon.png ------------------------------------------------------------------------------ svn:mime-type = image/png Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/widget/CommonScreens.xml?rev=1838074&r1=1838073&r2=1838074&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/common-theme/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/common-theme/widget/CommonScreens.xml Wed Aug 15 09:15:13 2018 @@ -449,7 +449,7 @@ under the License. <set field="layoutSettings.javaScripts[]" value="/common/js/util/OfbizUtil.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/common/js/util/fieldlookup.js" global="true"/> <!-- The default (global) shortcut icon --> - <set field="layoutSettings.shortcutIcon" value="/images/ofbiz.ico" global="true"/> + <set field="layoutSettings.shortcutIcon" value="/images/favicon" global="true"/> <!-- The settings below are used for xsl-fo screens --> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="organizationPartyId" from-field="parameters.organizationPartyId" default-value="${userPreferences.ORGANIZATION_PARTY}" global="true" to-scope="user"/> Modified: ofbiz/ofbiz-framework/trunk/themes/common-theme/widget/Theme.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/widget/Theme.xml?rev=1838074&r1=1838073&r2=1838074&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/common-theme/widget/Theme.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/common-theme/widget/Theme.xml Wed Aug 15 09:15:13 2018 @@ -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/trunk/themes/flatgrey/template/Header.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl?rev=1838074&r1=1838073&r2=1838074&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl (original) +++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl Wed Aug 15 09:15:13 2018 @@ -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/trunk/themes/rainbowstone/template/includes/Header.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Header.ftl?rev=1838074&r1=1838073&r2=1838074&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Header.ftl (original) +++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Header.ftl Wed Aug 15 09:15:13 2018 @@ -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/trunk/themes/tomahawk/template/Header.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl?rev=1838074&r1=1838073&r2=1838074&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl (original) +++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl Wed Aug 15 09:15:13 2018 @@ -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> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |