diff --git a/app/assets/stylesheets/frontend/views/award_form.scss b/app/assets/stylesheets/frontend/views/award_form.scss index e33e974cd..4057139f1 100644 --- a/app/assets/stylesheets/frontend/views/award_form.scss +++ b/app/assets/stylesheets/frontend/views/award_form.scss @@ -392,3 +392,7 @@ select.read-only { margin-right: 0.5em; } } + +.form-banner { + max-width: 100%; +} diff --git a/app/pdf_generators/qae_pdf_forms/general/draw_elements.rb b/app/pdf_generators/qae_pdf_forms/general/draw_elements.rb index 0ffe5cba9..d5dd98c29 100644 --- a/app/pdf_generators/qae_pdf_forms/general/draw_elements.rb +++ b/app/pdf_generators/qae_pdf_forms/general/draw_elements.rb @@ -131,7 +131,7 @@ def render_guidance_block #{bullet} You must complete the online form. #{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 #{deadline}. #{bullet} You can still edit submitted applications up to this date.) diff --git a/app/views/account/collaborators/index.html.slim b/app/views/account/collaborators/index.html.slim index 2f551bdaf..43480e44b 100644 --- a/app/views/account/collaborators/index.html.slim +++ b/app/views/account/collaborators/index.html.slim @@ -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? @@ -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. diff --git a/app/views/accounts/useful_information.html.slim b/app/views/accounts/useful_information.html.slim index ef681b1bd..5f2e6a271 100644 --- a/app/views/accounts/useful_information.html.slim +++ b/app/views/accounts/useful_information.html.slim @@ -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. However, we advise that one person works on a section at a time to avoid data saving issues.".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." diff --git a/app/views/content_only/_award_nickname.html.slim b/app/views/content_only/_award_nickname.html.slim index 44c611eea..263cc9593 100644 --- a/app/views/content_only/_award_nickname.html.slim +++ b/app/views/content_only/_award_nickname.html.slim @@ -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. However, we advise that one person works on a section at a time to avoid data saving issues. li p.govuk-body diff --git a/app/views/content_only/award_info_development.html.slim b/app/views/content_only/award_info_development.html.slim index c19fb765a..2aedf3c0d 100644 --- a/app/views/content_only/award_info_development.html.slim +++ b/app/views/content_only/award_info_development.html.slim @@ -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 diff --git a/app/views/content_only/award_info_innovation.html.slim b/app/views/content_only/award_info_innovation.html.slim index e3ab0df6f..2828078b0 100644 --- a/app/views/content_only/award_info_innovation.html.slim +++ b/app/views/content_only/award_info_innovation.html.slim @@ -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 diff --git a/app/views/content_only/award_info_mobility.html.slim b/app/views/content_only/award_info_mobility.html.slim index db5317cb9..4d8175f6c 100644 --- a/app/views/content_only/award_info_mobility.html.slim +++ b/app/views/content_only/award_info_mobility.html.slim @@ -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 diff --git a/app/views/content_only/award_info_trade.html.slim b/app/views/content_only/award_info_trade.html.slim index 7d48a61f8..dd104707f 100644 --- a/app/views/content_only/award_info_trade.html.slim +++ b/app/views/content_only/award_info_trade.html.slim @@ -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 diff --git a/app/views/qae_form/show.html.slim b/app/views/qae_form/show.html.slim index 6c57016de..5c28a99bf 100644 --- a/app/views/qae_form/show.html.slim +++ b/app/views/qae_form/show.html.slim @@ -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