svn commit: r1806141 - in /ofbiz/ofbiz-framework/trunk/themes/bluelight: data/BlueLightThemeData.xml template/Header.ftl

[nmalin]

Author: nmalin
Date: Fri Aug 25 09:38:25 2017
New Revision: 1806141

URL: http://svn.apache.org/viewvc?rev=1806141&view=rev
Log:
Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Five step these step break all the UI
#3 Migrate the Bluelight theme from VisualThemeRessource data definition to be an extends of common-theme

Modified:
    ofbiz/ofbiz-framework/trunk/themes/bluelight/data/BlueLightThemeData.xml
    ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl

Modified: ofbiz/ofbiz-framework/trunk/themes/bluelight/data/BlueLightThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/bluelight/data/BlueLightThemeData.xml?rev=1806141&r1=1806140&r2=1806141&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/bluelight/data/BlueLightThemeData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/bluelight/data/BlueLightThemeData.xml Fri Aug 25 09:38:25 2017
@@ -20,6 +20,7 @@ under the License.
 
 <entity-engine-xml>
     <VisualTheme visualThemeId="BLUELIGHT" visualThemeSetId="BACKOFFICE" description="BlueLight Theme: breadcrumbs, drop-down menus and rounded corners"/>
+    <delete>
     <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAME" resourceValue="BLUELIGHT" sequenceId="01"/>
     <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="01"/>
     <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
@@ -64,5 +65,5 @@ under the License.
     <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAV_OPEN_TMPLT" resourceValue="component://bluelight/template/AppBarOpen.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://bluelight/template/AppBarClose.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://bluelight/template/Messages.ftl" sequenceId="01"/>
-    
+    </delete>
 </entity-engine-xml>

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=1806141&r1=1806140&r2=1806141&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/bluelight/template/Header.ftl Fri Aug 25 09:38:25 2017
@@ -32,7 +32,7 @@ under the License.
     <#if layoutSettings.shortcutIcon?has_content>
       <#assign shortcutIcon = layoutSettings.shortcutIcon/>
     <#elseif layoutSettings.VT_SHORTCUT_ICON?has_content>
-      <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON.get(0)/>
+      <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON   />
     </#if>
     <#if shortcutIcon?has_content>
       <link rel="shortcut icon" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@ofbizContentUrl>" />