<% unless params[:action] == 'frontpage' %> <% if flash[:notice] %>
<%= flash[:notice] %>
@@ -122,21 +122,23 @@ <% unless AlaveteliConfiguration::ga_code.empty? || (@user && @user.super?) %> - - + <% end %> <%= render :partial => 'general/before_body_end' %> + Back to content diff --git a/app/views/one_time_passwords/show.html.erb b/app/views/one_time_passwords/show.html.erb index d70911ce24..166ea92caf 100644 --- a/app/views/one_time_passwords/show.html.erb +++ b/app/views/one_time_passwords/show.html.erb @@ -36,7 +36,8 @@ 'time passcode you will need to update your ' \ 'password manager or re-print it.') %> <%= link_to one_time_password_path, :method => :put, - :confirm => confirmation_msg, + :data => { + :confirm => confirmation_msg }, :class => 'action-item__action' do %> <%= _('Regenerate one time passcode') %> <% end %> @@ -45,7 +46,7 @@ <% confirmation_msg = _('Are you sure you want to disable two factor ' \ 'authentication?') %> <%= link_to one_time_password_path, :method => :delete, - :confirm => confirmation_msg, + :data => { :confirm => confirmation_msg }, :class => 'action-item__action' do %> <%= _('Disable two factor authentication') %> <% end %> diff --git a/app/views/outgoing_messages/delivery_statuses/_delivered.html.erb b/app/views/outgoing_messages/delivery_statuses/_delivered.html.erb new file mode 100644 index 0000000000..5b086a6e00 --- /dev/null +++ b/app/views/outgoing_messages/delivery_statuses/_delivered.html.erb @@ -0,0 +1 @@ +

<%= _("We've received a delivery status notification from the mailserver belonging to the authority.") %>

diff --git a/app/views/outgoing_messages/delivery_statuses/_failed.html.erb b/app/views/outgoing_messages/delivery_statuses/_failed.html.erb new file mode 100644 index 0000000000..6c241e4740 --- /dev/null +++ b/app/views/outgoing_messages/delivery_statuses/_failed.html.erb @@ -0,0 +1 @@ +

<%= _("It looks like something has gone wrong when sending this message. It could be a technical issue, or an issue with the email address we have for the authority.") %>

diff --git a/app/views/outgoing_messages/delivery_statuses/_sent.html.erb b/app/views/outgoing_messages/delivery_statuses/_sent.html.erb new file mode 100644 index 0000000000..b33703fdc5 --- /dev/null +++ b/app/views/outgoing_messages/delivery_statuses/_sent.html.erb @@ -0,0 +1 @@ +

<%= _("We've sent this message but we have not received a confirmation of receipt from the authority's mailserver. This can take some time.") %>

diff --git a/app/views/outgoing_messages/delivery_statuses/show.html.erb b/app/views/outgoing_messages/delivery_statuses/show.html.erb new file mode 100644 index 0000000000..65a3c8cc7f --- /dev/null +++ b/app/views/outgoing_messages/delivery_statuses/show.html.erb @@ -0,0 +1,26 @@ +

<%= @title %>

+ +<% if @delivery_status %> +

<%= @delivery_status.humanize %>

+ <%= render :partial => @delivery_status.simple.to_s %> +<% else %> +

<%= _("We couldn't determine the delivery status of this message") %>

+<% end %> + +<% if @show_mail_server_logs %> + <% if @mail_server_logs.any? %> +

+ <%= _("These logs show what happened to this message as it passed through " \ + "our {{mta_type}} mail server. You can send these logs to an " \ + "authority to help them diagnose problems receiving email from " \ + "{{site_name}}.", + :mta_type => AlaveteliConfiguration.mta_log_type.capitalize, + :site_name => AlaveteliConfiguration.site_name) %> +

+ + 
<%= @mail_server_logs.join %>
+ <% else %> +

<%= _("We couldn’t display any logs for this message.") %>

+

<%= _("If this is a recent message, check back tomorrow, as we check for new logs periodically.") %>

+ <% end %> +<% end %> diff --git a/app/views/public_body/_list_sidebar_extra.html.erb b/app/views/public_body/_list_sidebar_extra.html.erb index d47a57e0e5..961040537d 100644 --- a/app/views/public_body/_list_sidebar_extra.html.erb +++ b/app/views/public_body/_list_sidebar_extra.html.erb @@ -4,7 +4,7 @@

<% end %>

- <%= link_to _('Are we missing a public authority?'), help_requesting_path + '#missing_body' %> + <%= link_to _('Are we missing a public authority?'), help_requesting_path(:anchor => 'missing_body') %>

<%= link_to _('List of all authorities (CSV)'), all_public_bodies_csv_path %> diff --git a/app/views/public_body/list.html.erb b/app/views/public_body/list.html.erb index b0482c3840..fd6bb35ead 100644 --- a/app/views/public_body/list.html.erb +++ b/app/views/public_body/list.html.erb @@ -5,22 +5,19 @@ <%= form_tag(list_public_bodies_default_url, :method => "get", :id=>"search_form") do %>

+ <%= text_field_tag(:public_body_query, params[:public_body_query], { :title => "type your search term here" } ) %> <%= submit_tag(_("Search")) %>
<% end %>

- <%= n_('Found {{count}} public authority {{description}}', - 'Found {{count}} public authorities {{description}}', - @public_bodies.total_entries, - :count => @public_bodies.total_entries, - :description => @description) %> + <%= @description %>

<%= render :partial => 'body_listing', :locals => { :public_bodies => @public_bodies } %> <%= will_paginate(@public_bodies) %>
- <%= link_to _("Can't find the one you want?"), help_requesting_path + '#missing_body' %> + <%= link_to _("Can't find the one you want?"), help_requesting_path(:anchor => 'missing_body') %>