diff options
| -rw-r--r-- | app/views/admin_general/stats.rhtml | 4 | ||||
| -rw-r--r-- | app/views/admin_public_body/_tags.rhtml | 1 | ||||
| -rw-r--r-- | app/views/admin_public_body/list.rhtml | 1 | ||||
| -rw-r--r-- | app/views/admin_request/_incoming_message_actions.rhtml | 12 | ||||
| -rw-r--r-- | app/views/admin_request/show.rhtml | 14 | ||||
| -rw-r--r-- | app/views/general/blog.rhtml | 2 | ||||
| -rw-r--r-- | app/views/help/api.rhtml | 10 | ||||
| -rw-r--r-- | app/views/help/officers.rhtml | 5 | ||||
| -rw-r--r-- | app/views/request/_describe_state.rhtml | 6 | ||||
| -rw-r--r-- | app/views/request/new.rhtml | 2 |
10 files changed, 27 insertions, 30 deletions
diff --git a/app/views/admin_general/stats.rhtml b/app/views/admin_general/stats.rhtml index f9163b332..1a8035006 100644 --- a/app/views/admin_general/stats.rhtml +++ b/app/views/admin_general/stats.rhtml @@ -11,7 +11,7 @@ <div class="span12"> <h1>Statistics</h1> <h2>Chart of requests (excluding backpaged)</h2> - <img src="/foi-live-creation.png"> + <img src="/foi-live-creation.png" alt="Chart of requests"> </div> </div> <div class="row"> @@ -34,7 +34,7 @@ <div class="row"> <div class="span12"> <h2>Chart of users</h2> - <img src="/foi-user-use.png"> + <img src="/foi-user-use.png" alt="Chart of users"> </div> </div> <div class="row"> diff --git a/app/views/admin_public_body/_tags.rhtml b/app/views/admin_public_body/_tags.rhtml index 55c9db906..26526f304 100644 --- a/app/views/admin_public_body/_tags.rhtml +++ b/app/views/admin_public_body/_tags.rhtml @@ -5,6 +5,7 @@ <% else %> <%= link_to(h(t.name), list_public_bodies_path(:tag => t.name)) %> <% end %> + </span> <% end %> diff --git a/app/views/admin_public_body/list.rhtml b/app/views/admin_public_body/list.rhtml index f9153217e..aaf72f78e 100644 --- a/app/views/admin_public_body/list.rhtml +++ b/app/views/admin_public_body/list.rhtml @@ -14,7 +14,6 @@ <%= link_to 'Import from CSV file', 'import_csv', :class => "btn btn-warning" %> </div> </div> -</p> <% form_tag("", :method => "get", :class => "form form-search") do %> <%= text_field_tag 'query', params[:query], { :size => 30, :class => "input-large search-query" } %> diff --git a/app/views/admin_request/_incoming_message_actions.rhtml b/app/views/admin_request/_incoming_message_actions.rhtml index 9fedcb525..f544e1f6e 100644 --- a/app/views/admin_request/_incoming_message_actions.rhtml +++ b/app/views/admin_request/_incoming_message_actions.rhtml @@ -1,4 +1,4 @@ -<formset class="form-horizontal"> +<fieldset class="form-horizontal"> <legend>Actions</legend> <% form_tag '../redeliver_incoming', :class => "form form-inline" do %> <div class="control-group"> @@ -16,9 +16,9 @@ </div> <% end %> <div class="control-group"> - <label class="control-label" for="generate_upload_url">Generate FOI officer upload URL</label> + <label class="control-label">Generate FOI officer upload URL</label> <div class="controls"> - <%= link_to 'Generate and take me there', "../generate_upload_url/#{incoming_message.info_request.id}?incoming_message_id=#{incoming_message.id}", :class => "btn", :id => "generate_upload_url" %> + <%= link_to 'Generate and take me there', "../generate_upload_url/#{incoming_message.info_request.id}?incoming_message_id=#{incoming_message.id}", :class => "btn" %> </div> </div> @@ -35,11 +35,11 @@ <% if @raw_email.nil? %> <%# we're not on the raw_email page itself %> <div class="control-group"> - <label class="control-label" for="show_rail_email">Inspect email</label> + <label class="control-label">Inspect email</label> <div class="controls"> - <%= link_to "View raw email", "../show_raw_email/#{incoming_message.raw_email_id}", :class => "btn", :id => "show_raw_email" %> + <%= link_to "View raw email", "../show_raw_email/#{incoming_message.raw_email_id}", :class => "btn" %> </div> </div> <% end %> -</formset> +</fieldset> diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml index fd5daee55..50dc6d392 100644 --- a/app/views/admin_request/show.rhtml +++ b/app/views/admin_request/show.rhtml @@ -39,10 +39,10 @@ <% end %> <% if column_name == 'described_state' %> <ul> - <li><strong>Initial request last sent at:</strong> <%= @info_request.calculate_status %> - <li><strong>Initial request last sent at:</strong> <%=@info_request.date_initial_request_last_sent_at.to_date %> - <li><strong>Date response required by:</strong> <%= @info_request.date_response_required_by %> - <li><strong>Very overdue after:</strong> <%= @info_request.date_very_overdue_after %> + <li><strong>Initial request last sent at:</strong> <%= @info_request.calculate_status %></li> + <li><strong>Initial request last sent at:</strong> <%=@info_request.date_initial_request_last_sent_at.to_date %></li> + <li><strong>Date response required by:</strong> <%= @info_request.date_response_required_by %></li> + <li><strong>Very overdue after:</strong> <%= @info_request.date_very_overdue_after %></li> </ul> <% end %> </td> @@ -112,7 +112,7 @@ </div> </div> <% end %> -<formset class="form-horizontal"> +<fieldset class="form-horizontal"> <legend>Actions</legend> <div class="control-group"> <label class="control-label"> @@ -123,7 +123,7 @@ <p class="help-block">(see also option to general URLs for individual incoming messages below)</p> </div> </div> - <% form_tag '../hide/' + @info_request.id.to_s, :class => "form form-inline", :info_request_id => @info_request.id.to_s, :id => "hide_request_form" do %> + <% form_tag '../hide/' + @info_request.id.to_s, :class => "form form-inline", :id => "hide_request_form" do %> <div class="control-group"> <% if @info_request.is_external? %> <label class="control-label">Hide the request:</label> @@ -168,7 +168,7 @@ </div> <% end %> <% end %> -</formset> +</fieldset> <hr> <h2>Events</h2> diff --git a/app/views/general/blog.rhtml b/app/views/general/blog.rhtml index 07d6d2f14..d42b32282 100644 --- a/app/views/general/blog.rhtml +++ b/app/views/general/blog.rhtml @@ -5,7 +5,7 @@ <div class="act_link"> <h2><%= _("Stay up to date") %></h2> <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="https://twitter.com/<%= @twitter_user %>"><%= _("Follow us on twitter") %></a><br/><br/> - <img src="/images/feed-16.png" alt="RSS icon" valign="middle"> <a href="<%= @feed_url %>"><%= _("Subscribe to blog") %></a> + <img src="/images/feed-16.png" alt="RSS icon"> <a href="<%= @feed_url %>"><%= _("Subscribe to blog") %></a> </div> <% if Configuration::twitter_widget_id %> <div id="twitter"> diff --git a/app/views/help/api.rhtml b/app/views/help/api.rhtml index 3a6c867ee..57390d65a 100644 --- a/app/views/help/api.rhtml +++ b/app/views/help/api.rhtml @@ -30,15 +30,15 @@ </ul> </dd> - <dt>RSS (actually, Atom) feeds</h2> + <dt>RSS (actually, Atom) feeds</dt> <dd> <p>There are Atom feeds on most pages which list FOI requests, which you can use to get updates and links in XML format. Find the URL of the Atom feed in one of these ways: <ul> <li>Look for the <img src="/images/feed-16.png" alt=""> RSS feed links.</li> - <li>Examine the <tt><link rel="alternate" type="application/atom+xml"></tt> tag in the head of the HTML. </li> - <li>Add <tt>/feed</tt> to the start of another URL. + <li>Examine the <code><link rel="alternate" type="application/atom+xml"></code> tag in the head of the HTML. </li> + <li>Add <code>/feed</code> to the start of another URL. </ul> <p>In particular, even complicated search queries have Atom feeds. @@ -53,8 +53,8 @@ objects in a structured form. Find them by: </p> <ul> - <li>Adding <tt>.json</tt> to the end of the URL. </li> - <li>Look for the <tt><link rel="alternate" type="application/json"></tt> tag in the head of the HTML. </li> + <li>Adding <code>.json</code> to the end of the URL. </li> + <li>Look for the <code><link rel="alternate" type="application/json"></code> tag in the head of the HTML. </li> </ul> <p>Requests, users and authorities all have JSON versions containing basic diff --git a/app/views/help/officers.rhtml b/app/views/help/officers.rhtml index b13e225fe..6db706f78 100644 --- a/app/views/help/officers.rhtml +++ b/app/views/help/officers.rhtml @@ -222,7 +222,7 @@ form in an annotation. </dd> - <dt id="copyright"><a name="commercial"></a>What is your policy on copyright of documents?<a href="#copyright">#</a> </dt> + <dt id="copyright"><a id="commercial"></a>What is your policy on copyright of documents?<a href="#copyright">#</a> </dt> <dd>Our Freedom of Information law is "applicant blind", so anyone in the world can request the same document and get a copy of it. @@ -235,9 +235,6 @@ </dl> - - </dl> - <p><strong>If you haven't already</strong>, read <a href="<%= help_about_path %>">the introduction</a> --> <br><strong>Otherwise</strong>, the <a href="<%= help_credits_path %>">credits</a> or the <a href="<%= help_api_path %>">programmers API</a> --> diff --git a/app/views/request/_describe_state.rhtml b/app/views/request/_describe_state.rhtml index 5b6004e81..fde1cdfa7 100644 --- a/app/views/request/_describe_state.rhtml +++ b/app/views/request/_describe_state.rhtml @@ -3,7 +3,7 @@ <% form_for(:incoming_message, @info_request, :url => describe_state_url(:id => @info_request.id)) do |f| %> <h2><%= _('What best describes the status of this request now?') %></h2> - <hr> <!------------------------------------------------> + <hr> <h3><%= _('This request is still in progress:') %></h3> <% if @info_request.described_state != 'internal_review' %> <div> @@ -40,7 +40,7 @@ <%= render :partial => 'general/custom_state_transitions_pending', :locals => {:id_suffix => id_suffix } %> - <hr> <!------------------------------------------------> + <hr> <h3><%= _('This particular request is finished:') %></h3> <% if @info_request.described_state == 'internal_review' %> @@ -67,7 +67,7 @@ <%= render :partial => 'general/custom_state_transitions_complete', :locals => {:id_suffix => id_suffix } %> - <hr> <!------------------------------------------------> + <hr> <h3><%= _('Other:') %></h3> <div> diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml index d25da8141..4766c981b 100644 --- a/app/views/request/new.rhtml +++ b/app/views/request/new.rhtml @@ -37,7 +37,7 @@ <div id="request_header"> <div id="request_header_body"> - <label class="form_label" for="info_request_public_body_id"><%= _('To:') %></label> + <label class="form_label"><%= _('To:') %></label> <span id="to_public_body"><%=h(@info_request.public_body.name)%></span> <div class="form_item_note"> <% if @info_request.public_body.info_requests.size > 0 %> |