5 files changed, 13 insertions, 5 deletions
diff --git a/app/views/admin_public_body/edit.rhtml b/app/views/admin_public_body/edit.rhtml
index 054e1826a..f4567203b 100644
--- a/app/views/admin_public_body/edit.rhtml
+++ b/app/views/admin_public_body/edit.rhtml
@@ -1,4 +1,6 @@
-<h1>Editing public body</h1>
+<% @title = 'Editing public body' %>
+
+<h1><%=@title%></h1>
 
 <% form_tag :action => 'update', :id => @public_body do %>
   <%= render :partial => 'form' %>
diff --git a/app/views/admin_public_body/list.rhtml b/app/views/admin_public_body/list.rhtml
index b5d4f4267..e8eaf4b52 100644
--- a/app/views/admin_public_body/list.rhtml
+++ b/app/views/admin_public_body/list.rhtml
@@ -1,4 +1,6 @@
-<h1>Listing public bodies</h1>
+<% @title = 'Listing public bodies' %>
+
+<h1><%=@title%></h1>
 
 <p><%= link_to 'New public body', :action => 'new' %></p>
 
diff --git a/app/views/admin_public_body/new.rhtml b/app/views/admin_public_body/new.rhtml
index 454e18c77..813c46bf1 100644
--- a/app/views/admin_public_body/new.rhtml
+++ b/app/views/admin_public_body/new.rhtml
@@ -1,4 +1,6 @@
-<h1>New public body</h1>
+<% @title = 'New public body' %>
+
+<h1><%=@title%></h1>
 
 <% form_tag :action => 'create' do %>
   <%= render :partial => 'form' %>
diff --git a/app/views/admin_public_body/show.rhtml b/app/views/admin_public_body/show.rhtml
index f30d65d42..098aaeaf7 100644
--- a/app/views/admin_public_body/show.rhtml
+++ b/app/views/admin_public_body/show.rhtml
@@ -1,4 +1,6 @@
-<h1><%=h @public_body.name%></h1>
+<% @title = h(@public_body.name) %>
+
+<h1><%=@title%></h1>
 
 <p>
 <% for column in PublicBody.content_columns %>
diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml
index e03ff1cb8..42ad0be49 100644
--- a/app/views/layouts/admin.rhtml
+++ b/app/views/layouts/admin.rhtml
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <title>FOIFA admin: <%=controller.controller_name %> <%= controller.action_name %></title>
+  <title>FOIFA admin<%= @title ? ":" : "" %> <%=@title%></title>
   <%= stylesheet_link_tag 'admin' %>
   <%= stylesheet_link_tag 'scaffold' %>
 </head>