summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Scheller <igor.scheller@igorshp.de>2019-11-28 02:08:18 +0100
committerIgor Scheller <igor.scheller@igorshp.de>2019-12-08 02:12:56 +0100
commit377b390c97afb9106fd9a139819d00306f996f24 (patch)
tree009d1fb8c0dc6383265ad6356b7958082a9a333e
parent89742ecd5542c740f3625af76c843a7471dbe98a (diff)
Twig: Macros: Form: Use input options and primary submit button
-rw-r--r--resources/views/macros/form.twig22
-rw-r--r--resources/views/pages/password/reset-form.twig4
-rw-r--r--resources/views/pages/password/reset.twig2
3 files changed, 16 insertions, 12 deletions
diff --git a/resources/views/macros/form.twig b/resources/views/macros/form.twig
index 5d41b085..6e821a28 100644
--- a/resources/views/macros/form.twig
+++ b/resources/views/macros/form.twig
@@ -1,18 +1,22 @@
-{% macro input(name, label, type, required) %}
+{% macro input(name, label, type, opt) %}
<div class="form-group">
- {% if label %}
+ {% if label -%}
<label for="{{ name }}">{{ label }}</label>
- {% endif %}
- <input type="{{ type|default('text') }}" class="form-control" id="{{ name }}" name="{{ name }}"
- {%- if required|default(false) %} required="required"{% endif -%}
+ {%- endif %}
+ <input type="{{ type|default('text') }}" class="form-control"
+ id="{{ name }}" name="{{ name }}"
+ value="{{ opt.value|default('') }}"
+ {%- if opt.required|default(false) %}
+ required="required"
+ {%- endif -%}
>
</div>
-{% endmacro %}
+{%- endmacro %}
{% macro hidden(name, value) %}
<input type="hidden" id="{{ name }}" name="{{ name }}" value="{{ value }}">
-{% endmacro %}
+{%- endmacro %}
{% macro submit(label) %}
- <button type="submit" class="btn btn-default">{{ label|default(__('form.submit')) }}</button>
-{% endmacro %}
+ <button type="submit" class="btn btn-primary">{{ label|default(__('form.submit')) }}</button>
+{%- endmacro %}
diff --git a/resources/views/pages/password/reset-form.twig b/resources/views/pages/password/reset-form.twig
index 60eb2499..a72dc92b 100644
--- a/resources/views/pages/password/reset-form.twig
+++ b/resources/views/pages/password/reset-form.twig
@@ -7,8 +7,8 @@
<form action="" enctype="multipart/form-data" method="post">
{{ csrf() }}
- {{ f.input('password', __('Password'), 'password', true) }}
- {{ f.input('password_confirmation', __('Confirm password'), 'password', true) }}
+ {{ f.input('password', __('Password'), 'password', {'required': true}) }}
+ {{ f.input('password_confirmation', __('Confirm password'), 'password', {'required': true}) }}
<div class="form-group">
{{ f.submit(__('Save')) }}
diff --git a/resources/views/pages/password/reset.twig b/resources/views/pages/password/reset.twig
index 289152ea..b1de4eae 100644
--- a/resources/views/pages/password/reset.twig
+++ b/resources/views/pages/password/reset.twig
@@ -19,7 +19,7 @@
{{ csrf() }}
{{ __('We will send you an e-mail with a password recovery link. Please use the email address you used for registration.') }}
- {{ f.input('email', __('E-Mail'), 'email', true) }}
+ {{ f.input('email', __('E-Mail'), 'email', {'required': true}) }}
<div class="form-group">
{{ f.submit(__('Recover')) }}