Some icons for attachments taken from /usr/share/icons/Rodent/48x48/mimetypes on an Ubuntu machine.

6 files changed, 23 insertions, 21 deletions

diff --git a/app/views/request/_bubble.rhtml b/app/views/request/_bubble.rhtml
index 387ff7657..9ad023aad 100644
--- a/app/views/request/_bubble.rhtml
+++ b/app/views/request/_bubble.rhtml
@@ -2,13 +2,16 @@
     <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">
     <%  if not attachments.nil? and attachments.size > 0 %>
-        <p>
-            <% attachments.each do |a| %>
-                Attachment: 
+        <p> <% attachments.each do |a| %>
+                <% if ['application/pdf', 'application/msword'].include?(a.content_type) %>
+                    <img src="/images/icon_<%=a.content_type.sub('/', '_')%>_large.png" align="absmiddle">
+                <% else %>
+                    Attachment: 
+                <% end %>
                 <%= link_to (TMail::Mail.get_part_file_name(a) || "download.bin"), get_attachment_url(:id => incoming_message.info_request_id,
                     :incoming_message_id => incoming_message.id, :part => a.url_part_number, :file_name =>
                     (TMail::Mail.get_part_file_name(a) || "download.bin")) %>
-                (<%= a.content_type %>)
+                <!-- (<%= a.content_type %>) -->
                 <br>
             <% end %>
         </p>
diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml
index 7fb60cf6e..883a3963f 100644
--- a/app/views/request/new.rhtml
+++ b/app/views/request/new.rhtml
@@ -34,7 +34,7 @@
     </div>
 
     <p>
-        <label class="form_label" for="public_body_id">Public body:</label>
+        <label class="form_label" for="info_request_public_body_id">Public body:</label>
         <%=
         @public_bodies = PublicBody.find(:all, :order => "name")
         f.collection_select(:public_body_id, @public_bodies, :id, :name)
@@ -65,11 +65,10 @@
     </p>
 
     <div class="form_button">
-    <%= hidden_field_tag(:submitted_new_request, { :value => 1 } ) %>
-    <%= submit_tag "Make public Freedom of Information request >>" %>
+        <%= hidden_field_tag(:submitted_new_request, { :value => 1 } ) %>
+        <%= submit_tag "Make public Freedom of Information request >>" %>
     </div>
 
-  </div>
 <% end %>
 
 
diff --git a/public/images/icon_application_msword_large.png b/public/images/icon_application_msword_large.png
new file mode 100644
index 000000000..91a696ab5
--- /dev/null
+++ b/public/images/icon_application_msword_large.png
diff --git a/public/images/icon_application_pdf_large.png b/public/images/icon_application_pdf_large.png
new file mode 100644
index 000000000..9a38ca33c
--- /dev/null
+++ b/public/images/icon_application_pdf_large.png
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 625488b5d..5e810d8e8 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -227,6 +227,7 @@ div.fieldWithErrors { display:inline; }
 
 #writeForm {
     float: right;
+    margin-bottom: 1em;
 }
 
 #writeForm #address_part {
@@ -362,11 +363,8 @@ dt {
 /* Speech bubbles
  * from http://www.cssplay.co.uk/boxes/chunky.html */
 
-.xsnazzy h1, .xsnazzy h2, .xsnazzy p {margin:0 10px; letter-spacing:1px;}
-.xsnazzy h1 {font-size:2.5em; color:#fc0;}
-.xsnazzy h2 {font-size:2em; color:#234; border:0;}
+.xsnazzy p {margin:0 10px; letter-spacing:1px;}
 .xsnazzy p {padding-bottom:0.5em; color:#eee;}
-.xsnazzy h2 {padding-top:0.5em; padding-left:10px;}
 .xsnazzy {background: transparent; margin:1em 0.5em 1em 0.5em;}
 
 .xsnazzy em {display:block; width:0; height:0; color:#d8d8ee; overflow:hidden; border-top:12px solid #fff; border-left:12px dotted transparent; border-right:12px dotted transparent; margin-left:50px;}
@@ -374,7 +372,7 @@ dt {
 /* hack for IE5.5 */
 * html .xsnazzy em {width:24px; height:12px; w\idth:0; hei\ght:0;}
 
-.xsnazzy span.bubblebit {display:block; width:0; height:0; color:#fff; overflow:hidden; border-top:10px solid #5f5f5f; border-left:10px dotted transparent; border-right:10px dotted transparent; margin-left:52px; margin-top:-15px;}
+.xsnazzy span.bubblebit {display:block; width:0; height:0; color:#fff; overflow:hidden; border-top:10px solid #6f6f6f; border-left:10px dotted transparent; border-right:10px dotted transparent; margin-left:52px; margin-top:-15px;}
 * html .xsnazzy span.bubblebit {width:20px; height:10px; w\idth:0; hei\ght:0;}
 
 .xb1, .xb2, .xb3, .xb4, .xb5, .xb6, .xb7 {display:block; overflow:hidden; font-size:0;}
@@ -383,30 +381,30 @@ dt {
 .xb1 {margin:0 8px; background:#fff;}
 .xb2 {margin:0 6px; background:#fff;}
 .xb3 {margin:0 4px; background:#fff;}
-.xb4 {margin:0 3px; background:#5f5f5f; border-width:0 5px;}
-.xb5 {margin:0 2px; background:#5f5f5f; border-width:0 4px;}
-.xb6 {margin:0 2px; background:#5f5f5f; border-width:0 3px;} 
-.xb7 {margin:0 1px; background:#5f5f5f; border-width:0 3px; height:2px;} 
+.xb4 {margin:0 3px; background:#6f6f6f; border-width:0 5px;}
+.xb5 {margin:0 2px; background:#6f6f6f; border-width:0 4px;}
+.xb6 {margin:0 2px; background:#6f6f6f; border-width:0 3px;} 
+.xb7 {margin:0 1px; background:#6f6f6f; border-width:0 3px; height:2px;} 
 
-.xboxcontent {display:block; background:#5f5f5f; border:3px solid #fff; border-width:0 3px;}
+.xboxcontent {display:block; background:#6f6f6f; border:3px solid #fff; border-width:0 3px;}
 
 .xsnazzy a:link {
     color: #0000aa;
 }
 .xsnazzy a:visited {
+    color: #551a8b;
 }
 
 .unfold_link a:link {
     color: #ffffff;
 }
 .unfold_link a:visited {
-    color: #999999;
+    color: #bbbbbb;
 }
 
 .event_bubble { 
     margin: -0.5em 1.5em; 
 }
-
 .event_plain { 
     margin-left: 1.5em;
 }
diff --git a/todo.txt b/todo.txt
index 9420c03c8..1d481a71c 100644
--- a/todo.txt
+++ b/todo.txt
@@ -76,7 +76,6 @@ Test it works if exim is down - e.g. not accepting connections
 
 Remove security warning from admin pages
 
-Make response messages go to a mailbox as backup
 Make it so if the pipe fails, exim tries again rather than sending an error to the public body.
     Or so errors go to an admin somehow, at the very least.
 
@@ -96,6 +95,9 @@ Properly escape all name_and_email functions
 Check out all automatically things here:
 http://foi.mysociety.org/request/14
 
+Sort the requests by when something last happened to them (this needs thought as to what
+sort orders we need)
+
 Tidying
 =======