4 files changed, 28 insertions, 7 deletions
diff --git a/app/views/admin_public_body/_form.rhtml b/app/views/admin_public_body/_form.rhtml
index fa84a2e96..504b01fa0 100644
--- a/app/views/admin_public_body/_form.rhtml
+++ b/app/views/admin_public_body/_form.rhtml
@@ -1,10 +1,19 @@
 <%= error_messages_for 'public_body' %>
 
 <!--[form:public_body]-->
+
 <p><label for="public_body_name">Name</label><br/>
 <%= text_field 'public_body', 'name', :size => 60  %></p>
+
 <p><label for="public_body_short_name">Short name (only put in abbreviations which are really used, otherwise leave blank. Short or long name is used in the URL - don't worry about breaking URLs through renaming, as the history is used to redirect)</label><br/>
 <%= text_field 'public_body', 'short_name', :size => 60  %></p>
+
+<p><label for="public_body_request_email">Request email (set to <strong>blank</strong> (empty string) if can't find an address; to <strong>not_apply</strong> if FOI no longer / never did apply to authority)</label><br/>
+<%= text_field 'public_body', 'request_email', :size => 40  %></p>
+
+<p><label for="public_body_home_page">Home page (set to <strong>blank</strong> to guess it from the email)</label><br/>
+<%= text_field 'public_body', 'home_page', :size => 60  %></p>
+
 <p><label for="public_body_tag_string">Tags (space separated:
     <% for category, description in PublicBody.categories_by_tag %>
         <% if category != "other" %>
@@ -14,12 +23,11 @@
 )</label><br/>
 <%= text_field 'public_body', 'tag_string', :size => 80  %></p>
 
-
-<p><label for="public_body_request_email">Request email (set to <strong>blank</strong> (empty string) if can't find an address; to <strong>not_apply</strong> if FOI no longer / never did apply to authority)</label><br/>
-<%= text_field 'public_body', 'request_email', :size => 40  %></p>
+<p><label for="public_body_notes">Notes</label> (for users to consider when making FOI requests to the authority)<br/>
+<%= text_area 'public_body', 'notes', :rows => 4, :cols => 60  %></p>
 
 <p><label for="public_body_last_edit_comment">Comment for this edit</label> (put URL or other source of new info)<br/>
-<%= text_area 'public_body', 'last_edit_comment', :rows => 3, :cols => 60  %></p>
+<%= text_area 'public_body', 'last_edit_comment', :rows => 2, :cols => 60  %></p>
 <!--[eoform:public_body]-->
 
 <p><strong>Privacy note:</strong> The email addresses are assumed public data,
diff --git a/app/views/admin_public_body/show.rhtml b/app/views/admin_public_body/show.rhtml
index baa3a9918..9791a9155 100644
--- a/app/views/admin_public_body/show.rhtml
+++ b/app/views/admin_public_body/show.rhtml
@@ -7,7 +7,8 @@
   <b><%= column.human_name %>:</b> <%=h @public_body.send(column.name) %>
   <br/>
 <% end %>
-<b>Tags:</b> <%=h @public_body.tag_string %>
+<b>Calculated home page:</b> <%= link_to(h(@public_body.calculated_home_page), @public_body.calculated_home_page) %>
+<br/><b>Tags:</b> <%=h @public_body.tag_string %>
 <br/>
 </p>
 
diff --git a/app/views/body/show.rhtml b/app/views/body/show.rhtml
index 380141340..c7dc49dbf 100644
--- a/app/views/body/show.rhtml
+++ b/app/views/body/show.rhtml
@@ -9,17 +9,22 @@
 
 <p class="subtitle">
 <%=@public_body.type_of_authority(true)%> in the UK<% if not @public_body.short_name.empty? %>, also called <%= h(@public_body.short_name) %><% end %>
+(<%= link_to "home page", @public_body.calculated_home_page %>)
 </p>
 
+<% if @public_body.notes != "" %>
+<p><%=@public_body.notes%></p>
+<% end %>
+
 <% if @public_body.eir_only? %>
 <p>You can only request information about the environment from this authority.</p>
 <% end %>
 
 <p>
 <% if @public_body.eir_only? %>
-<%= link_to "Make new EIR request to " + @public_body.short_or_long_name, new_request_to_body_url(:public_body_id => @public_body.id.to_s)%>
+<%= link_to "Make new EIR request to " + h(@public_body.short_or_long_name), new_request_to_body_url(:public_body_id => @public_body.id.to_s)%>
 <% else %>
-<%= link_to "Make new FOI request to " + @public_body.short_or_long_name, new_request_to_body_url(:public_body_id => @public_body.id.to_s)%>
+<%= link_to "Make new FOI request to " + h(@public_body.short_or_long_name), new_request_to_body_url(:public_body_id => @public_body.id.to_s)%>
 <% end %>
 </p>
 
diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml
index d8b18df81..1ba68c99a 100644
--- a/app/views/request/new.rhtml
+++ b/app/views/request/new.rhtml
@@ -39,6 +39,13 @@
 		</li>
 		</ul>
 
+        <% if @info_request.public_body.notes != "" %>
+            <h1>Please note for this authorite</h1>
+            <ul>
+                <li><%=@info_request.public_body.notes %></li>
+            </ul>
+        <% end %>
+
         <% if @info_request.public_body.eir_only? %>
             <h1>Please ask for environmental information only</h1>