From 045c8f1aacbfe0a31bc7523fdfd37f70fb0168ce Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Wed, 17 Nov 2010 13:49:12 -0800
Subject: [PATCH] updated magent, now using my fork untill bugfix gets pulled

---
 Gemfile                                 |  2 +-
 Gemfile.lock                            | 18 +++++++++---------
 app/views/layouts/application.html.haml | 20 +++++++++++---------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Gemfile b/Gemfile
index ba1f612ba..b98554cae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,7 @@ gem 'thin'
 
 #Websocket
 gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket'
-gem 'magent', :git => 'git://github.com/dcu/magent.git'
+gem 'magent', :git => 'git://github.com/maxwell/magent.git'
 
 #File uploading
 gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
diff --git a/Gemfile.lock b/Gemfile.lock
index 8aaf7f55b..b64c58475 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,15 +13,6 @@ GIT
     devise-mongo_mapper (0.0.1)
       devise (~> 1.1.0)
 
-GIT
-  remote: git://github.com/dcu/magent.git
-  revision: 90ee5db241abd2e2b7d7de5c80f0d7c5b4b8db2d
-  specs:
-    magent (0.5.1)
-      em-websocket
-      mongo
-      uuidtools
-
 GIT
   remote: git://github.com/iain/http_accept_language.git
   revision: 0b78aa7849fc90cf9e12586af162fa4c408a795d
@@ -55,6 +46,15 @@ GIT
       activesupport (~> 3.0.0)
       plucky (~> 0.3.6)
 
+GIT
+  remote: git://github.com/maxwell/magent.git
+  revision: af5ad4b58e27fc0ca49bea8ab11ec3f746e92f33
+  specs:
+    magent (0.5.1)
+      em-websocket
+      mongo
+      uuidtools
+
 GIT
   remote: git://github.com/rsofaer/carrierwave.git
   revision: c3dfbdda2fa227af91fe383bb126f59b991a318f
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index bb4398607..38b3a25a9 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -36,16 +36,18 @@
 
     = csrf_meta_tag
     = yield(:head)
-    :javascript
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'UA-17207587-5']);
-      _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);
-      })();
+    -if true#APP_CONFIG[:google_a_site]
+      :javascript
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', '#{APP_CONFIG[:google_a_site]}']);
+        _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);
+        })();
 
   %body
     - flash.each do |name, msg|