svn commit: r1689466 - in /accumulo/site/trunk: content/downloads/index.mdtext templates/skeleton.html

[ct...@apache.org]

Author: ctubbsii
Date: Mon Jul  6 17:41:25 2015
New Revision: 1689466

URL: http://svn.apache.org/r1689466
Log:
ACCUMULO-3932 Fix broken download links

* Do same check in downloads page for google-analytics script being loaded
* Indent to make it slightly more readable


Modified:
    accumulo/site/trunk/content/downloads/index.mdtext
    accumulo/site/trunk/templates/skeleton.html

Modified: accumulo/site/trunk/content/downloads/index.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/downloads/index.mdtext?rev=1689466&r1=1689465&r2=1689466&view=diff
==============================================================================
--- accumulo/site/trunk/content/downloads/index.mdtext (original)
+++ accumulo/site/trunk/content/downloads/index.mdtext Mon Jul  6 17:41:25 2015
@@ -1,7 +1,5 @@
 Title: Apache Accumulo Downloads
-Nav: nav_downloads
-Notice:    Licensed to the Apache Software Foundation (ASF) under one
-           or more contributor license agreements.  See the NOTICE file
+Nav: nav_downloads Notice:    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
@@ -31,10 +29,14 @@ var gaCallback = function(event) {
   // $(this) != this
   var url = "http://accumulo.apache.org" + $(this).attr("id")
   if (newWin) {
-    ga('send', 'event', 'outbound', 'click', url, {'nonInteraction': 1});
+    if (ga.hasOwnProperty('loaded') && ga.loaded === true) {
+      ga('send', 'event', 'outbound', 'click', url, {'nonInteraction': 1});
+    }
     return true;
   } else {
-    ga('send', 'event', 'outbound', 'click', url, {'hitCallback': 
+    if (ga.hasOwnProperty('loaded') && ga.loaded === true) {
+      ga('send', 'event', 'outbound', 'click', url, {'hitCallback': 
+    }
     function () {window.location.href = hrefUrl;}}, {'nonInteraction': 1});
     return false;
   }

Modified: accumulo/site/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/templates/skeleton.html?rev=1689466&r1=1689465&r2=1689466&view=diff
==============================================================================
--- accumulo/site/trunk/templates/skeleton.html (original)
+++ accumulo/site/trunk/templates/skeleton.html Mon Jul  6 17:41:25 2015
@@ -43,8 +43,8 @@
   })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
   if (ga.hasOwnProperty('loaded') && ga.loaded === true) {
-  ga('create', 'UA-50934829-1', 'apache.org');
-  ga('send', 'pageview');
+    ga('create', 'UA-50934829-1', 'apache.org');
+    ga('send', 'pageview');
   }
 
 </script>