Merge branch 'release/0.8' into wdtk

Conflicts:
    app/controllers/admin_request_controller.rb
    app/views/contact_mailer/from_admin_message.rhtml

1 files changed, 32 insertions, 0 deletions

diff --git a/app/views/admin_general/admin.js b/app/views/admin_general/admin.js
new file mode 100644
index 000000000..61382dab3
--- /dev/null
+++ b/app/views/admin_general/admin.js
@@ -0,0 +1,32 @@
+(function() {
+  jQuery(function() {
+    $('.locales a:first').tab('show');
+    $('.accordion-body').on('hidden', function() {
+      return $(this).prev().find('i').first().removeClass().addClass('icon-chevron-right');
+    });
+    $('.accordion-body').on('shown', function() {
+      return $(this).prev().find('i').first().removeClass().addClass('icon-chevron-down');
+    });
+    $('.toggle-hidden').live('click', function() {
+      $(this).parents('td').find('div:hidden').show();
+      return false;
+    });
+    return $('#request_hidden_user_explanation_reasons input').live('click', function() {
+      var info_request_id, reason;
+      $('#request_hidden_user_subject, #request_hidden_user_explanation, #request_hide_button').show();
+      info_request_id = $('#hide_request_form').attr('info_request_id');
+      reason = $(this).val();
+      $('#request_hidden_user_explanation_field').attr("value", "[loading default text...]");
+      return $.ajax("/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id, {
+        type: "GET",
+        dataType: "text",
+        error: function(data, textStatus, jqXHR) {
+          return $('#request_hidden_user_explanation_field').attr("value", "Error: " + textStatus);
+        },
+        success: function(data, textStatus, jqXHR) {
+          return $('#request_hidden_user_explanation_field').attr("value", data);
+        }
+      });
+    });
+  });
+}).call(this);