Merge branch 'master' of github.com:diaspora/diaspora

app/views/comments/_new_comment.html.haml

@@ -4,4 +4,4 @@
     = f.text_area :text, :rows => 1, :id => "comment_text_on_#{post.id}", :class => "comment_box"
   = f.hidden_field :post_id, :value => post.id
   %p{:style => "text-align:right;"}
-    = f.submit "Comment", :class => "comment_submit"
+    = f.submit "Comment", :class => "comment_submit button"

app/views/layouts/application.html.haml

@@ -13,13 +13,14 @@
     = stylesheet_link_tag "fileuploader" 
 
     /= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
-    = javascript_include_tag 'jquery-1.4.2.min', 'rails', 'google'
+    = javascript_include_tag 'jquery-1.4.2.min', 'rails'
     = javascript_include_tag 'jquery.infieldlabel', 'jquery.cycle/jquery.cycle.min.js'
     
     = javascript_include_tag 'fancybox/jquery.fancybox-1.3.1.pack'
     = javascript_include_tag 'fileuploader'
 
-    = javascript_include_tag 'view', 'image_picker', 'aspect_nav', 'stream'
+    = javascript_include_tag 'view', 'image_picker', 'stream'
+
     = render 'js/websocket_js'
     
     = csrf_meta_tag

public/javascripts/aspect_nav.js

-$(document).ready( function() {
-
-  var vars = [], hash;
-  var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-  for(var i = 0; i < hashes.length; i++)
-  {
-      hash = hashes[i].split('=');
-      vars.push(hash[0]);
-      vars[hash[0]] = hash[1];
-  }
-
-  $("."+vars['g']).addClass('selected');
-
-});

public/javascripts/google.js

-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', 'UA-17207587-1']);
-_gaq.push(['_setDomainName', '.joindiaspora.com']);
-_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);
-})();
\ No newline at end of file