Show annotations and status update box better.

3 files changed, 14 insertions, 17 deletions

diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml
index b55cb37d9..87f9e3757 100644
--- a/app/views/request/show.rhtml
+++ b/app/views/request/show.rhtml
@@ -101,6 +101,12 @@
         <%= render :partial => 'correspondence', :locals => { :info_request_event => info_request_event } %>
     <% end %>
 
+    <% if @info_request.awaiting_description %>
+        <div class="describe_state_form">
+        <%= render :partial => 'describe_state', :locals => { :id_suffix => "2" } %>
+        </div>
+    <% end %>
+
     <div id="add_annotation">
         <h2>Add an annotation</h2>
 
@@ -157,11 +163,3 @@
     </div>
 </div>
 
-
-<% if @info_request.awaiting_description %>
-    <div class="describe_state_form">
-    <%= render :partial => 'describe_state', :locals => { :id_suffix => "2" } %>
-    </div>
-<% end %>
-
-
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 2aee210c4..dccafcc99 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -597,9 +597,12 @@ div.pagination { text-align: center; padding-top: 0.3em;}
     margin-bottom: 1em;
     font-size: 1.0em;
     color: #454545;
+    float: left;
+    width: 37em;
 }
 .requires_admin_details {
     margin-left: 1.8em;
+    width: 30em;
 }
 
 /*---------------- content : request detail pages */
@@ -648,7 +651,9 @@ div.comment_in_request h2
 
 div#add_annotation
 {
-    clear: both;
+    float: left;
+    margin-bottom: 1em;
+    width: 37em;
 }
 
 /* id starts with... */
@@ -693,8 +698,6 @@ a img.attachment_image {
     clear: both;
 }
 
-
-.describe_state_form, 
 #followup
 { clear: both; float: left; }
 
diff --git a/todo.txt b/todo.txt
index fb4c1cdcf..76c2ea6fe 100644
--- a/todo.txt
+++ b/todo.txt
@@ -52,17 +52,13 @@ Comments etc. do not sort in right order - by date, but not by time
 Perhaps show grouping count?
 http://www.whatdotheyknow.com/search/variety:comment/newest
 
-Try changing "email me" link to something else?
+Try changing "email me" link to something else like "track by email"
 
 CSS things
-    - Annotation thing too far down when much sidebar e.g. http://localhost:3000/request/heya#outgoing-199
-    - Put classification box above annotation one?
     - Need Icon for annotations in search results
     - Icon for government departments is too Parliamentary
-    - CSS error on all councils page on some browsers
+    - CSS error on "all councils" page on some browsers
     - Right sidebar on requests page is too narrow
-    - Do what Richard suggested re. annotations look
-        see e.g. http://www.whatdotheyknow.com/request/excessive_use_of_speed_by_police
     - Sidebar text overlapping on Linux
     - Login dialog CSS on Linux