diff --git a/app/views/aspect_memberships/create.js.erb b/app/views/aspect_memberships/create.js.erb index 35c232373de556bc97be4251dbc072cdeee25ba9..595304cf6c1939509f1f2ce528fef0bdf8098cd6 100644 --- a/app/views/aspect_memberships/create.js.erb +++ b/app/views/aspect_memberships/create.js.erb @@ -2,7 +2,7 @@ // licensed under the Affero General Public License version 3 or later. See // the COPYRIGHT file. -ContactEdit.updateNumber(); +ContactEdit.updateNumber("<%= @contact.person_id%>"); var element = $(".add[data-aspect_id=<%= @aspect.id %>][data-person_id=<%= @contact.person_id%>]"); diff --git a/app/views/aspect_memberships/destroy.js.erb b/app/views/aspect_memberships/destroy.js.erb index 9f3aea546756444d76108f54a532248f86e3ed24..3c48c72290535b2f1a998ae1bb8c1ef91614264c 100644 --- a/app/views/aspect_memberships/destroy.js.erb +++ b/app/views/aspect_memberships/destroy.js.erb @@ -2,7 +2,7 @@ // licensed under the Affero General Public License version 3 or later. See // the COPYRIGHT file. -ContactEdit.updateNumber(); +ContactEdit.updateNumber("<%= @contact.person_id%>"); var element = $(".added[data-aspect_id=<%= @aspect.id %>][data-person_id=<%= @contact.person_id%>]"); element.parent().html("<%= escape_javascript(render('aspect_memberships/remove_from_aspect', :aspect => @aspect, :person => @contact.person, :contact => @contact)) %>"); element.fadeTo(200,1); diff --git a/app/views/aspects/create.js.erb b/app/views/aspects/create.js.erb index 68549ad4294ab92b0628046024720c2a2eae18ec..a5ddd04e7206319153d34d3891269e9877acf115 100644 --- a/app/views/aspects/create.js.erb +++ b/app/views/aspects/create.js.erb @@ -2,8 +2,9 @@ // licensed under the Affero General Public License version 3 or later. See // the COPYRIGHT file. -ContactEdit.updateNumber(); $('ul.dropdown_list[data-person_id=<%= @person.id %>] .newItem').before("<%= escape_javascript( render('contacts/aspect_dropdown_list_item', :aspect => @aspect, :person => @person, :contact => @contact)) %>"); + +ContactEdit.updateNumber("<%= @person.id %>"); $.facebox.close(); $('#profile .dropdown').toggleClass("active"); diff --git a/app/views/contacts/_aspect_dropdown.html.haml b/app/views/contacts/_aspect_dropdown.html.haml index 8c30d29f55d48266e03b25872abd2b8d7f68e8e1..29bb8a7f7fab29a33c906afed217fb36685b33f2 100644 --- a/app/views/contacts/_aspect_dropdown.html.haml +++ b/app/views/contacts/_aspect_dropdown.html.haml @@ -8,10 +8,11 @@ ▼ .wrapper - %ul.dropdown_list{:unSelectable => 'on', 'data-person_id' => ((@person.id) if @person)} + %ul.dropdown_list{:unSelectable => 'on', 'data-person_id' => ((person.id) if person)} - for aspect in @all_aspects = aspect_dropdown_list_item(aspect, contact, person) - - %li.newItem - .add_aspect - = link_to "Add a new aspect", new_aspect_path(:person_id => person.id), :rel => 'facebox' + + - if defined?(@aspect) && ( @aspect == :profile || @aspect == :tag) + %li.newItem + .add_aspect + = link_to "Add a new aspect", new_aspect_path(:person_id => person.id), :rel => 'facebox' diff --git a/app/views/tags/show.haml b/app/views/tags/show.haml index 8802710162fd28ca4036dac7d8f4f8b072c546fc..926f4aff1fe0957c0a8e772e6cee1344ddece12b 100644 --- a/app/views/tags/show.haml +++ b/app/views/tags/show.haml @@ -38,7 +38,8 @@ - if current_user - contact = current_user.contacts.find_by_person_id(person.id) - contact ||= Contact.new(:person => person) - = render 'contacts/aspect_dropdown', :contact => contact, :person => person, :hang => 'left' + .right + = render 'contacts/aspect_dropdown', :contact => contact, :person => person, :hang => 'left' .content %span.from diff --git a/public/javascripts/contact-edit.js b/public/javascripts/contact-edit.js index 157e700b8d1973902efc8f03fdf8fb8758708b75..8d3e346b2d754bf7f38f43d555bc219a09509c18 100644 --- a/public/javascripts/contact-edit.js +++ b/public/javascripts/contact-edit.js @@ -8,9 +8,15 @@ var ContactEdit = { ContactEdit.processClick($(this), evt); }); }, - updateNumber: function(){ - var number = $(".dropdown_list input[type=checkbox]:checked").length - var element = $('.button.toggle'); + updateNumber: function(personId){ + console.log(personId); + var dropdown = $(".dropdown_list[data-person_id=" + personId.toString() +"]") + console.log(dropdown); + + var number = dropdown.find("input[type=checkbox]:checked").length + + console.log(number); + var element = dropdown.parents(".dropdown").children('.button.toggle'); var replacement; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 3670729ee3cd3338faa3340977ee06ec7cb0a9e7..01a0d41f92bb325b335ab9d8ee674ad6b207f6be 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -2837,12 +2837,6 @@ ul.show_comments, :padding 10px 0 .avatar :float left - .right - :display none - - .stream_element:hover - .right - :display none .tag :display inline-block