6 files changed, 15 insertions, 17 deletions
diff --git a/app/views/general/_custom_state_descriptions.rhtml b/app/views/general/_custom_state_descriptions.rhtml
new file mode 100644
index 000000000..913a6d50a
--- /dev/null
+++ b/app/views/general/_custom_state_descriptions.rhtml
@@ -0,0 +1 @@
+  <% raise "unknown status " + status %>
diff --git a/app/views/general/_custom_state_transitions_complete.rhtml b/app/views/general/_custom_state_transitions_complete.rhtml
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/app/views/general/_custom_state_transitions_complete.rhtml
diff --git a/app/views/general/_custom_state_transitions_pending.rhtml b/app/views/general/_custom_state_transitions_pending.rhtml
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/app/views/general/_custom_state_transitions_pending.rhtml
diff --git a/app/views/request/_describe_state.rhtml b/app/views/request/_describe_state.rhtml
index f1db6ec18..8164637bf 100644
--- a/app/views/request/_describe_state.rhtml
+++ b/app/views/request/_describe_state.rhtml
@@ -4,7 +4,7 @@
         <h2><%= _('What best describes the status of this request now?') %></h2>
 
         <hr> <!------------------------------------------------>
-
+	<h3>This request is still in progress:</h3>
         <% if @info_request.described_state != 'internal_review' %>
             <div>
                 <%= radio_button "incoming_message", "described_state", "waiting_response", :id => 'waiting_response' + id_suffix %>
@@ -38,11 +38,10 @@
             <label for="gone_postal<%=id_suffix%>"><%= _('They are going to reply <strong>by post</strong>') %></label>
         </div>
 
-        <div>
-            <%= radio_button "incoming_message", "described_state", "deadline_extended", :id => 'deadline_extended' + id_suffix %>
-            <label for="deadline_extended<%=id_suffix%>"><%= _('Authority has requested <strong>extension of the deadline.</strong>') %></label>
-        </div>
+        <%= render :partial => 'general/custom_state_transitions_pending', :locals => {:id_suffix => id_suffix } %>
+
         <hr> <!------------------------------------------------>
+	<h3>This particular request is finished:</h3>
 
         <% if @info_request.described_state == 'internal_review' %>
             <p><%= _('The <strong>review has finished</strong> and overall:') %></p>
@@ -65,12 +64,11 @@
             <label for="rejected<%=id_suffix%>"><%= _('My request has been <strong>refused</strong>') %></label>
         </div>
 
-        <div>
-            <%= radio_button "incoming_message", "described_state", "wrong_response", :id => 'wrong_response' + id_suffix %>
-            <label for="rejected<%=id_suffix%>"><%= _('Authority has replied but the response <strong>does not correspond to the request</strong>') %></label>
-        </div>
+        <%= render :partial => 'general/custom_state_transitions_complete', :locals => {:id_suffix => id_suffix } %>
+
 
         <hr> <!------------------------------------------------>
+	<h3>Other:</h3>
 
         <div>
            <%= radio_button "incoming_message", "described_state", "error_message", :id => 'error_message' + id_suffix %>
diff --git a/app/views/request/_other_describe_state.rhtml b/app/views/request/_other_describe_state.rhtml
index 7bd4bf7ea..1c88f97f8 100644
--- a/app/views/request/_other_describe_state.rhtml
+++ b/app/views/request/_other_describe_state.rhtml
@@ -7,7 +7,7 @@
     Thanks.') %></h2>
 
     <hr> <!------------------------------------------------>
-
+    <h3>This request is still in progress:</h3>
     <% if @info_request.described_state != 'internal_review' %>
         <div>
             <%= radio_button "incoming_message", "described_state", "waiting_response", :id => 'waiting_response' + id_suffix %>
@@ -34,7 +34,10 @@
         <label for="gone_postal<%=id_suffix%>"><%= _('A response will be sent <strong>by post</strong>') %></label>
     </div>
 
+    <%= render :partial => 'general/custom_state_transitions_pending', :locals => {:id_suffix => id_suffix } %>
+
     <hr> <!------------------------------------------------>
+    <h3>This particular request is finished:</h3>
 
     <% if @info_request.described_state == 'internal_review' %>
         <p><%= _('The <strong>review has finished</strong> and overall:') %></p>
@@ -56,6 +59,8 @@
         <%= radio_button "incoming_message", "described_state", "rejected", :id => 'rejected' + id_suffix %>
         <label for="rejected<%=id_suffix%>"><%= _('The request has been <strong>refused</strong>') %></label>
     </div>
+    
+    <%= render :partial => 'general/custom_state_transitions_complete', :locals => {:id_suffix => id_suffix } %>
 
     <hr> <!------------------------------------------------>
 
diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml
index af1d1b6d2..c8f5f3eed 100644
--- a/app/views/request/show.rhtml
+++ b/app/views/request/show.rhtml
@@ -86,12 +86,6 @@
         <%= _('The request was <strong>refused</strong> by') %> <%= public_body_link(@info_request.public_body) %>.
     <% elsif @status == 'successful' %>
         <%= _('The request was <strong>successful</strong>.') %>
-    <% elsif @status == 'deadline_extended' %>
-    Currently <strong>deadline extended</strong> from <%= public_body_link(@info_request.public_body) %>,
-        they must respond promptly and normally no later than <strong><%= simple_date(@info_request.date_deadline_extended) %></strong>
-        (<%= link_to "details", "/help/requesting#deadline_extended" %>).
-    <% elsif @status == 'wrong_response' %>
-        <%= public_body_link(@info_request.public_body) %> has replied but the response <strong>does not correspond to the request</strong>.
     <% elsif @status == 'partially_successful' %>
         <%= _('The request was <strong>partially successful</strong>.') %>
     <% elsif @status == 'waiting_clarification' %>
@@ -116,7 +110,7 @@
         <%= _('This request has been <strong>withdrawn</strong> by the person who made it. 
         	   There may be an explanation in the correspondence below.') %>
     <% else %>
-        <% raise "unknown status " + @status %>
+        <%= render :partial => 'general/custom_state_descriptions', :locals => { :status => @status } %>
     <% end %>
     </p>