diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-02-16 17:37:17 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-02-16 17:37:17 +0000 |
| commit | 80eeed612586c7970bc9d8831228e48ef1300bad (patch) | |
| tree | c64f0c396a878d9f08c012e4952012c7d6e0c996 | |
| parent | 368d2482f23b019a3a1582fc6b49e94c6f91d4bb (diff) | |
| parent | 3606b5717d3a526ff022460aa9b60d3cd1504f96 (diff) | |
Merge branch 'hotfix/0.7.0.2'0.7.0.2
| -rw-r--r-- | app/views/public_body/show.rhtml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index 6431b4742..7110ae9dd 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -27,14 +27,14 @@ <% end %> <% end %> <%= link_to _('View FOI email address'), view_public_body_email_url(@public_body.url_name) %><br> - </div> + </div> <div id="header_left"> <p class="public-body-name-prefix"><%= _("Freedom of information requests to") %></p> <h1><%=h(@public_body.name)%></h1> <p class="subtitle"> - <%=@public_body.type_of_authority(true)%><% if not @public_body.short_name.empty? %>, + <%=@public_body.type_of_authority(true)%><% if not @public_body.short_name.empty? %>, <%= _('also called {{public_body_short_name}}', :public_body_short_name => h(@public_body.short_name))%><% end %> <% if !@user.nil? && @user.admin_page_links? %> (<%= link_to _("admin"), public_body_admin_url(@public_body) %>) @@ -42,7 +42,7 @@ </p> <% if @public_body.has_notes? && (@public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact') %> - <p><%= @public_body.notes_as_html %></p> + <p><%= @public_body.notes_as_html.html_safe %></p> <% end %> <% if @public_body.eir_only? %> @@ -99,7 +99,7 @@ <%= @page_desc %> </h2> <a name="results"></a> - + <% if @public_body.info_requests.size > 4 %> <%= render :partial => 'request/request_filter_form' %> <% end %> @@ -120,7 +120,7 @@ <p> <%= _('Only requests made using {{site_name}} are shown.', :site_name => site_name) %></p> <% end %> - <% else %> + <% else %> <% if @public_body.eir_only? %> <h2><%= _('Environmental Information Regulations requests made') %></h2> <% else %> |