nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Style aspect controls

Browse source
This commit is contained in:
Błażej Pankowiak 2014-08-07 16:36:57 +02:00
parent 0ad658f98c
commit d0cbde2394
4 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/assets/stylesheets/aspects.css.scss
View file

@ -27,6 +27,14 @@ $bluebg: #e7f2f7;
} }
} }
.modify_aspect {
background: url("icons/pencil.png") no-repeat;
width: 12px;
height: 12px;
display: inline-block;
}
/* -- Used in contacts/index.html.haml -- */ /* -- Used in contacts/index.html.haml -- */
#aspect_controls { #aspect_controls {
@ -39,7 +47,13 @@ $bluebg: #e7f2f7;
.button, .button_to { .button, .button_to {
margin-right: 5px; margin-right: 5px;
} }
.btn {
&.delete {
color: desaturate($red,10%);
}
}
.button_to { display: inline-block; } .button_to { display: inline-block; }
.contact_visibility_padlock, .contact_visibility_padlock,

2
app/helpers/aspects_helper.rb
View file

@ -50,7 +50,7 @@ module AspectsHelper
title = t('aspects.edit.aspect_list_is_not_visible'); title = t('aspects.edit.aspect_list_is_not_visible');
end end
link_to aspect_toggle_contact_visibility_path(@aspect), class: 'contact_visibility_link button', title: title, method: :put, remote: true do link_to aspect_toggle_contact_visibility_path(@aspect), class: 'contact_visibility_link btn', title: title, method: :put, remote: true do
concat t('aspects.edit.set_visibility') concat t('aspects.edit.set_visibility')
concat content_tag(:span, nil, class: "contact_visibility_padlock " + icon) concat content_tag(:span, nil, class: "contact_visibility_padlock " + icon)
end end

2
app/helpers/contacts_helper.rb
View file

@ -24,7 +24,7 @@ module ContactsHelper
def start_a_conversation_link(aspect, contacts_size) def start_a_conversation_link(aspect, contacts_size)
suggested_limit = 16 suggested_limit = 16
conv_opts = { class: "button conversation_button", rel: "facebox"} conv_opts = { class: "btn conversation_button", rel: "facebox"}
conv_opts[:title] = t('.many_people_are_you_sure', suggested_limit: suggested_limit) if contacts_size > suggested_limit conv_opts[:title] = t('.many_people_are_you_sure', suggested_limit: suggested_limit) if contacts_size > suggested_limit
link_to new_conversation_path(aspect_id: aspect.id, name: aspect.name), conv_opts do link_to new_conversation_path(aspect_id: aspect.id, name: aspect.name), conv_opts do

4
app/views/contacts/index.html.haml
View file

@ -23,11 +23,11 @@
#aspect_controls #aspect_controls
- if @contacts_size > 0 && @contacts_size < 20 - if @contacts_size > 0 && @contacts_size < 20
= start_a_conversation_link(@aspect, @contacts_size) = start_a_conversation_link(@aspect, @contacts_size)
= link_to edit_aspect_path(@aspect), rel: "facebox", class: "button" do = link_to edit_aspect_path(@aspect), rel: "facebox", class: "btn" do
= t('aspects.edit.manage') = t('aspects.edit.manage')
%span.modify_aspect %span.modify_aspect
= aspect_visibility_link(@aspect) = aspect_visibility_link(@aspect)
= link_to @aspect, method: "delete", data: { confirm: t('aspects.edit.confirm_remove_aspect') }, class: 'button delete' do = link_to @aspect, method: "delete", data: { confirm: t('aspects.edit.confirm_remove_aspect') }, class: 'btn delete' do
= t('delete') = t('delete')
%span.icons-monotone_close_exit_delete %span.icons-monotone_close_exit_delete