diff options
| -rw-r--r-- | app/controllers/admin_censor_rule_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 15 | ||||
| -rw-r--r-- | app/helpers/admin_helper.rb | 37 | ||||
| -rwxr-xr-x | app/helpers/link_to_helper.rb | 21 | ||||
| -rw-r--r-- | app/views/admin_censor_rule/_form.rhtml | 6 | ||||
| -rw-r--r-- | app/views/admin_censor_rule/new.rhtml | 2 | ||||
| -rw-r--r-- | app/views/admin_general/index.rhtml | 27 | ||||
| -rw-r--r-- | app/views/admin_general/timeline.rhtml | 7 | ||||
| -rw-r--r-- | app/views/admin_public_body/_one_list.rhtml | 2 | ||||
| -rw-r--r-- | app/views/admin_request/_some_requests.rhtml | 4 | ||||
| -rw-r--r-- | app/views/admin_request/list_old_unclassified.rhtml | 15 | ||||
| -rw-r--r-- | app/views/admin_request/show.rhtml | 192 | ||||
| -rw-r--r-- | app/views/admin_track/_some_tracks.rhtml | 4 | ||||
| -rw-r--r-- | app/views/admin_user/_user_table.rhtml | 2 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
15 files changed, 156 insertions, 181 deletions
diff --git a/app/controllers/admin_censor_rule_controller.rb b/app/controllers/admin_censor_rule_controller.rb index f6abc70df..d3e9e47d2 100644 --- a/app/controllers/admin_censor_rule_controller.rb +++ b/app/controllers/admin_censor_rule_controller.rb @@ -10,7 +10,7 @@ class AdminCensorRuleController < AdminController @info_request = InfoRequest.find(params[:info_request_id]) end if params[:user_id] - @user = User.find(params[:user_id]) + @censor_user = User.find(params[:user_id]) end end diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index d84b44b6f..53055ae32 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -20,21 +20,6 @@ class AdminRequestController < AdminController :conditions => @query.nil? ? nil : ["lower(title) like lower('%'||?||'%')", @query] end - def list_old_unclassified - @info_requests = WillPaginate::Collection.create((params[:page] or 1), 50) do |pager| - info_requests = InfoRequest.find_old_unclassified(:conditions => ["prominence = 'normal'"], - :limit => pager.per_page, - :offset => pager.offset) - # inject the result array into the paginated collection: - pager.replace(info_requests) - - unless pager.total_entries - # the pager didn't manage to guess the total count, do it manually - pager.total_entries = InfoRequest.count_old_unclassified(:conditions => ["prominence = 'normal'"]) - end - end - end - def show @info_request = InfoRequest.find(params[:id]) # XXX is this *really* the only way to render a template to a diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb new file mode 100644 index 000000000..059cebdfa --- /dev/null +++ b/app/helpers/admin_helper.rb @@ -0,0 +1,37 @@ +module AdminHelper + def icon(name) + content_tag(:i, "", :class => "icon-#{name}") + end + + def eye + icon("eye-open") + end + + def chevron_right + icon("chevron-right") + end + + def chevron_down + icon("chevron-down") + end + + def arrow_right + icon("arrow-right") + end + + def request_both_links(info_request) + link_to(eye, request_path(info_request), :title => "view request on public website") + " " + + link_to(info_request.title, admin_request_show_path(info_request), :title => "view full details") + end + + def public_body_both_links(public_body) + link_to(eye, public_body_path(public_body), :title => "view authority on public website") + " " + + link_to(h(public_body.name), admin_body_show_path(public_body), :title => "view full details") + end + + def user_both_links(user) + link_to(eye, user_path(user), :title => "view user's page on public website") + " " + + link_to(h(user.name), admin_user_show_path(user), :title => "view full details") + end +end + diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index 15cce39eb..dc5c8f34e 100755 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -22,14 +22,6 @@ module LinkToHelper link_to h(info_request.title), request_path(info_request), :class => cls end - def request_admin_link(info_request, name="admin", cls=nil) - link_to name, admin_request_show_url(info_request), :class => cls - end - - def request_both_links(info_request) - link_to(h(info_request.title), request_url(info_request)) + " (" + link_to("admin", admin_request_show_url(info_request)) + ")" - end - def request_details_path(info_request) details_request_path(:url_title => info_request.url_title) end @@ -94,10 +86,6 @@ module LinkToHelper link_to h(public_body.name), public_body_url(public_body) end - def public_body_both_links(public_body) - link_to(h(public_body.name), public_body_url(public_body)) + " (" + link_to("admin", admin_body_show_url(public_body)) + ")" - end - # Users def user_url(user, options = {}) show_user_url(options.merge(:url_name => user.url_name)) @@ -126,10 +114,9 @@ module LinkToHelper def user_admin_link_for_request(request, external_text=nil, internal_text=nil) if request.is_external? - text = external_text ? external_text : (request.external_user_name || _("Anonymous user")) + " (external)" + external_text || (request.external_user_name || _("Anonymous user")) + " (external)" else - text = internal_text ? internal_text : request.user.name - link_to(h(text), admin_user_show_url(request.user)) + link_to(h(internal_text || request.user.name), admin_user_show_url(request.user)) end end @@ -181,10 +168,6 @@ module LinkToHelper link_to name, admin_user_show_url(user), :class => cls end - def user_both_links(user) - link_to(h(user.name), user_url(user)) + " (" + link_to("admin", admin_user_show_url(user)) + ")" - end - # Tracks. feed can be 'track' or 'feed' def do_track_url(track_thing, feed = 'track', options = {}) if track_thing.track_type == 'request_updates' diff --git a/app/views/admin_censor_rule/_form.rhtml b/app/views/admin_censor_rule/_form.rhtml index ac84935c5..5035238d6 100644 --- a/app/views/admin_censor_rule/_form.rhtml +++ b/app/views/admin_censor_rule/_form.rhtml @@ -3,13 +3,11 @@ <div class="well"> <%=_("Applies to")%> <% unless info_request.nil? %> - <%= request_link(info_request)%> - <%= request_admin_link(info_request, "(admin)", "btn btn-info")%> + <%= request_both_links(info_request) %> <%= hidden_field 'censor_rule', 'info_request_id', { :value => info_request.id } %> <% end %> <% unless user.nil? %> - <%= user_link(user) %> - <%= user_admin_link(user, "admin", "btn btn-info") %> + <%= user_both_links(user) %> <%= hidden_field 'censor_rule', 'user_id', { :value => user.id } %> <% end %> </div> diff --git a/app/views/admin_censor_rule/new.rhtml b/app/views/admin_censor_rule/new.rhtml index efa96700a..f6978c07c 100644 --- a/app/views/admin_censor_rule/new.rhtml +++ b/app/views/admin_censor_rule/new.rhtml @@ -3,7 +3,7 @@ <h1><%=@title%></h1> <% form_tag admin_rule_create_path, :class => "form form-horizontal" do %> - <%= render :partial => 'form', :locals => { :info_request => @info_request, :user => @user } %> + <%= render :partial => 'form', :locals => { :info_request => @info_request, :user => @censor_user } %> <div class="form-actions"> <%= submit_tag "Create", :class => "btn btn-primary" %> </div> diff --git a/app/views/admin_general/index.rhtml b/app/views/admin_general/index.rhtml index db1146302..9940434ac 100644 --- a/app/views/admin_general/index.rhtml +++ b/app/views/admin_general/index.rhtml @@ -28,7 +28,7 @@ <% if @holding_pen_messages.size > 0 %> <div class="accordion-group"> <div class="accordion-heading"> - <a class="accordion-toggle" href="#holding-pen" data-toggle="collapse" data-parent="things-to-do"><span class="label label-important"><%=@holding_pen_messages.size%></span><i class='icon-chevron-right'></i> Put misdelivered responses with the right request</a> + <a class="accordion-toggle" href="#holding-pen" data-toggle="collapse" data-parent="things-to-do"><span class="label label-important"><%=@holding_pen_messages.size%></span><%= chevron_right %> Put misdelivered responses with the right request</a> </div> <div id="holding-pen" class="accordion-body collapse"> <table class="table table-striped table-condensed"> @@ -56,7 +56,7 @@ <% if @error_message_requests.size > 0 %> <div class="accordion-group"> <div class="accordion-heading"> - <a class="accordion-toggle" href="#error-messages" data-toggle="collapse" data-parent="things-to-do"><span class="label label-important"><%=@error_message_requests.size%></span> <i class='icon-chevron-right'></i>Fix these delivery and other errors</a> + <a class="accordion-toggle" href="#error-messages" data-toggle="collapse" data-parent="things-to-do"><span class="label label-important"><%=@error_message_requests.size%></span> <%= chevron_right %>Fix these delivery and other errors</a> </div> <div id="error-messages" class="accordion-body collapse"> <table class="table table-striped table-condensed"> @@ -64,8 +64,7 @@ <% for @request in @error_message_requests %> <tr> <td class="link"> - <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_request_show_path(@request))%> - <%= link_to(@request.title, request_path(@request)) %> + <%= request_both_links(@request) %> </td> <td class="span2"> <%=simple_date(@request.get_last_event.created_at)%> @@ -81,7 +80,7 @@ <% if @attention_requests.size > 0 %> <div class="accordion-group"> <div class="accordion-heading"> - <a class="accordion-toggle" href="#attention-messages" data-toggle="collapse" data-parent="things-to-do"><span class="label label-important"><%=@attention_requests.size%></span><i class='icon-chevron-right'></i> Review requests marked by users as requiring your attention + <a class="accordion-toggle" href="#attention-messages" data-toggle="collapse" data-parent="things-to-do"><span class="label label-important"><%=@attention_requests.size%></span><%= chevron_right %> Review requests marked by users as requiring your attention </a> </div> <div id="attention-messages" class="accordion-body collapse"> @@ -90,8 +89,7 @@ <% for @request in @attention_requests %> <tr> <td class="link"> - <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_request_show_path(@request))%> - <%= link_to(@request.title, request_path(@request)) %> + <%= request_both_links(@request) %> </td> <td class="span2"> <%=simple_date(@request.get_last_event.created_at)%> @@ -107,7 +105,7 @@ <% if @requires_admin_requests.size > 0 %> <div class="accordion-group"> <div class="accordion-heading"> - <a class="accordion-toggle" href="#requires-admin" data-toggle="collapse" data-parent="things-to-do"><span class="label label-important"><%=@requires_admin_requests.size%></span><i class='icon-chevron-right'></i> These require administrator attention</a> + <a class="accordion-toggle" href="#requires-admin" data-toggle="collapse" data-parent="things-to-do"><span class="label label-important"><%=@requires_admin_requests.size%></span><%= chevron_right %> These require administrator attention</a> </div> <div id="requires-admin" class="accordion-body collapse"> <table class="table table-striped table-condensed"> @@ -115,8 +113,7 @@ <% for @request in @requires_admin_requests %> <tr> <td class="link"> - <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_request_show_path(@request))%> - <%= link_to(@request.title, request_path(@request)) %> + <%= request_both_links(@request) %> </td> <td class="span2"> <%=simple_date(@request.get_last_event.created_at)%> @@ -132,7 +129,7 @@ <% if @blank_contacts.size > 0 %> <div class="accordion-group"> <div class="accordion-heading"> - <a class="accordion-toggle" href="#blank-contacts" data-toggle="collapse" data-parent="things-to-do"><span class="label label-important"><%=@blank_contacts.size%></span><i class='icon-chevron-right'></i> Find missing FOI email for these public authorities (try phoning!)</a> + <a class="accordion-toggle" href="#blank-contacts" data-toggle="collapse" data-parent="things-to-do"><span class="label label-important"><%=@blank_contacts.size%></span><%= chevron_right %> Find missing FOI email for these public authorities (try phoning!)</a> </div> <div id="blank-contacts" class="accordion-body collapse"> <table class="table table-striped table-condensed"> @@ -140,8 +137,7 @@ <% for @blank_contact in @blank_contacts %> <tr> <td class="link"> - <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_body_show_path(@blank_contact))%> - <%= link_to h(@blank_contact.name), public_body_path(@blank_contact) %> + <%= public_body_both_links(@blank_contact) %> </td> <td class="span2"> <%=simple_date(@blank_contact.updated_at)%> @@ -157,7 +153,7 @@ <% if @old_unclassified.size > 0 %> <div class="accordion-group"> <div class="accordion-heading"> - <a class="accordion-toggle" href="#unclassified" data-toggle="collapse" data-parent="things-to-do"><span class="label label-important"><%=@old_unclassified.size%></span><i class='icon-chevron-right'></i> Classify responses that are still unclassified <%=InfoRequest::OLD_AGE_IN_DAYS.inspect %> after response</a> + <a class="accordion-toggle" href="#unclassified" data-toggle="collapse" data-parent="things-to-do"><span class="label label-important"><%=@old_unclassified.size%></span><%= chevron_right %> Classify responses that are still unclassified <%=InfoRequest::OLD_AGE_IN_DAYS.inspect %> after response</a> </div> <div id="unclassified" class="accordion-body collapse"> <table class="table table-striped table-condensed"> @@ -165,8 +161,7 @@ <% for @request in @old_unclassified %> <tr> <td class="link"> - <%= link_to("<i class='icon-tags'></i>".html_safe, admin_request_show_path(@request)) %> - <%= link_to(@request.title, request_path(@request)) %> + <%= request_both_links(@request) %> </td> <td class="span2"> <%=simple_date(@request.get_last_response_event.created_at)%> diff --git a/app/views/admin_general/timeline.rhtml b/app/views/admin_general/timeline.rhtml index 6f153504e..8fd8875b6 100644 --- a/app/views/admin_general/timeline.rhtml +++ b/app/views/admin_general/timeline.rhtml @@ -31,9 +31,7 @@ <%= simple_time(event_at) %> <% if event.is_a? InfoRequestEvent %> - <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_request_show_path(event.info_request), :title => "view full details")%> - <%= link_to(event.info_request.title, request_path(event.info_request), :title => "view request on public website")%> - + <%= request_both_links(event.info_request) %> <% if event.event_type == 'edit' %> was edited by administrator <strong><%=h event.params[:editor] %></strong>. <% for p in ['title', 'prominence', 'described_state', 'awaiting_description'] @@ -95,8 +93,7 @@ had '<%=event.event_type%>' done to it, parameters <%=h event.params_yaml%>. <% end %> <% else %> - <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_body_show_path(event.public_body), :title => "view full details")%> - <%= link_to(event.public_body.name, public_body_path(event.public_body), :title => "view authority on public website")%> + <%= public_body_both_links(event.public_body) %> was created/updated by administrator <strong><%=h event.last_edit_editor %></strong> <% end %> <% end %> diff --git a/app/views/admin_public_body/_one_list.rhtml b/app/views/admin_public_body/_one_list.rhtml index c867433a0..d8746bae7 100644 --- a/app/views/admin_public_body/_one_list.rhtml +++ b/app/views/admin_public_body/_one_list.rhtml @@ -3,7 +3,7 @@ <div class="accordion-group"> <div class="accordion-heading accordion-toggle row"> <span class="item-title span6"> - <a href="#body_<%=public_body.id%>" data-toggle="collapse" data-parent="requests"><i class="icon-chevron-right"></i></a> + <a href="#body_<%=public_body.id%>" data-toggle="collapse" data-parent="requests"><%= chevron_right %></a> <%= link_to(public_body.name, admin_body_show_path(public_body), :title => "view full details")%> </span> <span class="item-metadata span6"> diff --git a/app/views/admin_request/_some_requests.rhtml b/app/views/admin_request/_some_requests.rhtml index 03a77dd0b..cff94956d 100644 --- a/app/views/admin_request/_some_requests.rhtml +++ b/app/views/admin_request/_some_requests.rhtml @@ -3,11 +3,11 @@ <div class="accordion-group"> <div class="accordion-heading accordion-toggle row"> <span class="item-title span6"> - <a href="#request_<%=info_request.id%>" data-toggle="collapse" data-parent="requests"><i class="icon-chevron-right"></i></a> + <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") %> </span> <span class="item-metadata span6"> - <%= user_admin_link_for_request(info_request) %> <i class="icon-arrow-right"></i> <%= 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_show_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/list_old_unclassified.rhtml b/app/views/admin_request/list_old_unclassified.rhtml deleted file mode 100644 index 2bdfcf7f4..000000000 --- a/app/views/admin_request/list_old_unclassified.rhtml +++ /dev/null @@ -1,15 +0,0 @@ -<% @title = "Unclassified responses" %> - -<h1><%=@title%></h1> - -<p>Classify responses that are still unclassified <%=InfoRequest::OLD_AGE_IN_DAYS.inspect %> after response:</p> -<ul> -<% for @request in @info_requests %> - <li> - <%= request_both_links(@request) %> - – <%=simple_date(@request.get_last_response_event.created_at)%> - </li> -<% end %> -</ul> - -<%= will_paginate(@info_requests, :class => "paginator") %> diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml index 04695a761..1401a7b94 100644 --- a/app/views/admin_request/show.rhtml +++ b/app/views/admin_request/show.rhtml @@ -4,49 +4,49 @@ <% form_tag admin_request_move_request_path, { :class => "form form-horizontal" } do %> <%= hidden_field_tag 'info_request_id', @info_request.id %> -<div class="accordion" id="info_request"> - <div class="accordion-group"> - <div class="accordion-heading"> - <span class="item-title"> - <a href="#metadata_<%=@info_request.id%>" data-toggle="collapse" data-parent="#info_request"><i class="icon-chevron-down"></i></a>Request metadata - </span> - </div> - <div id="metadata_<%=@info_request.id%>" class="accordion-body collapse in"> - <table class="table table-striped table-condensed"> - <thead> - <tr> - <td colspan="2"> - <%= link_to 'Edit metadata', admin_request_edit_path(@info_request), :class => "btn" %> - </td> - </tr> - </thead> - <tbody> - <tr> - <th>Public page:</th> - <td><%= link_to request_url(@info_request), request_path(@info_request) %></td> - </tr> - <% @info_request.for_admin_column do |name, value, type, column_name|%> - <tr> - <td> - <b><%= name %>:</b> - </td> - <td> - <% if type == 'datetime' %> - <%= I18n.l(value, :format => "%e %B %Y %H:%M:%S") %> - (<%= _('{{length_of_time}} ago', :length_of_time => time_ago_in_words(value)) %>) - <% else %> - <%= h value %> - <% end %> - <% if column_name == 'described_state' %> - <ul> - <li><strong>Initial request last sent at:</strong> <%= @info_request.calculate_status %></li> - <li><strong>Initial request last sent at:</strong> <%=@info_request.date_initial_request_last_sent_at.to_date %></li> - <li><strong>Date response required by:</strong> <%= @info_request.date_response_required_by %></li> - <li><strong>Very overdue after:</strong> <%= @info_request.date_very_overdue_after %></li> - </ul> - <% end %> - </td> - </tr> + <div class="accordion" id="info_request"> + <div class="accordion-group"> + <div class="accordion-heading"> + <span class="item-title"> + <a href="#metadata_<%=@info_request.id%>" data-toggle="collapse" data-parent="#info_request"><%= chevron_down %></a>Request metadata + </span> + </div> + <div id="metadata_<%=@info_request.id%>" class="accordion-body collapse in"> + <table class="table table-striped table-condensed"> + <thead> + <tr> + <td colspan="2"> + <%= link_to 'Edit metadata', admin_request_edit_path(@info_request), :class => "btn" %> + </td> + </tr> + </thead> + <tbody> + <tr> + <th>Public page:</th> + <td><%= link_to request_url(@info_request), request_path(@info_request) %></td> + </tr> + <% @info_request.for_admin_column do |name, value, type, column_name|%> + <tr> + <td> + <b><%= name %>:</b> + </td> + <td> + <% if type == 'datetime' %> + <%= I18n.l(value, :format => "%e %B %Y %H:%M:%S") %> + (<%= _('{{length_of_time}} ago', :length_of_time => time_ago_in_words(value)) %>) + <% else %> + <%= h value %> + <% end %> + <% if column_name == 'described_state' %> + <ul> + <li><strong>Initial request last sent at:</strong> <%= @info_request.calculate_status %></li> + <li><strong>Initial request last sent at:</strong> <%=@info_request.date_initial_request_last_sent_at.to_date %></li> + <li><strong>Date response required by:</strong> <%= @info_request.date_response_required_by %></li> + <li><strong>Very overdue after:</strong> <%= @info_request.date_very_overdue_after %></li> + </ul> + <% end %> + </td> + </tr> <% end %> <tr> <td> @@ -54,61 +54,59 @@ </td> <td> <% if @info_request.is_external? %> - <%= link_to("<i class='icon-eye-open'></i>".html_safe, @info_request.external_url, :title => "view URL of original request on external website") %> + <%= link_to(eye, @info_request.external_url, :title => "view URL of original request on external website") %> <%= @info_request.public_body.name %> on behalf of <%= (@info_request.user_name || _('an anonymous user'))%> (using API) <% else %> - <%= link_to("<i class='icon-eye-open'></i>".html_safe, user_path(@info_request.user), :title => "view user's page on public website") %> - <%= user_admin_link_for_request(@info_request) %> + <%= user_both_links(@info_request.user) %> <%= link_to _("move..."), "#", :class => "btn btn-mini btn-warning toggle-hidden" %> <div style="display:none;"> <strong>url_name of new user:</strong> <%= text_field_tag 'user_url_name', "", { :size => 20 } %> <%= submit_tag "Move request to user", :class => "btn btn-info" %> </div> - <% end %> - - </td> - </tr> - <tr> - <td> - <b>Public authority:</b> - </td> - <td> - <%= link_to("<i class='icon-eye-open'></i>".html_safe, public_body_path(@info_request.public_body), :title => "view authority on public website") %> - <%= link_to(@info_request.public_body.name, admin_body_show_path(@info_request.public_body)) %> - <%= link_to "move...", "#", :class => "btn btn-mini btn-warning toggle-hidden" %> - <div style="display:none;"> - <strong>url_name of new authority:</strong> - <%= text_field_tag 'public_body_url_name', "", { :size => 20 } %> - <%= submit_tag "Move request to authority", :class => "btn btn-info" %> - </div> - </td> - </tr> - <tr> - <td> - <b><%=_("Incoming email address")%></b> - </td> - <td> - <%= link_to h(@info_request.incoming_email), "mailto:#{@info_request.incoming_email}" %> - </td> - </tr> - <tr> - <td> - <b><%=_("Tags")%></b> - </td> - <td> - <%= render :partial => 'tags', :locals => { :info_request => @info_request} %> - </td> - </tr> - </tbody> - <tfoot> - <tr> - <td colspan="2"> - <%= link_to 'Edit metadata', admin_request_edit_path(@info_request), :class => "btn" %> - </td> - </tr> - </tfoot> - </table> + <% end %> + </td> + </tr> + <tr> + <td> + <b>Public authority:</b> + </td> + <td> + <%= public_body_both_links(@info_request.public_body) %> + <%= link_to "move...", "#", :class => "btn btn-mini btn-warning toggle-hidden" %> + <div style="display:none;"> + <strong>url_name of new authority:</strong> + <%= text_field_tag 'public_body_url_name', "", { :size => 20 } %> + <%= submit_tag "Move request to authority", :class => "btn btn-info" %> + </div> + </td> + </tr> + <tr> + <td> + <b><%=_("Incoming email address")%></b> + </td> + <td> + <%= link_to h(@info_request.incoming_email), "mailto:#{@info_request.incoming_email}" %> + </td> + </tr> + <tr> + <td> + <b><%=_("Tags")%></b> + </td> + <td> + <%= render :partial => 'tags', :locals => { :info_request => @info_request} %> + </td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> + <%= link_to 'Edit metadata', admin_request_edit_path(@info_request), :class => "btn" %> + </td> + </tr> + </tfoot> + </table> + </div> </div> </div> <% end %> @@ -177,7 +175,7 @@ <div class="accordion-group"> <div class="accordion-heading"> <span class="item-title"> - <a href="#event_<%=info_request_event.id%>" data-toggle="collapse" data-parent="#events"><i class="icon-chevron-right"></i></a> + <a href="#event_<%=info_request_event.id%>" data-toggle="collapse" data-parent="#events"><%= chevron_right %></a> <%= _("Event {{id}}", :id => info_request_event.id) %>: <strong> <%=h info_request_event.event_type.humanize %><% if !info_request_event.calculated_state.nil? %>; state: <%= info_request_event.calculated_state %><% end %> @@ -234,7 +232,7 @@ <% for outgoing_message in @info_request.outgoing_messages.find(:all, :order => 'created_at') %> <div class="accordion-group"> <div class="accordion-heading"> - <a href="#outgoing_<%=outgoing_message.id%>" data-toggle="collapse" data-parent="#outgoing_messages"><i class="icon-chevron-right"></i></a> + <a href="#outgoing_<%=outgoing_message.id%>" data-toggle="collapse" data-parent="#outgoing_messages"><%= chevron_right %></a> <% link_to admin_request_edit_outgoing_path(outgoing_message) do %> #<%= outgoing_message.id %> -- <%= outgoing_message.status.humanize %> <%= outgoing_message.message_type.humanize %> <% end %> @@ -280,7 +278,7 @@ <% for incoming_message in @info_request.incoming_messages.find(:all, :order => 'created_at') %> <div class="accordion-group"> <div class="accordion-heading"> - <a href="#incoming_<%=incoming_message.id%>" data-toggle="collapse" data-parent="#incoming_messages"><i class="icon-chevron-right"></i></a> + <a href="#incoming_<%=incoming_message.id%>" data-toggle="collapse" data-parent="#incoming_messages"><%= chevron_right %></a> <%=incoming_message.id%> -- <%= h(incoming_message.mail_from) %> <%=_("at")%> <%=admin_value(incoming_message.sent_at)%> <blockquote class="incoming-message"> <% if !incoming_message.cached_main_body_text_folded.nil? %> @@ -327,8 +325,8 @@ <% for comment in @info_request.comments %> <div class="accordion-group"> <div class="accordion-heading"> - <a href="#comment_<%=comment.id%>" data-toggle="collapse" data-parent="#comments"><i class="icon-chevron-right"></i></a> - <% link_to admin_request_edit_comment_path(comment) do %> + <a href="#comment_<%=comment.id%>" data-toggle="collapse" data-parent="#comments"><%= chevron_right %></a> + <% link_to admin_request_edit_comment_path(comment) do %> #<%=comment.id%> -- <%=h(comment.user.name)%> @@ -343,9 +341,7 @@ <tbody> <tr> <td colspan="2"> - By <%= link_to("<i class='icon-eye-open'></i>".html_safe, user_path(comment.user), :title => "view user's page on public website") %> - - <%= link_to(h(comment.user.name), admin_user_show_path(comment.user)) %> + By <%= user_both_links(comment.user) %> </td> </tr> <% comment.for_admin_column do |name, value, type, column_name |%> diff --git a/app/views/admin_track/_some_tracks.rhtml b/app/views/admin_track/_some_tracks.rhtml index 68ebf7dd6..95101cb55 100644 --- a/app/views/admin_track/_some_tracks.rhtml +++ b/app/views/admin_track/_some_tracks.rhtml @@ -10,7 +10,7 @@ <% for track_thing in track_things %> <div class="accordion-group"> <div class="accordion-heading"> - <a href="#track_<%=track_thing.id%>" data-toggle="collapse" data-parent="requests"><i class="icon-chevron-right"></i></a> + <a href="#track_<%=track_thing.id%>" data-toggle="collapse" data-parent="requests"><%= chevron_right %></a> <%=track_thing.id%>: <% if track_thing.public_body_id %> <%= link_to "<code>#{h track_thing.track_query}</code>".html_safe, public_body_path(track_thing.public_body) %> @@ -23,7 +23,7 @@ <% end %> <% if @admin_user.nil? %> <%# Do not show this on the list of tracks on the user page, because it’s rather repetitive there %> - tracked by <%=link_to '<i class="icon-eye-open"></i>'.html_safe, admin_user_show_path(track_thing.tracking_user) %> <%=link_to h(track_thing.tracking_user.name), user_path(track_thing.tracking_user) %> + tracked by <%= user_both_links track_thing.tracking_user %> <% end %> </div> <div id="track_<%=track_thing.id%>" class="accordion-body collapse"> diff --git a/app/views/admin_user/_user_table.rhtml b/app/views/admin_user/_user_table.rhtml index a4227e017..57066bf3f 100644 --- a/app/views/admin_user/_user_table.rhtml +++ b/app/views/admin_user/_user_table.rhtml @@ -3,7 +3,7 @@ <div class="accordion-group"> <div class="accordion-heading accordion-toggle"> <span class="item-title"> - <a href="#user_<%=user.id%>" data-toggle="collapse" data-parent="requests"><i class="icon-chevron-right"></i></a> + <a href="#user_<%=user.id%>" data-toggle="collapse" data-parent="requests"><%= chevron_right %></a> <% if user.admin_level == "super" %> <span class="label">superuser</span> <% end %> diff --git a/config/routes.rb b/config/routes.rb index 86d60c0ae..ee7ebdcac 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -189,7 +189,6 @@ ActionController::Routing::Routes.draw do |map| end map.with_options :controller => 'admin_request' do |admin| - admin.admin_request_list_old_unclassified '/admin/unclassified', :action => 'list_old_unclassified' admin.admin_request_index '/admin/request', :action => 'index' admin.admin_request_list '/admin/request/list', :action => 'list' admin.admin_request_show '/admin/request/show/:id', :action => 'show' |