10 files changed, 45 insertions, 25 deletions

diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml
index d04de8567..b86b92800 100644
--- a/app/views/request/show.rhtml
+++ b/app/views/request/show.rhtml
@@ -58,7 +58,7 @@
     <%= user_link(@info_request.user) %>
     </p>
 
-    <p id="request_status">
+    <p id="request_status" class="request_icon_line icon_<%= @info_request.calculate_status %>">
     <% if @info_request.awaiting_description %>
         <% if @is_owning_user %>
             Please <strong>answer the question above</strong> so we know whether the 
diff --git a/public/images/navimg/status-icons-error-message.png b/public/images/navimg/status-icons-error-message.png
new file mode 100644
index 000000000..03ddd60b7
--- /dev/null
+++ b/public/images/navimg/status-icons-error-message.png
diff --git a/public/images/navimg/status-icons-internal-review.png b/public/images/navimg/status-icons-internal-review.png
new file mode 100644
index 000000000..44fe2fdb3
--- /dev/null
+++ b/public/images/navimg/status-icons-internal-review.png
diff --git a/public/images/navimg/status-icons-not-held.png b/public/images/navimg/status-icons-not-held.png
new file mode 100644
index 000000000..1225a3db3
--- /dev/null
+++ b/public/images/navimg/status-icons-not-held.png
diff --git a/public/images/navimg/status-icons-user-withdrawn.png b/public/images/navimg/status-icons-user-withdrawn.png
new file mode 100644
index 000000000..fa4e278ff
--- /dev/null
+++ b/public/images/navimg/status-icons-user-withdrawn.png
diff --git a/public/images/navimg/status-iconsmall-wait.png b/public/images/navimg/status-iconsmall-wait.png
deleted file mode 100644
index e016c7036..000000000
--- a/public/images/navimg/status-iconsmall-wait.png
+++ /dev/null
diff --git a/public/images/navimg/status-iconssmall-attn.png b/public/images/navimg/status-iconssmall-attn.png
deleted file mode 100644
index e7f892eec..000000000
--- a/public/images/navimg/status-iconssmall-attn.png
+++ /dev/null
diff --git a/public/images/navimg/status-iconssmall-fail.png b/public/images/navimg/status-iconssmall-fail.png
deleted file mode 100644
index 380740dcd..000000000
--- a/public/images/navimg/status-iconssmall-fail.png
+++ /dev/null
diff --git a/public/images/navimg/status-iconssmall-succeed.png b/public/images/navimg/status-iconssmall-succeed.png
deleted file mode 100644
index c90d0af04..000000000
--- a/public/images/navimg/status-iconssmall-succeed.png
+++ /dev/null
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 65117d3e1..9a30c68b8 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -461,7 +461,7 @@ dd { margin: 0.6em 0 2em 4em; width: 33em; }
 	{
 		clear: left; 
 		display: block;
-			padding: 10px 0 0 42px;
+        padding: 10px 0 0 42px;
 
 	}
 		.request_listing span.bottomline
@@ -474,32 +474,52 @@ dd { margin: 0.6em 0 2em 4em; width: 33em; }
 			min-height: 42px;		
 		}
 
-		/* Waiting */
-		span.bottomline.icon_waiting_response,
-		span.bottomline.icon_waiting_classification,
-		span.bottomline.icon_waiting_clarification,
-		span.bottomline.icon_internal_review
-		{ background-image: url(../images/navimg/status-icons-wait.png);}
-		/* Failed */
-		span.bottomline.icon_not_held,
-		span.bottomline.icon_rejected
-		{ background-image: url(../images/navimg/status-icons-fail.png);}
-		/* successful */
-		span.bottomline.icon_successful, 
-		span.bottomline.icon_partially_successful
-		{ background-image: url(../images/navimg/status-icons-succeed.png);}
-		/* Alert */
-		span.bottomline.icon_requires_admin,	
-		span.bottomline.icon_waiting_response_overdue
-		{ background-image: url(../images/navimg/status-icons-attn.png);}
-		/* Postal */
-		span.bottomline.icon_gone_postal
-		{ background-image: url(../images/navimg/status-icons-post.png);}
-
-
 		span.bottomline a
 		{}
 	
+    .request_icon_line
+    {
+        background-repeat: no-repeat;
+        background-position: left center;
+        min-height: 42px;		
+        padding: 0 0 0 42px;
+    }
+
+    /* Waiting */
+    .icon_waiting_response,
+    .icon_waiting_classification,
+    .icon_waiting_clarification
+    { background-image: url(../images/navimg/status-icons-wait.png);}
+    /* Failed */
+    .icon_rejected
+    { background-image: url(../images/navimg/status-icons-fail.png);}
+    /* Not held */
+    .icon_not_held
+    { background-image: url(../images/navimg/status-icons-not-held.png);}
+    /* Successful */
+    .icon_successful, 
+    .icon_partially_successful
+    { background-image: url(../images/navimg/status-icons-succeed.png);}
+    /* Alert */
+    .icon_requires_admin,	
+    .icon_waiting_response_overdue
+    { background-image: url(../images/navimg/status-icons-attn.png);}
+    /* Postal */
+    .icon_gone_postal
+    { background-image: url(../images/navimg/status-icons-post.png);}
+    /* Error */
+    .icon_error_message
+    { background-image: url(../images/navimg/status-icons-error-message.png);}
+    /* Interal review */
+    .icon_internal_review
+    { background-image: url(../images/navimg/status-icons-internal-review.png);}
+    /* User withdrawn */
+    .icon_user_withdrawn
+    { background-image: url(../images/navimg/status-icons-user-withdrawn.png);}
+
+    /* span.bottomline.icon_requires_admin, 
+    span.bottomline.icon_user_withdrawn,  */
+
 	span.desc
 	{
 		display: block;