4 files changed, 1 insertions, 91 deletions
diff --git a/app/views/admin_general/admin.coffee b/app/views/admin_general/admin.coffee
deleted file mode 100644
index 3d39369a4..000000000
--- a/app/views/admin_general/admin.coffee
+++ /dev/null
@@ -1,24 +0,0 @@
-jQuery ->
-    $('.locales a:first').tab('show')
-    $('.accordion-body').on('hidden', ->
-        $(@).prev().find('i').first().removeClass().addClass('icon-chevron-right')
-        )
-    $('.accordion-body').on('shown', ->
-        $(@).prev().find('i').first().removeClass().addClass('icon-chevron-down'))
-    $('.toggle-hidden').live('click', ->
-        $(@).parents('td').find('div:hidden').show()
-        false)
-    $('#request_hidden_user_explanation_reasons input').live('click', ->
-        $('#request_hidden_user_subject, #request_hidden_user_explanation, #request_hide_button').show()
-        info_request_id = $('#hide_request_form').attr('data-info-request-id')
-        reason = $(this).val()
-        $('#request_hidden_user_explanation_field').attr("value", "[loading default text...]")
-        $.ajax "/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id,
-          type: "GET"
-          dataType: "text"
-          error: (data, textStatus, jqXHR) ->
-            $('#request_hidden_user_explanation_field').attr("value", "Error: #{textStatus}")
-          success: (data, textStatus, jqXHR) ->
-            $('#request_hidden_user_explanation_field').attr("value", data)
-      )
-
diff --git a/app/views/admin_general/admin.js b/app/views/admin_general/admin.js
deleted file mode 100644
index 9daa51459..000000000
--- a/app/views/admin_general/admin.js
+++ /dev/null
@@ -1,32 +0,0 @@
-(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('data-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);
diff --git a/app/views/admin_general/admin_js.erb b/app/views/admin_general/admin_js.erb
deleted file mode 100644
index c8788a452..000000000
--- a/app/views/admin_general/admin_js.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-(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('data-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);
diff --git a/app/views/admin_general/timeline.html.erb b/app/views/admin_general/timeline.html.erb
index fe2221294..c4ea4849b 100644
--- a/app/views/admin_general/timeline.html.erb
+++ b/app/views/admin_general/timeline.html.erb
@@ -88,7 +88,7 @@
         <% elsif event.event_type == 'comment' %>
             had an annotation posted by <%=h event.comment.user.name %>.
         <% elsif event.event_type == 'status_update' %>
-                had its status updated by <%=h User.find(event.params[:user_id]).name %> from '<%= h event.params[:old_described_state] %>' to '<%= h event.params[:described_state] %>'.
+                had its status updated by <%= event.params[:user_id] ? User.find(event.params[:user_id]).name : event.params[:script] %> from '<%= h event.params[:old_described_state] %>' to '<%= h event.params[:described_state] %>'.
         <% else %>
             had '<%=event.event_type%>' done to it, parameters <%=h event.params_yaml%>.
         <% end %>