reverting commit manually

app/views/aspects/manage.html.haml

@@ -16,7 +16,7 @@
   %h3=t('.requests')
 
   .requests
-    %ul
+    %ul.dropzone
       - if @remote_requests.size < 1
         %li No new requests
       - else
@@ -44,23 +44,20 @@
             %span.tip click to edit
 
           %ul.tools
+            %li= link_to t('.add_a_new_friend'), "#add_request_pane_#{aspect.id}", :class => 'add_request_button'
             %li!= remove_link(aspect)
 
-
+        %ul.dropzone{:data=>{:aspect_id=>aspect.id}}
-        %ul.people{:data=>{:aspect_id=>aspect.id}}
           -for person in aspect.people
             %li.person{:data=>{:guid=>person.id, :aspect_id=>aspect.id}}
               .delete
                 .x
-                  = link_to "X", "#remove_person_pane", :class => "remove_person_button"
+                  X
                 .circle
               = person_image_tag(person)
+          .draggable_info
+            Drag to add people
 
-          %li.dropzone_targets
-            %span.dropzone.add_person
-              = link_to "Add person", "#add_request_pane_#{aspect.id}", :class => 'add_request_button'
-            %span.dropzone.move_person
-              = link_to "Move person", '#'
 
 
           .fancybox_content
@@ -68,11 +65,3 @@
               = render "requests/new_request", :aspect => aspect
 
 
-  .fancybox_content
-    #remove_person_pane
-      .span-12.last
-        .modal_title_bar
-          %h4 Remove from aspect
-
-        .person
-

public/javascripts/aspect-edit.js

@@ -21,62 +21,49 @@ function decrementRequestsCounter() {
 
 // Dragging person between aspects
 $(function() {
-  $(".person").draggable({
+  $("ul .person").draggable({
     revert: true,
     start: function(event,ui){
       $(this).children("img").animate({'height':80, 'width':80, 'opacity':0.8},200);
-      $(".dropzone").fadeIn(100);
+      $(".draggable_info").fadeIn(100);
     },
     stop: function(event,ui){
       $(this).children("img").animate({'height':70, 'width':70, 'opacity':1},200);
+      $(".draggable_info").fadeOut(100);
     }
   });
 
-  $(".dropzone", ".aspect").droppable({
+  $(".aspect ul.dropzone").droppable({
     hoverClass: 'active',
     drop: function(event, ui) {
 
       var dropzone = $(this);
       var person   = ui.draggable;
-      var aspect   = dropzone.closest(".aspect");
 
       if( person.hasClass('request') ){
         $.ajax({
           type: "DELETE",
           url: "/requests/" + person.attr('data-guid'),
-          data: {"accept" : true, "aspect_id" : aspect.attr('data-guid') },
+          data: {"accept" : true, "aspect_id" : dropzone.attr('data-aspect_id') },
           success: function(data){
             decrementRequestsCounter();
           }
         });
       };
 
-      if( aspect.attr('data-guid') != person.attr('data-aspect_id' )){
 
-        if( dropzone.hasClass("move_person") ){
+      if( dropzone.attr('data-aspect_id') != person.attr('data-aspect_id' )){
-          $.ajax({
+        $.ajax({
-            url: "/aspects/move_friend/",
+          url: "/aspects/move_friend/",
-            data: {"friend_id" : person.attr('data-guid'),
+          data: {"friend_id" : person.attr('data-guid'),
-                   "from"      : person.attr('data-aspect_id'),
+                 "from"      : person.attr('data-aspect_id'),
-                   "to"        : { "to" : aspect.attr('data-guid') }},
+                 "to"        : { "to" : dropzone.attr('data-aspect_id') }},
-            success: function(data){
+          success: function(data){
-              person.attr('data-aspect_id', aspect.attr('data-guid'));
+            person.attr('data-aspect_id', dropzone.attr('data-aspect_id'));
-            }});
+          }});
-
-          $("ul.people li:last", aspect).before(person);
-
-        } else {
-          $.ajax({
-            url: "/aspects/add_to_aspect/",
-            data: {"friend_id" : person.attr('data-guid'),
-                   "aspect_id" : aspect.attr('data-guid') },
-            success: function(data){
-              person.attr('data-aspect_id', aspect.attr('data-guid'));
-            }});
-    
-          $("ul.people li:last", aspect).before(person);
         }
-      }
+
+      $(this).closest("ul").append(person);
     }
   });
 
@@ -101,7 +88,7 @@ $(function() {
                   'aspect_id' : person.attr('data-aspect_id') }
           });
         }
-      person.fadeOut('slow', function(){person.remove()});
+      person.fadeOut('slow', $(this).remove());
       }
     }
   });
@@ -111,7 +98,6 @@ $(function() {
 
 
 // Person deletion
-
 $(".delete").live("click", function() {
 
   var person = $(this).closest("li.person");
@@ -132,19 +118,17 @@ $(".delete").live("click", function() {
 
   } else {
 
-    var person_id = $(this).closest("li.person").attr('data-guid');
+    if( confirm("Remove this person from all aspects?") ){
+      var person_id = $(this).closest("li.person").attr('data-guid');
 
-
+      $.ajax({
-    /*
+        type: "DELETE",
-    $.ajax({
+        url: "/people/" + person_id,
-      type: "DELETE",
+        success: function() {
-      url: "/people/" + person_id,
+          person.fadeOut(200);
-      success: function() {
+        }
-        person.fadeOut(200);
+      });
-      }
+    }
-    });
-
-    */
   }
 });
 

public/stylesheets/sass/application.sass

@@ -938,71 +938,49 @@ h1.big_text
         &:last-child
           :margin
             :right 0
-
-ul#aspect_list
-  :list
-    :style none
-  :padding 0
-  :margin 0
-
 .aspect,
 .requests,
 .aspect_remove
-  :position relative
+  :list
+    :style none
   :color #999
   :cursor default
   :text-shadow 0 1px #fff
 
+  ul.dropzone
+    :position relative
+    :min-height 20px
+    :margin 0
+      :bottom 25px
 
-  .dropzone
-    :display inline-block
-    
     :-webkit-border-radius 10px
     :-moz-border-radius 10px
     :border-radius 10px
 
-    :margin 5px
+    :list
+      :style none
+    :padding 15px
     :border 2px dashed #ccc
 
-    :height 70px
-    :max-height 70px
-    :width 70px
-    :max-width 70px
-
     &.active
       :background
         :color rgba(255,252,127,0.2)
 
-    a
+    .draggable_info
-      :display block
+      :position absolute
-      :height 100%
+      :display none
-      :padding
+      :right 15px 
-        :top 12px
+      :bottom 10px 
-      :text
-        :align center
       :font
+        :style italic
         :size 14px
-
+      :color #aaa
-      :color #999
-
-      &:hover
-        :color #666
-
-  ul
-    :list
-      :style none
-    :min-height 20px
-    :margin 0
-      :bottom 25px
-    :padding 0
-
-    li
-      :display inline-block
 
   .person
+    :display inline-block
     :cursor move
     :z-index 10
-    :top 0
+    :position relative
     :padding 0
     :margin 5px
 
@@ -1056,15 +1034,8 @@ ul#aspect_list
       .x
         :z-index 2
         :position absolute
-        :padding
+        :top 2px
-          :top 2px
+        :left 7px
-          :left 7px
-        a
-          :cursor default
-          :display block
-          :height 100%
-          :text-shadow none
-          :color #eee
 
       &:hover
         :cursor default