Skip to content

Commit ccda2a9

Browse files
unplugged216unplugged216
committed
Refactored 'user-set-password.html.twig'
Refactored the modal 'user-set-password.html.twig'. Created 'forms/user-set-password.html.twig' and included it in the modal. Also created 'forms/partials/user-set-password.html.twig' to seperate the controls for setting the users password for reuse elsewhere.
1 parent d7e207b commit ccda2a9

3 files changed

Lines changed: 59 additions & 56 deletions

File tree

‎app/sprinkles/admin/templates/forms/partials/user-set-password.html.twig‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<!-- Prevent browsers from trying to autofill the password field. See http://stackoverflow.com/a/23234498/2970321 -->
2+
<input type="text" style="display:none">
3+
<input type="password" style="display:none">
4+
<div class="col-sm-12">
5+
<div class="radio">
6+
<label for="change_password_mode_link">
7+
<input type="radio" name="change_password_mode" id="change_password_mode_link" value="link" checked>
8+
{{translate("USER.ADMIN.SEND_PASSWORD_LINK")}}
9+
</label>
10+
</div>
11+
</div>
12+
<div class="col-sm-12">
13+
<div class="radio">
14+
<label for="change_password_mode_manual">
15+
<input type="radio" name="change_password_mode" id="change_password_mode_manual" value="manual">
16+
{{translate("USER.ADMIN.SET_PASSWORD")}}:
17+
</label>
18+
</div>
19+
<div class="row controls-password">
20+
<div class="col-sm-11 col-sm-offset-1">
21+
<div class="form-group">
22+
<label>{{translate('PASSWORD')}}</label>
23+
<div class="input-group">
24+
<span class="input-group-addon"><i class="fa fa-key"></i></span>
25+
<input type="password" class="form-control" name="value" autocomplete="off" value="" placeholder="{{translate('PASSWORD.BETWEEN', {min: 12, max: 50})}}">
26+
</div>
27+
</div>
28+
<div class="form-group">
29+
<label>{{translate('PASSWORD.CONFIRM')}}</label>
30+
<div class="input-group">
31+
<span class="input-group-addon"><i class="fa fa-key"></i></span>
32+
<input type="password" class="form-control" name="passwordc" autocomplete="off" value="" placeholder="{{translate('PASSWORD.CONFIRM')}}">
33+
</div>
34+
</div>
35+
</div>
36+
</div>
37+
</div>

‎app/sprinkles/admin/templates/forms/user-set-password.html.twig‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<form class="js-form" method="PUT" action="{{site.uri.public}}/api/users/u/{{user.user_name}}">
2+
{% include "forms/csrf.html.twig" %}
3+
<div class="js-form-alerts">
4+
</div>
5+
<div class="row">
6+
{% include "forms/partials/user-set-password.html.twig" %}
7+
</div>
8+
<br>
9+
<div class="row">
10+
<div class="col-xs-8 col-sm-4">
11+
<button type="submit" class="btn btn-block btn-lg btn-success">{{translate('SUBMIT')}}</button>
12+
</div>
13+
<div class="col-xs-4 col-sm-3 pull-right">
14+
<button type="button" class="btn btn-block btn-lg btn-link" data-dismiss="modal">{{translate('CANCEL')}}</button>
15+
</div>
16+
</div>
17+
</form>
18+
<!-- Include validation rules -->
19+
<script>
20+
{% include "pages/partials/page.js.twig" %}
21+
</script>

‎app/sprinkles/admin/templates/modals/user-set-password.html.twig‎

Lines changed: 1 addition & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -3,60 +3,5 @@
33
{% block modal_title %}{{translate("USER.ADMIN.CHANGE_PASSWORD")}}{% endblock %}
44

55
{% block modal_body %}
6-
<form class="js-form" method="PUT" action="{{site.uri.public}}/api/users/u/{{user.user_name}}">
7-
{% include "forms/csrf.html.twig" %}
8-
<!-- Prevent browsers from trying to autofill the password field. See http://stackoverflow.com/a/23234498/2970321 -->
9-
<input type="text" style="display:none">
10-
<input type="password" style="display:none">
11-
<div class="js-form-alerts">
12-
</div>
13-
<div class="row">
14-
<div class="col-sm-12">
15-
<div class="radio">
16-
<label for="change_password_mode_link">
17-
<input type="radio" name="change_password_mode" id="change_password_mode_link" value="link" checked>
18-
{{translate("USER.ADMIN.SEND_PASSWORD_LINK")}}
19-
</label>
20-
</div>
21-
</div>
22-
<div class="col-sm-12">
23-
<div class="radio">
24-
<label for="change_password_mode_manual">
25-
<input type="radio" name="change_password_mode" id="change_password_mode_manual" value="manual">
26-
{{translate("USER.ADMIN.SET_PASSWORD")}}:
27-
</label>
28-
</div>
29-
<div class="row controls-password">
30-
<div class="col-sm-11 col-sm-offset-1">
31-
<div class="form-group">
32-
<label>{{translate('PASSWORD')}}</label>
33-
<div class="input-group">
34-
<span class="input-group-addon"><i class="fa fa-key"></i></span>
35-
<input type="password" class="form-control" name="value" autocomplete="off" value="" placeholder="{{translate("PASSWORD.BETWEEN", {min: 12, max: 50})}}">
36-
</div>
37-
</div>
38-
<div class="form-group">
39-
<label>{{translate('PASSWORD.CONFIRM')}}</label>
40-
<div class="input-group">
41-
<span class="input-group-addon"><i class="fa fa-key"></i></span>
42-
<input type="password" class="form-control" name="passwordc" autocomplete="off" value="" placeholder="{{translate('PASSWORD.CONFIRM')}}">
43-
</div>
44-
</div>
45-
</div>
46-
</div>
47-
</div>
48-
</div><br>
49-
<div class="row">
50-
<div class="col-xs-8 col-sm-4">
51-
<button type="submit" class="btn btn-block btn-lg btn-success">{{translate('SUBMIT')}}</button>
52-
</div>
53-
<div class="col-xs-4 col-sm-3 pull-right">
54-
<button type="button" class="btn btn-block btn-lg btn-link" data-dismiss="modal">{{translate('CANCEL')}}</button>
55-
</div>
56-
</div>
57-
</form>
58-
<!-- Include validation rules -->
59-
<script>
60-
{% include "pages/partials/page.js.twig" %}
61-
</script>
6+
{% include "forms/user-set-password.html.twig" %}
627
{% endblock %}

0 commit comments

Comments
 (0)