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

Change icon when adding, fix #4568

Browse source
This commit is contained in:
flaburgan 2013-11-01 21:18:41 -07:00
parent 3df0fdc09b
commit bee2c63762
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/aspect-edit-pane.js
View file

@ -71,6 +71,9 @@ _.extend(app.tmp.ContactAspectsBox.prototype, {
.addClass('added') .addClass('added')
.attr('data-membership_id', membership_id) // just to be sure... .attr('data-membership_id', membership_id) // just to be sure...
.data('membership_id', membership_id); .data('membership_id', membership_id);
el.find('div').removeClass('icons-monotone_plus_add_round')
.addClass('icons-monotone_check_yes');
}, },
removeFromAspect: function(evt) { removeFromAspect: function(evt) {
@ -97,6 +100,9 @@ _.extend(app.tmp.ContactAspectsBox.prototype, {
.addClass('add') .addClass('add')
.removeAttr('data-membership_id') .removeAttr('data-membership_id')
.removeData('membership_id'); .removeData('membership_id');
el.find('div').removeClass('icons-monotone_check_yes')
.addClass('icons-monotone_plus_add_round');
}, },
_displayError: function(msg_id, contact_el) { _displayError: function(msg_id, contact_el) {

18
app/helpers/aspects_helper.rb
View file

@ -41,16 +41,18 @@ module AspectsHelper
end end
end end
def aspect_visibility_link(aspect); def aspect_visibility_link(aspect)
if aspect.contacts_visible? if aspect.contacts_visible?
icon = 'icons-padlock-open'; icon = 'icons-padlock-open'
title = t('.aspect_list_is_visible'); title = t('.aspect_list_is_visible')
else else
icon = 'icons-padlock-closed'; icon = 'icons-padlock-closed'
title = t('.aspect_list_is_not_visible'); title = t('.aspect_list_is_not_visible')
end
link_to aspect_toggle_contact_visibility_path(@aspect), class: 'contact_visibility_link button', title: title, method: :put, remote: true do
concat t('.visibility')
concat content_tag(:div, nil, id: "contact_visibility_padlock", class: icon)
end end
padlock = content_tag(:div, nil, id: "contact_visibility_padlock", class: icon);
link_to "#{t('.visibility')} #{padlock}".html_safe, aspect_toggle_contact_visibility_path(@aspect),
class: 'contact_visibility_link button', title: title, method: :put, remote: true;
end end
end end