-

You have signed out

-

You haven't entered any details for 20 minutes, so we've cleared your information to keep it secure.

+

You have been signed out

+

To protect your information, you have been signed out. This is because you did not do anything for 20 minutes.

diff --git a/app/views/preferences/menu.html b/app/views/preferences/menu.html index 42967eb..6ab4c8b 100644 --- a/app/views/preferences/menu.html +++ b/app/views/preferences/menu.html @@ -71,8 +71,9 @@

diff --git a/app/views/round-9/e6/file-check.njk b/app/views/round-9/e6/file-check.njk index ca9f52b..1670337 100644 --- a/app/views/round-9/e6/file-check.njk +++ b/app/views/round-9/e6/file-check.njk @@ -21,7 +21,7 @@ diff --git a/app/views/round-9/e6/sending-data.njk b/app/views/round-9/e6/sending-data.njk index 6ca9bac..6ab57c9 100644 --- a/app/views/round-9/e6/sending-data.njk +++ b/app/views/round-9/e6/sending-data.njk @@ -21,7 +21,7 @@ diff --git a/app/views/round-9/e6/upload-evidence.njk b/app/views/round-9/e6/upload-evidence.njk index 25e9361..1e81be3 100644 --- a/app/views/round-9/e6/upload-evidence.njk +++ b/app/views/round-9/e6/upload-evidence.njk @@ -30,21 +30,37 @@
  • not be password protected
    • -

    You will be able to upload a maximum of 100MB in total.

    +

    You can upload 100MBs of files in total.

    - +
    + You can select multiple files. +
    +
    + + + What to do if my file is too big to upload? + + +
    + We recommend that you post your evidence instead. +
    +
    + To find details on where to post your evidence, you need to contact the benefit that you wish to send evidence to directly. +
    +
    + diff --git a/app/views/round-9/e6/upload-table-content-2.njk b/app/views/round-9/e6/upload-table-content-2.njk new file mode 100644 index 0000000..ea798f5 --- /dev/null +++ b/app/views/round-9/e6/upload-table-content-2.njk @@ -0,0 +1,203 @@ +{% extends "layouts/main.html" %} + +{% set evidenceTypeCapitalFirstLetter = data.evidenceType %} +{% if data.evidenceType !== "P60" %} + {% set evidenceType = data.evidenceType.toLowerCase() %} +{% else %} + {% set evidenceType = data.evidenceType %} +{% endif %} + +{% set remainingUploadBalance = data.uploadLimit - data.benefits[0].files.length * 9 %} + +{% set warningText = "You have gone over your 100MB limit. You must remove at least " + remainingUploadBalance * -1 + "MB to continue."%} + +{% block pageTitle %} + Content page template – {{ serviceName }} – GOV.UK Prototype Kit +{% endblock %} + +{% block beforeContent %} + +
    + +{# {{ data | dump }} #} + +{{ govukBackLink({ + text: "Back", + href: "javascript:window.history.back()" +}) }} + +{% endblock %} + +{% block content %} + +{% for item in data.benefits %} + +

    Upload {{ evidenceType }}

    + +{% if data.benefits[0].files.length > 0 %} + +
    +
    +

    {{ evidenceTypeCapitalFirstLetter }} files added

    + +
    + {% for item in data.benefits %} + {% if item.name === data.yourBenefits %} + {% for item in item.files %} +
    + +
    + File {{ loop.index }} +
    +
    +

    {{item}} (9MB)

    +
    +
    + + Remove + +
    +
    + {% endfor %} + {% endif %} + {% endfor %} +
    +
    +
    + +{% if remainingUploadBalance > 0 %} + +
    + You have {{ remainingUploadBalance }}MB remaining of your upload limit +
    + +
    + +
    +
    + +
    + +
    + + + + Do you want to upload another {{ evidenceType }} file? + + + +
    + For example, if your {{ evidenceType }} has more pages. +
    + +
    + +
    + + + +
    + +
    + + + +
    + +
    + +
    + + + +
    + +{% else %} + {{ govukWarningText({ + text: warningText, + iconFallbackText: "Warning" +}) }} + + + +
    +
    +

    How do I send more files?

    +

    You will need to send your files in 2 parts because they are too big to send all together.

    +

    Remove some files so you are not over the 100MB limit, then send your files.

    +

    Then start the process again to add and send the files you removed.

    +

    You can also post your evidence instead. To find details on where to post your evidence, you need to contact the benefit that you wish to send evidence to directly.

    +
    +
    + +{% endif %} + + +{% else %} +
    +
    +

    No {{ evidenceType }} files added

    +

    You will need to upload a file to send your evidence.

    +
    +
    + +
    + + Cancel upload +
    + + +{% endif %} + +{% endfor %} + + + +
    +
    + + + + +{% endblock %} diff --git a/app/views/round-9/e6/upload-table.njk b/app/views/round-9/e6/upload-table.njk index 1d700c6..465bed3 100644 --- a/app/views/round-9/e6/upload-table.njk +++ b/app/views/round-9/e6/upload-table.njk @@ -110,6 +110,10 @@ +
    + + +
    {% else %} @@ -117,9 +121,25 @@ text: warningText, iconFallbackText: "Warning" }) }} + + + +
    +
    +

    How do I send more files?

    +

    You will need to send your files in 2 parts if they are too big to send all together. You can send some now, and then start again to send the rest.

    +

    Follow these 3 steps:

    +
      +
    1. Remove some files so you are not over the 100MB limit
      2. +
    2. Send the files you did not remove
      3. +
    3. Start the process again to add and send the files you removed
      4. +
    +

    You can also post your evidence instead. To find details on where to post your evidence, you need to contact the benefit that you wish to send evidence to directly.

    +
    +
    + {% endif %} - {% else %}