diff options
Diffstat (limited to 'app/views/admin_request')
| -rw-r--r-- | app/views/admin_request/_incoming_message_actions.html.erb | 52 | ||||
| -rw-r--r-- | app/views/admin_request/_some_annotations.html.erb | 12 | ||||
| -rw-r--r-- | app/views/admin_request/_some_requests.html.erb | 4 | ||||
| -rw-r--r-- | app/views/admin_request/edit.html.erb | 8 | ||||
| -rw-r--r-- | app/views/admin_request/edit_comment.html.erb | 22 | ||||
| -rw-r--r-- | app/views/admin_request/index.html.erb (renamed from app/views/admin_request/list.html.erb) | 0 | ||||
| -rw-r--r-- | app/views/admin_request/show.html.erb | 25 | ||||
| -rw-r--r-- | app/views/admin_request/show_raw_email.html.erb | 63 |
8 files changed, 24 insertions, 162 deletions
diff --git a/app/views/admin_request/_incoming_message_actions.html.erb b/app/views/admin_request/_incoming_message_actions.html.erb deleted file mode 100644 index 22effcce5..000000000 --- a/app/views/admin_request/_incoming_message_actions.html.erb +++ /dev/null @@ -1,52 +0,0 @@ -<fieldset class="form-horizontal"> - <legend>Actions</legend> - <%= form_tag admin_incoming_redeliver_path, :class => "form form-inline" do %> - <div class="control-group"> - <label class="control-label" for="url_title_<%= incoming_message.id %>">Redeliver message to one or more other requests</label> - <div class="controls"> - <% if @info_requests && @info_requests.size == 1 %> - <%= text_field_tag 'url_title', @info_requests[0].url_title, { :size => 20, :id => "url_title_#{incoming_message.id}" } %> - <% else %> - <%= text_field_tag 'url_title', "", { :size => 20, :id => "url_title_#{incoming_message.id}" } %> - <% end %> - <%= hidden_field_tag 'redeliver_incoming_message_id', incoming_message.id, :id => nil %> - <%= submit_tag "Redeliver to another request", :class => "btn" %> - <p class="help-block"><code>id</code> or <code>url_title</code>; you can supply more than one, separated by commas</p> - </div> - </div> - <% end %> - <div class="control-group"> - <label class="control-label">Generate FOI officer upload URL</label> - <div class="controls"> - <%= link_to 'Generate and take me there', admin_request_generate_upload_url_path(incoming_message.info_request, :incoming_message_id => incoming_message.id), :class => "btn" %> - </div> - </div> - - <div class="control-group"> - <label class="control-label">Mark <code>To:</code> address as spam</label> - <div class="controls"> - <%= link_to 'Spam Addresses', admin_spam_addresses_path %> - </div> - </div> - - <%= form_tag admin_incoming_destroy_path, :class => "form form-inline" do %> - <div class="control-group"> - <label class="control-label" for="destroy_message_<%= incoming_message.id %>">Destroy message</label> - <div class="controls"> - <%= hidden_field_tag 'incoming_message_id', incoming_message.id, :id => nil %> - <%= submit_tag "Destroy message", :class => "btn btn-danger", :confirm => "This is permanent! Are you sure?", :id => "destroy_message_#{incoming_message.id}" %> - </div> - </div> - <% end %> - - <% if @raw_email.nil? %> - <%# we're not on the raw_email page itself %> - <div class="control-group"> - <label class="control-label">Inspect email</label> - <div class="controls"> - <%= link_to "View raw email", admin_request_show_raw_email_path(incoming_message.raw_email_id), :class => "btn" %> - </div> - </div> - <% end %> - -</fieldset> diff --git a/app/views/admin_request/_some_annotations.html.erb b/app/views/admin_request/_some_annotations.html.erb index 7adcdc5bb..de470d26b 100644 --- a/app/views/admin_request/_some_annotations.html.erb +++ b/app/views/admin_request/_some_annotations.html.erb @@ -1,20 +1,20 @@ <% if comments.any? %> - <%= form_tag admin_user_modify_comment_visibility_path do %> + <%= form_tag modify_comment_visibility_admin_users_path do %> <div class="accordion" id="comments"> <% comments.each do |comment| %> <div class="accordion-group"> <div class="accordion-heading"> <%= check_box_tag 'comment_ids[]', comment.id %> - + <a href="#comment_<%= comment.id %>" data-toggle="collapse" data-parent="#comments"><%= chevron_right %></a> - - <%= link_to admin_request_edit_comment_path(comment) do %> + + <%= link_to edit_admin_comment_path(comment) do %> #<%= comment.id %> -- <%= h(comment.user.name) %> <%= admin_value(comment.created_at) %> <% end %> - + <%= comment_visibility(comment) %> <blockquote class="incoming-message"> @@ -58,4 +58,4 @@ <% end %> <% else %> <p>None yet.</p> -<% end %> +<% end %> diff --git a/app/views/admin_request/_some_requests.html.erb b/app/views/admin_request/_some_requests.html.erb index cff94956d..9a39cd0c0 100644 --- a/app/views/admin_request/_some_requests.html.erb +++ b/app/views/admin_request/_some_requests.html.erb @@ -4,10 +4,10 @@ <div class="accordion-heading accordion-toggle row"> <span class="item-title span6"> <a href="#request_<%=info_request.id%>" data-toggle="collapse" data-parent="requests"><%= chevron_right %></a> - <%= link_to(info_request.title, admin_request_show_path(info_request), :title => "view full details") %> + <%= link_to(info_request.title, admin_request_path(info_request), :title => "view full details") %> </span> <span class="item-metadata span6"> - <%= user_admin_link_for_request(info_request) %> <%= arrow_right %> <%= link_to("#{info_request.public_body.name}", admin_body_show_path(info_request.public_body)) %>, <%= time_ago_in_words(info_request.updated_at) %> ago + <%= user_admin_link_for_request(info_request) %> <%= arrow_right %> <%= link_to("#{info_request.public_body.name}", admin_body_path(info_request.public_body)) %>, <%= time_ago_in_words(info_request.updated_at) %> ago </span> </div> <div id="request_<%=info_request.id%>" class="item-detail accordion-body collapse row"> diff --git a/app/views/admin_request/edit.html.erb b/app/views/admin_request/edit.html.erb index 552b31bbb..db0b54655 100644 --- a/app/views/admin_request/edit.html.erb +++ b/app/views/admin_request/edit.html.erb @@ -2,7 +2,7 @@ <%= error_messages_for 'info_request' %> -<%= form_tag admin_request_update_path(@info_request) do %> +<%= form_tag admin_request_path(@info_request), :method => :put do %> <p><label for="info_request_title"><strong>Title</strong></label> (warning: editing this will break URLs right now)<br/> <%= text_field 'info_request', 'title', :size => 50 %></p> @@ -43,15 +43,15 @@ <% end %> <p> -<%= link_to 'Show', admin_request_show_path(@info_request) %> | -<%= link_to 'List all', admin_request_list_path %> +<%= link_to 'Show', admin_request_path(@info_request) %> | +<%= link_to 'List all', admin_requests_path %> </p> <hr> <div class="well"> -<%= form_tag admin_request_destroy_path(@info_request) do %> +<%= form_tag admin_request_path(@info_request), :method => :delete do %> <p> <strong>This is permanent and irreversible!</strong> <%= submit_tag 'Destroy request entirely', :class => 'btn btn-danger' %> <br>Use it mainly if someone posts private information, e.g. made a Data Protection request. It diff --git a/app/views/admin_request/edit_comment.html.erb b/app/views/admin_request/edit_comment.html.erb deleted file mode 100644 index 2cf49a4a8..000000000 --- a/app/views/admin_request/edit_comment.html.erb +++ /dev/null @@ -1,22 +0,0 @@ -<h1>Edit annotation</h1> - -<%= error_messages_for 'comment' %> - -<%= form_tag admin_request_update_comment_path(@comment) do %> - - <p><label for="comment_body">Body of annotation</label><br/> - <%= text_area 'comment', 'body', :rows => 10, :cols => 60 %></p> - - <p><label for="comment_visible">Visible</label> - <%= select('comment', "visible", [["Yes – show comment",true],["No – hide comment",false]]) %> - </p> - - - <p><%= submit_tag 'Save', :accesskey => 's' %></p> -<% end %> - -<p> -<%= link_to 'Show', admin_request_show_path(@comment.info_request) %> | -<%= link_to 'List all', admin_request_list_path %> -</p> - diff --git a/app/views/admin_request/list.html.erb b/app/views/admin_request/index.html.erb index 2bd3e3326..2bd3e3326 100644 --- a/app/views/admin_request/list.html.erb +++ b/app/views/admin_request/index.html.erb diff --git a/app/views/admin_request/show.html.erb b/app/views/admin_request/show.html.erb index 9c04badeb..dfb911ea7 100644 --- a/app/views/admin_request/show.html.erb +++ b/app/views/admin_request/show.html.erb @@ -2,8 +2,7 @@ <h1><%=@title%></h1> -<%= form_tag admin_request_move_request_path, { :class => "form form-horizontal" } do %> - <%= hidden_field_tag 'info_request_id', @info_request.id %> +<%= form_tag move_admin_request_path(@info_request), { :class => "form form-horizontal" } do %> <div class="accordion" id="info_request"> <div class="accordion-group"> <div class="accordion-heading"> @@ -16,7 +15,7 @@ <thead> <tr> <td colspan="2"> - <%= link_to 'Edit metadata', admin_request_edit_path(@info_request), :class => "btn" %> + <%= link_to 'Edit metadata', edit_admin_request_path(@info_request), :class => "btn" %> </td> </tr> </thead> @@ -101,7 +100,7 @@ <tfoot> <tr> <td colspan="2"> - <%= link_to 'Edit metadata', admin_request_edit_path(@info_request), :class => "btn" %> + <%= link_to 'Edit metadata', edit_admin_request_path(@info_request), :class => "btn" %> </td> </tr> </tfoot> @@ -117,11 +116,13 @@ FOI officer upload URL </label> <div class="controls"> - <%= link_to 'Generate URL', admin_request_generate_upload_url_path(@info_request), :class => "btn" %> + <%= form_tag generate_upload_url_admin_request_path(@info_request), :class => "form form-inline" do %> + <%= submit_tag "Generate URL", :class => "btn" %> + <% end %> <p class="help-block">(see also option to generate URLs for individual incoming messages below)</p> </div> </div> - <%= form_tag admin_request_hide_path(@info_request), :class => "form form-inline", :id => "hide_request_form", 'data-info-request-id' => @info_request.id.to_s do %> + <%= form_tag hide_admin_request_path(@info_request), :class => "form form-inline", :id => "hide_request_form", 'data-info-request-id' => @info_request.id.to_s do %> <div class="control-group"> <% if @info_request.is_external? %> <label class="control-label">Hide the request:</label> @@ -191,8 +192,7 @@ <tr> <td> <% if info_request_event.described_state != 'waiting_clarification' and info_request_event.event_type == 'response' %> - <%= form_tag admin_request_clarification_path, :class => "form form-inline admin-table-form admin-inline-form" do %> - <%= hidden_field_tag 'info_request_event_id', info_request_event.id, :id => nil %> + <%= form_tag admin_info_request_event_path(info_request_event), :method => 'put', :class => "form form-inline admin-table-form admin-inline-form" do %> <%= submit_tag "Was clarification request", :class => "btn btn-mini btn-primary" %> <% end %> <% end %> @@ -233,7 +233,7 @@ <div class="accordion-group"> <div class="accordion-heading"> <a href="#outgoing_<%=outgoing_message.id%>" data-toggle="collapse" data-parent="#outgoing_messages"><%= chevron_right %></a> - <%= link_to admin_outgoing_edit_path(outgoing_message) do %> + <%= link_to edit_admin_outgoing_message_path(outgoing_message) do %> #<%= outgoing_message.id %> -- <%= outgoing_message.status.humanize %> <%= outgoing_message.message_type.humanize %> <% end %> <blockquote> @@ -245,8 +245,7 @@ <tbody> <tr> <td colspan="2"> - <%= form_tag admin_request_resend_path, :class => "admin-table-form" do %> - <%= hidden_field_tag 'outgoing_message_id', outgoing_message.id %> + <%= form_tag resend_admin_outgoing_message_path(outgoing_message), :class => "admin-table-form" do %> <%= submit_tag "Resend", :class => "btn" %> <% end %> </td> @@ -279,7 +278,7 @@ <div class="accordion-group"> <div class="accordion-heading"> <a href="#incoming_<%=incoming_message.id%>" data-toggle="collapse" data-parent="#incoming_messages"><%= chevron_right %></a> - <%= link_to admin_incoming_edit_path(incoming_message) do %> + <%= link_to edit_admin_incoming_message_path(incoming_message) do %> <%=incoming_message.id%> -- <%= h(incoming_message.mail_from) %> @@ -296,7 +295,7 @@ <thead> <tr> <td colspan="2" class="well"> - <%= render :partial => 'incoming_message_actions', :locals => { :incoming_message => incoming_message } %> + <%= render :partial => 'admin_incoming_message/actions', :locals => { :incoming_message => incoming_message } %> </td> </tr> </thead> diff --git a/app/views/admin_request/show_raw_email.html.erb b/app/views/admin_request/show_raw_email.html.erb deleted file mode 100644 index da22b6069..000000000 --- a/app/views/admin_request/show_raw_email.html.erb +++ /dev/null @@ -1,63 +0,0 @@ -<%= render :partial => 'admin_incoming_message/intro', :locals => { :incoming_message => @raw_email.incoming_message } %> - - <% if @holding_pen %> - <br>This is in the holding pen because: <strong><%= @rejected_reason %></strong> - <% if @public_bodies.size > 0 %> - <br>Guessed authority: - <% @public_bodies.each do |public_body| %> - <%=public_body_both_links(public_body)%> - <% end %> - (based on From: email domain) - <% end %> - <% if @info_requests.size > 0 %> - <div class="accordion" id="guessed-requests"> - Guessed request: - <% @info_requests.each do |info_request| %> - <div class="accordion-group"> - <div class="accordion-heading"> - <a href="#info_request_<%= info_request.id %>" data-toggle="collapse"><i class="icon-chevron-right"></i></a> - <%=request_both_links(info_request)%> - </div> - <div class="accordion-body collapse" id="info_request_<%= info_request.id %>"> - <table class="table table-striped table-condensed"> - <tr> - <td><strong>Last outgoing message:</strong></td> - <td><%= info_request.outgoing_messages.last.body %></td> - </tr> - <tr> - <td><strong>Created by:</strong></td> - <td><%= user_admin_link_for_request(info_request) %></td> - </tr> - <tr> - <td><strong>Authority:</strong></td> - <td> - <%= link_to(info_request.public_body.name, admin_body_show_path(info_request.public_body)) %> - </td> - </tr> - <tr> - <td><strong>url_title:</strong></td> - <td><%= info_request.url_title %></td> - </tr> - </table> - <p> - This request was guessed because it has an incoming email address of <strong><%= info_request.incoming_email %></strong> and this incoming message was sent to <strong><%= @raw_email.incoming_message.mail.to %></strong>. - </p> - </div> - </div> - <% end %> - (based on id, not hash, in To/Cc email) - </div> - <% end %> - <% end %> -</p> - -<div> - <%= render :partial => 'incoming_message_actions', :locals => { :incoming_message => @raw_email.incoming_message } %> -</div> - -<h2>Raw email</h2> - -<p><%= link_to "Download", admin_request_download_raw_email_path(@raw_email) %></p> - -<pre><%=h(@raw_email.data).gsub(/\n/, '<br>').html_safe %></pre> - |