Add a couple of types to authorities list, and display better

5 files changed, 31 insertions, 9 deletions

diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index b4b1e1487..be296d659 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -21,7 +21,7 @@
 # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: public_body.rb,v 1.42 2008-03-21 14:45:38 francis Exp $
+# $Id: public_body.rb,v 1.43 2008-03-24 14:04:15 francis Exp $
 
 require 'csv'
 require 'set'
@@ -40,6 +40,8 @@ class PublicBody < ActiveRecord::Base
             "non_ministerial_department" => "Non-Ministerial Departments",
             "university" => "Universities",
             "police" => "Police Forces",
+            "rda" => "Regional Development Agencies",
+            "npa" => "National Park Authorities",
             "other" => "Other"
         }
     end
diff --git a/app/views/body/list.rhtml b/app/views/body/list.rhtml
index ddc3e0fd4..3d996d993 100644
--- a/app/views/body/list.rhtml
+++ b/app/views/body/list.rhtml
@@ -1,14 +1,21 @@
+<div id="body_sidebar">
+<h1>Show only...</h1>
 <p>
-Show only:
+<ul>
 <% for category, description in PublicBody.categories_by_tag %>
-<%= link_to_unless (@tag == category), description, list_public_bodies_url(:tag => category) %> 
+<li>
+    <%= link_to_unless (@tag == category), description, list_public_bodies_url(:tag => category) %> 
+</li>
 <% end %>
+</ul>
 </p>
 
 <p>
 <a href="/help/about#missing_body">Are we missing a public body?</a>
 </p>
 
+</div>
+
 <% @title = "Public bodies - " + @description %>
 
 <h1><%=@title%></h1>
diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml
index 4641f683b..0ce16768d 100644
--- a/app/views/general/frontpage.rhtml
+++ b/app/views/general/frontpage.rhtml
@@ -6,7 +6,7 @@
     <% if @public_bodies.size == 0 and @query_made %>
         <div id="error">
             Sorry! We couldn't find any public bodies with that in their names.
-            Either <a href="/body">browse them all</a> or
+            Either <a href="/body/list/department">browse them all</a> or
             <a href="/help/contact">ask us to add the one you want</a>.
         </div>
     <% end %>
@@ -51,7 +51,7 @@
         <% end %>
 
         <p>
-            Can't find it? <a href="/body">Browse all</a> or <a href="/help/contact">ask us to add it</a>.
+            Can't find it? <a href="/body/list/department">Browse all</a> or <a href="/help/contact">ask us to add it</a>.
         </p>
     <% end %>
 </div>
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 81a93b547..8da7e35f5 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -403,7 +403,22 @@ table#list_requests .odd {
     color: #ff0000;
 }
 
-
+#body_sidebar {
+    float: right;
+    width: 15em;
+    border: solid 1px #c7eb6e;
+    margin: 0em 0 3em 3em;
+}
+#body_sidebar h1 {
+    font-size: 120%;
+    padding: 2px;
+    margin: 0;
+    color: #000000;
+    background-color: #c7eb6e;
+}
+#body_sidebar p {
+    margin: 1em;
+}
 
 
 /* /request - viewing requests */
diff --git a/todo.txt b/todo.txt
index 119d8043c..e2883de51 100644
--- a/todo.txt
+++ b/todo.txt
@@ -27,8 +27,6 @@ BAILII - relationship with law courts, robots.txt ?
 Next
 ====
 
-Send email to remind people to clarify
-
 Search and replace text "FOI" and "Freedom of Information" out the way more
  - but put it in the title tag
 "public body" --> "public authority"?
@@ -48,7 +46,7 @@ Now of course when ids go into requests/users for new ones it just adds an _ on
 Later
 =====
 
-Just stop using the seaprate bounce address, it's a waste of time
+Send email to remind people to clarify
 
 This search gives a runtime error:
     "19 hours