From 245f9858415f230a8ca8bc9d80fe038bd00c0b72 Mon Sep 17 00:00:00 2001 From: Montana Date: Fri, 8 Feb 2019 14:07:01 -0500 Subject: [PATCH 1/3] Update copy for KO Review message --- templates/fragments/ko_review_alert.html | 7 ------- templates/fragments/ko_review_message.html | 8 ++++++++ templates/portfolios/task_orders/review.html | 10 +++++----- translations.yaml | 14 +++++++------- 4 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 templates/fragments/ko_review_alert.html create mode 100644 templates/fragments/ko_review_message.html diff --git a/templates/fragments/ko_review_alert.html b/templates/fragments/ko_review_alert.html deleted file mode 100644 index 473b01bb..00000000 --- a/templates/fragments/ko_review_alert.html +++ /dev/null @@ -1,7 +0,0 @@ -
-

{{ "fragments.ko_review_alert.make_sure" | translate }}:

- diff --git a/templates/fragments/ko_review_message.html b/templates/fragments/ko_review_message.html new file mode 100644 index 00000000..46fe501b --- /dev/null +++ b/templates/fragments/ko_review_message.html @@ -0,0 +1,8 @@ +

{{ "task_orders.ko_review.message" | translate }}

+
+

{{ "fragments.ko_review_message.title" | translate }}:

+ diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index e19054d4..db79f177 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -25,16 +25,16 @@ {% block form %} - {% set message = "task_orders.ko_review.submitted_by" | translate({"name": task_order.creator.full_name}) %} - - {{ Alert(("task_orders.ko_review.alert_title" | translate), message, level='warning', - fragment="fragments/ko_review_alert.html") }} +
+

{{ "task_orders.ko_review.title" | translate }}

+ {% include "fragments/ko_review_message.html" %} +

-
{{ "task_orders.ko_review.title" | translate }}
+
{{ "task_orders.ko_review.review_title" | translate }}
{{ "task_orders.new.review.section_title"| translate }}

diff --git a/translations.yaml b/translations.yaml index dfaf1773..beb10b09 100644 --- a/translations.yaml +++ b/translations.yaml @@ -274,11 +274,11 @@ fragments: learn_more_link_text: Learn more about the JEDI Cloud Task Order and the Financial Verification process. paragraph_1: 'The next step is to create a Task Order associated with JEDI Cloud. Please contact a Contracting Officer (KO), Contracting Officer Representative (COR), or a Financial Manager to help with this step.' paragraph_2: 'Once the Task Order has been created, you will be asked to provide details about the task order in the Financial Verification step.' - ko_review_alert: - make_sure: Make sure to take a moment to - bullet_1: Verify that all information is accurate and up-to-date + ko_review_message: + title: Steps + bullet_1: Make sure the information below matches the final task order and is accurate and up-to-date bullet_2: Upload your Task Order (TO) document - bullet_3: Add both the Task Order (TO) and Lines of Accounting (LOA) + bullet_3: Add both the Task Order (TO) and Line(s) of Accounting (LOA) numbers login: ccpo_logo_alt_text: Cloud Computing Program Office Logo certificate_selection: @@ -477,9 +477,9 @@ task_orders: add_button_text: Add / Invite Security Officer invite_button_text: Invite Security Officer ko_review: - alert_title: Verify Your Info - title: Task Order Builder - submitted_by: Below is an overview of the projected portfolio submitted by {name} + title: Verify Task Order Information + message: Grant your team access to the cloud by verifying the Task Order info below. + review_title: Task Order Builder task_order_information: Task Order Information portfolios: applications: From 3af4a9379e2d807619f164d6e8d43ccee00a56b9 Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 12 Feb 2019 11:00:28 -0500 Subject: [PATCH 2/3] Styling --- styles/atat.scss | 1 + templates/fragments/ko_review_message.html | 13 ++++++------- templates/portfolios/task_orders/review.html | 6 ++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/styles/atat.scss b/styles/atat.scss index 6ef73f66..2d18992e 100644 --- a/styles/atat.scss +++ b/styles/atat.scss @@ -24,6 +24,7 @@ @import 'elements/menu'; @import 'components/topbar'; +@import 'components/top_message'; @import 'components/global_layout'; @import 'components/global_navigation'; @import 'components/portfolio_layout'; diff --git a/templates/fragments/ko_review_message.html b/templates/fragments/ko_review_message.html index 46fe501b..3433e799 100644 --- a/templates/fragments/ko_review_message.html +++ b/templates/fragments/ko_review_message.html @@ -1,8 +1,7 @@ -

{{ "task_orders.ko_review.message" | translate }}

-
-

{{ "fragments.ko_review_message.title" | translate }}:

-
    -
  • {{ "fragments.ko_review_message.bullet_1" | translate }}
    • -
  • {{ "fragments.ko_review_message.bullet_2" | translate }}
    • -
  • {{ "fragments.ko_review_message.bullet_3" | translate }}
    • +{{ "task_orders.ko_review.message" | translate }} +
    {{ "fragments.ko_review_message.title" | translate }}:
    +
      +
    • {{ "fragments.ko_review_message.bullet_1" | translate }}
      • +
    • {{ "fragments.ko_review_message.bullet_2" | translate }}
      • +
    • {{ "fragments.ko_review_message.bullet_3" | translate }}
    diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index db79f177..4165eefd 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -25,8 +25,10 @@ {% block form %} -
    -

    {{ "task_orders.ko_review.title" | translate }}

    +
    +

    + {{ "task_orders.ko_review.title" | translate }} +

    {% include "fragments/ko_review_message.html" %}
    From f4aaffdb1e159b234cc81a7bfc82e954ec3fa824 Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 12 Feb 2019 11:06:17 -0500 Subject: [PATCH 3/3] Forgot new file --- styles/components/_top_message.scss | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 styles/components/_top_message.scss diff --git a/styles/components/_top_message.scss b/styles/components/_top_message.scss new file mode 100644 index 00000000..24221f1b --- /dev/null +++ b/styles/components/_top_message.scss @@ -0,0 +1,35 @@ +.top-message { + padding: $gap * 2; + + @include panel-margin; + @include media($medium-screen) { + padding: $gap * 4; + } + + border-top-width: 1px; + border-bottom-width: 1px; + border-top-style: solid; + border-bottom-style: solid; + border-bottom-color: $color-gray-light; + + .title { + padding-top: $gap * 2; + padding-bottom: $gap * 2; + padding-left: 0; + padding-right:0; + } + + .list-title { + padding-top: $gap * 4; + font-weight: bold; + } + + .list { + padding-left: $gap * 2.5; + margin-top: 0.5rem; + } + + .list-item { + margin-bottom: 0.5rem; + } +}