Statistics
Chart of requests (excluding backpaged)
- <% if File.exists?(File.expand_path("public/foi-live-creation.png", Rails.root)) %> + <% if File.exist?(File.expand_path("public/foi-live-creation.png", Rails.root)) %>
<% else %>
No requests yet (the raw data may include the Holding Pen request)
@@ -37,7 +37,7 @@
Chart of users
- <% if File.exists?(File.expand_path("public/foi-user-use.png", Rails.root)) %> + <% if File.exist?(File.expand_path("public/foi-user-use.png", Rails.root)) %>
<% else %>
No user data yet
diff --git a/app/views/admin_holiday_imports/new.html.erb b/app/views/admin_holiday_imports/new.html.erb
index d62b7b15c0..5b372e72cd 100644
--- a/app/views/admin_holiday_imports/new.html.erb
+++ b/app/views/admin_holiday_imports/new.html.erb
@@ -3,7 +3,8 @@
<%= form_for( @holiday_import, :as => 'holiday_import', :url => '', :method => 'get', :html => { :class => 'form-horizontal form-inline' }) do |f| %>
<% if @holiday_import.holidays.empty? %>
- <%= error_messages_for 'holiday_import', :header_message => 'There was a problem with these import settings' %>
+ <% if @holiday_import.errors.any? %>There was a problem with these import settings
<% end %> + <%= foi_error_messages_for :holiday_import %> <% end %>
@@ -58,7 +59,7 @@
<% end %>
<% else %>
<%= form_for( @holiday_import, :as => 'holiday_import', :url => admin_holiday_imports_path, :html => { :class => 'form-inline' } ) do |f| -%>
- <%= error_messages_for 'holiday_import' %>
+ <%= foi_error_messages_for :holiday_import %>
<% end %>
diff --git a/app/views/admin_public_body/import_csv.html.erb b/app/views/admin_public_body/import_csv.html.erb
index c90efcbec8..57ab0b78e0 100644
--- a/app/views/admin_public_body/import_csv.html.erb
+++ b/app/views/admin_public_body/import_csv.html.erb
@@ -50,10 +50,12 @@
CSV file format: The first row should be a list
- of fields, starting with #. The fields name and
- request_email are required; additionally, translated values are
- supported by adding the locale name to the field name,
- e.g. name.es, name.de…
+ of field headers, starting with #. The fields
+ name and request_email are required, but the
+ values for request_email may be left blank to leave the
+ existing request_email unchanged. Translated values are
+ supported by adding the locale name to the field name, e.g.
+ name.es, name.de…
Example:
- <%= f.submit "Create", :class => "btn btn-primary" %>
+ <%= f.submit "Create", :class => "btn btn-success" %>
<% end %>
diff --git a/app/views/admin_public_body_categories/_form.html.erb b/app/views/admin_public_body_categories/_form.html.erb
index 2d289f3a7b..681ce06e89 100644
--- a/app/views/admin_public_body_categories/_form.html.erb
+++ b/app/views/admin_public_body_categories/_form.html.erb
@@ -1,8 +1,16 @@
<% if @public_body_category.errors.any? %>
-
- <% @public_body_category.errors.each do |attr, message| %>
- <% unless attr.to_s.starts_with?('translation') %>
-
- <%= message %> + <% if rails_upgrade? %> + <% @public_body_category.errors.each do |error| %> + <% unless error.attribute.to_s.starts_with?('translation') %> +
- <%= error.message %> + <% end %> + <% end %> + <% else %> + <% @public_body_category.errors.each do |attr, message| %> + <% unless attr.to_s.starts_with?('translation') %> +
- <%= message %> + <% end %> <% end %> <% end %>
-
- <% translation.errors.each do |attr, message| %>
-
- <%= message %> + <% if rails_upgrade? %> + <% translation.errors.each do |error| %> +
- <%= error.message %> + <% end %> + <% else %> + <% translation.errors.each do |attr, message| %> +
- <%= message %> + <% end %> <% end %>
- <%= link_to "Save", '#', :class => "btn btn-primary disabled save-order", "data-heading-id" => heading.id, "data-list-id" => "#heading_#{heading.id}_category_list", 'data-endpoint' => reorder_categories_admin_heading_path(heading) %>
Drag and drop to change the order of categories.
+ <%= link_to "Save", '#', :class => "btn btn-success disabled save-order", "data-heading-id" => heading.id, "data-list-id" => "#heading_#{heading.id}_category_list", 'data-endpoint' => reorder_categories_admin_heading_path(heading) %>Drag and drop to change the order of categories.
- <%= link_to "Save", '#', :class => "btn btn-primary disabled save-order", "data-list-id" => '#category_list', 'data-endpoint' => reorder_admin_headings_path %>
Drag and drop to change the order of category headings.
+ <%= link_to "Save", '#', :class => "btn btn-success disabled save-order", "data-list-id" => '#category_list', 'data-endpoint' => reorder_admin_headings_path %>Drag and drop to change the order of category headings.
-
- <% @public_body_heading.errors.each do |attr, message| %>
- <% unless attr.to_s.starts_with?('translation') %>
-
- <%= message %> + <% if rails_upgrade? %> + <% @public_body_heading.errors.each do |error| %> + <% unless error.attribute.to_s.starts_with?('translation') %> +
- <%= error.message %> + <% end %> + <% end %> + <% else %> + <% @public_body_heading.errors.each do |attr, message| %> + <% unless attr.to_s.starts_with?('translation') %> +
- <%= message %> + <% end %> <% end %> <% end %>
-
- <% translation.errors.each do |attr, message| %>
-
- <%= message %> + <% if rails_upgrade? %> + <% translation.errors.each do |error| %> +
- <%= error.message %> + <% end %> + <% else %> + <% translation.errors.each do |attr, message| %> +
- <%= message %> + <% end %> <% end %>
- <%= f.submit "Create", :class => "btn btn-primary" %>
+ <%= f.submit "Create", :class => "btn btn-success" %>
<%= link_to 'List all', admin_categories_path, :class => "btn" %>
<% end %>
diff --git a/app/views/admin_request/_some_annotations.html.erb b/app/views/admin_request/_some_annotations.html.erb
index 387a97f1be..233e2fd552 100644
--- a/app/views/admin_request/_some_annotations.html.erb
+++ b/app/views/admin_request/_some_annotations.html.erb
@@ -12,7 +12,7 @@
#<%= comment.id %>
--
<%= h(comment.user.name) %>
- <%= admin_value(comment.created_at) %>
+ <%= admin_date(comment.created_at) %>
<% end %>
<%= comment_visibility(comment) %>
diff --git a/app/views/admin_request/_some_requests.html.erb b/app/views/admin_request/_some_requests.html.erb
index 805a47c180..6fff72cfbe 100644
--- a/app/views/admin_request/_some_requests.html.erb
+++ b/app/views/admin_request/_some_requests.html.erb
@@ -11,7 +11,7 @@
<% end %>
@@ -21,12 +21,7 @@
<%= h name %>
- <% if type == 'datetime' && value %>
- <%= value.to_s(:db) %>
- (<%= time_ago_in_words(value) %> ago)
- <% else %>
- <%=h value %>
- <% end %>
+ <%= admin_value(value) %>
<% end %>
diff --git a/app/views/admin_request/edit.html.erb b/app/views/admin_request/edit.html.erb
index 353d9323d7..c3f62972b1 100644
--- a/app/views/admin_request/edit.html.erb
+++ b/app/views/admin_request/edit.html.erb
@@ -1,6 +1,6 @@
Edit basic details of request
-<%= error_messages_for 'info_request' %> +<%= foi_error_messages_for :info_request %> <%= form_tag admin_request_path(@info_request), :method => :put do %> @@ -82,7 +82,7 @@ <%= text_field 'info_request', 'tag_string', :size => 60 %><%= submit_tag 'Save changes', :accesskey => 's', - :class => 'btn btn-primary', + :class => 'btn btn-success', :data => { toggle: 'tooltip' } %>
diff --git a/app/views/admin_request/show.html.erb b/app/views/admin_request/show.html.erb index 3fe809992f..662de899f2 100644 --- a/app/views/admin_request/show.html.erb +++ b/app/views/admin_request/show.html.erb @@ -57,15 +57,12 @@ <%= name %>: