From a4de4b04eb5a249665551b81018486676de3a241 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Thu, 24 Jan 2019 10:10:10 -0500
Subject: [PATCH 1/4] Fix typos and styling for disabled fields

---
 styles/sections/_task_order.scss       |  9 +++++++++
 templates/task_orders/new/funding.html | 24 +++++++++++++-----------
 translations.yaml                      |  2 +-
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss
index b63d064f..01123107 100644
--- a/styles/sections/_task_order.scss
+++ b/styles/sections/_task_order.scss
@@ -266,6 +266,15 @@
       margin: 0;
     }
   }
+
+  input[type="text"]:disabled {
+    color: $color-gray-lighter;
+    font-style: italic;
+  }
+
+  .task-order__invite-dod-id {
+
+  }
 }
 
 .task-order-invitations {
diff --git a/templates/task_orders/new/funding.html b/templates/task_orders/new/funding.html
index 79efa6d6..93bdc1bf 100644
--- a/templates/task_orders/new/funding.html
+++ b/templates/task_orders/new/funding.html
@@ -29,7 +29,7 @@
     <h3 class="subheading">{{ "task_orders.new.funding.estimate_usage_title" | translate }}</h3>
     <p>{{ "task_orders.new.funding.estimate_usage_description" | translate }}</p>
     <p><a class="icon-link" target="_blank" href="{{ url_for('atst.jedi_csp_calculator') }}">
-      {{ Icon("link")}} Cloud Service Provider's estimate calculator
+      {{ Icon("link")}} Go to Cloud Service Provider’s estimate calculator
     </a></p>
     <p>{{ "task_orders.new.funding.estimate_usage_paragraph" | translate }}</p>
     <template v-if="showUpload">
@@ -51,18 +51,20 @@
 
     <hr>
 
-    <h3 class="subheading">{{ "task_orders.new.funding.cloud_calculations_title" | translate }}</h3>
-    <p>{{ "task_orders.new.funding.cloud_calculations_paragraph" | translate }}</p>
+    <div class="">
+      <h3 class="subheading">{{ "task_orders.new.funding.cloud_calculations_title" | translate }}</h3>
+      <p>{{ "task_orders.new.funding.cloud_calculations_paragraph" | translate }}</p>
 
-    <h4 class="task-order-form__heading subheading">{{ "task_orders.new.funding.cloud_offerings_title" | translate }}</h4>
-    <p>{{ "task_orders.new.funding.cloud_offerings_paragraph" | translate }}</p>
-    {{ TextInput(form.clin_01, validation='dollars', placeholder="$0.00") }}
-    {{ TextInput(form.clin_02, validation='dollars', disabled=(not config.CLASSIFIED)) }}
+      <h4 class="task-order-form__heading subheading">{{ "task_orders.new.funding.cloud_offerings_title" | translate }}</h4>
+      <p>{{ "task_orders.new.funding.cloud_offerings_paragraph" | translate }}</p>
+      {{ TextInput(form.clin_01, validation='dollars', placeholder="$0.00") }}
+      {{ TextInput(form.clin_02, validation='dollars', placeholder="$0.00", disabled=(not config.CLASSIFIED)) }}
 
-    <h4 class="task-order-form__heading subheading">{{ "task_orders.new.funding.support_assistance_title" | translate }}</h4>
-    <p>{{ "task_orders.new.funding.support_assistance_paragraph" | translate }}</p>
-    {{ TextInput(form.clin_03, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', placeholder="$0.00") }}
-    {{ TextInput(form.clin_04, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', disabled=(not config.CLASSIFIED)) }}
+      <h4 class="task-order-form__heading subheading">{{ "task_orders.new.funding.support_assistance_title" | translate }}</h4>
+      <p>{{ "task_orders.new.funding.support_assistance_paragraph" | translate }}</p>
+      {{ TextInput(form.clin_03, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', placeholder="$0.00") }}
+      {{ TextInput(form.clin_04, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', placeholder="$0.00", disabled=(not config.CLASSIFIED)) }}
+    </div>
   </div>
 </funding>
 
diff --git a/translations.yaml b/translations.yaml
index 8a188943..b0233c8d 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -188,7 +188,7 @@ forms:
       description: Which of these describes how complex your team's use of the cloud will be? Select all that apply.
       storage: Storage
       data_analytics: Data Analytics
-      conus: CONUS Acess
+      conus: CONUS Access
       oconus: OCONUS Access
       tactical_edge: Tactical Edge Access
       not_sure: Not Sure

From 2c0018dba074aad4f5b06b7d6cb81d01107c8cfb Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Thu, 24 Jan 2019 10:41:59 -0500
Subject: [PATCH 2/4] Add blue background to officers DoD ID field

---
 styles/sections/_task_order.scss         | 20 ++++++++++----------
 templates/components/text_input.html     |  3 ++-
 templates/task_orders/new/oversight.html |  6 +++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss
index 01123107..a45da134 100644
--- a/styles/sections/_task_order.scss
+++ b/styles/sections/_task_order.scss
@@ -258,22 +258,22 @@
     }
   }
 
-  .alert {
-    padding: 1.5rem;
-
-    .usa-input {
-      width: 100%;
-      margin: 0;
-    }
-  }
-
   input[type="text"]:disabled {
     color: $color-gray-lighter;
     font-style: italic;
   }
 
-  .task-order__invite-dod-id {
+  .task-order__invite-officer {
+    padding: 1.5rem;
+    background-color: $color-aqua-lightest;
+    border-color: $color-blue;
+    border-left-style: solid;
+    border-left-width: $gap / 2;
 
+    .usa-input {
+      width: 100%;
+      margin: 0;
+    }
   }
 }
 
diff --git a/templates/components/text_input.html b/templates/components/text_input.html
index 210c8178..3bd95cc4 100644
--- a/templates/components/text_input.html
+++ b/templates/components/text_input.html
@@ -12,6 +12,7 @@
   paragraph=False,
   disabled=False,
   initial_value='',
+  classes='',
   noMaxWidth=False) -%}
 
   <textinput
@@ -26,7 +27,7 @@
     inline-template>
 
     <div
-      {% if disabled %}class="input--disabled"{% endif %}
+      class='{% if disabled %}input--disabled{% endif %}{{ classes }}'
       v-bind:class="['usa-input usa-input--validation--' + validation, { 'usa-input--error': showError, 'usa-input--success': showValid, 'usa-input--validation--paragraph': paragraph, 'no-max-width': noMaxWidth }]">
 
       <label for={{field.name}}>
diff --git a/templates/task_orders/new/oversight.html b/templates/task_orders/new/oversight.html
index ac8d39cb..e3cb255e 100644
--- a/templates/task_orders/new/oversight.html
+++ b/templates/task_orders/new/oversight.html
@@ -18,7 +18,7 @@
         {{ UserInfo(form.ko_first_name, form.ko_last_name, form.ko_email, form.ko_phone_number) }}
         {{ CheckboxInput(form.ko_invite) }}
         <template v-if="ko_invite">
-            {{ TextInput(form.ko_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId')}}
+            {{ TextInput(form.ko_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId', classes="task-order__invite-officer")}}
         </template>
 
         <hr />
@@ -30,7 +30,7 @@
             {{ UserInfo(form.cor_first_name, form.cor_last_name, form.cor_email, form.cor_phone_number) }}
             {{ CheckboxInput(form.cor_invite) }}
             <template v-if="cor_invite">
-                {{ TextInput(form.cor_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId')}}
+                {{ TextInput(form.cor_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId', classes="task-order__invite-officer")}}
             </template>
         </template>
 
@@ -41,7 +41,7 @@
         {{ UserInfo(form.so_first_name, form.so_last_name, form.so_email, form.so_phone_number) }}
         {{ CheckboxInput(form.so_invite) }}
         <template v-if="so_invite">
-            {{ TextInput(form.so_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId')}}
+            {{ TextInput(form.so_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId', classes="task-order__invite-officer")}}
         </template>
     </div>
 </oversight>

From a2b9526cd44db3cebcb351fdb08afd1a772b7392 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Thu, 24 Jan 2019 15:06:14 -0500
Subject: [PATCH 3/4] Stying fixes after rebase

---
 styles/sections/_task_order.scss      | 12 +++++++++---
 templates/task_orders/new/review.html |  6 ++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss
index a45da134..9e2956a7 100644
--- a/styles/sections/_task_order.scss
+++ b/styles/sections/_task_order.scss
@@ -258,9 +258,15 @@
     }
   }
 
-  input[type="text"]:disabled {
-    color: $color-gray-lighter;
-    font-style: italic;
+  .input--disabled {
+    label .usa-input__title {
+      color: $color-gray-light;
+    }
+
+    input[type="text"]:disabled {
+      color: $color-gray-lighter;
+      font-style: italic;
+    }
   }
 
   .task-order__invite-officer {
diff --git a/templates/task_orders/new/review.html b/templates/task_orders/new/review.html
index 988a9f65..bfd90827 100644
--- a/templates/task_orders/new/review.html
+++ b/templates/task_orders/new/review.html
@@ -118,8 +118,10 @@
         <a href="{{ url_for("task_orders.download_csp_estimate", task_order_id=task_order.id) }}" class='icon-link icon-link--left' download>{{ Icon('download') }} {{ "task_orders.new.review.usage_est_link"| translate }}</a>
       </p>
     {% else %}
-      <a href="{{ url_for("task_orders.download_csp_estimate", task_order_id=task_order.id) }}" class='icon-link icon-link--left icon-link--disabled' aria-disabled="true">{{ Icon('download') }} {{ "task_orders.new.review.usage_est_link"| translate }}</a>
-      {{ Icon('alert', classes='icon--red') }} <span class="task-order-invite-message not-sent">{{ "task_orders.new.review.not_uploaded"| translate }}</span>
+      <p>
+        <a href="{{ url_for("task_orders.download_csp_estimate", task_order_id=task_order.id) }}" class='icon-link icon-link--left icon-link--disabled' aria-disabled="true">{{ Icon('download') }} {{ "task_orders.new.review.usage_est_link"| translate }}</a><br>
+        {{ Icon('alert', classes='icon--red') }} <span class="task-order-invite-message not-sent">{{ "task_orders.new.review.not_uploaded"| translate }}</span>
+      </p>
     {% endif %}
   {% endcall %}
 

From 3b2349d554d660706f8ba49729d52181a2e56d61 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Fri, 25 Jan 2019 11:24:08 -0500
Subject: [PATCH 4/4] Add space in classes and remove unnecessary div

---
 templates/components/text_input.html   |  2 +-
 templates/task_orders/new/funding.html | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/templates/components/text_input.html b/templates/components/text_input.html
index 3bd95cc4..97797983 100644
--- a/templates/components/text_input.html
+++ b/templates/components/text_input.html
@@ -27,7 +27,7 @@
     inline-template>
 
     <div
-      class='{% if disabled %}input--disabled{% endif %}{{ classes }}'
+      class='{% if disabled %}input--disabled{% endif %} {{ classes }}'
       v-bind:class="['usa-input usa-input--validation--' + validation, { 'usa-input--error': showError, 'usa-input--success': showValid, 'usa-input--validation--paragraph': paragraph, 'no-max-width': noMaxWidth }]">
 
       <label for={{field.name}}>
diff --git a/templates/task_orders/new/funding.html b/templates/task_orders/new/funding.html
index 93bdc1bf..cc012474 100644
--- a/templates/task_orders/new/funding.html
+++ b/templates/task_orders/new/funding.html
@@ -51,20 +51,18 @@
 
     <hr>
 
-    <div class="">
-      <h3 class="subheading">{{ "task_orders.new.funding.cloud_calculations_title" | translate }}</h3>
-      <p>{{ "task_orders.new.funding.cloud_calculations_paragraph" | translate }}</p>
+    <h3 class="subheading">{{ "task_orders.new.funding.cloud_calculations_title" | translate }}</h3>
+    <p>{{ "task_orders.new.funding.cloud_calculations_paragraph" | translate }}</p>
 
-      <h4 class="task-order-form__heading subheading">{{ "task_orders.new.funding.cloud_offerings_title" | translate }}</h4>
-      <p>{{ "task_orders.new.funding.cloud_offerings_paragraph" | translate }}</p>
-      {{ TextInput(form.clin_01, validation='dollars', placeholder="$0.00") }}
-      {{ TextInput(form.clin_02, validation='dollars', placeholder="$0.00", disabled=(not config.CLASSIFIED)) }}
+    <h4 class="task-order-form__heading subheading">{{ "task_orders.new.funding.cloud_offerings_title" | translate }}</h4>
+    <p>{{ "task_orders.new.funding.cloud_offerings_paragraph" | translate }}</p>
+    {{ TextInput(form.clin_01, validation='dollars', placeholder="$0.00") }}
+    {{ TextInput(form.clin_02, validation='dollars', placeholder="$0.00", disabled=(not config.CLASSIFIED)) }}
 
-      <h4 class="task-order-form__heading subheading">{{ "task_orders.new.funding.support_assistance_title" | translate }}</h4>
-      <p>{{ "task_orders.new.funding.support_assistance_paragraph" | translate }}</p>
-      {{ TextInput(form.clin_03, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', placeholder="$0.00") }}
-      {{ TextInput(form.clin_04, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', placeholder="$0.00", disabled=(not config.CLASSIFIED)) }}
-    </div>
+    <h4 class="task-order-form__heading subheading">{{ "task_orders.new.funding.support_assistance_title" | translate }}</h4>
+    <p>{{ "task_orders.new.funding.support_assistance_paragraph" | translate }}</p>
+    {{ TextInput(form.clin_03, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', placeholder="$0.00") }}
+    {{ TextInput(form.clin_04, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', placeholder="$0.00", disabled=(not config.CLASSIFIED)) }}
   </div>
 </funding>