diff options
Diffstat (limited to 'app/views/admin_general')
| -rw-r--r-- | app/views/admin_general/index.rhtml | 243 | ||||
| -rw-r--r-- | app/views/admin_general/stats.rhtml | 84 | ||||
| -rw-r--r-- | app/views/admin_general/timeline.rhtml | 43 |
3 files changed, 142 insertions, 228 deletions
diff --git a/app/views/admin_general/index.rhtml b/app/views/admin_general/index.rhtml index 891f8b70d..1a4b8ba96 100644 --- a/app/views/admin_general/index.rhtml +++ b/app/views/admin_general/index.rhtml @@ -1,160 +1,95 @@ <% @title = "Summary" %> -<div class="hero-unit"> - <h2><%=@public_body_count%> public authorities</h2> - <h2><%=@info_request_count%> requests, <%=@outgoing_message_count%> outgoing messages, <%=@incoming_message_count%> incoming messages</h2> - <h2><%=@user_count%> users, <%=@track_thing_count%> tracked things</h2> - <h2><%=@comment_count%> annotations</h2> -</div> - -<div class="row"> - <div class="span12"> - <h1>Things to do</h1> - </div> -</div> - -<div class="accordion" id="things-to-do"> - <% 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> Put misdelivered responses with the right request</a> - </div> - <div id="holding-pen" class="accordion-body collapse"> - <table class="table table-striped"> - <tbody> - <% for message in @holding_pen_messages %> - <tr> - <td> - <% if message.get_body_for_quoting.strip.size == 0 %> - <%= link_to "(no body)", "request/show_raw_email/" + message.raw_email_id.to_s %> - <% else %> - <%= link_to excerpt(message.get_body_for_quoting, "", 60), "request/show_raw_email/" + message.raw_email_id.to_s %> - <% end %> - </td> - <td class="span2"> - <%=simple_date(message.sent_at)%> - </td> - </tr> - <% end %> - </tbody> - </table> - </div> - </div> - <% end %> - - <% 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> Fix these delivery and other errors</a> - </div> - <div id="error-messages" class="accordion-body collapse"> - <table class="table table-striped"> - <tbody> - <% for @request in @error_message_requests %> - <tr> - <td> - <%= link_to("admin", request_admin_url(@request), :class => "btn btn-primary btn-mini")%> - </td> - <td class="link"> - <%= request_link(@request)%> - </td> - <td class="span2"> - <%=simple_date(@request.get_last_event.created_at)%> - </td> - </tr> - <% end %> - </tbody> - </table> - </div> - </div> - <% end %> - - <% 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> These require administrator attention</a> - </div> - <div id="requires-admin" class="accordion-body collapse"> - <table class="table table-striped"> - <tbody> - <% for @request in @requires_admin_requests %> - <tr> - <td> - <%= link_to("admin", request_admin_url(@request), :class => "btn btn-primary btn-mini")%> - </td> - <td class="link"> - <%= request_link(@request)%> - </td> - <td class="span2"> - <%=simple_date(@request.get_last_event.created_at)%> - </td> - </tr> - <% end %> - </tbody> - </table> - </div> - </div> - <% end %> - - <% 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> 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"> - <tbody> - <% for @blank_contact in @blank_contacts %> - <tr> - <td> - <%= link_to("admin", public_body_admin_url(@blank_contact), :class => "btn btn-primary btn-mini")%> - </td> - <td class="link"> - <%= public_body_link(@blank_contact)%> - </td> - <td class="span2"> - <%=simple_date(@blank_contact.updated_at)%> - </td> - </tr> - <% end %> - </tbody> - </table> - </div> - </div> - <% end %> - - <% 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> 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"> - <tbody> - <% for @request in @old_unclassified %> - <tr> - <td> - <%= link_to("admin", request_admin_url(@request), :class => "btn btn-primary btn-mini")%> - </td> - <td class="link"> - <%= request_link(@request)%> - </td> - <td class="span2"> - <%=simple_date(@request.get_last_response_event.created_at)%> - </td> - </tr> + +<h1><%=@title%></h1> + +<ul> +<li><%=@public_body_count%> public authorities</li> +<li><%=@info_request_count%> requests, <%=@outgoing_message_count%> outgoing messages, + <%=@incoming_message_count%> incoming messages +</li> +<li><%=@user_count%> users, <%=@track_thing_count%> tracked things</li> +<li><%=@comment_count%> annotations</li> +</ul> + +<hr> + +<h1>Things to do</h1> + +<% if @holding_pen_messages.size > 0 %> + <h3>Put misdelivered responses with the right request (<%=@holding_pen_messages.size%> total)</h3> + + <ul> + <% for message in @holding_pen_messages %> + <li> + <% if message.get_body_for_quoting.strip.size == 0 %> + <%= link_to "(no body)", "request/show_raw_email/" + message.raw_email_id.to_s %> + <% else %> + <%= link_to excerpt(message.get_body_for_quoting, "", 60), "request/show_raw_email/" + message.raw_email_id.to_s %> <% end %> - </tbody> + (<%=simple_date(message.sent_at)%>) + </li> + <% end %> + </ul> + +<% end %> - </table> - </div> - </div> - <% end %> -</div> +<% if @error_message_requests.size > 0 %> + <h3>Fix these delivery and other errors (<%=@error_message_requests.size%> total)</h3> + + <ul> + <% for @request in @error_message_requests %> + <li> + <%= request_both_links(@request)%> + – <%=simple_date(@request.get_last_event.created_at)%> + </li> + <% end %> + </ul> +<% end %> + +<% if @requires_admin_requests.size > 0 %> + <h3>These require administrator attention (<%=@requires_admin_requests.size%> total)</h3> + + <ul> + <% for @request in @requires_admin_requests %> + <li> + <%= request_both_links(@request)%> + – <%=simple_date(@request.get_last_event.created_at)%> + </li> + <% end %> + </ul> +<% end %> + +<% if @blank_contacts.size > 0 %> + <h3>Find missing FOI email for these public authorities (try phoning!) (<%=@blank_contacts.size%> total)</h3> + <ul> + <% for @blank_contact in @blank_contacts %> + <li> + <%= public_body_both_links(@blank_contact)%> + – <%=simple_date(@blank_contact.updated_at)%> + </li> + <% end %> + </ul> +<% end %> + +<% if @old_unclassified.size > 0 %> + <h3>Classify responses that are still unclassified <%=InfoRequest::OLD_AGE_IN_DAYS.inspect %> after response</h3> + + <ul> + <% for @request in @old_unclassified %> + <li> + <%= request_both_links(@request) %> + – <%=simple_date(@request.get_last_response_event.created_at)%> + </li> + <% end %> + </ul> + + <p>(<%= link_to "Full list", admin_url("unclassified") %>, or play public + <%= link_to "Categorisation game", main_url(play_url(:only_path => true)) %>) + </p> +<% end %> <% if @holding_pen_messages.size == 0 && @old_unclassified.size == 0 && @requires_admin_requests.size == 0 && @blank_contacts.size == 0 %> - <div class="row"> - <div class="span12 alert alert-success"> - No pending administration required. - </div> - </div> + <p>No pending administration required.</p> <% end %> + + diff --git a/app/views/admin_general/stats.rhtml b/app/views/admin_general/stats.rhtml index 023c08cf5..b22adb581 100644 --- a/app/views/admin_general/stats.rhtml +++ b/app/views/admin_general/stats.rhtml @@ -1,54 +1,38 @@ <% @title = "Statistics" %> -<div class="row"> - <div class="span12"> - <h1>Statistics</h1> - <h2>Chart of requests (excluding backpaged)</h2> + +<h1>Statistics</h1> + +<h2>Chart of requests (excluding backpaged)</h2> + +<p> <img src="<%= main_url("/foi-live-creation.png")%>"> - </div> -</div> -<div class="row"> - <div class="span12"> - <h2>State of requests (includes backpaged)</h2> - <div class="container"> - <% for state, count in @request_by_state %> - <div class="row"> - <div class="span1"> - <span class="label label-info"><%=count%></span> - </div> - <div class="span4"> - <%=state%> - </div> - </div> - <% end %> - </div> - </div> -</div> -<div class="row"> - <div class="span12"> - <h2>Chart of users</h2> +</p> + +<h2>State of requests (includes backpaged)</h2> + +<table> +<% for state, count in @request_by_state %> +<tr> <td><%=state %></td><td><%= count %></td> </tr> +<% end %> +</table> + +<h2>Chart of users</h2> + +<p> <img src="<%= main_url("/foi-user-use.png")%>"> - </div> -</div> -<div class="row"> - <div class="span12"> - <h2>Tracks by type</h2> - <div class="container"> - <% for state, count in @tracks_by_type %> - <div class="row"> - <div class="span1"> - <span class="label label-info"><%=count%></span> - </div> - <div class="span4"> - <%=state%> - </div> - </div> - <% end %> - </div> - </div> -</div> -<div class="row"> - <div class="span12"> - <h2>Web analytics</h2> - </div> -</div> +</p> + +<h2>Tracks by type</h2> + +<table> +<% for state, count in @tracks_by_type %> +<tr> <td><%=state %></td><td><%= count %></td> </tr> +<% end %> +</table> + +<h2>Web analytics</h2> + + +</p> + diff --git a/app/views/admin_general/timeline.rhtml b/app/views/admin_general/timeline.rhtml index 532f17f98..39a4b3e36 100644 --- a/app/views/admin_general/timeline.rhtml +++ b/app/views/admin_general/timeline.rhtml @@ -1,19 +1,14 @@ <% @title = "Timeline" %> -<div class="btn-toolbar"> - <div class="btn-group"> - <a class="btn" href="?hour=1">Hour</a> - <a class="btn" href="?day=1">Day</a> - <a class="btn" href="?">2 days</a> - <a class="btn" href="?week=1">Week</a> - <a class="btn" href="?month=1">Month</a> - <a class="btn" href="?all=1">All time</a> - </div> -</div> -<div class="row"> - <div class="span12"> - <h1><%=h @events_title%></h1> - </div> -</div> + +<h1><%=h @events_title%></h1> + +<p> +<a href="?hour=1">Hour</a> +| <a href="?day=1">Day</a> +| <a href="?">2 days</a> +| <a href="?week=1">Week</a> +| <a href="?month=1">Month</a> +| <a href="?all=1">All time</a></p> <% last_date = nil %> <% for event in @events %> @@ -27,14 +22,14 @@ <br> <% end %> <% last_date = event.created_at.to_date %> - + <%= simple_time(event.created_at) %> <% if event.class.to_s == 'InfoRequestEvent' %> <%= 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'] + <% for p in ['title', 'prominence', 'described_state', 'awaiting_description'] if event.params[p.to_sym] != event.params[('old_'+p).to_sym] %> Changed <%=p%> from '<%=h event.params[('old_'+p).to_sym]%>' to '<%=h event.params[p.to_sym] %>'. <% end @@ -43,9 +38,8 @@ <% elsif event.event_type == 'edit_outgoing' %> <% outgoing_message = OutgoingMessage.find(event.params[:outgoing_message_id].to_i) %> had outgoing message edited by administrator <strong><%=h event.params[:editor] %></strong>. - <% if outgoing_messages.size > 0 %> - <% outgoing_message = outgoing_messages[0] %> - <% for p in ['body'] + <% if outgoing_message %> + <% for p in ['body'] if event.params[p.to_sym] != event.params[('old_'+p).to_sym] %> Changed <%=p%> from '<%=h event.params[('old_'+p).to_sym]%>' to '<%=h event.params[p.to_sym] %>'. <% end @@ -57,9 +51,8 @@ <% elsif event.event_type == 'edit_comment' %> <% comment = Comment.find(event.params[:comment_id].to_i) %> had annotation edited by administrator <strong><%=h event.params[:editor] %></strong>. - <% if comments.size > 0 %> - <% comment = comments[0] %> - <% for p in ['body'] + <% if comment %> + <% for p in ['body'] if event.params[p.to_sym] != event.params[('old_'+p).to_sym] %> Changed <%=p%> from '<%=h event.params[('old_'+p).to_sym]%>' to '<%=h event.params[p.to_sym] %>'. <% end @@ -76,7 +69,7 @@ had incoming message redelivered to another request by administrator <strong><%=h event.params[:editor] %></strong>. <% elsif event.event_type == 'response' %> <% incoming_message = event.incoming_message %> - received + received <%= link_to 'a response', main_url(incoming_message_url(incoming_message)) %> from <%=h event.info_request.public_body.name %>. <% elsif event.event_type == 'sent' %> @@ -100,3 +93,5 @@ <% if not @events.empty? %> </p> <% end %> + + |