You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/06/18 21:06:59 UTC
[maven-doxia-sitetools] branch master updated (f55cfb1 -> 78aa397)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git.
from f55cfb1 [DOXIASITETOOLS-208] Remove obsolete meta tags from default site template
new ae4e9dc [DOXIASITETOOLS-209] Align Google Analytics snippet with Fluido Skin
new 78aa397 [DOXIASITETOOLS-210] Drop redundant "All rights reserved"
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../siterenderer/resources/default-site-macros.vm | 21 +++++++++------------
.../doxia/siterenderer/resources/default-site.vm | 2 +-
2 files changed, 10 insertions(+), 13 deletions(-)
[maven-doxia-sitetools] 01/02: [DOXIASITETOOLS-209] Align Google
Analytics snippet with Fluido Skin
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit ae4e9dc21a9015316da622b0e36ed6226afb8832
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jun 18 22:50:55 2019 +0200
[DOXIASITETOOLS-209] Align Google Analytics snippet with Fluido Skin
---
.../siterenderer/resources/default-site-macros.vm | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm
index 056384e..911047f 100644
--- a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm
+++ b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm
@@ -475,18 +475,15 @@ $indent </ul>##
#macro ( googleAnalytics $accountId )
#**##if( $accountId && $accountId != "" )
<!-- Google Analytics -->
- <script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', '$accountId']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
-
+ <script>
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+ })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+ ga('create', '$accountId', 'auto');
+ ga('send', 'pageview');
+ ga('set', 'anonymizeIp', true);
+ ga('set', 'forceSSL', true);
</script>
#**##end
#end
[maven-doxia-sitetools] 02/02: [DOXIASITETOOLS-210] Drop redundant
"All rights reserved"
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit 78aa397c131677071a55d8ef63ec01deb8567b15
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jun 18 22:56:18 2019 +0200
[DOXIASITETOOLS-210] Drop redundant "All rights reserved"
---
.../org/apache/maven/doxia/siterenderer/resources/default-site.vm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
index 8ec00d9..4b74796 100644
--- a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
+++ b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm
@@ -84,7 +84,7 @@
#* *##if( $decoration.body.footer )
$render.eval( $decoration.body.footer )
#* *##else
- Copyright ©#copyright()All rights reserved.#publishDate( "bottom" $decoration.publishDate $decoration.version )
+ Copyright ©#copyright().#publishDate( "bottom" $decoration.publishDate $decoration.version )
#* *##end
</div>
<div class="clear">