Revert "remove aspect sorting logic"

This reverts commit 8d8d3c649a.

Conflicts:
	app/assets/javascripts/main.js

app/assets/javascripts/aspects-sorting.js

@@ -0,0 +1,18 @@
+/*   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+ *   licensed under the Affero General Public License version 3 or later.  See
+ *   the COPYRIGHT file.
+ */
+
+$(document).ready(function() {
+  $('#aspect_nav.left_nav .all_aspects .sub_nav').sortable({
+    items: "li[data-aspect_id]",
+    update: function(event, ui) {
+      var order = $(this).sortable("toArray", {attribute: "data-aspect_id"}),
+          obj = { 'reorder_aspects': order, '_method': 'put' };
+      $.ajax('/user', { type: 'post', dataType: 'script', data: obj });
+    },
+    revert: true,
+    helper: 'clone'
+  });
+});
+

app/assets/javascripts/main.js

@@ -20,6 +20,7 @@
 //= require jquery-idletimer/dist/idle-timer
 //= require jquery.infinitescroll-custom
 //= require jquery.autocomplete-custom
+//= require jquery-ui
 //= require keycodes
 //= require fileuploader-custom
 //= require handlebars.runtime
@@ -39,6 +40,7 @@
 //= require_tree ./widgets
 //= require view
 //= require aspects-dropdown
+//= require aspects-sorting
 //= require mentions
 //= require bootstrap-tooltip
 //= require bootstrap-popover

app/controllers/users_controller.rb

@@ -70,6 +70,8 @@ class UsersController < ApplicationController
           flash[:error] = I18n.t 'users.update.follow_settings_not_changed'
         end
       end
+    elsif aspect_order = params[:reorder_aspects]
+      @user.reorder_aspects(aspect_order)
     end
     set_email_preferences
 

app/models/user.rb

@@ -486,6 +486,14 @@ class User < ActiveRecord::Base
     end
   end
 
+  def reorder_aspects(aspect_order)
+    i = 0
+    aspect_order.each do |id|
+      self.aspects.find(id).update_attributes({ :order_id => i })
+      i += 1
+    end
+  end
+
   # Generate public/private keys for User and associated Person
   def generate_keys
     key_size = (Rails.env == 'test' ? 512 : 4096)