From 99d51b72e8cadd3f0f184ac70504b4a636c222e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Sch=C3=B6lling?= Date: Mon, 7 Nov 2011 00:15:41 +0100 Subject: [PATCH 1/2] Modified "Ignore user" icon --- app/helpers/stream_element_helper.rb | 8 +- db/schema.rb | 20 ++--- public/images/icons/ignoreuser.svg | 99 ++++++++++++++++++++++++ public/stylesheets/sass/application.sass | 8 +- 4 files changed, 120 insertions(+), 15 deletions(-) create mode 100644 public/images/icons/ignoreuser.svg 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 From 3e9efad9d6def9606250d26c13efb6a501a9553a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Sch=C3=B6lling?= Date: Mon, 7 Nov 2011 20:42:59 +0100 Subject: [PATCH 2/2] Fixed icon path of 'Ignore User' icon and converted to .png --- app/helpers/stream_element_helper.rb | 2 +- db/schema.rb | 20 +++++++++--------- .../{images/icons => graphics}/ignoreuser.svg | 5 ++++- public/images/icons/ignoreuser.png | Bin 0 -> 463 bytes 4 files changed, 15 insertions(+), 12 deletions(-) rename public/{images/icons => graphics}/ignoreuser.svg (93%) create mode 100644 public/images/icons/ignoreuser.png diff --git a/app/helpers/stream_element_helper.rb b/app/helpers/stream_element_helper.rb index ee1eecac7..f79c5cacb 100644 --- a/app/helpers/stream_element_helper.rb +++ b/app/helpers/stream_element_helper.rb @@ -1,7 +1,7 @@ module StreamElementHelper def block_user_control(author) if user_signed_in? && current_user.person.id != author.id - link_to image_tag('/images/icons/ignoreuser.svg', :height => 14), blocks_path(:block => {:person_id => author.id}), + link_to image_tag('icons/ignoreuser.png'), 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), diff --git a/db/schema.rb b/db/schema.rb index c9d8ade95..63a1b222d 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", :limit => 60, :default => "Post", :null => false + t.integer "likes_count", :default => 0, :null => false + t.string "commentable_type", :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", :limit => 60, :default => "Post", :null => false + t.boolean "hidden", :default => false, :null => false + t.integer "contact_id", :null => false + t.string "shareable_type", :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/graphics/ignoreuser.svg similarity index 93% rename from public/images/icons/ignoreuser.svg rename to public/graphics/ignoreuser.svg index 33d9c2a3b..ab652155c 100644 --- a/public/images/icons/ignoreuser.svg +++ b/public/graphics/ignoreuser.svg @@ -12,7 +12,10 @@ id="svg3148" version="1.1" inkscape:version="0.48.2 r9819" - sodipodi:docname="ignoreuser.svg"> + sodipodi:docname="ignoreuser.svg" + inkscape:export-filename="/home/manuel/Projekte/diaspora_manuels/public/images/icons/ignoreuser.png" + inkscape:export-xdpi="4.5500002" + inkscape:export-ydpi="4.5500002"> diff --git a/public/images/icons/ignoreuser.png b/public/images/icons/ignoreuser.png new file mode 100644 index 0000000000000000000000000000000000000000..c12f90842337edd0c8410e4ea4054d3a1532b541 GIT binary patch literal 463 zcmeAS@N?(olHy`uVBq!ia0vp@K+MO%1|+}KPrC%9Sc;uILpXq-h9ji|$mcBZh%5%u zn?aay=jARIAVadmHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXpducSqL9pz zoK%L)^t}9{RMz`n+ZY%aO*~y3Lo_D#UbOW-93XP+W4%{LBilh&r-jj(vv|sMr!_2E zY++TRS;sUzY4eeV(cFp`7Vd85;CuDp&7(dOsjuGbdCz;LdXMpLV86p8SimpS z!O{KGHsSR5zlD3_>X}uhF5jxr_WNzw@7+;rmtB;(an?!8;7e_M&TYR70yiSMlPZ>J zcwKo}vLr@tKl9o%-;zqWVxAW5oSwJcx?JYD;EDCoE^-wN`zBR}gieiHuYNSikm*k7 zi=xDArjBKqLM)9lmRYiG3zpp|Tz^Z5$>n+}=ivaZ)#c_g20t{WdL8%rbf^AQ>0Ra1o6glU@MhW@bM1R{1Q@Oip00i_>zopr0LhiP AIsgCw literal 0 HcmV?d00001