aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/views/admin_general/_admin_navbar.rhtml2
-rw-r--r--app/views/admin_general/admin.coffee2
-rw-r--r--app/views/admin_general/admin.js2
-rw-r--r--app/views/admin_general/admin_js.erb2
-rw-r--r--app/views/admin_general/index.rhtml11
-rw-r--r--app/views/admin_general/stats.rhtml1
-rw-r--r--app/views/admin_general/timeline.rhtml2
-rw-r--r--app/views/admin_request/_some_requests.rhtml2
-rw-r--r--app/views/admin_request/show.rhtml6
-rw-r--r--app/views/admin_request/show_raw_email.rhtml54
-rw-r--r--app/views/admin_track/_some_tracks.rhtml4
-rw-r--r--app/views/admin_track/list.rhtml2
-rw-r--r--app/views/admin_user/show.rhtml1
13 files changed, 60 insertions, 31 deletions
diff --git a/app/views/admin_general/_admin_navbar.rhtml b/app/views/admin_general/_admin_navbar.rhtml
index 49592c545..5cc740f70 100644
--- a/app/views/admin_general/_admin_navbar.rhtml
+++ b/app/views/admin_general/_admin_navbar.rhtml
@@ -20,5 +20,3 @@
</div>
</div>
</div>
-
-
diff --git a/app/views/admin_general/admin.coffee b/app/views/admin_general/admin.coffee
index 407ef3e3d..8f9e879ae 100644
--- a/app/views/admin_general/admin.coffee
+++ b/app/views/admin_general/admin.coffee
@@ -13,7 +13,7 @@ jQuery ->
info_request_id = $('#hide_request_form').attr('info_request_id')
reason = $(this).val()
$('#request_hidden_user_explanation_field').attr("value", "[loading default text...]")
- $.ajax "<%= Configuration::admin_public_url %>/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id,
+ $.ajax "/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id,
type: "GET"
dataType: "text"
error: (data, textStatus, jqXHR) ->
diff --git a/app/views/admin_general/admin.js b/app/views/admin_general/admin.js
index c4c44dff0..61382dab3 100644
--- a/app/views/admin_general/admin.js
+++ b/app/views/admin_general/admin.js
@@ -17,7 +17,7 @@
info_request_id = $('#hide_request_form').attr('info_request_id');
reason = $(this).val();
$('#request_hidden_user_explanation_field').attr("value", "[loading default text...]");
- return $.ajax("<%= Configuration::admin_public_url %>/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id, {
+ return $.ajax("/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id, {
type: "GET",
dataType: "text",
error: function(data, textStatus, jqXHR) {
diff --git a/app/views/admin_general/admin_js.erb b/app/views/admin_general/admin_js.erb
index c4c44dff0..61382dab3 100644
--- a/app/views/admin_general/admin_js.erb
+++ b/app/views/admin_general/admin_js.erb
@@ -17,7 +17,7 @@
info_request_id = $('#hide_request_form').attr('info_request_id');
reason = $(this).val();
$('#request_hidden_user_explanation_field').attr("value", "[loading default text...]");
- return $.ajax("<%= Configuration::admin_public_url %>/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id, {
+ return $.ajax("/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id, {
type: "GET",
dataType: "text",
error: function(data, textStatus, jqXHR) {
diff --git a/app/views/admin_general/index.rhtml b/app/views/admin_general/index.rhtml
index 8fd63d326..74d0f92f8 100644
--- a/app/views/admin_general/index.rhtml
+++ b/app/views/admin_general/index.rhtml
@@ -16,6 +16,7 @@
</div>
</div>
+<hr>
<div class="row">
<div class="span12">
@@ -63,7 +64,7 @@
<% for @request in @error_message_requests %>
<tr>
<td class="link">
- <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_request_show_url(@request))%>
+ <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_request_show_path(@request))%>
<%= link_to(@request.title, request_path(@request)) %>
</td>
<td class="span2">
@@ -89,7 +90,7 @@
<% for @request in @attention_requests %>
<tr>
<td class="link">
- <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_request_show_url(@request))%>
+ <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_request_show_path(@request))%>
<%= link_to(@request.title, request_path(@request)) %>
</td>
<td class="span2">
@@ -114,7 +115,7 @@
<% for @request in @requires_admin_requests %>
<tr>
<td class="link">
- <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_request_show_url(@request))%>
+ <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_request_show_path(@request))%>
<%= link_to(@request.title, request_path(@request)) %>
</td>
<td class="span2">
@@ -140,7 +141,7 @@
<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_url(@blank_contact) %>
+ <%= link_to h(@blank_contact.name), public_body_path(@blank_contact) %>
</td>
<td class="span2">
<%=simple_date(@blank_contact.updated_at)%>
@@ -164,7 +165,7 @@
<% for @request in @old_unclassified %>
<tr>
<td class="link">
- <%= link_to("<i class='icon-tags'></i>".html_safe, admin_request_show_url(@request)) %>
+ <%= link_to("<i class='icon-tags'></i>".html_safe, admin_request_show_path(@request)) %>
<%= link_to(@request.title, request_path(@request)) %>
</td>
<td class="span2">
diff --git a/app/views/admin_general/stats.rhtml b/app/views/admin_general/stats.rhtml
index 1a8035006..27dc25ee0 100644
--- a/app/views/admin_general/stats.rhtml
+++ b/app/views/admin_general/stats.rhtml
@@ -1,5 +1,4 @@
<% @title = "Statistics" %>
-
<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>
diff --git a/app/views/admin_general/timeline.rhtml b/app/views/admin_general/timeline.rhtml
index ec5b860e5..0c5f24279 100644
--- a/app/views/admin_general/timeline.rhtml
+++ b/app/views/admin_general/timeline.rhtml
@@ -31,7 +31,7 @@
<%= simple_time(event_at) %>
<% if event.is_a? InfoRequestEvent %>
- <%= link_to('<i class="icon-tags"></i>'.html_safe, admin_request_show_url(event.info_request), :title => "view full details")%>
+ <%= 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")%>
<% if event.event_type == 'edit' %>
diff --git a/app/views/admin_request/_some_requests.rhtml b/app/views/admin_request/_some_requests.rhtml
index 50da67c86..03a77dd0b 100644
--- a/app/views/admin_request/_some_requests.rhtml
+++ b/app/views/admin_request/_some_requests.rhtml
@@ -4,7 +4,7 @@
<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>
- <%= link_to(info_request.title, admin_request_show_url(info_request), :title => "view full details") %>
+ <%= 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
diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml
index e5c6954eb..72552a588 100644
--- a/app/views/admin_request/show.rhtml
+++ b/app/views/admin_request/show.rhtml
@@ -57,7 +57,7 @@
<%= link_to("<i class='icon-eye-open'></i>".html_safe, @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_url(@info_request.user), :title => "view user's page on public website") %>
+ <%= 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) %>
<%= link_to _("move..."), "#", :class => "btn btn-mini btn-warning toggle-hidden" %>
<div style="display:none;">
@@ -343,9 +343,9 @@
<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("<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_url(comment.user)) %>
+ <%= link_to(h(comment.user.name), admin_user_show_path(comment.user)) %>
</td>
</tr>
<% comment.for_admin_column do |name, value, type, column_name |%>
diff --git a/app/views/admin_request/show_raw_email.rhtml b/app/views/admin_request/show_raw_email.rhtml
index c770d432d..72c782ad6 100644
--- a/app/views/admin_request/show_raw_email.rhtml
+++ b/app/views/admin_request/show_raw_email.rhtml
@@ -1,24 +1,56 @@
-<% @title = 'Incoming message ' + @raw_email.incoming_message.id.to_s + ' of FOI request \'' + h(@raw_email.incoming_message.info_request.title) + "'" %>
+<% @title = "Incoming message #{@raw_email.incoming_message.id} of FOI request '#{@raw_email.incoming_message.info_request.title}'" %>
-<h1>Incoming message <%=@raw_email.incoming_message.id.to_s %></h1>
+<h1>Incoming message <%=@raw_email.incoming_message.id %></h1>
<p>
FOI request: <%= request_both_links(@raw_email.incoming_message.info_request) %>
- <% if @holding_pen %>
+ <% if @holding_pen %>
<br>This is in the holding pen because: <strong><%= @rejected_reason %></strong>
<% if @public_bodies.size > 0 %>
<br>Guessed authority:
- <% for public_body in @public_bodies %>
- <%=public_body_both_links(public_body)%>
+ <% @public_bodies.each do |public_body| %>
+ <%=public_body_both_links(public_body)%>
<% end %>
(based on From: email domain)
<% end %>
<% if @info_requests.size > 0 %>
- <br>Guessed request:
- <% for info_request in @info_requests %>
- <%=request_both_links(info_request)%>
- <% end %>
- (based on id, not hash, in To/Cc email)
+ <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>
@@ -29,7 +61,7 @@
<h2>Raw email</h2>
-<p><%= link_to "Download", "../download_raw_email/" + @raw_email.id.to_s %></p>
+<p><%= link_to "Download", admin_request_download_raw_email_path(@raw_email) %></p>
<pre><%=h(@raw_email.data).gsub(/\n/, '<br>').html_safe %></pre>
diff --git a/app/views/admin_track/_some_tracks.rhtml b/app/views/admin_track/_some_tracks.rhtml
index c5daa405e..8ae7bd5c1 100644
--- a/app/views/admin_track/_some_tracks.rhtml
+++ b/app/views/admin_track/_some_tracks.rhtml
@@ -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 '<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) %>
<% end %>
</div>
<div id="track_<%=track_thing.id%>" class="accordion-body collapse">
@@ -52,7 +52,7 @@
<%= I18n.l(track_thing.send(column.name), :format => "%e %B %Y %H:%M:%S") %>
(<%= _('{{length_of_time}} ago', :length_of_time => time_ago_in_words(track_thing.send(column.name))) %>)
<% elsif column.name == 'track_medium' and track_thing.track_medium == 'feed' %>
- <%= link_to track_thing.track_medium, atom_feed_url(:track_id => track_thing.id) %>
+ <%= link_to track_thing.track_medium, atom_feed_path(:track_id => track_thing.id) %>
<% else %>
<%= h track_thing.send(column.name)%>
<% end %>
diff --git a/app/views/admin_track/list.rhtml b/app/views/admin_track/list.rhtml
index fa4d02eec..9cff5635b 100644
--- a/app/views/admin_track/list.rhtml
+++ b/app/views/admin_track/list.rhtml
@@ -14,7 +14,7 @@
<h2>Current top tracks:</h2>
<ol>
<% for row in @popular %>
- <li><%= link_to row['title'], admin_request_show_url(row['info_request_id']) %> (<%= row['count'] %> people following)</li>
+ <li><%= link_to row['title'], admin_request_show_path(row['info_request_id']) %> (<%= row['count'] %> people following)</li>
<% end %>
</ol>
diff --git a/app/views/admin_user/show.rhtml b/app/views/admin_user/show.rhtml
index 0b3adb332..ccf2694b9 100644
--- a/app/views/admin_user/show.rhtml
+++ b/app/views/admin_user/show.rhtml
@@ -10,7 +10,6 @@
<%= submit_tag "Clear photo", :class => "btn btn-info" %>
<% end %>
</div>
-
<% end %>
<table class="table table-striped table-condensed">
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 05:03:00 +0000