svn commit: r1806143 - in /ofbiz/ofbiz-framework/trunk/themes/flatgrey: data/FlatGreyThemeData.xml template/Header.ftl widget/ widget/Theme.xml

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

svn commit: r1806143 - in /ofbiz/ofbiz-framework/trunk/themes/flatgrey: data/FlatGreyThemeData.xml template/Header.ftl widget/ widget/Theme.xml

nmalin
Author: nmalin
Date: Fri Aug 25 09:40:40 2017
New Revision: 1806143

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

Added:
    ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/
    ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml   (with props)
Modified:
    ofbiz/ofbiz-framework/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
    ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl

Modified: ofbiz/ofbiz-framework/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/flatgrey/data/FlatGreyThemeData.xml?rev=1806143&r1=1806142&r2=1806143&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/data/FlatGreyThemeData.xml Fri Aug 25 09:40:40 2017
@@ -22,10 +22,11 @@ under the License.
     <VisualTheme visualThemeId="FLAT_GREY" visualThemeSetId="BACKOFFICE" description="Flat Grey - Floating Layout, Sight-Impaired Accessible, Bidirectional"/>
     
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAME" resourceValue="FLAT_GREY" sequenceId="01"/>
+    <delete> <!--data deprecated with the theme properties-->
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/flatgrey/images/ofbiz_logo.gif" sequenceId="01"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/flatgrey/screenshot.jpg" sequenceId="01"/>
-    
+
     <!-- css references -->
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/flatgrey/style.css" sequenceId="01"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/flatgrey/javascript.css" sequenceId="02"/>
@@ -33,20 +34,20 @@ under the License.
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/flatgrey/help.css" sequenceId="01"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/flatgrey/webapp/flatgrey/docbook.css" sequenceId="01"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_RTL_STYLESHEET" resourceValue="/flatgrey/stylertl.css" sequenceId="01"/>
-    
+
     <!-- javascript references -->
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-1.11.0.min.js" sequenceId="01"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/jquery-migrate-1.2.1.js" sequenceId="02"/>
-    
+
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/ui/js/jquery-ui-1.10.3.min.js" sequenceId="03"/>
-    
+
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" sequenceId="05"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js" sequenceId="07"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/fjTimer/jquerytimer-min.js" sequenceId="09"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/jquery.maskedinput-1.3.1.min.js" sequenceId="10"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/jeditable/jquery.jeditable.js" sequenceId="11"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/jquery/plugins/validate/jquery.validate.min.js" sequenceId="12"/>
-    
+
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/OpenLayers-2.13.1.js" sequenceId="13"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/OfbizUtil.js" sequenceId="15"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/fieldlookup.js" sequenceId="16"/>
@@ -56,12 +57,13 @@ under the License.
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/selectMultipleRelatedValues.js" sequenceId="20"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/util.js" sequenceId="21"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/FromThruDateCheck.js" sequenceId="22"/>
-    
+
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/flatgrey/js/application.js" sequenceId="30"/>
-    
+
     <!-- ftl references -->
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://flatgrey/template/Header.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_MSG_TMPLT_LOC" resourceValue="component://common-theme/template/includes/Messages.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://flatgrey/template/Footer.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://flatgrey/template/AppBar.ftl" sequenceId="01"/>
+    </delete>
 </entity-engine-xml>

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=1806143&r1=1806142&r2=1806143&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/template/Header.ftl Fri Aug 25 09:40:40 2017
@@ -28,7 +28,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>" />
@@ -109,7 +109,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/flatgrey/widget/Theme.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml?rev=1806143&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml (added)
+++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml Fri Aug 25 09:40:40 2017
@@ -0,0 +1,48 @@
+<?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="flatgrey"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-theme.xsd">
+    <visual-themes>
+        <visual-theme id="FLAT_GREY" display-name="Flat Grey">
+            <description>${str:label('CommonEntityLabels', 'VisualTheme.description.FLAT_GREY', locale)}</description>
+            <screenshot location="/flatgrey/screenshot.jpg"/>
+        </visual-theme>
+    </visual-themes>
+    <extends location="component://common-theme/widget/Theme.xml"/>
+
+    <theme-properties>
+        <!--template location-->
+        <property name="VT_HDR_IMAGE_URL" value="/flatgrey/images/ofbiz_logo.gif"/>
+        <property name="VT_HDR_TMPLT_LOC" value="component://flatgrey/template/Header.ftl"/>
+        <property name="VT_FTR_TMPLT_LOC" value="component://flatgrey/template/Footer.ftl"/>
+        <property name="VT_NAV_TMPLT_LOC" value="component://flatgrey/template/AppBar.ftl"/>
+        <!--javascript lib-->
+        <property name="VT_HDR_JAVASCRIPT['add']" value="/flatgrey/js/application.js"/>
+        <!--Css style-->
+        <property name="VT_STYLESHEET['add']" value="/flatgrey/style.css"/>
+        <property name="VT_STYLESHEET['add']" value="/flatgrey/javascript.css"/>
+        <property name="VT_HELPSTYLESHEET['add']" value="/flatgrey/help.css"/>
+        <property name="VT_DOCBOOKSTYLESHEET['add']" value="/flatgrey/webapp/flatgrey/docbook.css"/>
+        <property name="VT_RTL_STYLESHEET['add']" value="/flatgrey/stylertl.css"/>
+    </theme-properties>
+
+</theme>
\ No newline at end of file

Propchange: ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/themes/flatgrey/widget/Theme.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml