AVSDev/sprinkle-uf-tweaks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed double hidden check by adding the col_width parameter to form inputs which generates the col div

Browse Source
This commit is contained in:
Craig Williams
2023-06-01 14:59:31 +01:00
parent e559d4380b
commit bf9467b480
12 changed files with 134 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
templates/forms/partials/input-user-current_password.html.twig
View File

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

30
templates/forms/partials/input-user-email.html.twig
View File

@@ -1,18 +1,20 @@
{% block input_user_email %} {% block input_user_email %}
{% if 'email' not in form.fields.hidden %} {% if 'email' not in form.fields.hidden %}
<div class="form-group"> {% if col_width %}<div class="{{col_width}}">{% endif %}
<label for="input-user-email" class="control-label">{{translate('EMAIL')}}</label> <div class="form-group">
<div class="input-group js-copy-container"> <label for="input-user-email" class="control-label">{{translate('EMAIL')}}</label>
<span class="input-group-addon"><i class="fas fa-envelope fa-fw"></i></span> <div class="input-group js-copy-container">
<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 %}> <span class="input-group-addon"><i class="fas fa-envelope fa-fw"></i></span>
{% if 'email' in form.fields.disabled %} <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 'copy' not in form.fields.disabled %} {% if 'email' in form.fields.disabled %}
<span class="input-group-btn"> {% if 'copy' not in form.fields.disabled %}
<button class="btn btn-default uf-copy-trigger js-copy-trigger" type="button"><i class="fas fa-clipboard"></i></button> <span class="input-group-btn">
</span> <button class="btn btn-default uf-copy-trigger js-copy-trigger" type="button"><i class="fas fa-clipboard"></i></button>
{% endif %} </span>
{% endif %} {% endif %}
</div> {% endif %}
</div> </div>
</div>
{% if col_width %}</div>{% endif %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}

16
templates/forms/partials/input-user-first_name.html.twig
View File

@@ -1,11 +1,13 @@
{% block input_user_first_name %} {% block input_user_first_name %}
{% if 'first_name' not in form.fields.hidden %} {% if 'first_name' not in form.fields.hidden %}
<div class="form-group"> {% if col_width %}<div class="{{col_width}}">{% endif %}
<label for="input-user-first-name" class="control-label">{{translate('FIRST_NAME')}}</label> <div class="form-group">
<div class="input-group"> <label for="input-user-first-name" class="control-label">{{translate('FIRST_NAME')}}</label>
<span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span> <div class="input-group">
<input type="text" id="input-user-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 %}> <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
</div> <input type="text" id="input-user-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>
</div>
{% if col_width %}</div>{% endif %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}

36
templates/forms/partials/input-user-group.html.twig
View File

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

16
templates/forms/partials/input-user-last_name.html.twig
View File

@@ -1,11 +1,13 @@
{% block input_user_last_name %} {% block input_user_last_name %}
{% if 'last_name' not in form.fields.hidden %} {% if 'last_name' not in form.fields.hidden %}
<div class="form-group"> {% if col_width %}<div class="{{col_width}}">{% endif %}
<label for="input-user-last-name" class="control-label">{{translate('LAST_NAME')}}</label> <div class="form-group">
<div class="input-group"> <label for="input-user-last-name" class="control-label">{{translate('LAST_NAME')}}</label>
<span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span> <div class="input-group">
<input type="text" id="input-user-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 %}> <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
</div> <input type="text" id="input-user-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>
</div>
{% if col_width %}</div>{% endif %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}

32
templates/forms/partials/input-user-locale.html.twig
View File

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

30
templates/forms/partials/input-user-new_password.html.twig
View File

@@ -1,18 +1,20 @@
{% block input_user_new_password %} {% block input_user_new_password %}
{% if 'password' not in form.fields.hidden %} {% if 'password' not in form.fields.hidden %}
<div class="form-group"> {% if col_width %}<div class="{{col_width}}">{% endif %}
<label for="input-user-password" class="control-label">{{translate("PASSWORD.NEW")}}</label> <div class="form-group">
<div class="input-group"> <label for="input-user-password" class="control-label">{{translate("PASSWORD.NEW")}}</label>
<span class="input-group-addon"><i class="fas fa-key"></i></span> <div class="input-group">
<input type="password" id="input-user-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 %}> <span class="input-group-addon"><i class="fas fa-key"></i></span>
</div> <input type="password" id="input-user-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"> </div>
<label for="input-user-passwordc" class="control-label">{{translate("PASSWORD.CONFIRM_NEW")}}</label> <div class="form-group">
<div class="input-group"> <label for="input-user-passwordc" class="control-label">{{translate("PASSWORD.CONFIRM_NEW")}}</label>
<span class="input-group-addon"><i class="fas fa-key"></i></span> <div class="input-group">
<input type="password" id="input-user-passwordc" class="form-control" name="passwordc" placeholder="{{translate("PASSWORD.CONFIRM_NEW_HELP")}}" {% if 'password' in form.fields.disabled %}disabled{% endif %}> <span class="input-group-addon"><i class="fas fa-key"></i></span>
</div> <input type="password" id="input-user-passwordc" class="form-control" name="passwordc" placeholder="{{translate("PASSWORD.CONFIRM_NEW_HELP")}}" {% if 'password' in form.fields.disabled %}disabled{% endif %}>
</div> </div>
</div>
{% if col_width %}</div>{% endif %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}

32
templates/forms/partials/input-user-theme.html.twig
View File

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

16
templates/forms/partials/input-user-user_name.html.twig
View File

@@ -1,11 +1,13 @@
{% block input_user_user_name %} {% block input_user_user_name %}
{% if 'user_name' not in form.fields.hidden %} {% if 'user_name' not in form.fields.hidden %}
<div class="form-group"> {% if col_width %}<div class="{{col_width}}">{% endif %}
<label>{{translate('USERNAME')}}</label> <div class="form-group">
<div class="input-group"> <label>{{translate('USERNAME')}}</label>
<span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span> <div class="input-group">
<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 %}> <span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
</div> <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>
</div>
{% if col_width %}</div>{% endif %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}

14
templates/forms/settings-account.html.twig
View File

@@ -10,23 +10,19 @@
{% block settings_account %} {% block settings_account %}
<div class="row"> <div class="row">
<div class="col-sm-12"> {% include "forms/partials/input-user-email.html.twig" with { 'col_width': 'col-sm-12' } %}
{% include "forms/partials/input-user-email.html.twig" %}
</div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12"> {% include "forms/partials/input-user-new_password.html.twig" with { 'col_width': 'col-sm-12' } %}
{% include "forms/partials/input-user-new_password.html.twig" %}
</div>
</div> </div>
{% if 'password' not in form.fields.hidden %} {% if 'password' not in form.fields.hidden %}
<hr> <hr>
{% endif %} {% endif %}
<div class="row"> <div class="row">
<div class="col-sm-12"> {% include "forms/partials/input-user-current_password.html.twig" with { 'col_width': 'col-sm-12' } %}
{% include "forms/partials/input-user-current_password.html.twig" %}
</div>
</div> </div>
{% endblock %} {% endblock %}
</div> </div>

13
templates/forms/settings-profile.html.twig
View File

@@ -6,21 +6,12 @@
{% include "forms/csrf.html.twig" %} {% include "forms/csrf.html.twig" %}
{% block settings_profile %} {% block settings_profile %}
{% if 'name' not in form.fields.hidden %}
<div class="row"> <div class="row">
<div class="col-sm-6"> {% include "forms/partials/input-user-name.html.twig" with { 'col_width': 'col-sm-12' } %}
{% include "forms/partials/input-user-first_name.html.twig" %}
</div>
<div class="col-sm-6">
{% include "forms/partials/input-user-last_name.html.twig" %}
</div>
</div> </div>
{% endif %}
<div class="row"> <div class="row">
<div class="col-sm-12"> {% include "forms/partials/input-user-locale.html.twig" with { 'col_width': 'col-sm-12' } %}
{% include "forms/partials/input-user-locale.html.twig" %}
</div>
</div> </div>
{% endblock %} {% endblock %}
</div> </div>

39
templates/forms/user.html.twig
View File

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