diff --git a/app/helpers/stream_element_helper.rb b/app/helpers/stream_element_helper.rb index 5c4ee610e..ee1eecac7 100644 --- a/app/helpers/stream_element_helper.rb +++ b/app/helpers/stream_element_helper.rb @@ -1,8 +1,8 @@ module StreamElementHelper def block_user_control(author) if user_signed_in? && current_user.person.id != author.id - link_to image_tag('deletelabel.png'), blocks_path(:block => {:person_id => author.id}), - :class => 'block_user delete', + link_to image_tag('/images/icons/ignoreuser.svg', :height => 14), blocks_path(:block => {:person_id => author.id}), + :class => 'block_user control_icon', :confirm => t('.ignore_user_description'), :title => t('.ignore_user', :name => author.first_name), :method => :post @@ -11,9 +11,9 @@ module StreamElementHelper def delete_or_hide_button(post) if user_signed_in? && current_user.owns?(post) - link_to image_tag('deletelabel.png'), post_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete remove_post", :title => t('delete') + link_to image_tag('deletelabel.png'), post_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete control_icon remove_post", :title => t('delete') else - link_to image_tag('deletelabel.png'), share_visibility_path(:id => "42", :post_id => post.id), :method => :put, :remote => true, :class => "delete remove_post vis_hide", :title => t('.hide_and_mute') + link_to image_tag('deletelabel.png'), share_visibility_path(:id => "42", :post_id => post.id), :method => :put, :remote => true, :class => "delete remove_post control_icon vis_hide", :title => t('.hide_and_mute') end end end diff --git a/db/schema.rb b/db/schema.rb index 63a1b222d..c9d8ade95 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -54,17 +54,17 @@ ActiveRecord::Schema.define(:version => 20111101202137) do end create_table "comments", :force => true do |t| - t.text "text", :null => false - t.integer "commentable_id", :null => false - t.integer "author_id", :null => false - t.string "guid", :null => false + t.text "text", :null => false + t.integer "commentable_id", :null => false + t.integer "author_id", :null => false + t.string "guid", :null => false t.text "author_signature" t.text "parent_author_signature" t.text "youtube_titles" t.datetime "created_at" t.datetime "updated_at" - t.integer "likes_count", :default => 0, :null => false - t.string "commentable_type", :default => "Post", :null => false + t.integer "likes_count", :default => 0, :null => false + t.string "commentable_type", :limit => 60, :default => "Post", :null => false end add_index "comments", ["author_id"], :name => "index_comments_on_person_id" @@ -371,12 +371,12 @@ ActiveRecord::Schema.define(:version => 20111101202137) do add_index "services", ["user_id"], :name => "index_services_on_user_id" create_table "share_visibilities", :force => true do |t| - t.integer "shareable_id", :null => false + t.integer "shareable_id", :null => false t.datetime "created_at" t.datetime "updated_at" - t.boolean "hidden", :default => false, :null => false - t.integer "contact_id", :null => false - t.string "shareable_type", :default => "Post", :null => false + t.boolean "hidden", :default => false, :null => false + t.integer "contact_id", :null => false + t.string "shareable_type", :limit => 60, :default => "Post", :null => false end add_index "share_visibilities", ["contact_id"], :name => "index_post_visibilities_on_contact_id" diff --git a/public/images/icons/ignoreuser.svg b/public/images/icons/ignoreuser.svg new file mode 100644 index 000000000..33d9c2a3b --- /dev/null +++ b/public/images/icons/ignoreuser.svg @@ -0,0 +1,99 @@ + + + + + + image/svg+xml + + ignore + + + + + + + + ignore + + + + + diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index c459533b9..021dd7cb0 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -479,13 +479,19 @@ ul.as-selections :margin :top -1px - .delete + .control_icon @include opacity(0.3) :padding 5px &:hover @include opacity(1) + .delete + img + :padding + :top 3px + :bottom 3px + .right :position absolute :right 12px