google analytics configuration moved to application.conf

matthiasn · matthiasn · commit f23ff20638d1 · 2013-10-13T15:47:40.000+02:00
diff --git a/app/controllers/BirdWatch.scala b/app/controllers/BirdWatch.scala
@@ -25,7 +25,9 @@ object BirdWatch extends Controller {
   val queryDefaults = "&default_field:text$default_operator:AND&sort=id:desc"
 
   /** Controller action serving single page application */
-  def index = Action { Ok(views.html.index()) }
+  def index = Action {
+    Ok(views.html.index(Conf.getOrEmpty("ga.hostname"), Conf.getOrEmpty("ga.domain"), Conf.getOrEmpty("ga.id")))
+  }
 
   /** Controller Action serving Tweets as JSON going backwards in time. Query passed in as JSON */
   def search =  Action.async(parse.json) {
diff --git a/app/views/index.scala.html b/app/views/index.scala.html
@@ -1,3 +1,4 @@
+@(hostname: String, domain: String, id: String)
 <!DOCTYPE html>
 
 <html lang="en">
@@ -138,14 +139,14 @@ <h6>Word Frequency</h6>
 
         <!-- Scripts placed at the end of the document so the pages load faster -->
 
-        <script src="/assets/javascripts/vendor/jquery-1.9.1.js"></script>
+        <script src="/assets/javascripts/vendor/jquery-1.10.2.min.js"></script>
         <script src="/assets/javascripts/vendor/angular.min.js"></script>
-        <script src="/assets/javascripts/vendor/d3.js"></script>
+        <script src="/assets/javascripts/vendor/d3.v3.min.js"></script>
 
         <script src="/assets/javascripts/vendor/d3.layout.cloud.js"></script>
         <script src="/assets/javascripts/vendor/moment.min.js"></script>
         <script src="/assets/javascripts/vendor/crossfilter.v1.min.js"></script>
-        <script src="/assets/javascripts/vendor/underscore.js"></script>
+        <script src="/assets/javascripts/vendor/underscore.min.js"></script>
         <script src="/assets/javascripts/vendor/rickshaw.min.js"></script>
 
         <script src="/assets/javascripts/ui-bootstrap-custom.js"></script>
@@ -164,12 +165,12 @@ <h6>Word Frequency</h6>
         
         <!-- Analytics, Todo: replace or remove in your own project. -->
         <script>
-            if ( location.hostname === 'birdwatch.matthiasnehlsen.com' ) {
+            if (location.hostname === '@hostname'){
                 (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', 'UA-40261983-2', 'matthiasnehlsen.com');
+                ga('create', '@id', '@domain');
                 ga('send', 'pageview');
             }
         </script>
diff --git a/conf/application.conf b/conf/application.conf
@@ -29,5 +29,7 @@ application.topics="1Pr0grammer,akka,angularjs,bigdata,cassandra,clojure,couchba
 
 application.instanceID="birdwatch1"
 
-
-
+# google analytics configuration
+ga.hostname="birdwatch.matthiasnehlsen.com"
+ga.domain="matthiasnehlsen.com"
+ga.id="UA-40261983-2"
