You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2009/02/11 04:19:21 UTC
svn commit: r743202 - in /ofbiz/trunk: applications/content/config/
applications/content/webapp/content/website/ applications/ecommerce/
applications/ecommerce/data/ framework/common/data/
framework/common/entitydef/ framework/common/widget/ framework/...
Author: jonesde
Date: Wed Feb 11 03:19:19 2009
New Revision: 743202
URL: http://svn.apache.org/viewvc?rev=743202&view=rev
Log:
Applied patch from Bruno Busco in Jira #OFBIZ-2172 with basics for VisualThemeSet; still not possible to change themes in ecommerce (should probably be supported on the back end instead of the front end, ie in the catalog manager and not by a customer in ecommerce, or perhaps only allowed in ecommerce if a flag on the ProductStore says its okay; also does not yet filter selectable themes in the back-end/manager applications
Added:
ofbiz/trunk/applications/ecommerce/data/EcommerceTypeData.xml (with props)
Modified:
ofbiz/trunk/applications/content/config/ContentUiLabels.xml
ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml
ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml
ofbiz/trunk/applications/ecommerce/ofbiz-component.xml
ofbiz/trunk/framework/common/data/CommonTypeData.xml
ofbiz/trunk/framework/common/entitydef/entitymodel.xml
ofbiz/trunk/framework/common/widget/LookupScreens.xml
ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml
ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml
Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=743202&r1=743201&r2=743202&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Wed Feb 11 03:19:19 2009
@@ -2673,6 +2673,10 @@
<value xml:lang="th">ระà¸à¸±à¸à¸ªà¸¹à¸à¹à¸à¹à¸²à¸à¸±à¸</value>
<value xml:lang="zh">ä¸è¾¹åæ </value>
</property>
+ <property key="FormFieldTitle_visualThemeSetId">
+ <value xml:lang="en">Visual Theme Set</value>
+ <value xml:lang="it">Set di temi grafici</value>
+ </property>
<property key="FormFieldTitle_webSiteContentTypeId">
<value xml:lang="de">Webseite Inhaltstyp ID</value>
<value xml:lang="en">Web Site Content Type Id</value>
Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml?rev=743202&r1=743201&r2=743202&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml Wed Feb 11 03:19:19 2009
@@ -46,6 +46,13 @@
<sub-hyperlink use-when=""${webSite.productStoreId}".length()>0" link-style="buttontext" target-type="inter-app" target="/catalog/control/EditProductStore?productStoreId=${webSite.productStoreId}" description="${uiLabelMap.ContentEditProductStore}"/>
</drop-down>
</field>
+ <field name="visualThemeSetId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="VisualThemeSet" description="${description}">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
</form>
<form name="ListWebSites" target="" title="" type="list" list-name="webSites" paginate-target="FindWebSite" paginate="true"
@@ -171,4 +178,4 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified: ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml?rev=743202&r1=743201&r2=743202&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml (original)
+++ ofbiz/trunk/applications/ecommerce/data/DemoProduct.xml Wed Feb 11 03:19:19 2009
@@ -103,8 +103,8 @@
<ProductStoreRole partyId="admin" roleTypeId="SALES_REP" productStoreId="9000" fromDate="2001-05-13 12:00:00.0"/>
<ProductStoreKeywordOvrd productStoreId="9000" keyword="gizmo" fromDate="2001-05-13 12:00:00.0" target="100" targetTypeEnumId="KOTT_PRODCAT"/>
- <WebSite webSiteId="WebStore" siteName="eCommerce Web Site" productStoreId="9000"/>
- <WebSite webSiteId="WebStoreClone" siteName="Cloned eCommerce Web Site" productStoreId="9000"/>
+ <WebSite webSiteId="WebStore" siteName="eCommerce Web Site" productStoreId="9000" visualThemeSetId="ECOMMERCE"/>
+ <WebSite webSiteId="WebStoreClone" siteName="Cloned eCommerce Web Site" productStoreId="9000" visualThemeSetId="ECOMMERCE"/>
<WebSite webSiteId="OrderEntry" siteName="Order Entry Web Site" productStoreId="9000"/>
<ProdCatalog prodCatalogId="DemoCatalog" catalogName="Demo Catalog" useQuickAdd="Y"/>
Added: ofbiz/trunk/applications/ecommerce/data/EcommerceTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/EcommerceTypeData.xml?rev=743202&view=auto
==============================================================================
--- ofbiz/trunk/applications/ecommerce/data/EcommerceTypeData.xml (added)
+++ ofbiz/trunk/applications/ecommerce/data/EcommerceTypeData.xml Wed Feb 11 03:19:19 2009
@@ -0,0 +1,34 @@
+<?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.
+-->
+
+<entity-engine-xml>
+
+ <VisualThemeSet visualThemeSetId="ECOMMERCE" description="ECommerce Visual Themes"/>
+
+ <!-- Ecommerce Default Visual Theme -->
+ <VisualTheme visualThemeId="EC_DEFAULT" visualThemeSetId="ECOMMERCE" description="OFBiz Ecommerce Standard Floating Layout"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/ecommain.css" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.jpg" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/header.ftl" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/footer.ftl" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/images/ecdefaulttheme.jpg" sequenceId="01"/>
+
+</entity-engine-xml>
Propchange: ofbiz/trunk/applications/ecommerce/data/EcommerceTypeData.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/ecommerce/data/EcommerceTypeData.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/ecommerce/data/EcommerceTypeData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/ecommerce/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/ofbiz-component.xml?rev=743202&r1=743201&r2=743202&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/ecommerce/ofbiz-component.xml Wed Feb 11 03:19:19 2009
@@ -25,6 +25,7 @@
<classpath type="jar" location="build/lib/*"/>
<classpath type="dir" location="config"/>
<classpath type="dir" location="script"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/EcommerceTypeData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoProduct.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoProductImages.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/DemoSurvey.xml"/>
Modified: ofbiz/trunk/framework/common/data/CommonTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/data/CommonTypeData.xml?rev=743202&r1=743201&r2=743202&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/data/CommonTypeData.xml (original)
+++ ofbiz/trunk/framework/common/data/CommonTypeData.xml Wed Feb 11 03:19:19 2009
@@ -115,7 +115,8 @@
<Enumeration enumId="VT_NAV_TMPLT_LOC" description="Main Navigation Template Location" enumTypeId="VT_RES_TYPE" sequenceId="10"/>
<Enumeration enumId="VT_MSG_TMPLT_LOC" description="Main Messages Template Location" enumTypeId="VT_RES_TYPE" sequenceId="11"/>
<Enumeration enumId="VT_SCREENSHOT" description="Theme Preview Screenshot" enumTypeId="VT_RES_TYPE" sequenceId="12"/>
- <VisualTheme visualThemeId="DEFAULT" description="OFBiz Standard Floating Layout"/>
+ <VisualThemeSet visualThemeSetId="BACKOFFICE" description="Themes to be used for backoffice applications"/>
+ <VisualTheme visualThemeId="DEFAULT" visualThemeSetId="BACKOFFICE" description="OFBiz Standard Floating Layout"/>
<VisualThemeResource visualThemeId="DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/maincss.css" sequenceId="01"/>
<VisualThemeResource visualThemeId="DEFAULT" resourceTypeEnumId="VT_RTL_STYLESHEET" resourceValue="/images/mainrtl.css" sequenceId="01"/>
<VisualThemeResource visualThemeId="DEFAULT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
Modified: ofbiz/trunk/framework/common/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/entitydef/entitymodel.xml?rev=743202&r1=743201&r2=743202&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/framework/common/entitydef/entitymodel.xml Wed Feb 11 03:19:19 2009
@@ -543,13 +543,26 @@
<!-- org.ofbiz.common.theme -->
<!-- ============================ -->
+ <entity entity-name="VisualThemeSet"
+ package-name="org.ofbiz.common.theme"
+ title="Defines a set of Visual Themes">
+ <description>Groups toghether Visual Themes that can be used for one (or a set of) application.</description>
+ <field name="visualThemeSetId" type="id-ne"></field>
+ <field name="description" type="description"></field>
+ <prim-key field="visualThemeSetId"/>
+ </entity>
+
<entity entity-name="VisualTheme"
package-name="org.ofbiz.common.theme"
title="Defines a Visual Theme">
<description>The VisualTheme entity contains one entry per visual theme.</description>
<field name="visualThemeId" type="id-ne"></field>
+ <field name="visualThemeSetId" type="id"></field>
<field name="description" type="description"></field>
<prim-key field="visualThemeId"/>
+ <relation type="one" fk-name="VT_THEME_SET" rel-entity-name="VisualThemeSet">
+ <key-map field-name="visualThemeSetId"/>
+ </relation>
</entity>
<entity entity-name="VisualThemeResource"
Modified: ofbiz/trunk/framework/common/widget/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupScreens.xml?rev=743202&r1=743201&r2=743202&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Wed Feb 11 03:19:19 2009
@@ -90,7 +90,10 @@
<section>
<actions>
<set field="title" value="${uiLabelMap.CommonVisualThemes}"/>
- <entity-condition entity-name="VisualTheme" list="visualThemes"/>
+ <entity-one entity-name="WebSite" value-field="webSite"/>
+ <entity-condition entity-name="VisualTheme" list-name="visualThemes">
+ <condition-expr field-name="visualThemeSetId" from-field="webSite.visualThemeSetId" ignore-if-empty="true"/>
+ </entity-condition>
</actions>
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
Modified: ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml?rev=743202&r1=743201&r2=743202&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/framework/webapp/entitydef/entitymodel.xml Wed Feb 11 03:19:19 2009
@@ -242,6 +242,10 @@
<field name="standardContentPrefix" type="url"></field>
<field name="secureContentPrefix" type="url"></field>
<field name="cookieDomain" type="long-varchar"></field>
+ <field name="visualThemeSetId" type="id"></field>
+ <relation type="one" fk-name="WEB_SITE_THEME_SET" rel-entity-name="VisualThemeSet">
+ <key-map field-name="visualThemeSetId"/>
+ </relation>
<prim-key field="webSiteId"/>
</entity>
</entitymodel>
Modified: ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml?rev=743202&r1=743201&r2=743202&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml (original)
+++ ofbiz/trunk/themes/bluelight/data/BlueLightThemeData.xml Wed Feb 11 03:19:19 2009
@@ -19,7 +19,7 @@
-->
<entity-engine-xml>
- <VisualTheme visualThemeId="BLUELIGHT" description="BlueLight Theme: Breadcrumbs, drop-down menus and rounded corners"/>
+ <VisualTheme visualThemeId="BLUELIGHT" visualThemeSetId="BACKOFFICE" description="BlueLight Theme: Breadcrumbs, drop-down menus and rounded corners"/>
<VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/bluelight/style.css" sequenceId="01"/>
<VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/bluelight/ofbiz.ico" sequenceId="01"/>
<VisualThemeResource visualThemeId="BLUELIGHT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/bluelight/ofbiz_logo.jpg" sequenceId="01"/>