pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove inset_form prop from text inputs

Browse Source
This commit is contained in:
graham-dds 2019-08-27 15:59:51 -04:00
parent aff4caa83f
commit 1901172d6e
6 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/components/text_input.js
View File

@ -31,7 +31,6 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
insetForm: Boolean,
}, },
data: function() { data: function() {
@ -61,7 +60,7 @@ export default {
this._checkIfValid({ this._checkIfValid({
value: this.value, value: this.value,
invalidate: true, invalidate: true,
showValidationIcon: !this.insetForm, showValidationIcon: false,
}) })
if (this.mask && this.validation !== 'email') { if (this.mask && this.validation !== 'email') {

4
templates/components/phone_input.html
View File

@ -3,10 +3,10 @@
{% macro PhoneInput(phone_number, phone_ext, placeholder_phone="") %} {% macro PhoneInput(phone_number, phone_ext, placeholder_phone="") %}
<div class='phone-input'> <div class='phone-input'>
<div class='phone-input__phone'> <div class='phone-input__phone'>
{{ TextInput(phone_number, placeholder=placeholder_phone, validation='usPhone', inset_form=True) }} {{ TextInput(phone_number, placeholder=placeholder_phone, validation='usPhone') }}
</div> </div>
<div class='phone-input__extension'> <div class='phone-input__extension'>
{{ TextInput(phone_ext, validation='phoneExt', inset_form=True)}} {{ TextInput(phone_ext, validation='phoneExt')}}
</div> </div>
</div> </div>
{%- endmacro %} {%- endmacro %}

4
templates/components/text_input.html
View File

@ -17,8 +17,7 @@
optional=True, optional=True,
showLabel=True, showLabel=True,
watch=False, watch=False,
show_validation=True, show_validation=True) -%}
inset_form=False) -%}
<textinput <textinput
v-cloak v-cloak
@ -29,7 +28,6 @@
{% if initial_value or field.data is not none %}initial-value='{{ initial_value or field.data }}'{% endif %} {% if initial_value or field.data is not none %}initial-value='{{ initial_value or field.data }}'{% endif %}
{% if field.errors %}v-bind:initial-errors='{{ field.errors | list }}'{% endif %} {% if field.errors %}v-bind:initial-errors='{{ field.errors | list }}'{% endif %}
v-bind:optional={{ optional|lower }} v-bind:optional={{ optional|lower }}
v-bind:inset-form={{ inset_form|lower }}
key='{{ field.name }}' key='{{ field.name }}'
:watch='{{ watch | string | lower }}' :watch='{{ watch | string | lower }}'
inline-template> inline-template>

6
templates/fragments/edit_user_form.html
View File

@ -11,15 +11,15 @@
<div class='panel__content'> <div class='panel__content'>
<div class='form-row'> <div class='form-row'>
<div class='form-col form-col--half'> <div class='form-col form-col--half'>
{{ TextInput(form.first_name, validation='requiredField', inset_form=True) }} {{ TextInput(form.first_name, validation='requiredField') }}
</div> </div>
<div class='form-col form-col--half'> <div class='form-col form-col--half'>
{{ TextInput(form.last_name, validation='requiredField', inset_form=True) }} {{ TextInput(form.last_name, validation='requiredField') }}
</div> </div>
</div> </div>
{{ TextInput(form.email, validation='email', inset_form=True) }} {{ TextInput(form.email, validation='email') }}
{{ PhoneInput(form.phone_number, form.phone_ext) }} {{ PhoneInput(form.phone_number, form.phone_ext) }}
{{ OptionsInput(form.service_branch, inset_form=True) }} {{ OptionsInput(form.service_branch, inset_form=True) }}

2
templates/portfolios/admin.html
View File

@ -17,7 +17,7 @@
{{ portfolio_form.csrf_token }} {{ portfolio_form.csrf_token }}
<div class='form-row'> <div class='form-row'>
<div class='form-col form-col--half'> <div class='form-col form-col--half'>
{{ TextInput(portfolio_form.name, validation="portfolioName", inset_form=True) }} {{ TextInput(portfolio_form.name, validation="portfolioName") }}
</div> </div>
<div class='edit-portfolio-name action-group'> <div class='edit-portfolio-name action-group'>
{{ SaveButton(text='Save', additional_classes='usa-button-big') }} {{ SaveButton(text='Save', additional_classes='usa-button-big') }}

4
templates/portfolios/applications/settings.html
View File

@ -25,8 +25,8 @@
</p> </p>
<div class="form-row"> <div class="form-row">
<div class="form-col form-col--two-thirds"> <div class="form-col form-col--two-thirds">
{{ TextInput(application_form.name, inset_form=True) }} {{ TextInput(application_form.name) }}
{{ TextInput(application_form.description, paragraph=True, inset_form=True) }} {{ TextInput(application_form.description, paragraph=True) }}
</div> </div>
<div class="form-col form-col--third"> <div class="form-col form-col--third">
{% if user_can(permissions.DELETE_APPLICATION) %} {% if user_can(permissions.DELETE_APPLICATION) %}