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

Update SaveButton to be either an input or a button element, and restore inputs that were previously switched to buttons

Browse Source
This commit is contained in:
leigh-mil 2019-04-04 13:29:15 -04:00
parent 850153a517
commit f3ea704c1b
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/components/save_button.html
View File

@ -1,6 +1,8 @@
{% macro SaveButton(text, additional_classes="") -%} {% macro SaveButton(text, element="button", additional_classes="", other_attrs="") -%}
{% set class = "usa-button usa-button-primary" + additional_classes %} {% set class = "usa-button usa-button-primary" + additional_classes %}
<button type="submit" class="{{ class }}" tabindex="0" v-bind:disabled="!changed"> <{{ element }} type="submit" class="{{ class }}" tabindex="0" v-bind:disabled="!changed" value="{{ text }}" {{ other_attrs }}>
{{ text }} {% if element == 'button'%}
</button> {{ text }}
{% endif %}
</{{ element }}>
{%- endmacro %} {%- endmacro %}

2
templates/portfolios/task_orders/invitations.html
View File

@ -60,7 +60,7 @@
{{ Icon("x") }} {{ Icon("x") }}
<span>Cancel</span> <span>Cancel</span>
</a> </a>
{{ SaveButton(text='Save Changes') }} {{ SaveButton(text='Save Changes', element="input") }}
</div> </div>
</div> </div>
</template> </template>

2
templates/portfolios/task_orders/review.html
View File

@ -103,7 +103,7 @@
{% endblock %} {% endblock %}
<div class='action-group'> <div class='action-group'>
{{ SaveButton(text="Continue") }} {{ SaveButton(text="Continue", element="input") }}
</div> </div>
</form> </form>

2
templates/portfolios/task_orders/so_review.html
View File

@ -32,7 +32,7 @@
{{ MultiCheckboxInput(form.required_distribution) }} {{ MultiCheckboxInput(form.required_distribution) }}
<div class="action-group"> <div class="action-group">
{{ SaveButton(text='Continue') }} {{ SaveButton(text='Continue', additional_classes="usa-button-big") }}
</div> </div>
</form> </form>
</div> </div>

2
templates/task_orders/signing/signature_requested.html
View File

@ -39,7 +39,7 @@
</div> </div>
</div> </div>
<div class="action-group"> <div class="action-group">
{{ SaveButton(text=('common.sign' | translate)) }} {{ SaveButton(text=('common.sign' | translate), additional_classes="usa-button-big") }}
<a <a
href="{{ url_for("portfolios.ko_review", portfolio_id=portfolio_id, task_order_id=task_order_id) }}" href="{{ url_for("portfolios.ko_review", portfolio_id=portfolio_id, task_order_id=task_order_id) }}"
class="action-group__action icon-link"> class="action-group__action icon-link">