Use headings above bubbles for dates.

3 files changed, 22 insertions, 12 deletions

diff --git a/app/views/request/_correspondence.rhtml b/app/views/request/_correspondence.rhtml
index 336f909e2..88e17db88 100644
--- a/app/views/request/_correspondence.rhtml
+++ b/app/views/request/_correspondence.rhtml
@@ -9,6 +9,11 @@
         
     if not incoming_message.nil?
     %>
+        <% if @previous_date.nil? or (@previous_date != incoming_message.sent_at.to_date) %>
+            <h2><%= simple_date(incoming_message.sent_at) %></h2>
+        <% end
+        @previous_date = incoming_message.sent_at.to_date %>
+
         <%= render :partial => 'bubble', :locals => { :incoming_message => incoming_message, :body => incoming_message.get_body_for_html_display(@collapse_quotes), :attachments => incoming_message.get_attachments_for_display }  %>
 
         <p class="event_bubble">
@@ -21,7 +26,6 @@
             <% else %>
                 replied 
             <% end %>
-            on <strong><%= simple_date(incoming_message.sent_at) %></strong>
             (<%= link_to "link to this", show_response_url(:id => incoming_message.info_request.id, :incoming_message_id => incoming_message.id) %>,
             <%= link_to "reply", show_response_url(:id => incoming_message.info_request.id, :incoming_message_id => incoming_message.id) + "#show_response_followup" %>)
         </p>
@@ -29,6 +33,11 @@
     elsif info_request_event.event_type == 'sent' || info_request_event.event_type == 'followup_sent'
         outgoing_message = OutgoingMessage.find(info_request_event.params[:outgoing_message_id]) 
         %>
+        <% if @previous_date.nil? or (@previous_date != info_request_event.created_at.to_date) %>
+            <h2><%= simple_date(info_request_event.created_at) %></h2>
+        <% end
+        @previous_date = info_request_event.created_at.to_date %>
+
         <%= render :partial => 'bubble', :locals => { :body => outgoing_message.get_body_for_html_display(), :attachments => nil }  %>
 
         <p class="event_bubble"> 
@@ -37,7 +46,6 @@
                 <% if outgoing_message.status == 'sent' %>
                     sent the initial request
                     to <%= public_body_link(@info_request.public_body) %>
-                    on <strong><%= simple_date(info_request_event.created_at) %></strong>
                 <% elsif outgoing_message.status == 'ready' %>
                      wrote the initial request, but it has <strong>not yet been sent</strong>
                 <% else raise "unknown outgoing_message.status" %>
@@ -49,7 +57,6 @@
                         <%= outgoing_message.incoming_message_followup.safe_mail_from %> of
                     <% end %>
                     <%= public_body_link(@info_request.public_body) %>
-                    on <strong><%= simple_date(info_request_event.created_at) %></strong>
                 <% elsif outgoing_message.status == 'ready' %>
                      wrote a follow up message, but it has <strong>not yet been sent</strong>
                 <% else raise "unknown outgoing_message.status" %>
@@ -62,7 +69,6 @@
         <p class="event_plain"> 
             Sent to <%= public_body_link(@info_request.public_body) %>
             again (perhaps to a new contact address) <!-- XXX actually say if it is a new one or not -->
-            on <strong><%= simple_date(info_request_event.created_at) %></strong>
         </p>
     <% 
     end 
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index b2c41bdca..06330e391 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -385,6 +385,13 @@ table#list_requests .odd {
     display: none;
 }
 
+.correspondence h2 {
+    margin-left: 1em;
+    margin-top: 2em;
+    margin-bottom: 0em;
+}
+
+
 /* /describe_state - user setting status of request */
 
 .describe_state_form {
diff --git a/todo.txt b/todo.txt
index 4e4c8beb1..bbed5048a 100644
--- a/todo.txt
+++ b/todo.txt
@@ -10,9 +10,8 @@ BAILII - relationship with law courts, robots.txt ?
 
 "Fundamental Savings Review" - Tom's friend
 
-
-Status of messages stuff
-========================
+Next
+====
 
 Adam's woes:
 http://foi.mysociety.org/request/18/response/31
@@ -21,11 +20,7 @@ http://foi.mysociety.org/request/18/response/31
 And Tom's woes:
     http://foi.mysociety.org/request/8
 Also: Consider removing login links from notifications of new responses
-
-Go through all requests and check status is shiny
-
-Next
-====
+      Consider password change code in relation to this
 
 Sort the requests by when something last happened to them (this needs thought as to what
 sort orders we need)
@@ -139,6 +134,8 @@ e.g.
     http://www.ordnancesurvey.co.uk/oswebsite/aboutus/foi/index.html
     http://www.ordnancesurvey.co.uk/oswebsite/aboutus/foi/coiindex.html
 
+Use environmental info laws for some bodies
+
 
 Sources of public bodies
 ========================