diff options
| -rw-r--r-- | app/helpers/admin_helper.rb | 20 | ||||
| -rw-r--r-- | app/views/admin_general/index.rhtml | 12 | ||||
| -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/show.rhtml | 16 | ||||
| -rw-r--r-- | app/views/admin_track/_some_tracks.rhtml | 4 | ||||
| -rw-r--r-- | app/views/admin_user/_user_table.rhtml | 2 |
7 files changed, 36 insertions, 24 deletions
diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index 65519692e..c7f467760 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -3,22 +3,34 @@ module AdminHelper content_tag(:i, "", :class => "icon-#{name}") end - def eye_icon + 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_icon, request_path(info_request), :title => "view request on public website") + " " + + link_to(eye, request_path(info_request), :title => "view request on public website") + " " + link_to(info_request.title, admin_request_show_url(info_request), :title => "view full details") end def public_body_both_links(public_body) - link_to(eye_icon, public_body_url(public_body), :title => "view authority on public website") + " " + + link_to(eye, public_body_url(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_icon, user_url(user), :title => "view user's page on public website") + " " + + link_to(eye, user_url(user), :title => "view user's page on public website") + " " + link_to(h(user.name), admin_user_show_url(user), :title => "view full details") end diff --git a/app/views/admin_general/index.rhtml b/app/views/admin_general/index.rhtml index 9da391e21..977af204f 100644 --- a/app/views/admin_general/index.rhtml +++ b/app/views/admin_general/index.rhtml @@ -27,7 +27,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"> @@ -55,7 +55,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"> @@ -79,7 +79,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"> @@ -104,7 +104,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"> @@ -128,7 +128,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"> @@ -152,7 +152,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"> 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 50da67c86..379947b8a 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_url(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/show.rhtml b/app/views/admin_request/show.rhtml index 5caaedd47..28c86fee5 100644 --- a/app/views/admin_request/show.rhtml +++ b/app/views/admin_request/show.rhtml @@ -8,7 +8,7 @@ <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 + <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"> @@ -54,7 +54,7 @@ </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 %> <%= user_both_links(@info_request.user) %> @@ -72,7 +72,7 @@ <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(eye, 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;"> @@ -176,7 +176,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 %> @@ -233,7 +233,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> <a href="../edit_outgoing/<%= outgoing_message.id %>"> #<%= outgoing_message.id %> -- <%= outgoing_message.status.humanize %> <%= outgoing_message.message_type.humanize %> </a> @@ -279,7 +279,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? %> @@ -326,7 +326,7 @@ <% 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> + <a href="#comment_<%=comment.id%>" data-toggle="collapse" data-parent="#comments"><%= chevron_right %></a> <a href="../edit_comment/<%= comment.id %>"> #<%=comment.id%> -- @@ -342,7 +342,7 @@ <tbody> <tr> <td colspan="2"> - By <%= link_to("<i class='icon-eye-open'></i>".html_safe, user_url(comment.user), :title => "view user's page on public website") %> + By <%= link_to(eye, user_url(comment.user), :title => "view user's page on public website") %> <%= link_to(h(comment.user.name), admin_user_show_url(comment.user)) %> </td> diff --git a/app/views/admin_track/_some_tracks.rhtml b/app/views/admin_track/_some_tracks.rhtml index c5daa405e..d0e52790a 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_url(track_thing.tracking_user) %> <%=link_to h(track_thing.tracking_user.name), user_path(track_thing.tracking_user) %> + tracked by <%=link_to eye, admin_user_show_url(track_thing.tracking_user) %> <%=link_to h(track_thing.tracking_user.name), user_path(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 %> |