Extract 'write a reponse/reply' into it's own button at the bottom of…

… message threads
mysociety · Aug 11, 2021 · 650da9f · 650da9f
1 parent f44ab48
commit 650da9f
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/app/assets/stylesheets/responsive/_global_layout.scss b/app/assets/stylesheets/responsive/_global_layout.scss
@@ -199,7 +199,8 @@ textarea{
 .action-bar__make-request,
 .action-bar__follow,
 .action-bar__follow-button,
-.action-bar__follower-count {
+.action-bar__follower-count,
+.action-bar__reply {
  vertical-align: middle;
  font-size: 16px;
  margin: 1em 0;

diff --git a/app/assets/stylesheets/responsive/_request_layout.scss b/app/assets/stylesheets/responsive/_request_layout.scss
@@ -75,8 +75,9 @@
 
   .after-actions {
     display: inline-block;
+    margin-bottom: 1em; 
     @include respond-min( $main_menu-mobile_menu_cutoff) {
-
+      margin: 0;
     }
     .action-menu__button {
       width: 100%;
@@ -95,6 +96,7 @@
     margin: 0;
     @include respond-min( 30em ){
       margin-left: 1em;
+
     }
     @include respond-min( $main_menu-mobile_menu_cutoff ){
       text-align: right;
@@ -109,6 +111,17 @@
   }
 }
 
+  .action-bar__reply {
+    margin-bottom: -1em; //seems easier to do this here than completely override the whole action styles
+    @media (min-width: 30em){
+      display: inline-block;
+      margin: 0 1em 0 0;
+    }
+    .button {
+      line-height: 1.5em;
+    }
+  }
+
 .request-header__action-bar__actions--narrow {
   //we use --narrow when a profile photo is available
   @media (min-width: 30em) {

diff --git a/app/views/request/_reply.html.erb b/app/views/request/_reply.html.erb
@@ -0,0 +1,9 @@
+<div class="action-bar__reply">
+  <% if last_response.nil? %>
+    <%= link_to _("Send a followup"), new_request_followup_path(:request_id => info_request.id, :anchor => 'followup'),
+    :class => "action-bar__reply-button" %>
+  <% else %>
+    <%= link_to _("Write a reply"), new_request_incoming_followup_path(:request_id => info_request.id, :incoming_message_id => last_response.id, :anchor => 'followup'),
+    :class => "action-bar__reply-button" %>
+  <% end %>
+</div>
diff --git a/app/views/request/show.html.erb b/app/views/request/show.html.erb
@@ -54,17 +54,22 @@
     <div class="request-footer__action-bar-container">
       <div class="request-footer__action-bar__actions">
         <% if @in_pro_area %>
+          <%= render partial: 'request/reply',
+                     locals: { info_request: @info_request,
+                               last_response: @last_response } %>
           <%= render partial: 'alaveteli_pro/info_requests/after_actions',
                      locals: { info_request: @info_request,
                                last_response: @last_response } %>
         <% else %>
+          <%= render partial: 'request/reply',
+                     locals: { info_request: @info_request,
+                               last_response: @last_response } %>
           <%= render partial: 'request/after_actions',
                      locals: { info_request: @info_request,
                                track_thing: @track_thing,
                                show_owner_update_status_action: @show_owner_update_status_action,
                                show_other_user_update_status_action: @show_other_user_update_status_action,
                                last_response: @last_response } %>
-
           <%= render partial: 'track/tracking_links_simple',
                      locals: { track_thing: @track_thing,
                                user: @user,