diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 1b29378c9978c18913e47180dd90f54eca1117a7..79545b5ccdf5a9a68805e5e2c6cbc410019114ed 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -4,7 +4,7 @@
class SessionsController < Devise::SessionsController
- after_filter :enqueue_update, :only => :create
+ #after_filter :enqueue_update, :only => :create
protected
def enqueue_update
diff --git a/app/views/comments/_comments.haml b/app/views/comments/_comments.haml
index 304550afccb81dcd0a69e2d7e9be74e0bad94557..85254bb518bf08afb1b0c37b98d530c26da118af 100644
--- a/app/views/comments/_comments.haml
+++ b/app/views/comments/_comments.haml
@@ -5,7 +5,7 @@
- unless comments_expanded
%ul.show_comments{:class => ("hidden" if post.comments.size <= 3)}
%li
- %b= comment_toggle( post)
+ = comment_toggle( post)
%ul.comments{:id => post.id, :class => ('loaded' if post.comments.size <= 3)}
-if post.comments.size > 3 && !comments_expanded
@@ -14,5 +14,5 @@
= render :partial => 'comments/comment', :collection => post.comments, :locals => {:post => post}
- unless @commenting_disabled
- .new_comment_form_wrapper{:class => ( 'hidden' if post.comments.size == 0)}
+ .new_comment_form_wrapper{:class => ('hidden' if post.comments.size == 0)}
= new_comment_form(post.id, current_user)
diff --git a/app/views/likes/_likes_container.haml b/app/views/likes/_likes_container.haml
index bb43ed49d75810e23f5f68d59943a7bf1798fda0..0a8ea4de088e4385a39049fc369124c10b8cfe46 100644
--- a/app/views/likes/_likes_container.haml
+++ b/app/views/likes/_likes_container.haml
@@ -5,7 +5,10 @@
.likes_container
- if likes_count > 0
= image_tag('icons/heart.svg')
- = link_to t('likes.likes.people_like_this', :count => likes_count), post_likes_path(target_id), :class => "expand_likes"
+ - if defined?(likes_index_link) && likes_index_link
+ = link_to t('likes.likes.people_like_this', :count => likes_count), post_likes_path(target_id), :class => "expand_likes"
+ - else
+ = t('likes.likes.people_like_this', :count => likes_count)
%span.hidden.likes_list
/= render 'likes/likes', :likes => likes
diff --git a/app/views/post_visibilities/update.js.erb b/app/views/post_visibilities/update.js.erb
index 010c13a6ba4bc14c45df3a8b0de39f1e6f4f8656..b7c4a701a6332745909e46928f73540ecf257c82 100644
--- a/app/views/post_visibilities/update.js.erb
+++ b/app/views/post_visibilities/update.js.erb
@@ -1,3 +1,3 @@
-var target = $(".stream_element[data-guid=<%= escape_javascript(@post.id.to_s) %>]")
+var target = $("#<%= @post.guid %>")
target.find(".sm_body").toggleClass("hidden");
target.find(".undo_text").toggleClass("hidden");
diff --git a/app/views/posts/destroy.js.erb b/app/views/posts/destroy.js.erb
index e873e96c7eb87e2cbbda60dc027aef1d08d48b0d..5a0c3dd8320e7cd5d111721a26c7fd7cbb415879 100644
--- a/app/views/posts/destroy.js.erb
+++ b/app/views/posts/destroy.js.erb
@@ -1,2 +1,2 @@
-var target = $(".stream_element[data-guid=<%= escape_javascript(@post.id.to_s) %>]")
+var target = $("#<%= @post.guid %>")
target.hide('blind', { direction: 'vertical' }, 300, function(){ target.remove() });
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index 415a96811f7ed6be4ed2af7a17898743503620ef..0c1d4769a79efc5ceaf98e5b34cfa051baceb3cb 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -55,7 +55,7 @@
·
= link_to t('comments.new_comment.comment'), '#', :class => 'focus_comment_textarea'
- .likes
- = render "likes/likes_container", :target_id => post.id, :likes_count => post.likes_count, :current_user => current_user
+ .likes.on_post
+ = render "likes/likes_container", :target_id => post.id, :likes_count => post.likes_count, :current_user => current_user, :likes_index_link => true
= render "comments/comments", :post => post, :current_user => current_user, :commenting_disabled => (defined?(@commenting_disabled) && @commenting_disabled)
diff --git a/db/migrate/20110707234802_likes_on_comments.rb b/db/migrate/20110707234802_likes_on_comments.rb
index 9a65d66c40e8c87c733a559d4638657e025589bb..7b3e80e751e71590f5abbdc65a26e49e131ba6c4 100644
--- a/db/migrate/20110707234802_likes_on_comments.rb
+++ b/db/migrate/20110707234802_likes_on_comments.rb
@@ -3,7 +3,7 @@ class LikesOnComments < ActiveRecord::Migration
def self.up
remove_foreign_key :likes, :posts
- add_column :likes, :target_type, :string, :null => false
+ add_column :likes, :target_type, :string, :limit => 60, :null => false
rename_column :likes, :post_id, :target_id
add_column :comments, :likes_count, :integer, :default => 0, :null => false
diff --git a/db/schema.rb b/db/schema.rb
index 4c3cbf3b434b3f3fd04ad002c0f68d061f953b55..da2eb61fc25f4a53c388eefef8f10e0fafab5483 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -110,7 +110,7 @@ ActiveRecord::Schema.define(:version => 20110707234802) do
add_index "invitations", ["sender_id"], :name => "index_invitations_on_sender_id"
create_table "likes", :force => true do |t|
- t.boolean "positive", :default => true
+ t.boolean "positive", :default => true
t.integer "target_id"
t.integer "author_id"
t.string "guid"
@@ -118,7 +118,7 @@ ActiveRecord::Schema.define(:version => 20110707234802) do
t.text "parent_author_signature"
t.datetime "created_at"
t.datetime "updated_at"
- t.string "target_type", :null => false
+ t.string "target_type", :limit => 60, :null => false
end
add_index "likes", ["author_id"], :name => "likes_author_id_fk"
diff --git a/public/javascripts/content-updater.js b/public/javascripts/content-updater.js
index 028670c65b8ee0c225bd67e2c2cdb5090fe9bb82..a3c0c7dd05b6ad66a85445df0359b12423cd1245 100644
--- a/public/javascripts/content-updater.js
+++ b/public/javascripts/content-updater.js
@@ -6,7 +6,7 @@
var ContentUpdater = {
addPostToStream: function(html) {
var streamElement = $(html);
- var postGUID = streamElement.id;
+ var postGUID = $(streamElement).attr('id');
if($("#"+postGUID).length === 0) {
if($("#no_posts").length) {
@@ -31,5 +31,5 @@ var ContentUpdater = {
.html(html)
.fadeIn("fast");
}
-
+
};
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 0275ce0ad0a981f833f6d75c2e0753a968fe4a26..56b25dad5c7327376fba5609d6b6fe714c1169f7 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -667,6 +667,7 @@ form.new_comment
:display inline-block
+.comment
.likes,
.likes_container
:display inline
@@ -2221,6 +2222,11 @@ ul.show_comments
:border
:top 1px dotted #aaa
+ul.show_comments,
+.likes_container
+ a
+ :color #999
+
.likes_container
:margin
:bottom -4px
@@ -2228,10 +2234,6 @@ ul.show_comments
ul.show_comments,
.likes_container
- a
- :font
- :weight bold
-
img
:position relative
:top 2px