Rebase fixes

templates/components/datepicker.html

@@ -1,50 +0,0 @@
-{% from "components/icon.html" import Icon %}
-
-{% macro DatePicker(field) -%}
-
-  <date-selector inline-template>
-    <div class="usa-input date-picker" v-bind:class="{ 'usa-input--success': isDateValid }">
-      <input v-bind:value="formattedDate" type="hidden" />
-
-
-      <div class="usa-form-group usa-form-group-month">
-        <label>Month</label>
-        <input
-          max="12"
-          maxlength="2"
-          min="1"
-          type="number"
-          v-bind:class="{ 'usa-input-error': !isMonthValid }"
-          v-model="month"
-        />
-      </div>
-
-      <div class="usa-form-group usa-form-group-day">
-        <label>Day</label>
-        <input
-          maxlength="2"
-          min="1"
-          type="number"
-          v-bind:class="{ 'usa-input-error': !isDayValid }"
-          v-bind:max="daysMaxCalculation"
-          v-model="day"
-        />
-      </div>
-
-      <div class="usa-form-group usa-form-group-year">
-        <label>Year</label>
-        <input
-          maxlength="2"
-          type="number"
-          v-model="year"
-        />
-      </div>
-
-      <div class="usa-form-group-date-ok" v-if="isDateValid">
-        {{ Icon("ok", classes="icon--green") }}
-      </div>
-
-    </div>
-  </date-selector>
-
-{%- endmacro %}

templates/portfolios/task_orders/review.html

@@ -3,7 +3,7 @@
 {% from "components/edit_link.html" import EditLink %}
 {% from "components/required_label.html" import RequiredLabel %}
 {% from "components/icon.html" import Icon %}
-{% from "components/datepicker.html" import DatePicker %}
+{% from "components/date_picker.html" import DatePicker %}
 {% from "components/text_input.html" import TextInput %}
 
 

templates/task_orders/new/app_info.html

@@ -4,7 +4,6 @@
 {% from "components/options_input.html" import OptionsInput %}
 {% from "components/date_input.html" import DateInput %}
 {% from "components/multi_checkbox_input.html" import MultiCheckboxInput %}
-{% from "components/datepicker.html" import DatePicker %}
 
 {% block heading %}
   {{ "task_orders.new.app_info.section_title"| translate }}
@@ -12,17 +11,6 @@
 
 {% block form %}
 
-<div class="usa-input">
-  <label>
-    <div class="usa-input__title">Date picker</div>
-  </label>
-
-  <span class="usa-form-hint">For example: 04 28 1986</span>
-
-  {{ DatePicker() }}
-</div>
-
-
 <!-- App Info Section -->
 <h3 class="task-order-form__heading subheading">{{ "task_orders.new.app_info.basic_info_title"| translate }}</h3>
 {{ TextInput(form.portfolio_name, placeholder="The name of your office or organization") }}