Modified "Ignore user" icon
This commit is contained in:
Manuel Schölling
parent
510bd7f0db
commit
99d51b72e8
4 changed files with 120 additions and 15 deletions
|
|
@ -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
|
||||
|
|
|
|||
20
db/schema.rb
20
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"
|
||||
|
|
|
|||
99
public/images/icons/ignoreuser.svg
Normal file
99
public/images/icons/ignoreuser.svg
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="450"
|
||||
height="300"
|
||||
id="svg3148"
|
||||
version="1.1"
|
||||
inkscape:version="0.48.2 r9819"
|
||||
sodipodi:docname="ignoreuser.svg">
|
||||
<metadata
|
||||
id="metadata3166">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title>ignore</dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs3164" />
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="640"
|
||||
inkscape:window-height="480"
|
||||
id="namedview3162"
|
||||
showgrid="false"
|
||||
inkscape:zoom="0.64063786"
|
||||
inkscape:cx="167.72506"
|
||||
inkscape:cy="69.893814"
|
||||
inkscape:window-x="7"
|
||||
inkscape:window-y="24"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg3148" />
|
||||
<!-- Created with SVG-edit - http://svg-edit.googlecode.com/ -->
|
||||
<rect
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none"
|
||||
id="rect3196"
|
||||
width="177.94765"
|
||||
height="39.023605"
|
||||
x="137.3631"
|
||||
y="-1.2622471" />
|
||||
<title
|
||||
id="title3150">ignore</title>
|
||||
<circle
|
||||
style="fill:#000000;stroke:#000000;stroke-width:5"
|
||||
sodipodi:ry="51.921875"
|
||||
sodipodi:rx="51.921875"
|
||||
sodipodi:cy="90.5"
|
||||
sodipodi:cx="190"
|
||||
cx="190"
|
||||
cy="90.5"
|
||||
r="51.921875"
|
||||
id="svg_2"
|
||||
inkscape:export-filename="/tmp/svg_13.png"
|
||||
inkscape:export-xdpi="3.52"
|
||||
inkscape:export-ydpi="3.52" />
|
||||
<path
|
||||
style="fill:#000000;stroke:#000000;stroke-width:5"
|
||||
d="M 193 142.46875 C 141.12811 142.46875 98.459209 181.94963 93.4375 232.5 L 292.5625 232.5 C 287.54079 181.94963 244.87189 142.46875 193 142.46875 z "
|
||||
id="svg_7"
|
||||
inkscape:export-filename="/tmp/svg_13.png"
|
||||
inkscape:export-xdpi="3.52"
|
||||
inkscape:export-ydpi="3.52" />
|
||||
<line
|
||||
style="fill:none;stroke:#000000;stroke-width:20"
|
||||
x1="89"
|
||||
y1="17.5"
|
||||
x2="330"
|
||||
y2="268.5"
|
||||
id="svg_12"
|
||||
inkscape:export-filename="/tmp/svg_13.png"
|
||||
inkscape:export-xdpi="3.52"
|
||||
inkscape:export-ydpi="3.52" />
|
||||
<line
|
||||
style="fill:none;stroke:#ffffff;stroke-width:9"
|
||||
x1="92"
|
||||
y1="20.5"
|
||||
x2="327"
|
||||
y2="266.5"
|
||||
id="svg_13"
|
||||
inkscape:export-xdpi="3.52"
|
||||
inkscape:export-ydpi="3.52" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.8 KiB |
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue