add mappam... also stuff in user controller that must have been done by TomH?

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 9972ca3ee6c203dd0d6ea2ac0ca348aef82c611e..3f6e4e3b7e269dc0c573254f65cea3cd3acce867 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -3,7 +3,7 @@ class UserController < ApplicationController
 
   before_filter :authorize, :only => [:preferences, :api_details, :api_gpx_files]
   before_filter :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend]
-  before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend]
+  before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :api_details]
 
   def save
     @title = 'create account'

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 15683daf3231530f9896deabf0bb1a52b0901868..1e2fa3ad10f85415e600a834ced56ce29d34de3b 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -20,6 +20,12 @@
 <script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
 <%= javascript_include_tag 'map.js' %>
 
+    <% unless @user %>
+    <script src="http://www.mappam.com/javascripts/mappam.js" type="text/javascript"></script>
+
+    <% end %>
+
+
 <script type="text/javascript">
   <!--
   var ie6 = ! ( window.addEventListener || window.XMLHttpRequest );
@@ -42,6 +48,15 @@
     map.events.register("moveend", map, updateLocation);
     updateLocation();
 
+    <% unless @user %>
+     if( window.location.host.match( /^www/ ) ) { 
+        mappam.register( map, '10011756636067178496', '1');
+      } else {
+        mappam.register( map, '6738410720121976832', '1');
+      }
+
+    <% end %>
+
     document.getElementById('map_OpenLayers_ViewPort').style.position = 'absolute';
     if ( ie6 ) {
       handleResize();