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

Jump to bottom

Add notification banner for user working simultaneously #3060

Merged
merged 2 commits into from
Aug 29, 2024
Merged

Add notification banner for user working simultaneously #3060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7108838
chore: Update form banner styling and add notification banner
TheDancingClown Aug 29, 2024
fd6a2c6
chore: Update wording for collaborators working on form simultaneously
TheDancingClown Aug 29, 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
4 changes: 4 additions & 0 deletions app/assets/stylesheets/frontend/views/award_form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,3 +392,7 @@ select.read-only {
margin-right: 0.5em;
}
}

.form-banner {
max-width: 100%;
}
2 changes: 1 addition & 1 deletion app/pdf_generators/qae_pdf_forms/general/draw_elements.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def render_guidance_block
#{bullet} You <b>must</b> complete the <b>online form</b>.
#{bullet} The online form can be completed over a number of days.
#{bullet} You can save and return to the online form at any point.
#{bullet} Collaborators can work on the form simultaneously if they are on different sections.
#{bullet} Collaborators can work on the form simultaneously in different sections. However, we advise that one person works on a section at a time to avoid data saving issues.
3. Submit your application
#{bullet} The deadline for submissions is <b>#{deadline}</b>.
#{bullet} You can still edit submitted applications up to this date.)
Expand Down
10 changes: 5 additions & 5 deletions app/views/account/collaborators/index.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ h1.govuk-heading-xl
div
- if !current_user.account_admin?
p.govuk-body
' Account users can work on the form simultaneously
strong
' if they are on different sections
' Collaborators can work on the form simultaneously in different sections.
strong
=< "However, we advise that one person works on a section at a time to avoid data saving issues"
' .

- if current_user.account_admin?
Expand All @@ -44,9 +44,9 @@ h1.govuk-heading-xl
' Add a collaborator

p.govuk-body
| Adding collaborators lets your colleagues sign in and contribute to your applications. Collaborators can work on the form simultaneously
| Adding collaborators lets your colleagues sign in and contribute to your applications. Collaborators can work on the form simultaneously in different sections.
strong
| if they are on different sections
=< "However, we advise that one person works on a section at a time to avoid data saving issues"
| .

p.govuk-body They will also receive any correspondence from us regarding your applications. This will help to ensure that any correspondence from us is less likely to be overlooked or not addressed in time. Also, if you leave the organisation, we will have a person to contact regarding applications.
Expand Down
2 changes: 1 addition & 1 deletion app/views/accounts/useful_information.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
li = "We've made the online version of this form accessible. You can learn more about accessibility options from our #{link_to('accessibility statement', "/accessibility-statement")}.".html_safe

h2.govuk-heading-l Collaborators
p.govuk-body = "We recommend that you #{link_to('add collaborators', account_collaborators_path)} to the account. Collaborators are usually colleagues in the same organisation who can help fill in the application. Collaborators can work on the form simultaneously if they are on different sections.".html_safe
p.govuk-body = "We recommend that you #{link_to('add collaborators', account_collaborators_path)} to the account. Collaborators are usually colleagues in the same organisation who can help fill in the application. Collaborators can work on the form simultaneously in different sections. <strong>However, we advise that one person works on a section at a time to avoid data saving issues</strong>.".html_safe
p.govuk-body = "Adding collaborators means that more people in your organisation can receive key notifications."
p.govuk-body = "Please be aware that all additional collaborators are able to see and edit all of your applications if you apply for more than one Award."

Expand Down
2 changes: 1 addition & 1 deletion app/views/content_only/_award_nickname.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
li The form can be completed over a number of days.
li You can save and return to the form at any point.
li You will be given more detailed instructions after the eligibility questionnaire.
li Collaborators can work on the form simultaneously if they are on different sections.
li Collaborators can work on the form simultaneously in different sections. <strong>However, we advise that one person works on a section at a time to avoid data saving issues</strong>.

li
p.govuk-body
Expand Down
5 changes: 4 additions & 1 deletion app/views/content_only/award_info_development.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ h1.govuk-heading-xl
p.govuk-body
| You need to
=<> link_to "add one or more collaborators", account_collaborators_path(form_id: @form_answer.id), class: 'govuk-link'
| before you can continue. Your named collaborators will be able to help you work on the form. Collaborators can work on the form simultaneously if they are on different sections.
| before you can continue. Your named collaborators will be able to help you work on the form. Collaborators can work on the form simultaneously in different sections.
strong
=< "However, we advise that one person works on a section at a time to avoid data saving issues"
| .
p.govuk-body
| Adding collaborators also means that important correspondence we send regarding your application is not overlooked if one applicant is not available.
p.govuk-body
Expand Down
5 changes: 4 additions & 1 deletion app/views/content_only/award_info_innovation.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ h1.govuk-heading-xl
p.govuk-body
| You need to
=<> link_to "add one or more collaborators", account_collaborators_path(form_id: @form_answer.id), class: 'govuk-link'
| before you can continue. Your named collaborators will be able to help you work on the form. Collaborators can work on the form simultaneously if they are on different sections.
| before you can continue. Your named collaborators will be able to help you work on the form. Collaborators can work on the form simultaneously in different sections.
strong
=< "However, we advise that one person works on a section at a time to avoid data saving issues"
| .
p.govuk-body
| Adding collaborators also means that important correspondence we send regarding your application is not overlooked if one applicant is not available.
p.govuk-body
Expand Down
5 changes: 4 additions & 1 deletion app/views/content_only/award_info_mobility.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ h1.govuk-heading-xl
p.govuk-body
| You need to
=<> link_to "add one or more collaborators", account_collaborators_path(form_id: @form_answer.id)
| before you can continue. Your named collaborators will be able to help you work on the form. Collaborators can work on the form simultaneously if they are on different sections.
| before you can continue. Your named collaborators will be able to help you work on the form. Collaborators can work on the form simultaneously in different sections.
strong
=< "However, we advise that one person works on a section at a time to avoid data saving issues"
| .
p.govuk-body
| Adding collaborators also means that important correspondence we send regarding your application is not overlooked if one applicant is not available.
p.govuk-body
Expand Down
5 changes: 4 additions & 1 deletion app/views/content_only/award_info_trade.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ h1.govuk-heading-xl
p.govuk-body
| You need to
=<> link_to "add one or more collaborators", account_collaborators_path(form_id: @form_answer.id), class: 'govuk-link'
| before you can continue. Your named collaborators will be able to help you work on the form. Collaborators can work on the form simultaneously if they are on different sections.
| before you can continue. Your named collaborators will be able to help you work on the form. Collaborators can work on the form simultaneously in different sections.
strong
=< "However, we advise that one person works on a section at a time to avoid data saving issues"
| .
p.govuk-body
| Adding collaborators also means that important correspondence we send regarding your application is not overlooked if one applicant is not available.
p.govuk-body
Expand Down
11 changes: 11 additions & 0 deletions app/views/qae_form/show.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,17 @@
- provide(:body_end) do
.js-collaborators-bar.hidden

.govuk-notification-banner role="region" aria-labelledby="govuk-notification-banner-title" data-module="govuk-notification-banner"
.govuk-notification-banner__header
.govuk-notification-banner__title#govuk-notification-banner-title
| Important
.govuk-notification-banner__content
p.form-banner
| Collaborators can work on the form simultaneously in different sections.
strong
=< "However, we advise that one person works on a section at a time to avoid data saving issues"
| .

form.qae-form.award-form data-autosave-url=save_form_url(@form_answer) action=save_form_url(@form_answer, next_step: next_step(@form, params[:step]), current_step: params[:step]) method="POST" data-attachments-url=attachments_url(@form_answer) novalidate=true

input name="authenticity_token" type="hidden" value=form_authenticity_token
Expand Down
Loading