5 files changed, 57 insertions, 33 deletions
diff --git a/app/views/admin_public_body/_form.rhtml b/app/views/admin_public_body/_form.rhtml
index dda975d14..8b9eca34e 100644
--- a/app/views/admin_public_body/_form.rhtml
+++ b/app/views/admin_public_body/_form.rhtml
@@ -16,3 +16,10 @@
 <%= text_area 'public_body', 'last_edit_comment', :rows => 3, :cols => 60  %></p>
 <!--[eoform:public_body]-->
 
+<p><strong>Privacy note:</strong> The email addresses are assumed public data,
+so we can share the love around later. If somebody wants to give us a
+super-secret address (say to bypass spam traps) then we'll have to rethink
+this.
+</p>
+
+
diff --git a/app/views/admin_public_body/edit.rhtml b/app/views/admin_public_body/edit.rhtml
index 775c98a99..b38ff02b3 100644
--- a/app/views/admin_public_body/edit.rhtml
+++ b/app/views/admin_public_body/edit.rhtml
@@ -7,6 +7,8 @@
   <%= submit_tag 'Save' %>
 <% end %>
 
+<p>
 <%= link_to 'Show', '../show/' + @public_body.id.to_s %> |
 <%= link_to 'List all', '../list' %>
+</p>
 
diff --git a/app/views/request/_bubble.rhtml b/app/views/request/_bubble.rhtml
index 0af5d7b21..8480693e3 100644
--- a/app/views/request/_bubble.rhtml
+++ b/app/views/request/_bubble.rhtml
@@ -1,11 +1,11 @@
     <blockquote class="xsnazzy">
     <b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"></b><b class="xb5"></b><b class="xb6"></b><b class="xb7"></b>
     <div class="xboxcontent">
-    <p><%= body.gsub(/\n/, '<br>') %></p>
+    <p><%= body %></p>
     </div>
     <b class="xb7"></b><b class="xb6"></b><b class="xb5"></b><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"></b>
     <em></em>
-    <span></span>
+    <span class="bubblebit"></span>
     </blockquote>
 
 
diff --git a/app/views/request/_correspondence.rhtml b/app/views/request/_correspondence.rhtml
index 7a85bb627..aa6b799fa 100644
--- a/app/views/request/_correspondence.rhtml
+++ b/app/views/request/_correspondence.rhtml
@@ -21,16 +21,18 @@
     </p>
 <% elsif (correspondence.class.to_s == 'IncomingMessage') 
     incoming_message = correspondence%>
-    <%= render :partial => 'bubble', :locals => { :body => incoming_message.sanitised_body }  %>
+    <%= render :partial => 'bubble', :locals => { :body => incoming_message.get_body_for_display(@collapse_quotes) }  %>
 
     <p class="xspeaker">
-    <%= incoming_message.mail.friendly_from %>
-    of <%= public_body_link(@info_request.public_body) %>
+    <% if incoming_message.mail.from %>
+        <%= incoming_message.mail.friendly_from %> of 
+    <% end %>
+    <%= public_body_link(@info_request.public_body) %>
     wrote a reply on <strong><%= simple_date(incoming_message.sent_at)
     %></strong>
     </p>
 <% else %>
-    <% raise "Unknown correspondence type" + correspondence.class.to_s %>
+    <% raise "Unknown correspondence type " + correspondence.class.to_s %>
 <% end %>
 
 </div>
diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml
index 3b5a5c2bf..83e183c81 100644
--- a/app/views/request/show.rhtml
+++ b/app/views/request/show.rhtml
@@ -1,33 +1,46 @@
 <% @title = h(@info_request.title) %>
 
-<h1><%=@title%></h1>
+<div id="request_main">
+    <h1><%=@title%></h1>
 
-<p class="subtitle">A Freedom of Information request to 
-<%= public_body_link(@info_request.public_body) %>
-by 
-<%= user_link(@info_request.user) %>
-</p>
+    <p class="subtitle">A Freedom of Information request to 
+    <%= public_body_link(@info_request.public_body) %>
+    by 
+    <%= user_link(@info_request.user) %>
+    </p>
 
-<p class="xspeaker">
-<% if @status == 'awaiting' %>
-Currently <strong>waiting for a response</strong> from <%= public_body_link(@info_request.public_body) %>
-<% elsif @status == 'overdue' %>
-Currently <strong>overdue a response</strong> from <%=
-public_body_link(@info_request.public_body) %>.  Under section blah of the
-Freedom of Information Act 2000 responses must be made within 20 working days.
-<% elsif @status == 'information' %>
-The request was at least partly <strong>successful</strong>.
-<% elsif @status == 'none' %>
-The request is <strong>not (yet) successful</strong>.
-<% elsif @status == 'unknown' %>
-<strong>Response received</strong>, but <%= user_link(@info_request.user) %> has not yet reported if it was
-successful or a rejection.
-<% else %>
-<% raise "unknown status " + $status %>
-<% end %>
-</p>
+    <p id="request_status">
+    <% if @status == 'awaiting' %>
+    Currently <strong>waiting for a response</strong> from <%= public_body_link(@info_request.public_body) %>
+    <% elsif @status == 'overdue' %>
+    Currently <strong>overdue a response</strong> from <%=
+    public_body_link(@info_request.public_body) %>.  Under section blah of the
+    Freedom of Information Act 2000 responses must be made within 20 working days.
+    <% elsif @status == 'information' %>
+    The request was at least partly <strong>successful</strong>.
+    <% elsif @status == 'none' %>
+    The request is <strong>not (yet) successful</strong>.
+    <% elsif @status == 'unknown' %>
+    <strong>Response received</strong>, but <%= user_link(@info_request.user) %> has not yet reported if it was
+    successful or a rejection.
+    <% else %>
+    <% raise "unknown status " + $status %>
+    <% end %>
+    </p>
+
+    <% for correspondence in @correspondences %>
+        <%= render :partial => 'correspondence', :locals => { :correspondence => correspondence } %>
+    <% end %>
+</div>
+
+<div id="request_sidebar">
+    <h2>Juicy stuff will be here</h2>
+    <p>For now it is just padding to make the messages on the left
+    narrower, so I can see what the formatting is like.
+    <!--<h2>Blog posts about this request</h2>
+    <p>...
+    <h2>Wikipedia articles</h2>
+    <p>...-->
+</div>
 
-<% for correspondence in @correspondences %>
-    <%= render :partial => 'correspondence', :locals => { :correspondence => correspondence } %>
-<% end %>