Re: svn commit: r1806146 - in /ofbiz/ofbiz-framework/trunk/themes/tomahawk: data/TomahawkThemeData.xml template/Header.ftl widget/ widget/Theme.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1806146 - in /ofbiz/ofbiz-framework/trunk/themes/tomahawk: data/TomahawkThemeData.xml template/Header.ftl widget/ widget/Theme.xml

Deepak Dixit-3
Hi Nicolas,

I think we can remove the ThemeData instead of keeping them in *ThemeData.xml
file.

Thanks & Regards
--
Deepak Dixit
www.hotwaxsystems.com
www.hotwax.co

On Fri, Aug 25, 2017 at 3:13 PM, <[hidden email]> wrote:

> Author: nmalin
> Date: Fri Aug 25 09:43:22 2017
> New Revision: 1806146
>
> URL: http://svn.apache.org/viewvc?rev=1806146&view=rev
> Log:
> Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common
> theme)
> Five step these step break all the UI
> #6 Migrate the Tomahawk theme from VisualThemeRessource data definition to
> be an extends of common-theme
>
> Added:
>     ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/
>     ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml   (with
> props)
> Modified:
>     ofbiz/ofbiz-framework/trunk/themes/tomahawk/data/TomahawkThemeData.xml
>     ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl
>
> Modified: ofbiz/ofbiz-framework/trunk/themes/tomahawk/data/
> TomahawkThemeData.xml
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> themes/tomahawk/data/TomahawkThemeData.xml?rev=
> 1806146&r1=1806145&r2=1806146&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/themes/tomahawk/data/TomahawkThemeData.xml
> (original)
> +++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/data/TomahawkThemeData.xml
> Fri Aug 25 09:43:22 2017
> @@ -20,32 +20,32 @@ under the License.
>
>  <entity-engine-xml>
>      <VisualTheme visualThemeId="TOMAHAWK" visualThemeSetId="BACKOFFICE"
> description="Tomahawk: the evolution of the BlueLight theme"/>
> -
> +    <delete>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_NAME" resourceValue="TOMAHAWK" sequenceId="01"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_SHORTCUT_ICON"
> resourceValue="/images/ofbiz.ico" sequenceId="01"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif"
> sequenceId="01"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_SCREENSHOT"
> resourceValue="/tomahawk/screenshot.jpg" sequenceId="01"/>
> -
> +
>      <!-- css references -->
>      <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_STYLESHEET"
> resourceValue="/tomahawk/css/style.css" sequenceId="01"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HELPSTYLESHEET"
> resourceValue="/tomahawk/css/help.css" sequenceId="01"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET"
> resourceValue="/tomahawk/webapp/tomahawk/css/docbook.css"
> sequenceId="01"/>
> -
> +
>      <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_STYLESHEET"
> resourceValue="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css"
> sequenceId="02"/>
> -
> +
>      <!-- javascript references -->
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-1.11.0.min.js"
> sequenceId="01"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-migrate-1.2.1.js"
> sequenceId="02"/>
> -
> +
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/ui/js/jquery-ui-1.10.3.min.js"
> sequenceId="03"/>
> -
> +
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/
> plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" sequenceId="05"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/
> plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js"
> sequenceId="07"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/
> plugins/fjTimer/jquerytimer-min.js" sequenceId="09"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/
> plugins/jquery.maskedinput-1.3.1.min.js" sequenceId="10"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/
> plugins/jeditable/jquery.jeditable.js" sequenceId="11"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/
> plugins/validate/jquery.validate.min.js" sequenceId="12"/>
> -
> +
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/OpenLayers-2.13.1.js"
> sequenceId="13"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/OfbizUtil.js"
> sequenceId="15"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/fieldlookup.js"
> sequenceId="16"/>
> @@ -55,13 +55,14 @@ under the License.
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/
> selectMultipleRelatedValues.js" sequenceId="20"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/util.js"
> sequenceId="21"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/FromThruDateCheck.js"
> sequenceId="22"/>
> -
> +
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/tomahawk/js/dropdown.js"
> sequenceId="30"/>
> -
> +
>      <!-- ftl references -->
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://tomahawk/template/Header.ftl"
> sequenceId="01"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://tomahawk/template/Footer.ftl"
> sequenceId="01"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_NAV_OPEN_TMPLT" resourceValue="component://
> tomahawk/template/AppBarOpen.ftl" sequenceId="01"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://
> tomahawk/template/AppBarClose.ftl" sequenceId="01"/>
>      <VisualThemeResource visualThemeId="TOMAHAWK"
> resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://
> common-theme/template/includes/Messages.ftl" sequenceId="01"/>
> +    </delete>
>  </entity-engine-xml>
>
> 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=1806146&r1=
> 1806145&r2=1806146&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl
> (original)
> +++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl Fri
> Aug 25 09:43:22 2017
> @@ -32,12 +32,12 @@ 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>" />
>      </#if>
> -
> +
>      <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
>          <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
>              <script src="<@ofbizContentUrl>${StringUtil.wrapString(
> javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
> @@ -115,7 +115,7 @@ under the License.
>            <#elseif layoutSettings.commonHeaderImageUrl??>
>              <#assign headerImageUrl = layoutSettings.
> commonHeaderImageUrl>
>            <#elseif layoutSettings.VT_HDR_IMAGE_URL??>
> -            <#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_
> URL.get(0)>
> +            <#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL>
>            </#if>
>            <#if headerImageUrl??>
>              <#if organizationLogoLinkURL?has_content>
>
> Added: ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> themes/tomahawk/widget/Theme.xml?rev=1806146&view=auto
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml (added)
> +++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml Fri Aug
> 25 09:43:22 2017
> @@ -0,0 +1,45 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!--
> +Licensed to the Apache Software Foundation (ASF) under one
> +or more contributor license agreements.  See the NOTICE file
> +distributed with this work for additional information
> +regarding copyright ownership.  The ASF licenses this file
> +to you under the Apache License, Version 2.0 (the
> +"License"); you may not use this file except in compliance
> +with the License.  You may obtain a copy of the License at
> +
> +http://www.apache.org/licenses/LICENSE-2.0
> +
> +Unless required by applicable law or agreed to in writing,
> +software distributed under the License is distributed on an
> +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +KIND, either express or implied.  See the License for the
> +specific language governing permissions and limitations
> +under the License.
> +-->
> +
> +<theme name="tomahawk"
> +        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> +        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/
> widget-theme.xsd">
> +    <visual-themes>
> +        <visual-theme id="TOMAHAWK" display-name="Tomahawk">
> +            <description>${str:label('CommonEntityLabels',
> 'VisualTheme.description.TOMAHAWK', locale)}</description>
> +            <screenshot location="/tomahawk/screenshot.jpg"/>
> +        </visual-theme>
> +    </visual-themes>
> +    <extends location="component://common-theme/widget/Theme.xml"/>
> +    <theme-properties>
> +        <!--template location-->
> +        <property name="VT_HDR_TMPLT_LOC" value="component://tomahawk/
> template/Header.ftl"/>
> +        <property name="VT_FTR_TMPLT_LOC" value="component://tomahawk/
> template/Footer.ftl"/>
> +        <property name="VT_NAV_OPEN_TMPLT" value="component://tomahawk/
> template/AppBarOpen.ftl"/>
> +        <property name="VT_NAV_CLOSE_TMPLT" value="component://tomahawk/
> template/AppBarClose.ftl"/>
> +        <property name="VT_MSG_TMPLT_LOC" value="component://common-
> theme/template/includes/Messages.ftl"/>
> +        <!--javascript lib-->
> +        <property name="VT_HDR_JAVASCRIPT['add']"
> value="/tomahawk/js/dropdown.js"/>
> +        <!--Css style-->
> +        <property name="VT_STYLESHEET['add']" value="/tomahawk/css/style.
> css"/>
> +        <property name="VT_HELPSTYLESHEET['add']"
> value="/tomahawk/css/help.css"/>
> +        <property name="VT_DOCBOOKSTYLESHEET['add']"
> value="/tomahawk/webapp/tomahawk/css/docbook.css"/>
> +    </theme-properties>
> +</theme>
> \ No newline at end of file
>
> Propchange: ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml
> ------------------------------------------------------------
> ------------------
>     svn:eol-style = native
>
> Propchange: ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml
> ------------------------------------------------------------
> ------------------
>     svn:keywords = Date Rev Author URL Id
>
> Propchange: ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml
> ------------------------------------------------------------
> ------------------
>     svn:mime-type = text/xml
>
>
>
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1806146 - in /ofbiz/ofbiz-framework/trunk/themes/tomahawk: data/TomahawkThemeData.xml template/Header.ftl widget/ widget/Theme.xml

Nicolas Malin-2
I agree Deepak, I just want to be sure during the migration process that
these data was removed from the database :)

Logically we can remove the entity visualThemeRessource because as much
the visualTheme can be use to select active theme on a tenant, I didn't
see any reason to have theme properties by tenant, and if the case exist
it can be easily manage by SystemProperties.

Nicolas


Le 25/08/2017 à 19:50, Deepak Dixit a écrit :

> Hi Nicolas,
>
> I think we can remove the ThemeData instead of keeping them in *ThemeData.xml
> file.
>
> Thanks & Regards
> --
> Deepak Dixit
> www.hotwaxsystems.com
> www.hotwax.co
>
> On Fri, Aug 25, 2017 at 3:13 PM, <[hidden email]> wrote:
>
>> Author: nmalin
>> Date: Fri Aug 25 09:43:22 2017
>> New Revision: 1806146
>>
>> URL: http://svn.apache.org/viewvc?rev=1806146&view=rev
>> Log:
>> Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common
>> theme)
>> Five step these step break all the UI
>> #6 Migrate the Tomahawk theme from VisualThemeRessource data definition to
>> be an extends of common-theme
>>
>> Added:
>>      ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/
>>      ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml   (with
>> props)
>> Modified:
>>      ofbiz/ofbiz-framework/trunk/themes/tomahawk/data/TomahawkThemeData.xml
>>      ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl
>>
>> Modified: ofbiz/ofbiz-framework/trunk/themes/tomahawk/data/
>> TomahawkThemeData.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
>> themes/tomahawk/data/TomahawkThemeData.xml?rev=
>> 1806146&r1=1806145&r2=1806146&view=diff
>> ============================================================
>> ==================
>> --- ofbiz/ofbiz-framework/trunk/themes/tomahawk/data/TomahawkThemeData.xml
>> (original)
>> +++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/data/TomahawkThemeData.xml
>> Fri Aug 25 09:43:22 2017
>> @@ -20,32 +20,32 @@ under the License.
>>
>>   <entity-engine-xml>
>>       <VisualTheme visualThemeId="TOMAHAWK" visualThemeSetId="BACKOFFICE"
>> description="Tomahawk: the evolution of the BlueLight theme"/>
>> -
>> +    <delete>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_NAME" resourceValue="TOMAHAWK" sequenceId="01"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_SHORTCUT_ICON"
>> resourceValue="/images/ofbiz.ico" sequenceId="01"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif"
>> sequenceId="01"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_SCREENSHOT"
>> resourceValue="/tomahawk/screenshot.jpg" sequenceId="01"/>
>> -
>> +
>>       <!-- css references -->
>>       <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_STYLESHEET"
>> resourceValue="/tomahawk/css/style.css" sequenceId="01"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_HELPSTYLESHEET"
>> resourceValue="/tomahawk/css/help.css" sequenceId="01"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET"
>> resourceValue="/tomahawk/webapp/tomahawk/css/docbook.css"
>> sequenceId="01"/>
>> -
>> +
>>       <VisualThemeResource visualThemeId="TOMAHAWK" resourceTypeEnumId="VT_STYLESHEET"
>> resourceValue="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css"
>> sequenceId="02"/>
>> -
>> +
>>       <!-- javascript references -->
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-1.11.0.min.js"
>> sequenceId="01"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-migrate-1.2.1.js"
>> sequenceId="02"/>
>> -
>> +
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/ui/js/jquery-ui-1.10.3.min.js"
>> sequenceId="03"/>
>> -
>> +
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/
>> plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" sequenceId="05"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/
>> plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js"
>> sequenceId="07"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/
>> plugins/fjTimer/jquerytimer-min.js" sequenceId="09"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/
>> plugins/jquery.maskedinput-1.3.1.min.js" sequenceId="10"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/
>> plugins/jeditable/jquery.jeditable.js" sequenceId="11"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/
>> plugins/validate/jquery.validate.min.js" sequenceId="12"/>
>> -
>> +
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/OpenLayers-2.13.1.js"
>> sequenceId="13"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/OfbizUtil.js"
>> sequenceId="15"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/fieldlookup.js"
>> sequenceId="16"/>
>> @@ -55,13 +55,14 @@ under the License.
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/
>> selectMultipleRelatedValues.js" sequenceId="20"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/util.js"
>> sequenceId="21"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/FromThruDateCheck.js"
>> sequenceId="22"/>
>> -
>> +
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/tomahawk/js/dropdown.js"
>> sequenceId="30"/>
>> -
>> +
>>       <!-- ftl references -->
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://tomahawk/template/Header.ftl"
>> sequenceId="01"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://tomahawk/template/Footer.ftl"
>> sequenceId="01"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_NAV_OPEN_TMPLT" resourceValue="component://
>> tomahawk/template/AppBarOpen.ftl" sequenceId="01"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_NAV_CLOSE_TMPLT" resourceValue="component://
>> tomahawk/template/AppBarClose.ftl" sequenceId="01"/>
>>       <VisualThemeResource visualThemeId="TOMAHAWK"
>> resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://
>> common-theme/template/includes/Messages.ftl" sequenceId="01"/>
>> +    </delete>
>>   </entity-engine-xml>
>>
>> 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=1806146&r1=
>> 1806145&r2=1806146&view=diff
>> ============================================================
>> ==================
>> --- ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl
>> (original)
>> +++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/template/Header.ftl Fri
>> Aug 25 09:43:22 2017
>> @@ -32,12 +32,12 @@ 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>" />
>>       </#if>
>> -
>> +
>>       <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
>>           <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
>>               <script src="<@ofbizContentUrl>${StringUtil.wrapString(
>> javaScript)}</@ofbizContentUrl>" type="text/javascript"></script>
>> @@ -115,7 +115,7 @@ under the License.
>>             <#elseif layoutSettings.commonHeaderImageUrl??>
>>               <#assign headerImageUrl = layoutSettings.
>> commonHeaderImageUrl>
>>             <#elseif layoutSettings.VT_HDR_IMAGE_URL??>
>> -            <#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_
>> URL.get(0)>
>> +            <#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL>
>>             </#if>
>>             <#if headerImageUrl??>
>>               <#if organizationLogoLinkURL?has_content>
>>
>> Added: ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
>> themes/tomahawk/widget/Theme.xml?rev=1806146&view=auto
>> ============================================================
>> ==================
>> --- ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml (added)
>> +++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml Fri Aug
>> 25 09:43:22 2017
>> @@ -0,0 +1,45 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<!--
>> +Licensed to the Apache Software Foundation (ASF) under one
>> +or more contributor license agreements.  See the NOTICE file
>> +distributed with this work for additional information
>> +regarding copyright ownership.  The ASF licenses this file
>> +to you under the Apache License, Version 2.0 (the
>> +"License"); you may not use this file except in compliance
>> +with the License.  You may obtain a copy of the License at
>> +
>> +http://www.apache.org/licenses/LICENSE-2.0
>> +
>> +Unless required by applicable law or agreed to in writing,
>> +software distributed under the License is distributed on an
>> +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>> +KIND, either express or implied.  See the License for the
>> +specific language governing permissions and limitations
>> +under the License.
>> +-->
>> +
>> +<theme name="tomahawk"
>> +        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>> +        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/
>> widget-theme.xsd">
>> +    <visual-themes>
>> +        <visual-theme id="TOMAHAWK" display-name="Tomahawk">
>> +            <description>${str:label('CommonEntityLabels',
>> 'VisualTheme.description.TOMAHAWK', locale)}</description>
>> +            <screenshot location="/tomahawk/screenshot.jpg"/>
>> +        </visual-theme>
>> +    </visual-themes>
>> +    <extends location="component://common-theme/widget/Theme.xml"/>
>> +    <theme-properties>
>> +        <!--template location-->
>> +        <property name="VT_HDR_TMPLT_LOC" value="component://tomahawk/
>> template/Header.ftl"/>
>> +        <property name="VT_FTR_TMPLT_LOC" value="component://tomahawk/
>> template/Footer.ftl"/>
>> +        <property name="VT_NAV_OPEN_TMPLT" value="component://tomahawk/
>> template/AppBarOpen.ftl"/>
>> +        <property name="VT_NAV_CLOSE_TMPLT" value="component://tomahawk/
>> template/AppBarClose.ftl"/>
>> +        <property name="VT_MSG_TMPLT_LOC" value="component://common-
>> theme/template/includes/Messages.ftl"/>
>> +        <!--javascript lib-->
>> +        <property name="VT_HDR_JAVASCRIPT['add']"
>> value="/tomahawk/js/dropdown.js"/>
>> +        <!--Css style-->
>> +        <property name="VT_STYLESHEET['add']" value="/tomahawk/css/style.
>> css"/>
>> +        <property name="VT_HELPSTYLESHEET['add']"
>> value="/tomahawk/css/help.css"/>
>> +        <property name="VT_DOCBOOKSTYLESHEET['add']"
>> value="/tomahawk/webapp/tomahawk/css/docbook.css"/>
>> +    </theme-properties>
>> +</theme>
>> \ No newline at end of file
>>
>> Propchange: ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml
>> ------------------------------------------------------------
>> ------------------
>>      svn:eol-style = native
>>
>> Propchange: ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml
>> ------------------------------------------------------------
>> ------------------
>>      svn:keywords = Date Rev Author URL Id
>>
>> Propchange: ofbiz/ofbiz-framework/trunk/themes/tomahawk/widget/Theme.xml
>> ------------------------------------------------------------
>> ------------------
>>      svn:mime-type = text/xml
>>
>>
>>