diff --git a/app/views/admin/users/_sign_in_table.html.erb b/app/views/admin/users/_sign_in_table.html.erb
new file mode 100644
index 0000000000..7bc3185d39
--- /dev/null
+++ b/app/views/admin/users/_sign_in_table.html.erb
@@ -0,0 +1,48 @@
+
+ <% unless User::SignIn.retain_signins? %>
+
+
Sign In Retention Disabled
+ To enable sign in retention set
+ USER_SIGN_IN_ACTIVITY_RETENTION_DAYS to a value greater than
+ 0 in Alaveteli’s configuration. Any existing records below will
+ soon be purged and no further sign ins will be tracked.
+
- put it in [square brackets], e.g. [personal information removed]. applies to text in emails and HTML conversions of binaries; binaries themselves must stay the same length and the replacement is just a bunch of 'x's
+ Put it in [square brackets], e.g.
+ [Name removed]. Applies to text in emails and HTML conversions of
+ binaries; binaries themselves must stay the same length and the
+ replacement is just a bunch of 'x's
diff --git a/app/views/admin_censor_rule/_show.html.erb b/app/views/admin_censor_rule/_show.html.erb
index 67b6f67e17..98ae703cdf 100644
--- a/app/views/admin_censor_rule/_show.html.erb
+++ b/app/views/admin_censor_rule/_show.html.erb
@@ -6,15 +6,22 @@
<% CensorRule.content_columns.each do |column| %>
<%= column.name.humanize %>
<% end %>
+
Applies to
Actions
<% censor_rules.each do |censor_rule| %>
<%=h censor_rule.id %>
+
<% CensorRule.content_columns.map { |c| c.name }.each do |column| %>
(Lines containing the request incoming email address, updated hourly.)
@@ -405,5 +414,5 @@
Censor rules
<%= render partial: 'admin_censor_rule/show',
- locals: { censor_rules: @info_request.censor_rules,
+ locals: { censor_rules: @info_request.applicable_censor_rules,
info_request: @info_request } %>
diff --git a/app/views/admin_track/_some_tracks.html.erb b/app/views/admin_track/_some_tracks.html.erb
index 8282fea0d9..c670a44058 100644
--- a/app/views/admin_track/_some_tracks.html.erb
+++ b/app/views/admin_track/_some_tracks.html.erb
@@ -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 <%= user_both_links track_thing.tracking_user %>
+ tracked by <%= both_links track_thing.tracking_user %>
<% end %>
+ This is disabled for banned users as the email address must be
+ preserved to enforce the ban. First remove the ban text and then close
+ and anonymise the account.
+
+
1 If the user has any requests, this will create a Censor
Rule that applies to the User. The Censor Rule will take the User’s
diff --git a/app/views/admin_user/index.html.erb b/app/views/admin_user/index.html.erb
index bdfd9272dc..4d8f1738f1 100644
--- a/app/views/admin_user/index.html.erb
+++ b/app/views/admin_user/index.html.erb
@@ -1,43 +1,33 @@
-<% @title = 'Listing users' %>
+<%= render 'scopes' %>
+ <%=
+ _('You have already sent this request to some ' \
+ 'authorities in this batch on {{date}}.',
+ date: simple_date(@info_request_batch.existing_batch.created_at))
+ %>
+
+
+ <%=
+ _('You can view the ' \
+ 'existing batch, ' \
+ 'edit your request, or ignore ' \
+ 'this warning by confirming you want to proceed anyway.',
+ existing_batch_url: info_request_batch_path(
+ @info_request_batch.existing_batch
+ ),
+ edit_batch_url: new_alaveteli_pro_info_request_batch_path(
+ draft_id: draft.id
+ ))
+ %>
+
+
+ <%=
+ _('Please remember that our ' \
+ 'terms and conditions include ' \
+ 'making responsible requests.',
+ terms_url: pro_page_path(id: 'legal'))
+ %>
+
+
+ <%= label_tag :ignore_existing_batch do %>
+ <%= check_box_tag :ignore_existing_batch %>
+ <%= _('Send this batch anyway?') %>
+ <% end %>
+
<%= _('Don’t worry – our free accounts are still available and always will be.',
diff --git a/app/views/comment/rate_limited.html.erb b/app/views/comment/rate_limited.html.erb
new file mode 100644
index 0000000000..9e9291ec47
--- /dev/null
+++ b/app/views/comment/rate_limited.html.erb
@@ -0,0 +1,29 @@
+<% @title = _('Too many annotations') %>
+
+
<%= @title %>
+
+
+ <%= _('You have hit the rate limit on annotations. Users are ordinarily ' \
+ 'limited to {{comment_limit}} annotations per day.',
+ comment_limit: User::CONTENT_LIMIT[:comments]) %>
+
+
+
+ <%= _("There is a limit on the number of annotations you can make in a day " \
+ "because we don’t want the site to be bombarded with " \
+ "large numbers of inappropriate annotations. If you feel you have a " \
+ "good reason to ask for the limit to be lifted in your case, " \
+ "please get in touch.",
+ help_contact_path: help_contact_path) %>
+
+
+<% if @comment %>
+
+ <%= _('Here is the message you wrote, in case you would like to copy ' \
+ 'the text and save it for later.') %>
+
+
+
+
<%= @comment.get_body_for_html_display %>
+
+<% end %>
diff --git a/app/views/general/_advanced_search_tips.html.erb b/app/views/general/_advanced_search_tips.html.erb
index b54fc82549..e5d187b2e5 100644
--- a/app/views/general/_advanced_search_tips.html.erb
+++ b/app/views/general/_advanced_search_tips.html.erb
@@ -13,7 +13,7 @@
<%= _('commented_by:tony_bowden to search annotations made by Tony Bowden, typing the name as in the URL.')%>
<% end %>
<%= _('request: to restrict to a specific request, typing the title as in the URL.')%>
-
<%= _('filetype:pdf to find all responses with PDF attachments. Or try these: {{list_of_file_extensions}}', :list_of_file_extensions => IncomingMessage.get_all_file_extensions)%>
+
<%= _('filetype:pdf to find all responses with PDF attachments. Or try these: {{list_of_file_extensions}}', list_of_file_extensions: AlaveteliFileTypes.all_extensions.join(' '))%>
<%= _('Type 01/01/2008..14/01/2008 to only show things that happened in the first two weeks of January.')%>
<%= _('tag:charity to find all public ' \
'authorities or requests with a given tag. You can include ' \
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index d94762e3d3..a41cb0cc97 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -4,10 +4,13 @@
<%= csrf_meta_tags %>
- <%= site_name %> admin<%= @title ? ":" : "" %> <%=@title%>
+
+ <%= @title ? "#{ @title } -" : "" %> <%= site_name %> admin
+
<%= javascript_include_tag "admin" %>
<%= stylesheet_link_tag "admin", :title => "Main", :rel => "stylesheet" %>
+ <%= stylesheet_link_tag 'admin/print', :rel => "stylesheet", :media => "print" %>
<%= render :partial => 'layouts/favicon' %>
diff --git a/app/views/layouts/admin/users.html.erb b/app/views/layouts/admin/users.html.erb
new file mode 100644
index 0000000000..cc49070fb7
--- /dev/null
+++ b/app/views/layouts/admin/users.html.erb
@@ -0,0 +1,7 @@
+<%= inside_layout 'admin' do %>
+