Merge pull request #3157 from DFE-Digital/test-button-groupings

Improve button groupings (first tranche)

app/views/schools/confirm_attendance/show.html.erb

@@ -54,8 +54,12 @@
 
     <%= pagination_bar @bookings %>
 
-    <div>
-      <%= f.govuk_submit 'Save and return to dashboard' %>
+    <div class="govuk-button-group">
+
+        <%= f.govuk_submit 'Save and return to dashboard' %>
+
+        <%= link_to 'View earlier attendance records', schools_attendances_path %>
+
     </div>
 
   <% end %>
@@ -67,11 +71,13 @@
     There are no bookings that need their attendance to be confirmed.
   </p>
 
-  <p>
+<div class="govuk-button-group">
+
     <%= govuk_link_to "Return to dashboard", schools_dashboard_path, secondary: true %>
-  </p>
+
+    <%= link_to 'View earlier attendance records', schools_attendances_path %>
+
+</div>
 <% end %>
 
-<p>
-  <%= link_to 'View earlier attendance records', schools_attendances_path %>
-</p>
+

app/views/schools/dashboards/_no_placement_dates_warning.html.erb

@@ -1,8 +1,8 @@
-<div class="govuk-warning-text govuk-!-padding-top-7">
+<div class="govuk-warning-text">
   <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
   <strong class="govuk-warning-text__text">
     <span class="govuk-visually-hidden">Warning</span>
-    You haven't entered any dates, your school will not appear in candidate
-    searches
+    You haven't entered any dates so your school will not appear in candidate
+    searches.
   </strong>
 </div>

app/views/schools/on_boarding/profiles/editing.html.erb

@@ -54,9 +54,7 @@
         <div class="govuk-!-margin-top-4">
           <div class="govuk-button-group">
             <%= govuk_link_to 'Preview profile', schools_on_boarding_preview_path, secondary: true %>
-          </div>
 
-          <div>
             <%= govuk_link_to 'Return to dashboard', schools_dashboard_path, secondary: true %>
           </div>
         </div>

app/views/schools/on_boarding/profiles/onboarding.html.erb

@@ -49,9 +49,7 @@
       <div class="govuk-button-group">
         <%= f.govuk_submit 'Accept and set up profile' %>
         <%= govuk_link_to 'Preview profile', schools_on_boarding_preview_path, secondary: true %>
-      </div>
 
-      <div>
         <%= govuk_link_to 'Return to dashboard', schools_dashboard_path, secondary: true %>
       </div>
     <% end %>

app/views/schools/placement_dates/index.html.erb

@@ -9,10 +9,6 @@
 
 <h1>Manage dates</h1>
 
-<div>
-  <%= govuk_link_to "Add a date", new_schools_placement_date_path %>
-</div>
-
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-full">
 
@@ -64,15 +60,16 @@
         <%- end -%>
         </tbody>
       </table>
+
     <%- else -%>
       <%= render partial: 'schools/dashboards/no_placement_dates_warning' %>
     <%- end -%>
 
   </div>
 </div>
 
+<div class="govuk-button-group">
+  <%= govuk_link_to "Add a date", new_schools_placement_date_path %>
 
-
-<div>
   <%= govuk_link_to "Return to dashboard", schools_dashboard_path, secondary: true %>
 </div>

app/views/schools/toggle_enabled/edit.html.erb

@@ -6,5 +6,9 @@
     <%= f.govuk_radio_button :enabled, false, label: { text: "Turn profile off" }, hint: nil %>
   <% end %>
 
+<div class="govuk-button-group">
   <%= f.govuk_submit 'Continue' %>
+  <%= link_to 'Return to dashboard', schools_dashboard_path %>
+</div>
+
 <% end %>

features/schools/placement_dates/index.feature

@@ -38,7 +38,7 @@ Feature: Listing placement dates
   Scenario: Warning displayed when there are no dates
       Given my school has no placement dates
       When I am on the 'placement dates' page
-      Then there should be a "You haven't entered any dates, your school will not appear in candidate searches" warning
+      Then there should be a "You haven't entered any dates so your school will not appear in candidate searches" warning
 
   Scenario: The return to dashboard button
       Given I am on the 'placement dates' page