Author: nmalin
Date: Fri Aug 25 09:41:42 2017
New Revision: 1806144
URL: http://svn.apache.org/viewvc?rev=1806144&view=rev
Log:
Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Five step these step break all the UI
#5 Migrate the Multiflex theme from VisualThemeRessource data definition to be
an extends of common-theme
Added:
ofbiz/ofbiz-framework/trunk/themes/multiflex/widget/
ofbiz/ofbiz-framework/trunk/themes/multiflex/widget/Theme.xml (with props)
Modified:
ofbiz/ofbiz-framework/trunk/themes/multiflex/data/MultiflexThemeData.xml
Modified:
ofbiz/ofbiz-framework/trunk/themes/multiflex/data/MultiflexThemeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/multiflex/data/MultiflexThemeData.xml?rev=1806144&r1=1806143&r2=1806144&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/multiflex/data/MultiflexThemeData.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/themes/multiflex/data/MultiflexThemeData.xml
Fri Aug 25 09:41:42 2017
@@ -20,6 +20,7 @@ under the License.
<entity-engine-xml>
<VisualTheme visualThemeId="MULTIFLEX" visualThemeSetId="ECOMMERCE"
description="Alternative VisualTheme for Ecommerce"/>
+ <delete> <!--data deprecated with the theme properties-->
<VisualThemeResource visualThemeId="MULTIFLEX"
resourceTypeEnumId="VT_STYLESHEET" resourceValue="/ecommerce/images/blog.css"
sequenceId="01"/>
<VisualThemeResource visualThemeId="MULTIFLEX"
resourceTypeEnumId="VT_STYLESHEET" resourceValue="/multiflex/style.css"
sequenceId="02"/>
<VisualThemeResource visualThemeId="MULTIFLEX"
resourceTypeEnumId="VT_STYLESHEET"
resourceValue="/content/images/contentForum.css" sequenceId="04"/>
@@ -28,4 +29,5 @@ under the License.
<VisualThemeResource visualThemeId="MULTIFLEX"
resourceTypeEnumId="VT_HDR_TMPLT_LOC"
resourceValue="component://multiflex/template/Header.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="MULTIFLEX"
resourceTypeEnumId="VT_FTR_TMPLT_LOC"
resourceValue="component://multiflex/template/Footer.ftl" sequenceId="01"/>
<VisualThemeResource visualThemeId="MULTIFLEX"
resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/multiflex/screenshot.jpg"
sequenceId="01"/>
+ </delete>
</entity-engine-xml>
Added: ofbiz/ofbiz-framework/trunk/themes/multiflex/widget/Theme.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/multiflex/widget/Theme.xml?rev=1806144&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/multiflex/widget/Theme.xml (added)
+++ ofbiz/ofbiz-framework/trunk/themes/multiflex/widget/Theme.xml Fri Aug 25
09:41:42 2017
@@ -0,0 +1,41 @@
+<?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="multiflex" visual-theme-id="MULTIFLEX"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-theme.xsd";>
+ <visual-themes>
+ <visual-theme id="MULTIFLEX" display-name="Multiflex">
+ <description>${str:label('CommonEntityLabels',
'VisualTheme.description.MULTIFLEX', locale)}</description>
+ <screenshot location="/multiflex/screenshot.jpg"/>
+ </visual-theme>
+ </visual-themes>
+ <extends location="component://common-theme/widget/Theme.xml"/>
+
+ <theme-properties>
+ <!--Css style-->
+ <property name="VT_STYLESHEET['add']"
value="/ecommerce/images/blog.css"/>
+ <property name="VT_STYLESHEET['add']" value="/multiflex/style.css"/>
+ <property name="VT_STYLESHEET['add']"
value="/content/images/contentForum.css"/>
+ <!--template location-->
+ <property name="VT_HDR_TMPLT_LOC"
value="component://multiflex/template/Header.ftl"/>
+ <property name="VT_FTR_TMPLT_LOC"
value="component://multiflex/template/Footer.ftl"/>
+ </theme-properties>
+</theme>
\ No newline at end of file
Propchange: ofbiz/ofbiz-framework/trunk/themes/multiflex/widget/Theme.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/ofbiz-framework/trunk/themes/multiflex/widget/Theme.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/ofbiz-framework/trunk/themes/multiflex/widget/Theme.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
