Updated user settings page and user forms

templates/forms/partials/input-current_password.html.twig

@@ -0,0 +1,11 @@
+{% block input_current_password %}
+{% if 'password' not in form.fields.hidden %}
+<div class="form-group">
+    <label for="input-passwordcheck" class="control-label">{{translate("PASSWORD.CURRENT")}}</label>
+    <div class="input-group">
+        <span class="input-group-addon"><i class="fas fa-key"></i></span>
+        <input type="password" id="input-passwordcheck" class="form-control" name="passwordcheck" placeholder="{{translate("PASSWORD.CURRENT_EXPLAIN")}}" {% if 'password' in form.fields.disabled %}disabled{% endif %}>
+    </div>
+</div>
+{% endif %}
+{% endblock %}

templates/forms/partials/input-email.html.twig

@@ -0,0 +1,18 @@
+{% block input_email %}
+{% if 'email' not in form.fields.hidden %}
+<div class="form-group">
+    <label for="input-email" class="control-label">{{translate('EMAIL')}}</label>
+    <div class="input-group js-copy-container">
+        <span class="input-group-addon"><i class="fas fa-envelope fa-fw"></i></span>
+        <input type="text" class="form-control js-copy-target" name="email" autocomplete="off" value="{{user.email}}" placeholder="{{translate('EMAIL')}}" {% if 'email' in form.fields.disabled %}disabled{% endif %}>
+        {% if 'email' in form.fields.disabled %}
+            {% if 'copy' not in form.fields.disabled %}
+            <span class="input-group-btn">
+                <button class="btn btn-default uf-copy-trigger js-copy-trigger" type="button"><i class="fas fa-clipboard"></i></button>
+            </span>
+            {% endif %}
+        {% endif %}
+    </div>
+</div>
+{% endif %}
+{% endblock %}

templates/forms/partials/input-first_name.html.twig

@@ -0,0 +1,11 @@
+{% block input_first_name %}
+{% if 'first_name' not in form.fields.hidden %}
+<div class="form-group">
+    <label for="input-first-name" class="control-label">{{translate('FIRST_NAME')}}</label>
+    <div class="input-group">
+        <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
+        <input type="text" id="input-first-name" name="first_name" class="form-control" autocomplete="off" value="{{user.first_name}}" placeholder="{{translate('FIRST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
+    </div>
+</div>
+{% endif %}
+{% endblock %}

templates/forms/partials/input-group.html.twig

@@ -0,0 +1,21 @@
+{% block input_group %}
+{% if 'group' not in form.fields.hidden %}
+<div class="form-group">
+    <label for="input-group">{{translate('GROUP')}}</label>
+    <div class="input-group">
+        <span class="input-group-addon"><i class="fas fa-users fa-fw"></i></span>
+        {% if 'group' in form.fields.disabled %}
+            <input type="text" class="form-control" name="theme" value="{{user.group.name}}" disabled>
+        {% else %}
+            <select id="input-group" class="form-control js-select2" name="group_id">
+                <option value="0">{{translate('GROUP.NONE')}}</option>
+                <option disabled="disabled">-----</option>
+                {% for group in groups %}
+                <option value="{{group.id}}" {% if (group.id == user.group_id) %}selected{% endif %}>{{group.name}}</option>
+                {% endfor %}
+            </select>
+        {% endif %}
+    </div>
+</div>
+{% endif %}
+{% endblock %}

templates/forms/partials/input-last_name.html.twig

@@ -0,0 +1,11 @@
+{% block input_last_name %}
+{% if 'last_name' not in form.fields.hidden %}
+<div class="form-group">
+    <label for="input-last-name" class="control-label">{{translate('LAST_NAME')}}</label>
+    <div class="input-group">
+        <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
+        <input type="text" id="input-last-name" name="last_name" class="form-control" autocomplete="off" value="{{user.last_name}}" placeholder="{{translate('LAST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
+    </div>
+</div>
+{% endif %}
+{% endblock %}

templates/forms/partials/input-locale.html.twig

@@ -0,0 +1,19 @@
+{% block input_locale %}
+{% if 'locale' not in form.fields.hidden %}
+<div class="form-group">
+    <label for="input-locale" class="control-label">{{translate('LOCALE')}}</label>
+    <div class="input-group">
+        <span class="input-group-addon"><i class="fas fa-language fa-fw"></i></span>
+        {% if 'locale' in form.fields.disabled %}
+            <input type="text" class="form-control" name="theme" value="{{locales[user.locale]}}" disabled>
+        {% else %}
+            <select id="input-locale" class="form-control js-select2" name="locale">
+                {% for option, label in locales %}
+                <option value="{{option}}" {% if (option == user.locale) %}selected{% endif %}>{{label}}</option>
+                {% endfor %}
+            </select>
+        {% endif %}
+    </div>
+</div>
+{% endif %}
+{% endblock %}

templates/forms/partials/input-new_password.html.twig

@@ -0,0 +1,18 @@
+{% block input_new_password %}
+{% if 'password' not in form.fields.hidden %}
+<div class="form-group">
+    <label for="input-password" class="control-label">{{translate("PASSWORD.NEW")}}</label>
+    <div class="input-group">
+        <span class="input-group-addon"><i class="fas fa-key"></i></span>
+        <input type="password" id="input-password" class="form-control" name="password" placeholder="{{translate("PASSWORD.BETWEEN", {min: site.password.length.min, max: site.password.length.max})}} ({{translate("OPTIONAL")}})" {% if 'password' in form.fields.disabled %}disabled{% endif %}>
+    </div>
+</div>
+<div class="form-group">
+    <label for="input-passwordc" class="control-label">{{translate("PASSWORD.CONFIRM_NEW")}}</label>
+    <div class="input-group">
+        <span class="input-group-addon"><i class="fas fa-key"></i></span>
+        <input type="password" id="input-passwordc" class="form-control" name="passwordc" placeholder="{{translate("PASSWORD.CONFIRM_NEW_HELP")}}" {% if 'password' in form.fields.disabled %}disabled{% endif %}>
+    </div>
+</div>
+{% endif %}
+{% endblock %}

templates/forms/partials/input-theme.html.twig

@@ -0,0 +1,19 @@
+{% block input_theme %}
+{% if 'theme' not in form.fields.hidden %}
+<div class="form-group">
+    <label for="input-theme">{{translate('THEME')}}</label>
+    <div class="input-group">
+        <span class="input-group-addon"><i class="fas fa-puzzle-piece fa-fw"></i></span>
+        {% if 'theme' in form.fields.disabled %}
+            <input type="text" class="form-control" name="theme" value="{{themes[user.theme]}}" disabled>
+        {% else %}
+            <select id="input-theme" class="form-control js-select2" name="theme">
+                {% for option, label in theme %}
+                <option value="{{option}}" {% if (option == user.theme) %}selected{% endif %}>{{label}}</option>
+                {% endfor %}
+            </select>
+        {% endif %}
+    </div>
+</div>
+{% endif %}
+{% endblock %}

templates/forms/partials/input-user_name.html.twig

@@ -0,0 +1,11 @@
+{% block input_user_name %}
+{% if 'user_name' not in form.fields.hidden %}
+<div class="form-group">
+    <label>{{translate('USERNAME')}}</label>
+    <div class="input-group">
+        <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
+        <input type="text" class="form-control" name="user_name" autocomplete="off" value="{{user.user_name}}" placeholder="{{translate('USERNAME')}}" {% if 'user_name' in form.fields.disabled %}disabled{% endif %}>
+    </div>
+</div>
+{% endif %}
+{% endblock %}

templates/forms/settings-account.html.twig

@@ -0,0 +1,39 @@
+<form id="account-settings" role="form" action="{{site.uri.public}}/account/settings" method="post">
+    <div class="box-header">
+        <h3 class="box-title"><i class="fas fa-cog fa-fw"></i> {{translate("ACCOUNT.SETTINGS")}}</h3>
+    </div>
+    <div class="box-body">
+        {% include "forms/csrf.html.twig" %}
+        <!-- Prevent browsers from trying to autofill the password field.  See http://stackoverflow.com/a/23234498/2970321 -->
+        <input type="text" style="display:none">
+        <input type="password" style="display:none">
+
+        {% block settings_account %}
+            <div class="row">
+                <div class="col-sm-12">
+                    {% include "forms/partials/input-email.html.twig" %}
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-sm-12">
+                    {% include "forms/partials/input-new_password.html.twig" %}
+                </div>
+            </div>
+            {% if 'password' not in form.fields.hidden %}
+            <hr>
+            {% endif %}
+            <div class="row">
+                <div class="col-sm-12">
+                    {% include "forms/partials/input-current_password.html.twig" %}
+                </div>
+            </div>
+        {% endblock %}
+    </div>
+    {% if 'submit' not in form.fields.hidden %}
+    <div class="box-footer text-center">
+        <button type="reset" class="btn btn-default">{{translate('RESET')}}</button>
+        <button type="submit" class="btn btn-primary js-submit">{{translate('SAVE')}}</button>
+    </div>
+    {% endif %}
+</form>

templates/forms/settings-profile.html.twig

@@ -0,0 +1,33 @@
+<form id="profile-settings" role="form" action="{{site.uri.public}}/account/settings/profile" method="post">
+    <div class="box-header">
+        <h3 class="box-title"><i class="fas fa-user fa-fw"></i> {{translate("PROFILE.SETTINGS")}}</h3>
+    </div>
+    <div class="box-body">
+        {% include "forms/csrf.html.twig" %}
+
+        {% block settings_profile %}
+            {% if 'name' not in form.fields.hidden %}
+            <div class="row">
+                <div class="col-sm-6">
+                    {% include "forms/partials/input-first_name.html.twig" %}
+                </div>
+                <div class="col-sm-6">
+                    {% include "forms/partials/input-last_name.html.twig" %}
+                </div>
+            </div>
+            {% endif %}
+
+            <div class="row">
+                <div class="col-sm-12">
+                    {% include "forms/partials/input-locale.html.twig" %}
+                </div>
+            </div>
+        {% endblock %}
+    </div>
+    {% if 'submit' not in form.fields.hidden %}
+    <div class="box-footer text-center">
+        <button type="reset" class="btn btn-default">{{translate('RESET')}}</button>
+        <button type="submit" class="btn btn-primary js-submit">{{translate('SAVE')}}</button>
+    </div>
+    {% endif %}
+</form>

templates/forms/user.html.twig

@@ -0,0 +1,46 @@
+{% extends "@admin/forms/user.html.twig" %}
+
+{% block user_form %}
+    {% if 'user_name' not in form.fields.hidden %}
+    <div class="col-sm-6">
+        {% include "forms/partials/input-user_name.html.twig" %}
+    </div>
+    {% endif %}
+
+    {% if 'group' not in form.fields.hidden %}
+    <div class="col-sm-6">
+        {% include "forms/partials/input-group.html.twig" %}
+    </div>
+    {% endif %}
+
+    {% if 'name' not in form.fields.hidden %}
+    <div class="col-sm-6">
+        {% include "forms/partials/input-first_name.html.twig" %}
+    </div>
+    <div class="col-sm-6">
+        {% include "forms/partials/input-last_name.html.twig" %}
+    </div>
+    {% endif %}
+
+    {% if 'email' not in form.fields.hidden %}
+    <div class="col-sm-6">
+        {% include "forms/partials/input-email.html.twig" %}
+    </div>
+    {% endif %}
+
+    {% if 'theme' not in form.fields.hidden %}
+    <div class="col-sm-6">
+        {% include "forms/partials/input-theme.html.twig" %}
+    </div>
+    {% endif %}
+
+    {% if 'locale' not in form.fields.hidden %}
+    <div class="col-sm-6">
+        {% include "forms/partials/input-locale.html.twig" %}
+    </div>
+    {% endif %}
+
+    {% if 'password' not in form.fields.hidden %}
+        {% include "forms/partials/user-set-password.html.twig" %}
+    {% endif %}
+{% endblock %}