Changed directory structure of forms/inputs slightly

templates/forms/inputs/abstract/description.html.twig

@@ -0,0 +1,8 @@
+{% if 'description' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-{{type}}-description" class="control-label">{{field_name | default(translate('DESCRIPTION'))}}</label>
+            <textarea id="input-{{type}}-description" class="form-control" type="text" name="description" {% if 'description' in form.fields.disabled %}disabled{% endif %} rows=6>{{current_value}}</textarea>
+        </div>
+    {% if col_width %}</div>{% endif %}
+{% endif %}

templates/forms/inputs/abstract/icon.html.twig

@@ -0,0 +1,11 @@
+{% if 'icon' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group iconpicker-container">
+            <label for="input-{{type}}-icon" class="control-label">{{field_name | default(translate("ICON"))}}</label>
+            <div class="input-group">
+                <span class="input-group-addon icon-preview"><i class="{{current_value}} fa-fw"></i></span>
+                <input type="text" id="input-{{type}}-icon" class="form-control icp icp-auto" name="icon" autocomplete="off" value="{{current_value}}" placeholder="{{ placeholder | default(translate('ICON')) }}" {% if 'icon' in form.fields.disabled %}disabled{% endif %}>
+            </div>
+        </div>
+    {% if col_width %}</div>{% endif %}
+{% endif %}

templates/forms/inputs/abstract/name.html.twig

@@ -0,0 +1,11 @@
+{% if 'name' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-{{type}}-name" class="control-label">{{field_name | default(translate('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-{{type}}-name" class="form-control" name="name" autocomplete="off" value="{{current_value}}" placeholder="{{ placeholder | default(translate('NAME')) }}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
+            </div>
+        </div>
+    {% if col_width %}</div>{% endif %}
+{% endif %}

templates/forms/inputs/abstract/slug.html.twig

@@ -0,0 +1,18 @@
+{% if 'description' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-{{type}}-slug" class="control-label">{{field_name | default(translate('SLUG'))}}</label>
+            <div class="input-group">
+                <span class="input-group-addon"><i class="fas fa-tag fa-fw"></i></span>
+                <input type="text" id="input-{{type}}-slug" class="form-control" name="slug" autocomplete="off" value="{{current_value}}" placeholder="{{placeholder | default(translate('SLUG'))}}" {% if 'slug' in form.fields.disabled %}disabled{% endif %} readonly>
+                {% if 'slug' not in form.fields.disabled %}
+                    <span class="input-group-btn" data-toggle="buttons">
+                        <label class="btn btn-primary">
+                            <input type="checkbox" id="input-{{type}}-slug-override" autocomplete="off"> {{translate("OVERRIDE")}}
+                        </label>
+                    </span>
+                {% endif %}
+            </div>
+        </div>
+    {% if col_width %}</div>{% endif %}
+{% endif %}

templates/forms/inputs/group-description.html.twig

@@ -0,0 +1,9 @@
+{% block input_group_description %}
+{% include "forms/inputs/abstract/description.html.twig" with
+    {
+        "type" : "group",
+        "current_value" : group.description,
+        "col_width" : col_width
+    }
+%}
+{% endblock %}

templates/forms/inputs/group-icon.html.twig

@@ -0,0 +1,11 @@
+{% block input_group_icon %}
+{% include "forms/inputs/abstract/icon.html.twig" with
+    {
+        "type" : "group",
+        "current_value" : group.icon,
+        "field_name" : translate('GROUP.ICON'),
+        "placeholder" : translate('GROUP.ICON_EXPLAIN'),
+        "col_width" : col_width
+    }
+%}
+{% endblock %}

templates/forms/inputs/group-name.html.twig

@@ -0,0 +1,11 @@
+{% block input_group_name %}
+{% include "forms/inputs/abstract/name.html.twig" with
+    {
+        "type" : "group",
+        "current_value" : group.name,
+        "field_name" : translate('GROUP.NAME'),
+        "placeholder" : translate('GROUP.NAME_EXPLAIN'),
+        "col_width" : col_width
+    }
+%}
+{% endblock %}

templates/forms/inputs/group-slug.html.twig

@@ -0,0 +1,9 @@
+{% block input_group_slug %}
+{% include "forms/inputs/abstract/slug.html.twig" with
+    {
+        "type" : "group",
+        "current_value" : group.slug,
+        "col_width" : col_width
+    }
+%}
+{% endblock %}

templates/forms/inputs/role-description.html.twig

@@ -0,0 +1,9 @@
+{% block input_role_description %}
+{% include "forms/inputs/abstract/description.html.twig" with
+    {
+        "type" : "role",
+        "current_value" : role.description,
+        "col_width" : col_width
+    }
+%}
+{% endblock %}

templates/forms/inputs/role-name.html.twig

@@ -0,0 +1,10 @@
+{% block input_role_name %}
+{% include "forms/inputs/abstract/name.html.twig" with
+    {
+        "type" : "role",
+        "current_value" : role.name,
+        "placeholder" : translate('ROLE.NAME_EXPLAIN'),
+        "col_width" : col_width
+    }
+%}
+{% endblock %}

templates/forms/inputs/role-slug.html.twig

@@ -0,0 +1,9 @@
+{% block input_role_slug %}
+{% include "forms/inputs/abstract/slug.html.twig" with
+    {
+        "type" : "role",
+        "current_value" : role.slug,
+        "col_width" : col_width
+    }
+%}
+{% endblock %}

templates/forms/inputs/user-current_password.html.twig

@@ -0,0 +1,13 @@
+{% block input_user_current_password %}
+{% if 'password' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-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-user-passwordcheck" class="form-control" name="passwordcheck" placeholder="{{translate("PASSWORD.CURRENT_EXPLAIN")}}" {% if 'password' in form.fields.disabled %}disabled{% endif %}>
+            </div>
+        </div>
+    {% if col_width %}</div>{% endif %}
+{% endif %}
+{% endblock %}

templates/forms/inputs/user-email.html.twig

@@ -0,0 +1,20 @@
+{% block input_user_email %}
+{% if 'email' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-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>
+    {% if col_width %}</div>{% endif %}
+{% endif %}
+{% endblock %}

templates/forms/inputs/user-first_name.html.twig

@@ -0,0 +1,13 @@
+{% block input_user_first_name %}
+{% if 'first_name' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-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-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>
+    {% if col_width %}</div>{% endif %}
+{% endif %}
+{% endblock %}

templates/forms/inputs/user-group.html.twig

@@ -0,0 +1,23 @@
+{% block input_user_group %}
+{% if 'group' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-group" class="control-label">{{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-user-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>
+    {% if col_width %}</div>{% endif %}
+{% endif %}
+{% endblock %}

templates/forms/inputs/user-last_name.html.twig

@@ -0,0 +1,13 @@
+{% block input_user_last_name %}
+{% if 'last_name' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-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-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>
+    {% if col_width %}</div>{% endif %}
+{% endif %}
+{% endblock %}

templates/forms/inputs/user-locale.html.twig

@@ -0,0 +1,21 @@
+{% block input_user_locale %}
+{% if 'locale' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-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-user-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>
+    {% if col_width %}</div>{% endif %}
+{% endif %}
+{% endblock %}

templates/forms/inputs/user-name.html.twig

@@ -0,0 +1,10 @@
+{% block input_user_name %}
+{% if 'name' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="row">
+            {% include "forms/inputs/user-first_name.html.twig" with { 'col_width': 'col-sm-6' } %}
+            {% include "forms/inputs/user-last_name.html.twig" with { 'col_width': 'col-sm-6' } %}
+        </div>
+    {% if col_width %}</div>{% endif %}
+{% endif %}
+{% endblock %}

templates/forms/inputs/user-new_password.html.twig

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

templates/forms/inputs/user-theme.html.twig

@@ -0,0 +1,21 @@
+{% block input_user_theme %}
+{% if 'theme' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-theme" class="control-label">{{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-user-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>
+    {% if col_width %}</div>{% endif %}
+{% endif %}
+{% endblock %}

templates/forms/inputs/user-user_name.html.twig

@@ -0,0 +1,13 @@
+{% block input_user_user_name %}
+{% if 'user_name' not in form.fields.hidden %}
+    {% if col_width %}<div class="{{col_width}}">{% endif %}
+        <div class="form-group">
+            <label for="input-user-username" class="control-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" id="input-user-username" 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>
+    {% if col_width %}</div>{% endif %}
+{% endif %}
+{% endblock %}