Author: ashish
Date: Mon Jan 11 08:40:47 2010
New Revision: 897796
URL: http://svn.apache.org/viewvc?rev=897796&view=rev
Log:
Applied patch from jira issue OFBIZ-3399 - Web Analytics Initial Support.
Adding Web Analytics support in OFBiz. Following things are covered in this
work:
– Added two new entities WebAnalyticsConfig & WebAnalyticsType & provided GUI
support for it (CRUD Operations).
– Added demo data for Google Analytics & Bing Analytics.
– Associated WebAnalyticsConfig entity with Content entity so that the client
data can be content driven.
– Initially we have added this feature in catalog component keeping things in
mind that in general we do configuration settings regarding to ecommerce in
this component. If anyone have better place for this then we can move this
timely at more appropriate place. But for now we found this place good for
initial contribution.
This is collaborative effort from me & Pranay(Thanks!).
Added:
ofbiz/trunk/applications/product/data/DemoWebAnalyticsContentData.xml
(with props)
ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsForms.xml
(with props)
ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml
(with props)
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/data/ProductTypeData.xml
ofbiz/trunk/applications/product/entitydef/entitymodel.xml
ofbiz/trunk/applications/product/ofbiz-component.xml
ofbiz/trunk/applications/product/servicedef/services.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
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=897796&r1=897795&r2=897796&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Mon Jan 11
08:40:47 2010
@@ -5841,6 +5841,12 @@
<value
xml:lang="th">à¹à¸à¹à¹à¸à¸à¸¹à¹à¸à¸³à¸«à¸à¹à¸²à¸¢à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">ç¼è¾ç»éå产å</value>
</property>
+ <property key="PageTitleEditWebAnalyticsConfigs">
+ <value xml:lang="en">Edit Web Analytics Configuration</value>
+ </property>
+ <property key="PageTitleEditWebAnalyticsTypes">
+ <value xml:lang="en">Edit Web Analytics Types</value>
+ </property>
<property key="PageTitleFacilityLocationGeoLocation">
<value xml:lang="en">Facility Location GeoLocation</value>
<value xml:lang="fr">Géolocalisation de l'emplacement de
stokage</value>
@@ -6020,6 +6026,12 @@
<value
xml:lang="th">à¸à¹à¸à¸«à¸²à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¸ªà¸±à¹à¸à¸à¸·à¹à¸</value>
<value xml:lang="zh">æ¥æ¾è®¢é
èµæº</value>
</property>
+ <property key="PageTitleFindWebAnalyticsConfigs">
+ <value xml:lang="en">Find Web Analytics Configuration</value>
+ </property>
+ <property key="PageTitleFindWebAnalyticsTypes">
+ <value xml:lang="en">Find Web Analytics Types</value>
+ </property>
<property key="PageTitleInventoryItemGrandTotals">
<value xml:lang="de">Bestandsposition Gesamttotale für
${facility.facilityName} [${facility.facilityId}]</value>
<value xml:lang="en">Inventory Item Grand Totals for
${facility.facilityName} [${facility.facilityId}]</value>
@@ -21128,6 +21140,15 @@
<value
xml:lang="th">à¸à¸µà¹à¸à¸·à¸à¸ªà¸´à¸à¸à¹à¸²à¹à¸à¸·à¸à¸à¸à¸±à¹à¸à¸«à¸¡à¸à¹à¸¥à¸°à¹à¸à¸¢à¸à¸±à¹à¸§à¹à¸à¸à¸§à¸£à¸à¸°à¹à¸¡à¹à¸¡à¸µà¸à¸¥à¸¸à¹à¸¡à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸´à¸à¸à¹à¸²à¸à¸à¹à¸«à¸¥à¸·à¸</value>
<value
xml:lang="zh">è¿æ¯ä¸ä¸ªèæ产åï¼é常ä¸åºè¯¥æåºåæç»ä¸å®å
³è</value>
</property>
+ <property key="CatalogWebAnalytics">
+ <value xml:lang="en">Web Analytics</value>
+ </property>
+ <property key="CatalogWebAnalyticsConfigs">
+ <value xml:lang="en">Web Analytics Configuration</value>
+ </property>
+ <property key="CatalogWebAnalyticsTypes">
+ <value xml:lang="en">Web Analytics Types</value>
+ </property>
<property key="ProductWebSite">
<value xml:lang="de">Webseite</value>
<value xml:lang="en">Web Site</value>
Added: ofbiz/trunk/applications/product/data/DemoWebAnalyticsContentData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/DemoWebAnalyticsContentData.xml?rev=897796&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/data/DemoWebAnalyticsContentData.xml
(added)
+++ ofbiz/trunk/applications/product/data/DemoWebAnalyticsContentData.xml Mon
Jan 11 08:40:47 2010
@@ -0,0 +1,39 @@
+<?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>
+
+ <!-- Content, Data Resource & Electronic Text Data -->
+ <DataResource dataResourceId="GOOGLE_ANA_DRS"
dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL"
dataResourceName="Google Analytics Data Resource" mimeTypeId="text/html"/>
+ <DataResource dataResourceId="BING_ANA_DRS"
dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL"
dataResourceName="Google Analytics Data Resource" mimeTypeId="text/html"/>
+
+ <Content contentId="GOOGLE_ANA_CNT" contentTypeId="DOCUMENT"
dataResourceId="GOOGLE_ANA_DRS" contentName="Google Analytics Content"
description="Content related to Google Analytics" mimeTypeId="text/html"/>
+ <Content contentId="BING_ANA_CNT" contentTypeId="DOCUMENT"
dataResourceId="BING_ANA_DRS" contentName="Bing Analytics Content"
description="Content related to Bing Analytics" mimeTypeId="text/html"/>
+
+ <ElectronicText dataResourceId="GOOGLE_ANA_DRS">
+ <textData><![CDATA[Google_Analytics Code goes here.
+ ]]></textData>
+ </ElectronicText>
+
+ <ElectronicText dataResourceId="BING_ANA_DRS">
+ <textData><![CDATA[Bing_Analytics code goes here.
+ ]]></textData>
+ </ElectronicText>
+</entity-engine-xml>
Propchange:
ofbiz/trunk/applications/product/data/DemoWebAnalyticsContentData.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/applications/product/data/DemoWebAnalyticsContentData.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/trunk/applications/product/data/DemoWebAnalyticsContentData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ofbiz/trunk/applications/product/data/ProductTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductTypeData.xml?rev=897796&r1=897795&r2=897796&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductTypeData.xml Mon Jan 11
08:40:47 2010
@@ -596,4 +596,8 @@
<WebSite webSiteId="PRODCATALOG" siteName="Catalog Manager"
visualThemeSetId="BACKOFFICE"/>
<WebSite webSiteId="FACILITY" siteName="Facility Manager"
visualThemeSetId="BACKOFFICE"/>
+ <WebAnalyticsType description="Web Analytics" hasTable="N" parentTypeId=""
webAnalyticsTypeId="WEB_ANALYTICS"/>
+ <WebAnalyticsType webAnalyticsTypeId="GOOGLE_ANALYTICS"
parentTypeId="WEB_ANALYTICS" hasTable="N" description="Google Analytics"/>
+ <WebAnalyticsType webAnalyticsTypeId="BING_ANALYTICS"
parentTypeId="WEB_ANALYTICS" hasTable="N" description="Bing Analytics"/>
+
</entity-engine-xml>
Modified: ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?rev=897796&r1=897795&r2=897796&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/product/entitydef/entitymodel.xml Mon Jan 11
08:40:47 2010
@@ -4678,4 +4678,43 @@
<field name="description" type="description"></field>
<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="value"></field>
+ <field name="isEnabled" type="indicator"></field>
+ <field name="description" type="description"></field>
+ <field name="contentId" type="id"></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>
+ <relation type="one-nofk" fk-name="WANA_CNT_CNT"
rel-entity-name="Content">
+ <key-map field-name="contentId"/>
+ </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>
+
</entitymodel>
Modified: ofbiz/trunk/applications/product/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/ofbiz-component.xml?rev=897796&r1=897795&r2=897796&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/product/ofbiz-component.xml Mon Jan 11 08:40:47
2010
@@ -40,6 +40,7 @@
<entity-resource type="data" reader-name="seed" loader="main"
location="data/ApiSchemaDhl.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/DimensionTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/ProductPortletData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main"
location="data/DemoWebAnalyticsContentData.xml"/>
<service-resource type="model" loader="main"
location="servicedef/services.xml"/>
<service-resource type="model" loader="main"
location="servicedef/services_facility.xml"/>
Modified: ofbiz/trunk/applications/product/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/servicedef/services.xml?rev=897796&r1=897795&r2=897796&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/product/servicedef/services.xml Mon Jan 11
08:40:47 2010
@@ -1257,4 +1257,36 @@
<description>Create product and inventory item</description>
<attribute name="dirName" type="java.lang.String" mode="IN"
optional="true"/>
</service>
+
+ <!-- Start Web Analytics configuration services -->
+ <service name="createWebAnalyticsConfig"
default-entity-name="WebAnalyticsConfig" engine="entity-auto" invoke="create"
auth="true">
+ <description>Create a WebAnalyticsConfig</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="updateWebAnalyticsConfig"
default-entity-name="WebAnalyticsConfig" engine="entity-auto" invoke="update"
auth="true">
+ <description>Update a WebAnalyticsConfig</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="deleteWebAnalyticsConfig"
default-entity-name="WebAnalyticsConfig" engine="entity-auto" invoke="delete"
auth="true">
+ <description>Delete a WebAnalyticsConfig</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
+
+ <service name="createWebAnalyticsType"
default-entity-name="WebAnalyticsType" engine="entity-auto" invoke="create"
auth="true">
+ <description>Create a WebAnalyticsType</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="updateWebAnalyticsType"
default-entity-name="WebAnalyticsType" engine="entity-auto" invoke="update"
auth="true">
+ <description>Update a WebAnalyticsType</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ </service>
+ <service name="deleteWebAnalyticsType"
default-entity-name="WebAnalyticsType" engine="entity-auto" invoke="delete"
auth="true">
+ <description>Delete a WebAnalyticsType</description>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
+
</services>
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=897796&r1=897795&r2=897796&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Mon
Jan 11 08:40:47 2010
@@ -2560,6 +2560,68 @@
<response name="success" type="view"
value="EditProductCommunicationEvents"/>
<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>
<!-- ================ Lookup Requests ================= -->
<request-map uri="LookupContent"><security auth="true"
https="true"/><response name="success" type="view"
value="LookupContent"/></request-map>
@@ -2746,6 +2808,12 @@
<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=897796&r1=897795&r2=897796&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CatalogMenus.xml Mon Jan 11
08:40:47 2010
@@ -28,6 +28,7 @@
<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>
<menu name="FeaturesTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
@@ -429,4 +430,24 @@
</link>
</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="WebAnalyticsConfigTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
+ <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="WebAnalyticsTypeTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
+ <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>
+
</menus>
\ No newline at end of file
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=897796&r1=897795&r2=897796&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Mon Jan
11 08:40:47 2010
@@ -268,6 +268,37 @@
</widgets>
</section>
</screen>
+
+ <screen name="CommonWebAnalyticsDecorator">
+ <section>
+ <actions>
+ <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="body">
+ <section>
+ <!-- do check for CATALOG, _VIEW permission -->
+ <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>
Added: ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsForms.xml?rev=897796&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsForms.xml
(added)
+++ ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsForms.xml Mon
Jan 11 08:40:47 2010
@@ -0,0 +1,173 @@
+<?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="FindWebAnalyticsConfig" type="single"
target="FindWebAnalyticsConfigs" default-entity-name="WebAnalyticsConfig">
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
+ <field name="productStoreId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="ProductStore"
description="${storeName} [${productStoreId}]">
+ <entity-order-by field-name="storeName"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="webAnalyticsTypeId"
title="${uiLabelMap.CatalogWebAnalyticsTypes}">
+ <drop-down allow-empty="true" current-description="">
+ <entity-options description="${description}"
key-field-name="webAnalyticsTypeId" entity-name="WebAnalyticsType">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="webSiteId" map-name="parameters">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="WebSite"
description="${siteName}[${webSiteId}]">
+ <entity-order-by field-name="webSiteId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="contentId"><text-find/></field>
+ <field name="searchButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
+ <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="productStoreId" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${productStoreId}"
target="EditProductStore">
+ <parameter param-name="productStoreId"/>
+ </hyperlink>
+ </field>
+ <field name="webAnalyticsTypeId"
title="${uiLabelMap.CommonType}"><display-entity
entity-name="WebAnalyticsType"/></field>
+ <field name="isEnabled" title="${uiLabelMap.CommonEnabled}"
sort-field="true"><display/></field>
+ <field name="webSiteId" sort-field="true"><display/></field>
+ <field name="contentId" widget-style="buttontext">
+ <display-entity entity-name="Content">
+ <sub-hyperlink target="/content/control/editContent"
target-type="inter-app" description="${contentId}" link-style="buttontext">
+ <parameter param-name="contentId"/>
+ </sub-hyperlink>
+ </display-entity>
+ </field>
+ <field name="editLink" title="${uiLabelMap.CommonEdit}"
widget-style="buttontext">
+ <hyperlink also-hidden="false"
description="${uiLabelMap.CommonEdit}" target="EditWebAnalyticsConfig">
+ <parameter param-name="productStoreId"/>
+ <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="productStoreId"
tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field
use-when="webAnalyticsConfig==null&&productStoreId==null"
name="productStoreId">
+ <drop-down allow-empty="false">
+ <entity-options entity-name="ProductStore"
description="${storeName} [${productStoreId}]">
+ <entity-order-by field-name="storeName"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field
use-when="webAnalyticsConfig==null&&productStoreId!=null"
name="productStoreId"
tooltip="${uiLabelMap.CommonCannotBeFound}:[${productStoreId}]"><text size="20"
maxlength="20"/></field>
+ <field use-when="webAnalyticsConfig!=null" name="webAnalyticsTypeId"
tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field
use-when="webAnalyticsConfig==null&&webAnalyticsTypeId==null"
name="webAnalyticsTypeId">
+ <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"
tooltip="${uiLabelMap.CommonCannotBeFound}:[${webAnalyticsTypeId}]"><text
size="20" maxlength="20"/></field>
+ <field name="webSiteId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="WebSite"
description="${siteName}[${webSiteId}]">
+ <entity-order-by field-name="webSiteId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="isEnabled" tooltip="${uiLabelMap.CommonEnabled}">
+ <drop-down no-current-selected-key="Y">
+ <option key="Y" description="${uiLabelMap.CommonYes}"/>
+ <option key="N" description="${uiLabelMap.CommonNo}"/>
+ </drop-down>
+ </field>
+ <field name="contentId">
+ <lookup target-form-name="LookupContent"/>
+ </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>
+
+ <form name="FindWebAnalyticsType" type="single"
target="FindWebAnalyticsTypes" default-entity-name="WebAnalyticsType">
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't
there then with all fields empty no query will be done --></field>
+ <field name="webAnalyticsTypeId"
title="${uiLabelMap.CatalogWebAnalyticsTypes}">
+ <drop-down allow-empty="true" current-description="">
+ <entity-options description="${description}"
key-field-name="webAnalyticsTypeId" entity-name="WebAnalyticsType">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="description"
title="${uiLabelMap.CommonDescription}"><text-find/></field>
+ <field name="searchButton" title="${uiLabelMap.CommonFind}"
widget-style="smallSubmit"><submit button-type="button"/></field>
+ </form>
+
+ <form name="ListWebAnalyticsType" type="list" list-name="listIt"
paginate-target="FindWebAnalyticsTypes" default-entity-name="WebAnalyticsType"
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="webAnalyticsTypeCtx"/>
+ <field-map field-name="entityName" value="WebAnalyticsType"/>
+ <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>
+ <field name="webAnalyticsTypeId" widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${webAnalyticsTypeId}"
target="EditWebAnalyticsType">
+ <parameter param-name="webAnalyticsTypeId"/>
+ </hyperlink>
+ </field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"
sort-field="true"><display/></field>
+ </form>
+
+ <form name="EditWebAnalyticsType" type="single"
target="updateWebAnalyticsType" title="" default-map-name="webAnalyticsType"
+ header-row-style="header-row" default-table-style="basic-table">
+ <alt-target use-when="webAnalyticsType==null"
target="createWebAnalyticsType"/>
+ <auto-fields-service service-name="updateWebAnalyticsType"
map-name="webAnalyticsType"/>
+ <field use-when="webAnalyticsType!=null" name="webAnalyticsTypeId"
tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
+ <field
use-when="webAnalyticsType==null&&webAnalyticsTypeId==null"
name="webAnalyticsTypeId">
+ <text size="20" maxlength="20"/>
+ </field>
+ <field
use-when="webAnalyticsType==null&&webAnalyticsTypeId!=null"
name="webAnalyticsTypeId"
tooltip="${uiLabelMap.CommonCannotBeFound}:[${webAnalyticsTypeId}]"><text
size="20" maxlength="20"/></field>
+ <field use-when="webAnalyticsType!=null" name="submitButton"
title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit
button-type="button"/></field>
+ <field use-when="webAnalyticsType==null" name="submitButton"
title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit
button-type="button"/></field>
+ </form>
+</forms>
+
\ No newline at end of file
Propchange:
ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsForms.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsForms.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsForms.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml?rev=897796&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml
(added)
+++ ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml Mon
Jan 11 08:40:47 2010
@@ -0,0 +1,136 @@
+<?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="PageTitleFindWebAnalyticsConfigs"/>
+ <set field="headerItem" value="WebAnalytics"/>
+ <set field="tabButtonItem" value="WebAnalyticsConfigs"/>
+ <set field="tabButtonItem2" value="WebAnalyticsTypes"/>
+ <set field="webAnalyticsConfigCtx" from-field="parameters"/>
+ <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">
+ <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <container>
+ <include-menu
name="WebAnalyticsConfigTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ </container>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindWebAnalyticsConfig"
location="component://product/widget/catalog/WebAnalyticsForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListWebAnalyticsConfig"
location="component://product/widget/catalog/WebAnalyticsForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditWebAnalyticsConfig">
+ <section>
+ <actions>
+ <set field="titleProperty"
value="PageTitleEditWebAnalyticsConfigs"/>
+ <set field="headerItem" value="WebAnalytics"/>
+ <set field="tabButtonItem" value="WebAnalyticsConfigs"/>
+ <set field="tabButtonItem2" value="WebAnalyticsTypes"/>
+ <set field="productStoreId"
from-field="parameters.productStoreId"/>
+ <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">
+ <include-menu name="WebAnalyticsConfigTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <screenlet
title="${uiLabelMap.PageTitleEditWebAnalyticsConfig}">
+ <include-form name="EditWebAnalyticsConfig"
location="component://product/widget/catalog/WebAnalyticsForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="FindWebAnalyticsTypes">
+ <section>
+ <actions>
+ <set field="titleProperty"
value="PageTitleFindWebAnalyticsTypes"/>
+ <set field="headerItem" value="WebAnalytics"/>
+ <set field="tabButtonItem" value="WebAnalyticsTypes"/>
+ <set field="tabButtonItem2" value="FindWebAnalyticsTypes"/>
+ <set field="webAnalyticsTypeCtx" from-field="parameters"/>
+ <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">
+ <decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="menu-bar">
+ <container>
+ <include-menu
name="WebAnalyticsTypeTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ </container>
+ </decorator-section>
+ <decorator-section name="search-options">
+ <include-form name="FindWebAnalyticsType"
location="component://product/widget/catalog/WebAnalyticsForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListWebAnalyticsType"
location="component://product/widget/catalog/WebAnalyticsForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+ <screen name="EditWebAnalyticsType">
+ <section>
+ <actions>
+ <set field="titleProperty"
value="PageTitleEditWebAnalyticsTypes"/>
+ <set field="headerItem" value="WebAnalytics"/>
+ <set field="tabButtonItem" value="WebAnalyticsTypes"/>
+ <set field="tabButtonItem2" value="WebAnalyticsTypes"/>
+ <set field="webAnalyticsTypeId"
from-field="parameters.webAnalyticsTypeId"/>
+ <entity-one entity-name="WebAnalyticsType"
value-field="webAnalyticsType" auto-field-map="true"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="CommonWebAnalyticsDecorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <include-menu name="WebAnalyticsTypeTabBar"
location="component://product/widget/catalog/CatalogMenus.xml"/>
+ <screenlet
title="${uiLabelMap.PageTitleEditWebAnalyticsTypes}">
+ <include-form name="EditWebAnalyticsType"
location="component://product/widget/catalog/WebAnalyticsForms.xml"/>
+ </screenlet>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+
+</screens>
\ No newline at end of file
Propchange:
ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/trunk/applications/product/widget/catalog/WebAnalyticsScreens.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
