Author: gmazza
Date: Sat May 31 12:44:03 2014
New Revision: 1598868
URL: http://svn.apache.org/r1598868
Log:
ROL-1999 Addition of #showAnalyticsTrackingCode() macro to include tracking
keys into HTML header section; addition of this macro to default templates
provided by Roller; update to user's and template guide explaining how this
works.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
roller/trunk/app/src/main/webapp/themes/basic/weblog.vm
roller/trunk/app/src/main/webapp/themes/brushedmetal/weblog.vm
roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm
roller/trunk/app/src/main/webapp/themes/sotto/weblog.vm
roller/trunk/docs/roller-install-guide.odt
roller/trunk/docs/roller-template-guide.odt
roller/trunk/docs/roller-user-guide.odt
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java?rev=1598868&r1=1598867&r2=1598868&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
Sat May 31 12:44:03 2014
@@ -171,8 +171,12 @@ public final class WeblogWrapper {
public Boolean getModerateComments() {
return this.pojo.getModerateComments();
}
-
-
+
+ public String getAnalyticsCode() {
+ return this.pojo.getAnalyticsCode();
+ }
+
+
public Boolean getEmailComments() {
return this.pojo.getEmailComments();
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java?rev=1598868&r1=1598867&r2=1598868&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
Sat May 31 12:44:03 2014
@@ -215,6 +215,7 @@ public class UtilitiesModel implements M
//------------------------------------------------------------ String utils
+ // isEmpty = empty (size = 0) or null
public boolean isEmpty(String str) {
return StringUtils.isEmpty(str);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java?rev=1598868&r1=1598867&r2=1598868&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
Sat May 31 12:44:03 2014
@@ -129,6 +129,10 @@ public class WeblogConfig extends UIActi
Weblog weblog = getActionWeblog();
+ if (getBean().getAnalyticsCode() != null) {
+
getBean().setAnalyticsCode(getBean().getAnalyticsCode().trim());
+ }
+
getBean().copyTo(weblog);
// if blogger category changed then lookup new cat and set it
Modified: roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm?rev=1598868&r1=1598867&r2=1598868&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm Sat May 31
12:44:03 2014
@@ -24,6 +24,7 @@ These are the documented macros in order
#showAutodiscoveryLinks($weblog)
#showTrackbackAutodiscovery($entry)
#showMetaDescription()
+ #showAnalyticsTrackingCode($weblog)
#showWeblogEntriesPager($pager)
#showNextPrevEntriesControl($pager)
@@ -155,6 +156,19 @@ will be created.
#end
#end
+#**
+Adds a tracking code for website analytics (e.g. Google Analytics). Will use
the blog-defined
+tracking code if defined and permitted by the installation, else the
server-defined tracking
+code if defined will be used.
+*#
+#macro(showAnalyticsTrackingCode $weblog)
+ #if ($config.analyticsOverrideAllowed &&
$utils.isNotEmpty($weblog.analyticsCode))
+ $weblog.analyticsCode
+ #elseif ($utils.isNotEmpty($config.defaultAnalyticsTrackingCode)
+ $config.defaultAnalyticsTrackingCode
+ #end
+#end
+
#**
Shows weblog entries pager via default day template
*#
Modified: roller/trunk/app/src/main/webapp/themes/basic/weblog.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/weblog.vm?rev=1598868&r1=1598867&r2=1598868&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/weblog.vm Sat May 31 12:44:03
2014
@@ -4,6 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>$model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
+ #showAnalyticsTrackingCode($model.weblog)
<link rel="stylesheet" type="text/css" media="all"
href="$model.weblog.stylesheet">
#showMetaDescription()
</head>
Modified: roller/trunk/app/src/main/webapp/themes/brushedmetal/weblog.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/brushedmetal/weblog.vm?rev=1598868&r1=1598867&r2=1598868&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/brushedmetal/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/brushedmetal/weblog.vm Sat May 31
12:44:03 2014
@@ -4,6 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>$model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
+ #showAnalyticsTrackingCode($model.weblog)
<link rel="stylesheet" type="text/css" media="all"
href="$model.weblog.stylesheet">
#showMetaDescription()
</head>
Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm?rev=1598868&r1=1598867&r2=1598868&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/weblog.vm Sat May 31
12:44:03 2014
@@ -5,6 +5,7 @@
#includeTemplate($model.weblog "standard_head")
<title>$model.weblog.name: $model.weblog.description</title>
#showAutodiscoveryLinks($model.weblog)
+ #showAnalyticsTrackingCode($model.weblog)
<link rel="stylesheet" type="text/css" href='$url.page("custom.css")' />
#showMetaDescription()
</head>
Modified: roller/trunk/app/src/main/webapp/themes/sotto/weblog.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/sotto/weblog.vm?rev=1598868&r1=1598867&r2=1598868&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/sotto/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/sotto/weblog.vm Sat May 31 12:44:03
2014
@@ -6,6 +6,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>$model.weblog.name</title>
#showAutodiscoveryLinks($model.weblog)
+ #showAnalyticsTrackingCode($model.weblog)
<link rel="stylesheet" type="text/css" media="all"
href="$model.weblog.stylesheet">
#showMetaDescription()
</head>
Modified: roller/trunk/docs/roller-install-guide.odt
URL:
http://svn.apache.org/viewvc/roller/trunk/docs/roller-install-guide.odt?rev=1598868&r1=1598867&r2=1598868&view=diff
==============================================================================
Binary files - no diff available.
Modified: roller/trunk/docs/roller-template-guide.odt
URL:
http://svn.apache.org/viewvc/roller/trunk/docs/roller-template-guide.odt?rev=1598868&r1=1598867&r2=1598868&view=diff
==============================================================================
Binary files - no diff available.
Modified: roller/trunk/docs/roller-user-guide.odt
URL:
http://svn.apache.org/viewvc/roller/trunk/docs/roller-user-guide.odt?rev=1598868&r1=1598867&r2=1598868&view=diff
==============================================================================
Binary files - no diff available.
