You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2011/11/21 12:34:33 UTC
svn commit: r1204455 - in /ofbiz/trunk: applications/content/entitydef/
applications/content/webapp/content/WEB-INF/ applications/content/widget/
applications/content/widget/content/ applications/content/widget/website/
applications/product/config/ app...
Author: hansbak
Date: Mon Nov 21 11:34:32 2011
New Revision: 1204455
URL: http://svn.apache.org/viewvc?rev=1204455&view=rev
Log:
simplify webanalytics entity and moved from product to content, this entity has nomally only a single record so a conversion program is not provided. After upgrade, save the content of the entitye web_analytics_config and drop it in webtools. Then restart and re-enter the saved record
Added:
ofbiz/trunk/applications/content/widget/WebAnalyticsScreens.xml (with props)
ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml (with props)
Removed:
ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsForms.xml
ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml
Modified:
ofbiz/trunk/applications/content/entitydef/entitymodel.xml
ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
ofbiz/trunk/applications/content/widget/CommonScreens.xml
ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/entitydef/entitymodel.xml
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
Modified: ofbiz/trunk/applications/content/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/entitydef/entitymodel.xml?rev=1204455&r1=1204454&r2=1204455&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/content/entitydef/entitymodel.xml Mon Nov 21 11:34:32 2011
@@ -1692,4 +1692,32 @@ under the License.
<key-map field-name="visitId"/>
</relation>
</entity>
+
+ <entity entity-name="WebAnalyticsConfig"
+ package-name="org.ofbiz.content.website"
+ title="Web Analytics Configuration">
+ <field name="webSiteId" type="id-ne"></field>
+ <field name="webAnalyticsTypeId" type="id-ne"></field>
+ <field name="webAnalyticsCode" type="very-long"><description>copy in here the analitics javascript code without the beginning- and end<script> tags</description></field>
+ <prim-key field="webSiteId"/>
+ <prim-key field="webAnalyticsTypeId"/>
+ <relation type="one-nofk" rel-entity-name="WebAnalyticsType">
+ <key-map field-name="webAnalyticsTypeId"/>
+ </relation>
+ <relation type="one-nofk" rel-entity-name="WebSite">
+ <key-map field-name="webSiteId"/>
+ </relation>
+ </entity>
+
+ <entity entity-name="WebAnalyticsType" package-name="org.ofbiz.content.website"
+ title="Web Analytics Type Entity">
+ <field name="webAnalyticsTypeId" type="id-ne"></field>
+ <field name="parentTypeId" type="id"></field>
+ <field name="hasTable" type="indicator"></field>
+ <field name="description" type="description"></field>
+ <prim-key field="webAnalyticsTypeId"/>
+ <relation type="one" fk-name="WANA_TYP_PARENT" title="Parent" rel-entity-name="WebAnalyticsType">
+ <key-map field-name="parentTypeId" rel-field-name="webAnalyticsTypeId"/>
+ </relation>
+ </entity>
</entitymodel>
Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml?rev=1204455&r1=1204454&r2=1204455&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/controller.xml Mon Nov 21 11:34:32 2011
@@ -1904,6 +1904,51 @@ under the License.
<response name="error" type="view" value="WebSiteContactList"/>
</request-map>
+ <!-- Web Analytics Request Mappings -->
+ <request-map uri="WebAnalytics">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindWebAnalyticsConfigs"/>
+ <response name="error" type="view" value="FindWebAnalyticsConfigs"/>
+ </request-map>
+ <request-map uri="WebAnalyticsConfigs">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindWebAnalyticsConfigs"/>
+ <response name="error" type="view" value="FindWebAnalyticsConfigs"/>
+ </request-map>
+ <request-map uri="FindWebAnalyticsConfigs">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindWebAnalyticsConfigs"/>
+ <response name="error" type="view" value="FindWebAnalyticsConfigs"/>
+ </request-map>
+ <request-map uri="EditWebAnalyticsConfig">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="EditWebAnalyticsConfig"/>
+ <response name="error" type="view" value="EditWebAnalyticsConfig"/>
+ </request-map>
+ <request-map uri="createWebAnalyticsConfig">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createWebAnalyticsConfig"/>
+ <response name="success" type="request-redirect" value="FindWebAnalyticsConfigs">
+ <redirect-parameter name="webSiteId"/>
+ </response>
+ <response name="error" type="view" value="EditWebAnalyticsConfig"/>
+ </request-map>
+ <request-map uri="updateWebAnalyticsConfig">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updateWebAnalyticsConfig"/>
+ <response name="success" type="request-redirect" value="FindWebAnalyticsConfigs">
+ <redirect-parameter name="webSiteId"/>
+ </response>
+ <response name="error" type="view" value="EditWebAnalyticsConfig"/>
+ </request-map>
+ <request-map uri="deleteWebAnalyticsConfig">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="deleteWebAnalyticsConfig"/>
+ <response name="success" type="request-redirect" value="FindWebAnalyticsConfigs">
+ <redirect-parameter name="webSiteId"/>
+ </response>
+ </request-map>
+
<!-- View Mappings -->
<view-map name="main" type="screen" page="component://content/widget/CommonScreens.xml#main"/>
<view-map name="fonts.fo" type="screenfop" page="component://content/widget/CommonScreens.xml#fonts.fo" content-type="application/pdf" encoding="none"/>
@@ -2086,5 +2131,9 @@ under the License.
<view-map name="ContentSearchOptions" type="screen" page="component://content/widget/content/ContentScreens.xml#ContentSearchOptions"/>
<view-map name="ContentSearchResults" type="screen" page="component://content/widget/content/ContentScreens.xml#ContentSearchResults"/>
+ <!-- Web Analytics View -->
+ <view-map name="FindWebAnalyticsConfigs" type="screen" page="component://content/widget/WebAnalyticsScreens.xml#FindWebAnalyticsConfigs"/>
+ <view-map name="EditWebAnalyticsConfig" type="screen" page="component://content/widget/WebAnalyticsScreens.xml#EditWebAnalyticsConfig"/>
+
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=1204455&r1=1204454&r2=1204455&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Mon Nov 21 11:34:32 2011
@@ -453,4 +453,44 @@ under the License.
</widgets>
</section>
</screen>
+
+ <screen name="CommonWebAnalyticsDecorator">
+ <section>
+ <actions>
+ <set field="headerItem" value="websites"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <and>
+ <if-has-permission permission="CONTENTMGR" action="_VIEW"/>
+ <not><if-empty field="parameters.webSiteId"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="website" location="component://content/widget/content/ContentMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <container style="button-bar">
+ <include-menu name="WebAnalyticsConfigButtonBar" location="component://content/widget/content/ContentMenus.xml"/>
+ </container>
+ <label style="h1" text="${uiLabelMap.CatalogWebAnalytics} ${uiLabelMap.CommonFor} : ${webSite.siteName} [${webSite.webSiteId}] ${${extraFunctionName}}"/>
+ <decorator-section-include name="body"/>
+ </widgets>
+ <fail-widgets>
+ <label style="h3">${uiLabelMap.ContentViewPermissionError}</label>
+ </fail-widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
</screens>
Added: ofbiz/trunk/applications/content/widget/WebAnalyticsScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebAnalyticsScreens.xml?rev=1204455&view=auto
==============================================================================
--- ofbiz/trunk/applications/content/widget/WebAnalyticsScreens.xml (added)
+++ ofbiz/trunk/applications/content/widget/WebAnalyticsScreens.xml Mon Nov 21 11:34:32 2011
@@ -0,0 +1,74 @@
+<?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.
+-->
+
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+ <screen name="FindWebAnalyticsConfigs">
+ <section>
+ <actions>
+ <set field="titleProperty" value="CatalogWebAnalytics"/>
+ <set field="headerItem" value="websites"/>
+ <set field="tabButtonItem" value="WebAnalytics"/>
+ <set field="tabButtonItem2" value="FindWebAnalyticsConfigs"/>
+ <set field="webAnalyticsConfigCtx" from-field="parameters"/>
+ <set field="webSiteId" from-field="parameters.webSiteId"/>
+ <entity-one entity-name="WebSite" value-field="webSite"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonWebAnalyticsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <section>
+ <widgets>
+ <screenlet title="${uiLabelMap.CatalogWebAnalytics}">
+ <include-form name="ListWebAnalyticsConfig" location="component://content/widget/website/WebAnalyticsForms.xml"/>
+ </screenlet>
+ </widgets>
+ </section>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditWebAnalyticsConfig">
+ <section>
+ <actions>
+ <set field="titleProperty" value="PageTitleEditWebAnalyticsConfigs"/>
+ <set field="tabButtonItem" value="WebAnalytics"/>
+ <set field="tabButtonItem2" value="EditWebAnalyticsConfig"/>
+ <set field="webSiteId" from-field="parameters.webSiteId"/>
+ <entity-one entity-name="WebSite" value-field="webSite"/>
+ <set field="webAnalyticsTypeId" from-field="parameters.webAnalyticsTypeId"/>
+ <entity-one entity-name="WebAnalyticsConfig" value-field="webAnalyticsConfig" auto-field-map="true"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonWebAnalyticsDecorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <screenlet title="${uiLabelMap.PageTitleEditWebAnalyticsConfigs}">
+ <include-form name="EditWebAnalyticsConfig" location="component://content/widget/website/WebAnalyticsForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+</screens>
Propchange: ofbiz/trunk/applications/content/widget/WebAnalyticsScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/content/widget/WebAnalyticsScreens.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/content/widget/WebAnalyticsScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/content/widget/content/ContentMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml?rev=1204455&r1=1204454&r2=1204455&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentMenus.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentMenus.xml Mon Nov 21 11:34:32 2011
@@ -179,6 +179,11 @@ under the License.
<parameter param-name="webSiteId" from-field="parameters.webSiteId"/>
</link>
</menu-item>
+ <menu-item name="WebAnalytics" title="${uiLabelMap.CatalogWebAnalytics}">
+ <link target="WebAnalytics">
+ <parameter param-name="webSiteId" from-field="parameters.webSiteId"/>
+ </link>
+ </menu-item>
</menu>
<menu name="blog" menu-container-style="button-bar tab-bar" default-selected-style="selected" default-menu-item-name="content" default-permission-operation="CONTENT_ADMIN"
default-permission-entity-action="_ADMIN" default-associated-content-id="${userLogin.userLoginId}" selected-menuitem-context-field-name="tabButtonItem"
@@ -286,4 +291,17 @@ under the License.
<link target="EditWebSite"/>
</menu-item>
</menu>
+ <!-- Web Analytics -->
+ <menu name="WebAnalyticsConfigButtonBar" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="tabButtonItem2">
+ <menu-item name="EditWebAnalyticsConfig" title="${uiLabelMap.CommonCreate}">
+ <link target="EditWebAnalyticsConfig" style="buttontext create">
+ <parameter param-name="webSiteId" from-field="parameters.webSiteId"/>
+ </link>
+ </menu-item>
+ <!--<menu-item name="WebAnalyticsTypes" title="Create ${uiLabelMap.CatalogWebAnalyticsTypes}">
+ <link target="EditWebAnalyticsType" style="buttontext create">
+ <parameter param-name="webSiteId" from-field="parameters.webSiteId"/>
+ </link>
+ </menu-item>-->
+ </menu>
</menus>
Added: ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml?rev=1204455&view=auto
==============================================================================
--- ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml (added)
+++ ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml Mon Nov 21 11:34:32 2011
@@ -0,0 +1,77 @@
+<?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.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+ <form name="ListWebAnalyticsConfig" type="list" list-name="listIt" paginate-target="FindWebAnalyticsConfigs" default-entity-name="WebAnalyticsConfig" separate-columns="true"
+ odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
+ <actions>
+ <service service-name="performFind" result-map="result" result-map-list="listIt">
+ <field-map field-name="inputFields" from-field="webAnalyticsConfigCtx"/>
+ <field-map field-name="entityName" value="WebAnalyticsConfig"/>
+ <field-map field-name="orderBy" from-field="parameters.sortField"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
+ </service>
+ </actions>
+ <auto-fields-entity entity-name="WebAnalyticsConfig" default-field-type="display"/>
+ <field name="webAnalyticsTypeId" title="${uiLabelMap.CommonType}">
+ <display-entity entity-name="WebAnalyticsType" description="${description} [${webAnalyticsTypeId}]"/>
+ </field>
+ <field name="webAnalyticsCode">
+ <hyperlink target="EditWebAnalyticsConfig" description="${webAnalyticsCode}">
+ <parameter param-name="productStoreId"/>
+ <parameter param-name="webAnalyticsTypeId"/>
+ <parameter param-name="webSiteId"/>
+ </hyperlink>
+ </field>
+ <field name="webSiteId"><hidden value="${webSiteId}"/></field>
+ <field name="removeButton" title="${uiLabelMap.CommonRemove}" widget-style="buttontext">
+ <hyperlink target="deleteWebAnalyticsConfig" description="${uiLabelMap.CommonRemove}">
+ <parameter param-name="webSiteId"/>
+ <parameter param-name="webAnalyticsTypeId"/>
+ </hyperlink>
+ </field>
+ </form>
+
+ <form name="EditWebAnalyticsConfig" type="single" target="updateWebAnalyticsConfig" title="" default-map-name="webAnalyticsConfig"
+ header-row-style="header-row" default-table-style="basic-table">
+ <alt-target use-when="webAnalyticsConfig==null" target="createWebAnalyticsConfig"/>
+ <auto-fields-service service-name="updateWebAnalyticsConfig" map-name="webAnalyticsConfig"/>
+ <field use-when="webAnalyticsConfig!=null" name="webAnalyticsTypeId" tooltip="${uiLabelMap.CommonNotModifRecreat}" title="${uiLabelMap.CatalogWebAnalyticsType}">
+ <display-entity entity-name="WebAnalyticsType"/>
+ </field>
+ <field use-when="webAnalyticsConfig==null&&webAnalyticsTypeId==null" name="webAnalyticsTypeId" title="${uiLabelMap.CatalogWebAnalyticsType}">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="WebAnalyticsType" description="${description}">
+ <entity-order-by field-name="webAnalyticsTypeId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field use-when="webAnalyticsConfig==null&&webAnalyticsTypeId!=null" name="webAnalyticsTypeId" title="${uiLabelMap.CatalogWebAnalyticsType}" tooltip="${uiLabelMap.CommonCannotBeFound}:[${webAnalyticsTypeId}]">
+ <text size="20" maxlength="20"/>
+ </field>
+ <field name="webSiteId" title="${uiLabelMap.CommonWebsite}"><hidden value="${parameters.webSiteId}"/></field>
+ <field name="noConditionFind"><hidden value="Y"/></field>
+ <field use-when="webAnalyticsConfig!=null" name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field use-when="webAnalyticsConfig==null" name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+</forms>
Propchange: ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/content/widget/website/WebAnalyticsForms.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1204455&r1=1204454&r2=1204455&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Mon Nov 21 11:34:32 2011
@@ -24,20 +24,27 @@
<value xml:lang="en">Add new Product Feature to current product</value>
</property>
<property key="CatalogWebAnalytics">
+ <value xml:lang="de">Web Analytik</value>
<value xml:lang="en">Web Analytics</value>
<value xml:lang="it">Analisi Web</value>
<value xml:lang="zh_TW">網ç«åæ</value>
</property>
<property key="CatalogWebAnalyticsConfigs">
+ <value xml:lang="de">Web Analytik Konfiguration</value>
<value xml:lang="en">Web Analytics Configuration</value>
<value xml:lang="it">Configurazione analisi Web</value>
<value xml:lang="zh_TW">網ç«åæé
ç½®</value>
</property>
<property key="CatalogWebAnalyticsTypes">
+ <value xml:lang="de">Web Analytik Typen</value>
<value xml:lang="en">Web Analytics Types</value>
<value xml:lang="it">Tipi di analisi Web</value>
<value xml:lang="zh_TW">網ç«åæåæ
</value>
</property>
+ <property key="CatalogWebAnalyticsType">
+ <value xml:lang="de">Web Analytik Typ</value>
+ <value xml:lang="en">Web Analytics Type</value>
+ </property>
<property key="CreateNewProductFeatureType">
<value xml:lang="de">Neuen Merkmaltyp erstellen</value>
<value xml:lang="en">Create New Product Feature Type</value>
@@ -5755,6 +5762,10 @@
<value xml:lang="zh">è§è§é£æ ¼</value>
<value xml:lang="zh_TW">è¦è¦ºé¢¨æ ¼</value>
</property>
+ <property key="FormFieldTitle_webAnalyticsCode">
+ <value xml:lang="de">Web Analytik Code</value>
+ <value xml:lang="en">Web Analytics Code</value>
+ </property>
<property key="FormFieldTitle_weightBreakId">
<value xml:lang="de">Gewicht Sprung ID</value>
<value xml:lang="en">Weight Break Id</value>
@@ -7576,11 +7587,18 @@
<value xml:lang="zh">ç¼è¾ç»éå产å</value>
<value xml:lang="zh_TW">編輯ç¶é·åç¢å</value>
</property>
+ <property key="PageTitleEditWebAnalyticsConfig">
+ <value xml:lang="de">Web Analytik Konfiguration</value>
+ <value xml:lang="en">Edit Web Analytics Configuration</value>
+ <value xml:lang="it">Aggiorna configurazione analisi Web</value>
+ </property>
<property key="PageTitleEditWebAnalyticsConfigs">
+ <value xml:lang="de">Web Analytik Konfiguration bearbeiten</value>
<value xml:lang="en">Edit Web Analytics Configuration</value>
<value xml:lang="it">Aggiorna configurazione analisi Web</value>
</property>
<property key="PageTitleEditWebAnalyticsTypes">
+ <value xml:lang="de">Web Analytik Typ bearbeiten</value>
<value xml:lang="en">Edit Web Analytics Types</value>
<value xml:lang="it">Aggiorna tipi di analisi Web</value>
</property>
@@ -7595,6 +7613,7 @@
<value xml:lang="en">Facility Geo Location</value>
</property>
<property key="PageTitleFindCategory">
+ <value xml:lang="de">Kategorie suchen</value>
<value xml:lang="en">Find Category</value>
<value xml:lang="th">à¸à¹à¸à¸«à¸²à¸«à¸¡à¸§à¸à¸«à¸¡à¸¹à¹</value>
</property>
@@ -7797,10 +7816,12 @@
<value xml:lang="zh_TW">æ¥æ¾è¨é±è³æº</value>
</property>
<property key="PageTitleFindWebAnalyticsConfigs">
+ <value xml:lang="de">Web Analytik Einstellungen suchen</value>
<value xml:lang="en">Find Web Analytics Configuration</value>
<value xml:lang="it">Ricerca configurazioni analisi Web</value>
</property>
<property key="PageTitleFindWebAnalyticsTypes">
+ <value xml:lang="de">Web Analytik Typen suchen</value>
<value xml:lang="en">Find Web Analytics Types</value>
<value xml:lang="it">Ricerca tipi di analisi Web</value>
</property>
Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=1204455&r1=1204454&r2=1204455&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Mon Nov 21 11:34:32 2011
@@ -4787,40 +4787,6 @@ under the License.
<prim-key field="supplierRatingTypeId"/>
</entity>
- <entity entity-name="WebAnalyticsConfig"
- package-name="org.ofbiz.product.catalog"
- title="Web Analytics Configuration">
- <field name="productStoreId" type="id-ne"></field>
- <field name="webAnalyticsTypeId" type="id-ne"></field>
- <field name="webSiteId" type="id"></field>
- <field name="webAnalyticsCode" type="very-long"><description>copy in here the analitics javascript code without the beginning- and end<script> tags</description></field>
- <field name="isEnabled" type="indicator"></field>
- <field name="description" type="description"></field>
- <prim-key field="productStoreId"/>
- <prim-key field="webAnalyticsTypeId"/>
- <relation type="one" fk-name="WANA_PROD_STORE" rel-entity-name="ProductStore">
- <key-map field-name="productStoreId"/>
- </relation>
- <relation type="one" fk-name="WANA_TYPE" rel-entity-name="WebAnalyticsType">
- <key-map field-name="webAnalyticsTypeId"/>
- </relation>
- <relation type="one" fk-name="WANA_WEBSITE" rel-entity-name="WebSite">
- <key-map field-name="webSiteId"/>
- </relation>
- </entity>
-
- <entity entity-name="WebAnalyticsType" package-name="org.ofbiz.product.catalog"
- title="Web Analytics Type Entity">
- <field name="webAnalyticsTypeId" type="id-ne"></field>
- <field name="parentTypeId" type="id"></field>
- <field name="hasTable" type="indicator"></field>
- <field name="description" type="description"></field>
- <prim-key field="webAnalyticsTypeId"/>
- <relation type="one" fk-name="WANA_TYP_PARENT" title="Parent" rel-entity-name="WebAnalyticsType">
- <key-map field-name="parentTypeId" rel-field-name="webAnalyticsTypeId"/>
- </relation>
- </entity>
-
<entity entity-name="ProductPromoContent"
package-name="org.ofbiz.product.promo"
title="Product Promo Content Entity">
Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1204455&r1=1204454&r2=1204455&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Mon Nov 21 11:34:32 2011
@@ -2630,68 +2630,6 @@ under the License.
<response name="error" type="view" value="EditProductCommunicationEvents"/>
</request-map>
- <!-- Web Analytics Request Mappings -->
- <request-map uri="WebAnalytics">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="FindWebAnalyticsConfigs"/>
- <response name="error" type="view" value="FindWebAnalyticsConfigs"/>
- </request-map>
- <request-map uri="WebAnalyticsConfigs">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="FindWebAnalyticsConfigs"/>
- <response name="error" type="view" value="FindWebAnalyticsConfigs"/>
- </request-map>
- <request-map uri="FindWebAnalyticsConfigs">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="FindWebAnalyticsConfigs"/>
- <response name="error" type="view" value="FindWebAnalyticsConfigs"/>
- </request-map>
- <request-map uri="EditWebAnalyticsConfig">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditWebAnalyticsConfig"/>
- <response name="error" type="view" value="EditWebAnalyticsConfig"/>
- </request-map>
- <request-map uri="createWebAnalyticsConfig">
- <security https="true" auth="true"/>
- <event type="service" invoke="createWebAnalyticsConfig"/>
- <response name="success" type="view" value="EditWebAnalyticsConfig"/>
- <response name="error" type="view" value="EditWebAnalyticsConfig"/>
- </request-map>
- <request-map uri="updateWebAnalyticsConfig">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateWebAnalyticsConfig"/>
- <response name="success" type="view" value="EditWebAnalyticsConfig"/>
- <response name="error" type="view" value="EditWebAnalyticsConfig"/>
- </request-map>
-
- <request-map uri="WebAnalyticsTypes">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="FindWebAnalyticsTypes"/>
- <response name="error" type="view" value="FindWebAnalyticsTypes"/>
- </request-map>
- <request-map uri="FindWebAnalyticsTypes">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="FindWebAnalyticsTypes"/>
- <response name="error" type="view" value="FindWebAnalyticsTypes"/>
- </request-map>
- <request-map uri="EditWebAnalyticsType">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditWebAnalyticsType"/>
- <response name="error" type="view" value="EditWebAnalyticsType"/>
- </request-map>
- <request-map uri="createWebAnalyticsType">
- <security https="true" auth="true"/>
- <event type="service" invoke="createWebAnalyticsType"/>
- <response name="success" type="view" value="EditWebAnalyticsType"/>
- <response name="error" type="view" value="EditWebAnalyticsType"/>
- </request-map>
- <request-map uri="updateWebAnalyticsType">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateWebAnalyticsType"/>
- <response name="success" type="view" value="EditWebAnalyticsType"/>
- <response name="error" type="view" value="EditWebAnalyticsType"/>
- </request-map>
-
<!-- ================ Image Management Requests ================= -->
<request-map uri="Imagemanagement"><security https="true" auth="true"/>
<response name="success" type="view" value="Imagemanagement"/>
@@ -3213,12 +3151,6 @@ under the License.
<view-map name="ListShipmentMethodTypes" type="screen" page="component://product/widget/catalog/ShippingScreens.xml#ListShipmentMethodTypes"/>
<view-map name="ListCarrierShipmentMethods" type="screen" page="component://product/widget/catalog/ShippingScreens.xml#ListCarrierShipmentMethods"/>
- <!-- Web Analytics View -->
- <view-map name="FindWebAnalyticsConfigs" type="screen" page="component://product/widget/catalog/WebAnalyticsScreens.xml#FindWebAnalyticsConfigs"/>
- <view-map name="EditWebAnalyticsConfig" type="screen" page="component://product/widget/catalog/WebAnalyticsScreens.xml#EditWebAnalyticsConfig"/>
- <view-map name="FindWebAnalyticsTypes" type="screen" page="component://product/widget/catalog/WebAnalyticsScreens.xml#FindWebAnalyticsTypes"/>
- <view-map name="EditWebAnalyticsType" type="screen" page="component://product/widget/catalog/WebAnalyticsScreens.xml#EditWebAnalyticsType"/>
-
<!-- Lookup request mappings -->
<view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/>
<view-map name="LookupFixedAsset" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupFixedAsset"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml?rev=1204455&r1=1204454&r2=1204455&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml Mon Nov 21 11:34:32 2011
@@ -31,7 +31,6 @@ under the License.
<menu-item name="configs" title="${uiLabelMap.ProductConfigItems}"><link target="FindProductConfigItems"/></menu-item>
<menu-item name="Subscription" title="${uiLabelMap.ProductSubscriptions}"><link target="FindSubscription"/></menu-item>
<menu-item name="shipping" title="${uiLabelMap.ProductShipping}"><link target="ListShipmentMethodTypes"/></menu-item>
- <menu-item name="WebAnalytics" title="${uiLabelMap.CatalogWebAnalytics}"><link target="WebAnalytics"/></menu-item>
<menu-item name="Imagemanagement" title="${uiLabelMap.ImageManagement}"><link target="Imagemanagement"/></menu-item>
</menu>
@@ -576,24 +575,6 @@ under the License.
</menu-item>
</menu>
- <menu name="WebAnalyticsTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="WebAnalyticsConfigs" title="${uiLabelMap.CatalogWebAnalyticsConfigs}">
- <link target="WebAnalyticsConfigs"/>
- </menu-item>
- <menu-item name="WebAnalyticsTypes" title="${uiLabelMap.CatalogWebAnalyticsTypes}">
- <link target="WebAnalyticsTypes"/>
- </menu-item>
- </menu>
-
- <menu name="WebAnalyticsConfigButtonBar" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="tabButtonItem2">
- <menu-item name="FindWebAnalyticsConfigs" title="${uiLabelMap.CommonFind}"><link target="FindWebAnalyticsConfigs"/></menu-item>
- <menu-item name="EditWebAnalyticsConfig" title="${uiLabelMap.CommonNew}"><link target="EditWebAnalyticsConfig"/></menu-item>
- </menu>
-
- <menu name="WebAnalyticsTypeButtonBar" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="tabButtonItem2">
- <menu-item name="FindWebAnalyticsTypes" title="${uiLabelMap.CommonFind}"><link target="FindWebAnalyticsTypes"/></menu-item>
- <menu-item name="EditWebAnalyticsType" title="${uiLabelMap.CommonNew}"><link target="EditWebAnalyticsType"/></menu-item>
- </menu>
<menu name="ImageManagementTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="userTabButtonImage">
<menu-item name="main" title="${uiLabelMap.CommonMain}">
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1204455&r1=1204454&r2=1204455&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Mon Nov 21 11:34:32 2011
@@ -212,40 +212,6 @@ under the License.
</widgets>
</section>
</screen>
-
- <screen name="CommonWebAnalyticsDecorator">
- <section>
- <actions>
- <set field="headerItem" value="WebAnalytics"/>
- <set field="leftbarScreenName" value="leftbar"/>
- <set field="leftbarScreenLocation" value="component://product/widget/catalog/CommonScreens.xml"/>
- <set field="MainColumnStyle" value="leftonly"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="left-column">
- <include-screen name="leftbar"/>
- </decorator-section>
- <decorator-section name="body">
- <section>
- <condition>
- <if-has-permission permission="CATALOG" action="_VIEW"/>
- </condition>
- <widgets>
- <include-menu name="WebAnalyticsTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
- <container style="no-clear">
- <decorator-section-include name="body"/>
- </container>
- </widgets>
- <fail-widgets>
- <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label>
- </fail-widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="leftbar">
<section>
Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml?rev=1204455&r1=1204454&r2=1204455&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml Mon Nov 21 11:34:32 2011
@@ -129,8 +129,8 @@ under the License.
<ProductStoreEmailSetting productStoreId="9000" emailType="UNSUB_CONT_LIST_NOTI" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListUnsubscribeEmail" subject="Unsubscribe Contact List" fromAddress="ofbiztest@example.com"/>
<ProductStoreEmailSetting productStoreId="9000" emailType="CONT_EMAIL_TEMPLATE" bodyScreenLocation="component://ecommerce/widget/EmailContactListScreens.xml#ContactListEmailTemplate"/>
- <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="GOOGLE_ANALYTICS" webAnalyticsCode="-- enter here your analytic script code --" isEnabled="Y" description="This is code provided from google analytics"/>
- <WebAnalyticsConfig productStoreId="9000" webAnalyticsTypeId="BING_ANALYTICS" webAnalyticsCode="-- enter here your analytic script code --" isEnabled="Y" description="This is code provided from bing analytics"/>
+ <WebAnalyticsConfig webSiteId="WebStore" webAnalyticsTypeId="GOOGLE_ANALYTICS" webAnalyticsCode="-- enter here your analytic script code --"/>
+ <WebAnalyticsConfig webSiteId="WebStore" webAnalyticsTypeId="BING_ANALYTICS" webAnalyticsCode="-- enter here your analytic script code --"/>
<ProductStoreFacility productStoreId="9000" facilityId="WebStoreWarehouse" fromDate="2001-05-13 12:00:00.0"/>
<ProductStoreRole partyId="admin" roleTypeId="SALES_REP" productStoreId="9000" fromDate="2001-05-13 12:00:00.0"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1204455&r1=1204454&r2=1204455&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Mon Nov 21 11:34:32 2011
@@ -62,7 +62,6 @@ under the License.
<set field="footerTemplateLocation" from-field="layoutSettings.VT_FTR_TMPLT_LOC[0]" default-value="component://ecommerce/webapp/ecommerce/includes/footer.ftl"/>
<entity-and list="webAnalyticsConfigs" entity-name="WebAnalyticsConfig">
<field-map field-name="webSiteId"/>
- <field-map field-name="isEnabled" value="Y"/>
</entity-and>
</actions>
<widgets>