From 6aeaea1b7dd01972e36f5f5c03f3fb71b1756797 Mon Sep 17 00:00:00 2001
From: Daniel Vincent Grippi <Dan@SPEEDRACER.local>
Date: Mon, 13 Sep 2010 11:42:41 -0700
Subject: [PATCH] removed some things. also, comment buttons are now css-ified
when they come through the socket
---
app/views/comments/_new_comment.html.haml | 2 +-
app/views/layouts/application.html.haml | 5 +++--
public/javascripts/aspect_nav.js | 14 --------------
public/javascripts/google.js | 10 ----------
4 files changed, 4 insertions(+), 27 deletions(-)
delete mode 100644 public/javascripts/aspect_nav.js
delete mode 100644 public/javascripts/google.js
diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
index bd117f7a00..494139356c 100644
--- a/app/views/comments/_new_comment.html.haml
+++ b/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"
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 5fe36a67a0..bb508be569 100644
--- a/app/views/layouts/application.html.haml
+++ b/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
diff --git a/public/javascripts/aspect_nav.js b/public/javascripts/aspect_nav.js
deleted file mode 100644
index 5f5347c31e..0000000000
--- a/public/javascripts/aspect_nav.js
+++ /dev/null
@@ -1,14 +0,0 @@
-$(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');
-
-});
diff --git a/public/javascripts/google.js b/public/javascripts/google.js
deleted file mode 100644
index b544a80752..0000000000
--- a/public/javascripts/google.js
+++ /dev/null
@@ -1,10 +0,0 @@
-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
--
GitLab