PlanetJava
Custom Search

java-ofbiz-scm
[Top] [All Lists]

svn commit: r1206052 - in /ofbiz/trunk: applications/commonext/widget/ a

Subject: svn commit: r1206052 - in /ofbiz/trunk: applications/commonext/widget/ applications/content/data/ applications/product/data/ themes/bizznesstime/includes/ themes/bluelight/includes/ themes/droppingcrumbs/includes/ themes/flatgrey/includes/ themes/tomah...
Date: Fri, 25 Nov 2011 03:27:10 -0000
Author: hansbak
Date: Fri Nov 25 03:27:08 2011
New Revision: 1206052
URL: http://svn.apache.org/viewvc?rev=1206052&view=rev
Log:
also allow analytics on the backend, and move analytics seed data from product 
to content
Modified:
    ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
    ofbiz/trunk/applications/content/data/ContentTypeData.xml
    ofbiz/trunk/applications/product/data/ProductTypeData.xml
    ofbiz/trunk/themes/bizznesstime/includes/header.ftl
    ofbiz/trunk/themes/bluelight/includes/header.ftl
    ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
    ofbiz/trunk/themes/flatgrey/includes/header.ftl
    ofbiz/trunk/themes/tomahawk/includes/header.ftl
Modified: ofbiz/trunk/applications/commonext/widget/CommonScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/widget/CommonScreens.xml?rev=1206052&r1=1206051&r2=1206052&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/commonext/widget/CommonScreens.xml Fri Nov 25 
03:27:08 2011
@@ -49,6 +49,9 @@ under the License.
                 <entity-and list="pageAvail" entity-name="ContentAssoc">
                     <field-map field-name="mapKey" from-field="helpTopic"/>
                 </entity-and>
+                <entity-and list="layoutSettings.WEB_ANALYTICS" 
entity-name="WebAnalyticsConfig">
+                    <field-map field-name="webAnalyticsTypeId" 
value="BACKEND_ANALYTICS"/>
+                </entity-and>
             </actions>
             <widgets>
                 <section>
Modified: ofbiz/trunk/applications/content/data/ContentTypeData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentTypeData.xml?rev=1206052&r1=1206051&r2=1206052&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/ContentTypeData.xml (original)
+++ ofbiz/trunk/applications/content/data/ContentTypeData.xml Fri Nov 25 
03:27:08 2011
@@ -259,4 +259,9 @@ under the License.
     <DataResource dataResourceId="DOCBOOK_HTML_TEMPL" 
dataResourceTypeId="OFBIZ_FILE" 
objectInfo="applications/content/template/docbook/html/docbook.xsl" 
dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help 
template file" mimeTypeId="text/html" isPublic="Y"/>
     <DataResource dataResourceId="DOCBOOK_PDF_TEMPL" 
dataResourceTypeId="OFBIZ_FILE" 
objectInfo="applications/content/template/docbook/fo/docbook.xsl" 
dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help 
template file" mimeTypeId="text/html" isPublic="Y"/>
+    <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"/>
+    <WebAnalyticsType webAnalyticsTypeId="BACKEND_ANALYTICS" 
parentTypeId="WEB_ANALYTICS" hasTable="N" description="Backend Analytics"/>
+
 </entity-engine-xml>
Modified: ofbiz/trunk/applications/product/data/ProductTypeData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductTypeData.xml?rev=1206052&r1=1206051&r2=1206052&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductTypeData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductTypeData.xml Fri Nov 25 
03:27:08 2011
@@ -602,10 +602,6 @@ under the License.
     <!-- product subscription type -->
     <SubscriptionType description="Product" hasTable="N" parentTypeId="" 
subscriptionTypeId="PRODUCT_SUBSCR"/>
-    <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"/>
-    
     <!-- Image Management -->
     <RoleType roleTypeId="IMAGEAPPROVER" hasTable="N" description="Image 
Approver"/>
Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=1206052&r1=1206051&r2=1206052&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Fri Nov 25 03:27:08 2011
@@ -99,6 +99,13 @@ under the License.
             <script 
src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" 
type="text/javascript"></script>
         </#list>
     </#if>
+    <#if layoutSettings.WEB_ANALYTICS?has_content>
+      <script language="JavaScript" type="text/javascript">
+        <#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
+          
${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode?if_exists)}
+        </#list>
+      </script>
+    </#if>
 </head>
 <#if layoutSettings.headerImageLinkUrl?exists>
   <#assign logoLinkURL = "${layoutSettings.headerImageLinkUrl}">
Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=1206052&r1=1206051&r2=1206052&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/header.ftl Fri Nov 25 03:27:08 2011
@@ -80,6 +80,13 @@ under the License.
             ${extraHead}
         </#list>
     </#if>
+    <#if layoutSettings.WEB_ANALYTICS?has_content>
+      <script language="JavaScript" type="text/javascript">
+        <#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
+          
${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode?if_exists)}
+        </#list>
+      </script>
+    </#if>
 </head>
 <#if layoutSettings.headerImageLinkUrl?exists>
   <#assign logoLinkURL = "${layoutSettings.headerImageLinkUrl}">
Modified: ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl?rev=1206052&r1=1206051&r2=1206052&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl Fri Nov 25 03:27:08 
2011
@@ -80,6 +80,13 @@ under the License.
             ${extraHead}
         </#list>
     </#if>
+    <#if layoutSettings.WEB_ANALYTICS?has_content>
+      <script language="JavaScript" type="text/javascript">
+        <#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
+          
${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode?if_exists)}
+        </#list>
+      </script>
+    </#if>
 </head>
 <#if layoutSettings.headerImageLinkUrl?exists>
   <#assign logoLinkURL = "${layoutSettings.headerImageLinkUrl}">
Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=1206052&r1=1206051&r2=1206052&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Fri Nov 25 03:27:08 2011
@@ -77,6 +77,13 @@ under the License.
         </#list>
     </#if>
     <#if lastParameters?exists><#assign parametersURL = "&" + 
lastParameters></#if>
+    <#if layoutSettings.WEB_ANALYTICS?has_content>
+      <script language="JavaScript" type="text/javascript">
+        <#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
+          
${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode?if_exists)}
+        </#list>
+      </script>
+    </#if>
 </head>
 <#if layoutSettings.headerImageLinkUrl?exists>
   <#assign logoLinkURL = "${layoutSettings.headerImageLinkUrl}">
Modified: ofbiz/trunk/themes/tomahawk/includes/header.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/header.ftl?rev=1206052&r1=1206051&r2=1206052&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/header.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/header.ftl Fri Nov 25 03:27:08 2011
@@ -80,6 +80,13 @@ under the License.
             ${extraHead}
         </#list>
     </#if>
+    <#if layoutSettings.WEB_ANALYTICS?has_content>
+      <script language="JavaScript" type="text/javascript">
+        <#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig>
+          
${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode?if_exists)}
+        </#list>
+      </script>
+    </#if>
 </head>
 <#if layoutSettings.headerImageLinkUrl?exists>
   <#assign logoLinkURL = "${layoutSettings.headerImageLinkUrl}">
msgmiddle
<Prev in Thread] Current Thread [Next in Thread>
  • svn commit: r1206052 - in /ofbiz/trunk: applications/commonext/widget/ applications/content/data/ applications/product/data/ themes/bizznesstime/includes/ themes/bluelight/includes/ themes/droppingcrumbs/includes/ themes/flatgrey/includes/ themes/tomah...,
Current Sitemap | © 2012 planetjava | Contact | Privacy Policy