Fixed icon path of 'Ignore User' icon and converted to .png
This commit is contained in:
parent
99d51b72e8
commit
3e9efad9d6
4 changed files with 15 additions and 12 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
module StreamElementHelper
|
module StreamElementHelper
|
||||||
def block_user_control(author)
|
def block_user_control(author)
|
||||||
if user_signed_in? && current_user.person.id != author.id
|
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',
|
:class => 'block_user control_icon',
|
||||||
:confirm => t('.ignore_user_description'),
|
:confirm => t('.ignore_user_description'),
|
||||||
:title => t('.ignore_user', :name => author.first_name),
|
:title => t('.ignore_user', :name => author.first_name),
|
||||||
|
|
|
||||||
20
db/schema.rb
20
db/schema.rb
|
|
@ -54,17 +54,17 @@ ActiveRecord::Schema.define(:version => 20111101202137) do
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "comments", :force => true do |t|
|
create_table "comments", :force => true do |t|
|
||||||
t.text "text", :null => false
|
t.text "text", :null => false
|
||||||
t.integer "commentable_id", :null => false
|
t.integer "commentable_id", :null => false
|
||||||
t.integer "author_id", :null => false
|
t.integer "author_id", :null => false
|
||||||
t.string "guid", :null => false
|
t.string "guid", :null => false
|
||||||
t.text "author_signature"
|
t.text "author_signature"
|
||||||
t.text "parent_author_signature"
|
t.text "parent_author_signature"
|
||||||
t.text "youtube_titles"
|
t.text "youtube_titles"
|
||||||
t.datetime "created_at"
|
t.datetime "created_at"
|
||||||
t.datetime "updated_at"
|
t.datetime "updated_at"
|
||||||
t.integer "likes_count", :default => 0, :null => false
|
t.integer "likes_count", :default => 0, :null => false
|
||||||
t.string "commentable_type", :limit => 60, :default => "Post", :null => false
|
t.string "commentable_type", :default => "Post", :null => false
|
||||||
end
|
end
|
||||||
|
|
||||||
add_index "comments", ["author_id"], :name => "index_comments_on_person_id"
|
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"
|
add_index "services", ["user_id"], :name => "index_services_on_user_id"
|
||||||
|
|
||||||
create_table "share_visibilities", :force => true do |t|
|
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 "created_at"
|
||||||
t.datetime "updated_at"
|
t.datetime "updated_at"
|
||||||
t.boolean "hidden", :default => false, :null => false
|
t.boolean "hidden", :default => false, :null => false
|
||||||
t.integer "contact_id", :null => false
|
t.integer "contact_id", :null => false
|
||||||
t.string "shareable_type", :limit => 60, :default => "Post", :null => false
|
t.string "shareable_type", :default => "Post", :null => false
|
||||||
end
|
end
|
||||||
|
|
||||||
add_index "share_visibilities", ["contact_id"], :name => "index_post_visibilities_on_contact_id"
|
add_index "share_visibilities", ["contact_id"], :name => "index_post_visibilities_on_contact_id"
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,10 @@
|
||||||
id="svg3148"
|
id="svg3148"
|
||||||
version="1.1"
|
version="1.1"
|
||||||
inkscape:version="0.48.2 r9819"
|
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">
|
||||||
<metadata
|
<metadata
|
||||||
id="metadata3166">
|
id="metadata3166">
|
||||||
<rdf:RDF>
|
<rdf:RDF>
|
||||||
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 3 KiB |
BIN
public/images/icons/ignoreuser.png
Normal file
BIN
public/images/icons/ignoreuser.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 463 B |
Loading…
Reference in a new issue