Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve button groupings (first tranche) #3157

Merged
merged 8 commits into from
Apr 26, 2024
Merged

Improve button groupings (first tranche) #3157

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5890114
Update show.html.erb
MylesJarvis Apr 24, 2024
b975aa7
Remove p tags in line with design system implementation
MylesJarvis Apr 24, 2024
396afe5
Improve grouping in onboarding flow
MylesJarvis Apr 24, 2024
a5706a1
Add return link and group on the profile toggle page
MylesJarvis Apr 24, 2024
eb4ed9e
Improve manage dates layout and group buttons
MylesJarvis Apr 24, 2024
4d8cbc7
Sort padding - warning element add dates page
MylesJarvis Apr 24, 2024
f1eaa69
Update app/views/schools/dashboards/_no_placement_dates_warning.html.erb
MylesJarvis Apr 26, 2024
80860a8
Fix failing test
MylesJarvis Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions app/views/schools/confirm_attendance/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>
Expand All @@ -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>

6 changes: 3 additions & 3 deletions app/views/schools/dashboards/_no_placement_dates_warning.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 0 additions & 2 deletions app/views/schools/on_boarding/profiles/editing.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions app/views/schools/on_boarding/profiles/onboarding.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>
Expand Down
9 changes: 3 additions & 6 deletions app/views/schools/placement_dates/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down Expand Up @@ -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>
4 changes: 4 additions & 0 deletions app/views/schools/toggle_enabled/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>
Loading