svn commit: r1806145 - in /ofbiz/ofbiz-framework/trunk/t
Locked
 
|
Author: nmalin
Date: Fri Aug 25 09:42:41 2017 New Revision: 1806145 URL: http://svn.apache.org/viewvc?rev=1806145&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 Rainbowstone theme from VisualThemeRessource data definition to be an extends of common-theme Added: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml (with props) Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Header.ftl Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml?rev=1806145&r1=1806144&r2=1806145&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/data/RainbowStoneThemeData.xml Fri Aug 25 09:42:41 2017 @@ -20,6 +20,10 @@ under the License. <entity-engine-xml> <VisualTheme visualThemeId="RAINBOWSTONE_SAPHIR" visualThemeSetId="BACKOFFICE" description="Rainbow Stone - Saphir"/> + <VisualTheme visualThemeId="RAINBOWSTONE_RUBY" visualThemeSetId="BACKOFFICE" description="Rainbow Stone - Ruby"/> + <VisualTheme visualThemeId="RAINBOWSTONE_EMERALD" visualThemeSetId="BACKOFFICE" description="Rainbow Stone - Emerald"/> + <VisualTheme visualThemeId="RAINBOWSTONE_AMBER" visualThemeSetId="BACKOFFICE" description="Rainbow Stone - Amber"/> + <delete> <!--data deprecated with the theme properties--> <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_NAME" resourceValue="RAINBOWSTONE_SAPHIR" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_STYLESHEET_LESS" resourceValue="/rainbowstone/rainbowstone-saphir.less" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/rainbowstone/style.css" sequenceId="01"/> @@ -66,7 +70,6 @@ under the License. <VisualThemeResource visualThemeId="RAINBOWSTONE_SAPHIR" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/FromThruDateCheck.js" sequenceId="22"/> - <VisualTheme visualThemeId="RAINBOWSTONE_RUBY" visualThemeSetId="BACKOFFICE" description="Rainbow Stone - Ruby"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_NAME" resourceValue="RAINBOWSTONE_RUBY" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_STYLESHEET_LESS" resourceValue="/rainbowstone/rainbowstone-ruby.less" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/rainbowstone/style.css" sequenceId="01"/> @@ -110,7 +113,6 @@ under the License. <VisualThemeResource visualThemeId="RAINBOWSTONE_RUBY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/FromThruDateCheck.js" sequenceId="22"/> - <VisualTheme visualThemeId="RAINBOWSTONE_EMERALD" visualThemeSetId="BACKOFFICE" description="Rainbow Stone - Emerald"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_NAME" resourceValue="RAINBOWSTONE_EMERALD" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_STYLESHEET_LESS" resourceValue="/rainbowstone/rainbowstone-emerald.less" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/rainbowstone/style.css" sequenceId="01"/> @@ -153,7 +155,6 @@ under the License. <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/util.js" sequenceId="21"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_EMERALD" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/FromThruDateCheck.js" sequenceId="22"/> - <VisualTheme visualThemeId="RAINBOWSTONE_AMBER" visualThemeSetId="BACKOFFICE" description="Rainbow Stone - Amber"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_NAME" resourceValue="RAINBOWSTONE_AMBER" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_STYLESHEET_LESS" resourceValue="/rainbowstone/rainbowstone-amber.less" sequenceId="01"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/rainbowstone/style.css" sequenceId="01"/> @@ -195,4 +196,5 @@ under the License. <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/selectMultipleRelatedValues.js" sequenceId="20"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/util.js" sequenceId="21"/> <VisualThemeResource visualThemeId="RAINBOWSTONE_AMBER" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/images/date/FromThruDateCheck.js" sequenceId="22"/> + </delete> </entity-engine-xml> 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=1806145&r1=1806144&r2=1806145&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Header.ftl (original) +++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Header.ftl Fri Aug 25 09:42:41 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>" /> @@ -38,6 +38,7 @@ under the License. <link rel="stylesheet/less" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/> </#list> </#if> + <link rel="stylesheet/less" href="<@ofbizContentUrl>/rainbowstone/${visualTheme.visualThemeId?replace("_","-")?lower_case}.less</@ofbizContentUrl>"/> <#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> Added: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml?rev=1806145&view=auto ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml (added) +++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml Fri Aug 25 09:42:41 2017 @@ -0,0 +1,66 @@ +<?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="rainbowstone" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-theme.xsd"> + <visual-themes> + <visual-theme id="RAINBOWSTONE_SAPHIR" display-name="Rainbow Stone - Saphir"> + <screenshot location="/rainbowstone/images/themeSaphir.png"/> + </visual-theme> + <visual-theme id="RAINBOWSTONE_AMBER" display-name="Rainbow Stone - Amber"> + <screenshot location="/rainbowstone/images/themeAmber.png"/> + </visual-theme> + <visual-theme id="RAINBOWSTONE_RUBY" display-name="Rainbow Stone - Ruby"> + <screenshot location="/rainbowstone/images/themeRuby.png"/> + </visual-theme> + <visual-theme id="RAINBOWSTONE_EMERALD" display-name="Rainbow Stone - Emerald"> + <screenshot location="/rainbowstone/images/themeEmerald.png"/> + </visual-theme> + </visual-themes> + <extends location="component://common-theme/widget/Theme.xml"/> + <theme-properties> + <!--template location--> + <property name="VT_HDR_IMAGE_URL" value="/rainbowstone/images/ofbiz_logo.gif"/> + <property name="VT_HDR_TMPLT_LOC" value="component://rainbowstone/template/includes/Header.ftl"/> + <property name="VT_FTR_TMPLT_LOC" value="component://rainbowstone/template/includes/Footer.ftl"/> + <property name="VT_NAV_TMPLT_LOC" value="component://rainbowstone/template/includes/TopAppBar.ftl"/> + <property name="VT_CHPWD_TMPLT_LOC" value="component://rainbowstone/template/ChangePassword.ftl"/> + <property name="VT_FGPWD_TMPLT_LOC" value="component://rainbowstone/template/ForgotPassword.ftl"/> + <property name="VT_GSQUE_TMPLT_LOC" value="component://rainbowstone/template/GetSecurityQuestion.ftl"/> + <property name="VT_LOGIN_TMPLT_LOC" value="component://rainbowstone/template/Login.ftl"/> + <!--javascript lib--> + <property name="VT_HDR_JAVASCRIPT['add']" value="/rainbowstone/js/less.min.js"/> + <property name="VT_FTR_JAVASCRIPT['add']" value="/rainbowstone/js/rainbowstone.js"/> + <!--Css style--> + <property name="VT_STYLESHEET['add']" value="/rainbowstone/style.css"/> + <property name="VT_STYLESHEET['add']" value="/rainbowstone/flag-icon.min.css"/> + <property name="VT_STYLESHEET['add']" value="/rainbowstone/javascript.css"/> + <property name="VT_RTL_STYLESHEET['add']" value="/rainbowstone/stylertl.css"/> + <property name="VT_HELPSTYLESHEET['add']" value="/rainbowstone/help.css"/> + <property name="VT_DOCBOOKSTYLESHEET['add']" value="/rainbowstone/webapp/rainbowstone/docbook.css"/> + </theme-properties> + + <templates> + <template name="screen" type="html" content-type="UTF-8" encoding="none" encoder="html" compress="false"> + <template-file widget="menu" location="component://rainbowstone/template/macro/HtmlMenuMacroLibrary.ftl"/> + </template> + </templates> +</theme> \ No newline at end of file Propchange: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/widget/Theme.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |