refinerycms 0.9.6.34 → 0.9.7

data/public/javascripts/refinery/admin.js

@@ -1,20 +1,69 @@
+var shiftHeld = false;
 $(document).ready(function(){
-
+  init_interface();
   init_flash_messages();
   init_delete_confirmations();
   init_sortable_menu();
   init_submit_continue();
   init_modal_dialogs();
   init_tooltips();
+});
+
+init_interface = function() {
+  $('input:submit:not(.button)').addClass('button');
+
+  $('.button, #editor_switch a').corner('6px');
+  $('#editor_switch a').appendTo($('<span></span>').prependTo('#editor_switch').corner('6px'));
+  $('#page_container, .wym_box').corner('5px bottom');
+  $('.wym_box').corner('5px tr');
+  $('.wym_iframe iframe').corner('2px');
+  $('.form-actions:not(".form-actions-dialog")').corner('5px');
+  $('#recent_activity li a, #recent_inquiries li a').each(function(i, a) {
+    $(this).textTruncate({
+      width: $(this).width()
+      , tooltip: false
+    });
+  });
+
+  // make sure that users can tab to wymeditor fields and add an overlay while loading.
+  $('textarea.wymeditor').each(function() {
+    textarea = $(this);
+    /*overlay = $("<div class='wym_loading_overlay'>&nbsp;</div>")
+              .css({'height': textarea.height(), 'width': textarea.width()});
+    textarea.before(overlay);*/
+    if ((instance = WYMeditor.INSTANCES[$(textarea.next('.wym_box').find('iframe').attr('id').split('_')).last().get(0)]) != null) {
+      textarea.parent().next().find('input, textarea').keydown($.proxy(function(e) {
+        shiftHeld = e.shiftKey;
+        if (shiftHeld && e.keyCode == $.ui.keyCode.TAB) {
+          this._iframe.contentWindow.focus();
+          e.preventDefault();
+        }
+      }, instance)).keyup(function(e) {
+        shiftHeld = false;
+      });
+      textarea.parent().prev().find('input, textarea').keydown($.proxy(function(e) {
+        if (e.keyCode == $.ui.keyCode.TAB) {
+          this._iframe.contentWindow.focus();
+          e.preventDefault();
+        }
+      }, instance));
+    }
+  });
 
   // focus first field in an admin form.
   $('form input[type=text]:first').focus();
-  $('#content').corner('2px');
-});
+
+  // ensure that the menu isn't wider than the page_container or else it looks silly to round that corner.
+  var last_item_offset = (last_item = $('#menu a:visible:last')).offset();
+  if (last_item_offset && ((last_item_offset.left + last_item.outerWidth() - $('#menu').offset().left + 5) < $('#page_container').outerWidth())) {
+    $("#page_container:not('.login #page_container')").corner('5px tr');
+  }
+}
 
 init_delete_confirmations = function() {
   $('a.confirm-delete').click(function(e) {
-    if (confirm("Are you sure you want to " + (t=($(this).attr('title') || $(this).attr('tooltip')))[0].toLowerCase() + t.substring(1) + "?")) {
+    if (confirm("Are you sure you want to " + (t=($(this).attr('title') || $(this).attr('tooltip')))[0].toLowerCase() + t.substring(1) + "?"))
+    {
       $("<form method='POST' action='" + $(this).attr('href') + "'></form>")
         .append("<input type='hidden' name='_method' value='delete' />")
         .append("<input type='hidden' name='authenticity_token' value='" + $('#admin_authenticity_token').val() + "'/>")
@@ -30,28 +79,28 @@ init_flash_messages = function(){
      $('#flash').fadeOut({duration: 330});
      e.preventDefault();
   });
+  $('#flash.flash_message').prependTo('#records');
 }
 
 init_modal_dialogs = function(){
   $('a[href*="dialog=true"]').not('#dialog_container a').each(function(i, anchor)
   {
     $(anchor).click(function(e){
-      iframe = $("<iframe id='dialog_iframe' src='" + $(this).attr('href') + "&amp;app_dialog=true" + "'></iframe>");
+      iframe = $("<iframe id='dialog_iframe' src='" + $(this).attr('href') + "&amp;app_dialog=true" + "'></iframe>").corner('8px');
       iframe.dialog({
-        title: $(anchor).attr('title') || $(anchor).attr('name') || $(anchor).html() || null,
-        modal: true,
-        resizable: false,
-        autoOpen: true,
-        width: (parseInt($(anchor.href.match("width=([0-9]*)")).last().get(0))||928),
-        height: (parseInt($(anchor.href.match("height=([0-9]*)")).last().get(0))||473)/*,
-        beforeclose: function(){
-          $(document.body).removeClass('hide-overflow');
-        }*/
+        title: $(anchor).attr('title') || $(anchor).attr('name') || $(anchor).html() || null
+        , modal: true
+        , resizable: false
+        , autoOpen: true
+        , width: (parseInt($(anchor.href.match("width=([0-9]*)")).last().get(0))||928)
+        , height: (parseInt($(anchor.href.match("height=([0-9]*)")).last().get(0))||473)
+        , open: onOpenDialog
+        , close: onCloseDialog
       });
       if ($.browser.msie) {
         iframe.css({'margin':'-2px 2px 2px -2px'});
       }
-      //$(document.body).addClass('hide-overflow');
+      $(document.body).addClass('hide-overflow');
       e.preventDefault();
     });
   });
@@ -65,21 +114,20 @@ init_sortable_menu = function(){
   $menu.sortable({
     axis: 'x',
     cursor: 'crosshair',
-    items: '.tab',
     update: function(){
-      var ser   = $menu.sortable('serialize', {key: 'menu[]'}),
+      var ser   = $menu.sortable('serialize', {key: 'menu[]', expression: /plugin_([\w]*)$/}),
           token = escape($('#admin_authenticity_token').val());
 
-      $.get('/admin/update_menu_positions?' + ser, {authenticity_token: token});
+      $.get('/refinery/update_menu_positions?' + ser, {authenticity_token: token});
     }
-  });
+  }).tabs();
   //Initial status disabled
   $menu.sortable('disable');
 
   $menu.find('#menu_reorder').click(function(e){
     e.preventDefault();
     $('#menu_reorder, #menu_reorder_done').toggle();
-    $('#header >*:not(#menu, script), #content, #logout').fadeTo(500, 0.2);
+    $('#site_bar, #header >*:not(#header_content, #menu, script), #content').fadeTo(500, 0.65);
     $menu.find('.tab a').click(function(ev){
       ev.preventDefault();
     });
@@ -90,73 +138,149 @@ init_sortable_menu = function(){
   $menu.find('#menu_reorder_done').click(function(e){
     e.preventDefault();
     $('#menu_reorder, #menu_reorder_done').toggle();
-    $('#header >*:not(#menu, script), #content, #logout').fadeTo(500, 1);
+    $('#site_bar, #header >*:not(#header_content, #menu, script), #content').fadeTo(500, 1);
     $menu.find('.tab a').unbind('click');
 
     $menu.sortable('disable');
   });
-  
-  $menu.find('> li a').corner('top 5px');
+
+  $menu.find('> a').corner('top 5px');
 }
 
 init_submit_continue = function(){
-  $('#submit_continue_button').click(function(e) {
-    // ensure wymeditors are up to date.
-    if ($(this).hasClass('wymupdate')) {
-      $.each(WYMeditor.INSTANCES, function(index, wym)
-      {
-        wym.update();
-      });
-    }
+  $('#submit_continue_button').click(submit_and_continue);
+
+  $('form').change(function(e) {
+    $(this).attr('data-changes-made', true);
+  });
 
-    $('#continue_editing').val(true);
-    $('#flash').fadeOut(250)
+  if ((continue_editing = $('#continue_editing')).length > 0 && continue_editing.attr('rel') != 'no-prompt') {
+    $('#editor_switch a').click(function(e) {
+      if ($('form[data-changes-made]').length > 0) {
+        if (!confirm("Any changes you've made will be lost. Are you sure you want to continue without saving?")) {
+          e.preventDefault();
+        }
+      }
+    });
+  }
+}
 
-    $('.fieldWithErrors').removeClass('fieldWithErrors').addClass('field');
-    $('#flash_container .errorExplanation').remove();
+submit_and_continue = function(e, redirect_to) {
+  // ensure wymeditors are up to date.
+  if ($(this).hasClass('wymupdate')) {
+    $.each(WYMeditor.INSTANCES, function(index, wym)
+    {
+      wym.update();
+    });
+  }
 
-    $.post(this.form.action, $(this.form).serialize(), function(data) {
-      if ((flash_container = $('#flash_container')).length > 0) {
-        flash_container.html(data);
+  $('#continue_editing').val(true);
+  $('#flash').fadeOut(250)
 
-        $('#flash').css('width', 'auto').fadeIn(550);
+  $('.fieldWithErrors').removeClass('fieldWithErrors').addClass('field');
+  $('#flash_container .errorExplanation').remove();
 
-        $('.errorExplanation').not($('#flash_container .errorExplanation')).remove();
+  $.post($('#continue_editing').get(0).form.action, $($('#continue_editing').get(0).form).serialize(), function(data) {
+    if (($flash_container = $('#flash_container')).length > 0) {
+      $flash_container.html(data);
 
-        if ((error_fields = $('#fieldsWithErrors').val()) != null) {
-          $.each(error_fields.split(','), function() {
-            $("#" + this).wrap("<div class='fieldWithErrors' />");
-          });
-        }
+      $('#flash').css('width', 'auto').fadeIn(550);
 
-        $('.fieldWithErrors:first :input:first').focus();
+      $('.errorExplanation').not($('#flash_container .errorExplanation')).remove();
 
-        $('#continue_editing').val(false);
+      if ((error_fields = $('#fieldsWithErrors').val()) != null) {
+        $.each(error_fields.split(','), function() {
+          $("#" + this).wrap("<div class='fieldWithErrors' />");
+        });
+      } else if (redirect_to) {
+        window.location = redirect_to;
       }
-    });
 
-    e.preventDefault();
+      $('.fieldWithErrors:first :input:first').focus();
+
+      $('#continue_editing').val(false);
+
+      init_flash_messages();
+    }
   });
+
+  e.preventDefault();
 }
 
 init_tooltips = function(args){
-  $($(args != null ? args : 'a[title], span[title], #image_grid img[title], *[tooltip]')).each(function(index, element)
+  $($(args != null ? args : 'a[title], span[title], #image_grid img[title], *[tooltip]')).not('.no-tooltip').each(function(index, element)
   {
     // create tooltip on hover and destroy it on hoveroff.
     $(element).hover(function(e) {
-      tooltip = $("<div class='tooltip'></div>").html($(this).attr('tooltip')).appendTo($('#tooltip_container'));
-      tooltip.css({
-          'left': ((left = $(this).offset().left - (tooltip.outerWidth() / 2) + ($(this).outerWidth() / 2)) >= 0 ? left : 0)
-        , 'top': $(this).offset().top - tooltip.outerHeight() - 6
-      }).show();
+      $(this).oneTime(350, 'tooltip', $.proxy(function() {
+        $('.tooltip').remove();
+        tooltip = $("<div class='tooltip'><div><span></span></div></div>").corner('6px').appendTo('#tooltip_container');
+        tooltip.find("span").html($(this).attr('tooltip')).corner('6px');
+
+        nib = $("<img src='/images/refinery/tooltip-nib.png' class='tooltip-nib'/>").appendTo('#tooltip_container');
+
+        tooltip.css({
+          'opacity': 0
+          , 'maxWidth': '300px'
+          , 'left': ((left = $(this).offset().left - (tooltip.outerWidth() / 2) + ($(this).outerWidth() / 2)) >= 0 ? left : 0)
+        });
+
+        var tooltip_offset = tooltip.offset();
+        var tooltip_outer_width = tooltip.outerWidth();
+        if (tooltip_offset && (tooltip_offset.left + tooltip_outer_width) > (window_width = $(window).width())) {
+          tooltip.css('left', window_width - tooltip_outer_width);
+        }
+
+        tooltip.css({
+          'top': $(this).offset().top - tooltip.outerHeight() - 2
+        })
+
+        nib.css({
+          'opacity': 0
+        });
+
+        if (tooltip_offset = tooltip.offset()) {
+          nib.css({
+            'left': tooltip_offset.left + (tooltip_outer_width / 2) - 5
+            , 'top': tooltip_offset.top + tooltip.height()
+          });
+        }
+
+        try {
+          tooltip.animate({
+            top: tooltip_offset.top - 10
+            , opacity: 1
+          }, 200, 'swing');
+          nib.animate({
+            top: nib.offset().top - 10
+            , opacity: 1
+          }, 200);
+        } catch(e) {
+          tooltip.show();
+          nib.show();
+        }
+      }, $(this)));
+
     }, function(e) {
-      $('.tooltip').remove();
+      $(this).stopTime('tooltip');
+      (tooltip = $('.tooltip')).css('z-index', '-1').animate({
+        top: tooltip.offset().top - 20
+        , opacity: 0
+      }, 125, 'swing', function(){
+        $(this).remove();
+      });
+      (nib = $('.tooltip-nib')).animate({
+        top: nib.offset().top - 20
+        , opacity: 0
+      }, 125, 'swing', function(){
+        $(this).remove();
+      })
     });
     if ($(element).attr('tooltip') == null) {
       $(element).attr({'tooltip': $(element).attr('title'), 'title': ''});
     }
     // wipe clean the title on any children too.
-    $(element).children('img').attr('title', '')
+    $(element).children('img').attr('title', '');
   });
 }
 
@@ -185,7 +309,7 @@ var link_dialog = {
   },
 
   init_resources_submit: function(){
-    $('#dialog-form-actions #submit_button').click(function(e){
+    $('#existing_resource_area .form-actions-dialog #submit_button').click(function(e){
       e.preventDefault();
       if((resource_selected = $('#existing_resource_area_content ul li.linked a')).length > 0) {
         resourceUrl = parseURL(resource_selected.attr('href'));
@@ -213,22 +337,24 @@ var link_dialog = {
       }
     });
 
-    $('#dialog-form-actions #cancel_button').click(function(e){
+    $('.form-actions-dialog #cancel_button').click(function(e){
       e.preventDefault();
       parent.tb_remove();
     });
   },
 
   init_close: function(){
-    $('#dialog-form-actions #cancel_button').click(function(e){
-      if (parent && typeof(parent.$) == "function") {
-    //    parent.$(document.body).removeClass('hide-overflow');
-        parent.$('.ui-dialog').dialog('close').remove();
-      } else {
-        $('.ui-dialog').dialog('close').remove();
-    //    $(document.body).removeClass('hide-overflow');
-      }
-    });
+    $('.form-actions-dialog #cancel_button').click(close_dialog);
+
+    if (parent
+        && parent.document.location.href != document.location.href
+        && parent.document.getElementById('wym_dialog_submit') != null) {
+      $('#dialog_container .form-actions input#submit_button').click(function(e) {
+        e.preventDefault();
+        $(parent.document.getElementById('wym_dialog_submit')).click();
+      });
+      $('#dialog_container .form-actions a.close_dialog').click(close_dialog);
+    }
   },
 
   switch_area: function(area){
@@ -343,7 +469,10 @@ var page_options = {
     // set the page tabs up, but ensure that all tabs are shown so that when wymeditor loads it has a proper height.
     // also disable page overflow so that scrollbars don't appear while the page is loading.
     $(document.body).addClass('hide-overflow');
-    page_options.tabs = $('#page-tabs').tabs({tabTemplate: '<li><a href="#{href}">#{label}</a></li>'}).find(' > ul li a').corner('top 5px');
+    page_options.tabs = $('#page-tabs');
+    page_options.tabs.tabs({tabTemplate: '<li><a href="#{href}">#{label}</a></li>'})
+    page_options.tabs.find(' > ul li a').corner('top 5px');
+
     part_shown = $('#page-tabs .page_part.field').not('.ui-tabs-hide');
     $('#page-tabs .page_part.field').removeClass('ui-tabs-hide');
 
@@ -369,7 +498,11 @@ var page_options = {
   show_options: function(){
     $('#toggle_advanced_options').click(function(e){
       e.preventDefault();
-      $('#more_options').toggle();
+      $('#more_options').animate({opacity: 'toggle', height: 'toggle'}, 250);
+
+      $('html,body').animate({
+        scrollTop: $('#toggle_advanced_options').parent().offset().top
+      }, 250);
     });
   },
 
@@ -410,19 +543,26 @@ var page_options = {
               , body: ''
             }
             , function(data, status){
+              $('#submit_continue_button').remove();
               // Add a new tab for the new content section.
-              $('#page_part_editors').append(data);
+              $(data).appendTo('#page_part_editors');
               page_options.tabs.tabs('add', '#page_part_new_' + $('#new_page_part_index').val(), part_title);
-              page_options.tabs.tabs('select', '#page_part_new_' + $('#new_page_part_index').val());
+              page_options.tabs.tabs('select', $('#new_page_part_index').val());
 
               // turn the new textarea into a wymeditor.
               $('#page_parts_attributes_' + $('#new_page_part_index').val() + "_body").wymeditor(wymeditor_boot_options);
 
+              // hook into wymedtior to instruct it to select this new tab again once it has loaded.
+              WYMeditor.loaded = function() {
+                page_options.tabs.tabs('select', $('#new_page_part_index').val());
+                WYMeditor.loaded = function(){}; // kill it again.
+              }
+
               // Wipe the title and increment the index counter by one.
               $('#new_page_part_index').val(parseInt($('#new_page_part_index').val()) + 1);
               $('#new_page_part_title').val('');
 
-              $('#page-tabs').tabs().find('> ul li a').corner('top 5px');
+              page_options.tabs.find('> ul li a').corner('top 5px');
             }
           );
         }else{
@@ -444,18 +584,16 @@ var page_options = {
 
     $('#delete_page_part').click(function(e){
       e.preventDefault();
-      var stab_id = page_options.tabs.tabs('option', 'selected');
-      var part_id = $('#page_parts_attributes_' + stab_id + '_id').val();
-      //console.log('stab_id: ' + stab_id + ' part_id: ' + part_id);
 
-      var result = confirm("This will remove the content section '" + $('#page_parts .ui-tabs-selected a').html() + "' and erase all content that has been entered into it even if you don't save the page, are you sure?");
-      if(part_id && result) {
+      if(confirm("This will remove the content section '" + $('#page_parts .ui-tabs-selected a').html() + "' immediately even if you don't save this page, are you sure?")) {
+        var tabId = page_options.tabs.tabs('option', 'selected');
         $.ajax({
-          url: page_options.del_part_url + '/' + part_id,
+          url: page_options.del_part_url + '/' + $('#page_parts_attributes_' + tabId + '_id').val(),
           type: 'DELETE'
         });
-        page_options.tabs.tabs('remove', stab_id);
-        //WYMeditor.loaded();
+        page_options.tabs.tabs('remove', tabId);
+        $('#page_parts_attributes_' + tabId + '_id').remove();
+        $('#submit_continue_button').remove();
       }
 
     });
@@ -510,7 +648,14 @@ var image_dialog = {
 
       $(img).parent().addClass('selected');
       var imageUrl = parseURL($(img).attr('src'));
-      var relevant_src = imageUrl.pathname.replace('_dialog_thumb', '');
+      var imageThumbnailSize = $('#existing_image_size_area li.selected a').attr('rel');
+      if (!imageThumbnailSize) {
+        imageThumbnailSize = '';
+      } else {
+        imageThumbnailSize = '_' + imageThumbnailSize;
+      }
+      //alert(imageThumbnailSize);
+      var relevant_src = imageUrl.pathname.replace('_dialog_thumb', imageThumbnailSize);
       if (imageUrl.protocol == "" && imageUrl.hostname == "system") {
         relevant_src = "/system" + relevant_src;
       }
@@ -529,35 +674,51 @@ var image_dialog = {
         if ((wym_alt = parent.document.getElementById('wym_alt')) != null) {
           wym_alt.value = $(img).attr('alt');
         }
+        if ((wym_size = parent.document.getElementById('wym_size')) != null) {
+          wym_size.value = imageThumbnailSize;
+        }
       }
     }
   }
 
   , submit_image_choice: function(e) {
     e.preventDefault();
-    if((img_selected = $('#existing_image_area_content ul li.selected img').get(0)) && typeof(this.callback) == "function") {
+    if((img_selected = $('#existing_image_area_content ul li.selected img').get(0)) && $.isFunction(this.callback))
+    {
       this.callback(img_selected);
     }
 
-    this.close_dialog(e);
-  }
-
-  , close_dialog: function(e) {
-    if (parent && typeof(parent.$) == "function") {
-//      parent.parent.$(document.body).removeClass('hide-overflow');
-      parent.$('.ui-dialog').dialog('close').remove();
-    } else {
-      $('.ui-dialog').dialog('close').remove();
-//      $(document.body).removeClass('hide-overflow');
-    }
-
-    e.preventDefault();
+    close_dialog(e);
   }
 
   , init_actions: function(){
     var _this = this;
-    $('#dialog-form-actions #submit_button').click($.proxy(_this.submit_image_choice, _this));
-    $('#dialog-form-actions #cancel_button').click($.proxy(_this.close_dialog, _this));
+    $('#existing_image_area .form-actions-dialog #submit_button').click($.proxy(_this.submit_image_choice, _this));
+    $('.form-actions-dialog #cancel_button').click($.proxy(close_dialog, _this));
+    $('#existing_image_size_area ul li a').click(function(e) {
+      $('#existing_image_size_area ul li').removeClass('selected');
+      $(this).parent().addClass('selected');
+      $('#existing_image_size_area #wants_to_resize_image').attr('checked', 'checked');
+      image_dialog.set_image($('#existing_image_area_content ul li.selected img'));
+      e.preventDefault();
+    });
+    $('#existing_image_size_area #wants_to_resize_image').change(function(){
+      if($(this).is(":checked")) {
+        $('#existing_image_size_area ul li:first a').click();
+      } else {
+        $('#existing_image_size_area ul li').removeClass('selected');
+        image_dialog.set_image($('#existing_image_area_content ul li.selected img'));
+      }
+    });
+
+    if (parent && parent.document.location.href != document.location.href
+        && parent.document.getElementById('wym_dialog_submit') != null) {
+      $('#existing_image_area .form-actions input#submit_button').click($.proxy(function(e) {
+        e.preventDefault();
+        $(this.document.getElementById('wym_dialog_submit')).click();
+      }, parent));
+      $('#existing_image_area .form-actions a.close_dialog').click(close_dialog);
+    }
   }
 }
 
@@ -570,19 +731,31 @@ var list_reorder = {
   , enable_reordering: function(e) {
     if(e) { e.preventDefault(); }
 
-    list_reorder.sortable_list.find('li').each(function(index, li) {
+    sortable_options = {
+      'tolerance': 'pointer'
+      , 'placeholder': 'placeholder'
+      , 'cursor': 'drag'
+      , 'items': 'li'
+      , 'axis': 'y'
+    };
+
+    $(list_reorder.sortable_list).find('li').each(function(index, li) {
       if ($('ul', li).length) { return; }
       $("<ul></ul>").appendTo(li);
     });
 
-    list_reorder.sortable_list.add(list_reorder.sortable_list.find('ul')).sortable({
-      'connectWith': $(list_reorder.sortable_list.find('ul'))
-			, 'tolerance': 'pointer'
-			, 'placeholder': 'placeholder'
-			, 'cursor': 'drag'
-			, 'items': 'li'
-			, 'axis': 'y'
-    });
+    if (list_reorder.tree && !$.browser.msie) {
+      $(list_reorder.sortable_list).parent().nestedSortable($.extend(sortable_options, {
+        'maxDepth': 1
+        , 'placeholderElement': 'li'
+      }));
+      $(list_reorder.sortable_list).addClass('ui-sortable');
+    } else {
+      $(list_reorder.sortable_list).sortable(sortable_options);
+    }
+
+    $('#site_bar, #header > *:not(script)').fadeTo(500, 0.3);
+    $('#actions *:not("#reorder_action_done, #reorder_action")').not($('#reorder_action_done').parents('li, ul')).fadeTo(500, 0.55);
 
     $('#reorder_action').hide();
     $('#reorder_action_done').show();
@@ -609,30 +782,41 @@ var list_reorder = {
 
     if (list_reorder.update_url != null) {
       serialized = "";
-  	  list_reorder.sortable_list.find('> li[id]').each(function(index, li) {
+      list_reorder.sortable_list.find('> li[id]').each(function(index, li) {
         if (list_reorder.tree) {
-  	      serialized += list_reorder.parse_branch([index], li);
+          serialized += list_reorder.parse_branch([index], li);
         }
         else {
           serialized += "&sortable_list[]=" + $($(li).attr('id').split('_')).last().get(0);
         }
-  	  });
-  	  serialized += "&tree=" + list_reorder.tree + "&authenticity_token=" + encodeURIComponent($('#reorder_authenticity_token').val() + "&continue_reordering=false");
+      });
+      serialized += "&tree=" + list_reorder.tree;
+      serialized += "&authenticity_token=" + encodeURIComponent($('#reorder_authenticity_token').val());
+      serialized += "&continue_reordering=false";
 
       $.post(list_reorder.update_url, serialized, function(data) {
-        $(list_reorder.sortable_list.get(0)).html(data);
-
-        $(list_reorder.sortable_list).removeClass('reordering').sortable('destroy');
+        $(list_reorder.sortable_list).html(data);
 
-        $('#reorder_action_done').hide();
-        $('#reorder_action').show();
+        list_reorder.restore_controls(e);
       });
     } else {
-      $(list_reorder.sortable_list).removeClass('reordering').sortable('destroy');
+      list_reorder.restore_controls(e);
+    }
+  }
+
+  , restore_controls: function(e) {
+    if (list_reorder.tree && !$.browser.msie) {
+      list_reorder.sortable_list.add(list_reorder.sortable_list.find('ul, li')).draggable('destroy');
+    } else {
+      $(list_reorder.sortable_list).sortable('destroy');
+    }
+    $(list_reorder.sortable_list).removeClass('reordering, ui-sortable');
 
+    $('#site_bar, #header > *:not(script)').fadeTo(250, 1);
+    $('#actions *:not("#reorder_action_done, #reorder_action")').not($('#reorder_action_done').parents('li, ul')).fadeTo(250, 1, function() {
       $('#reorder_action_done').hide();
       $('#reorder_action').show();
-    }
+    });
   }
 }
 
@@ -693,41 +877,56 @@ var resource_picker = {
   }
 }
 
+close_dialog = function(e) {
+  if (parent
+      && parent.document.location.href != document.location.href
+      && $.isFunction(parent.$))
+  {
+    $(parent.document.body).removeClass('hide-overflow');
+    parent.$('.ui-dialog').dialog('close').remove();
+  } else {
+    $(document.body).removeClass('hide-overflow');
+    $('.ui-dialog').dialog('close').remove();
+  }
+
+  e.preventDefault();
+}
+
 //parse a URL to form an object of properties
 parseURL = function(url)
 {
-	//save the unmodified url to href property
-	//so that the object we get back contains
-	//all the same properties as the built-in location object
-	var loc = { 'href' : url };
-
-	//split the URL by single-slashes to get the component parts
-	var parts = url.replace('//', '/').split('/');
-
-	//store the protocol and host
-	loc.protocol = parts[0];
-	loc.host = parts[1];
-
-	//extract any port number from the host
-	//from which we derive the port and hostname
-	parts[1] = parts[1].split(':');
-	loc.hostname = parts[1][0];
-	loc.port = parts[1].length > 1 ? parts[1][1] : '';
-
-	//splice and join the remainder to get the pathname
-	parts.splice(0, 2);
-	loc.pathname = '/' + parts.join('/');
-
-	//extract any hash and remove from the pathname
-	loc.pathname = loc.pathname.split('#');
-	loc.hash = loc.pathname.length > 1 ? '#' + loc.pathname[1] : '';
-	loc.pathname = loc.pathname[0];
-
-	//extract any search query and remove from the pathname
-	loc.pathname = loc.pathname.split('?');
-	loc.search = loc.pathname.length > 1 ? '?' + loc.pathname[1] : '';
-	loc.pathname = loc.pathname[0];
-
-	//return the final object
-	return loc;
-}
+  //save the unmodified url to href property
+  //so that the object we get back contains
+  //all the same properties as the built-in location object
+  var loc = { 'href' : url };
+
+  //split the URL by single-slashes to get the component parts
+  var parts = url.replace('//', '/').split('/');
+
+  //store the protocol and host
+  loc.protocol = parts[0];
+  loc.host = parts[1];
+
+  //extract any port number from the host
+  //from which we derive the port and hostname
+  parts[1] = parts[1].split(':');
+  loc.hostname = parts[1][0];
+  loc.port = parts[1].length > 1 ? parts[1][1] : '';
+
+  //splice and join the remainder to get the pathname
+  parts.splice(0, 2);
+  loc.pathname = '/' + parts.join('/');
+
+  //extract any hash and remove from the pathname
+  loc.pathname = loc.pathname.split('#');
+  loc.hash = loc.pathname.length > 1 ? '#' + loc.pathname[1] : '';
+  loc.pathname = loc.pathname[0];
+
+  //extract any search query and remove from the pathname
+  loc.pathname = loc.pathname.split('?');
+  loc.search = loc.pathname.length > 1 ? '?' + loc.pathname[1] : '';
+  loc.pathname = loc.pathname[0];
+
+  //return the final object
+  return loc;
+}