From b66a61addb6c8e66cb26fcf74b532d68891267e4 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Wed, 23 May 2018 22:23:28 +0200
Subject: Refactored code, many fixes and improvements in chat backend+frontend

---
 .../admin/templates/forms/group.html.twig          |  81 +++++----
 .../sprinkles/admin/templates/forms/role.html.twig |  65 ++++----
 .../sprinkles/admin/templates/forms/user.html.twig | 181 +++++++++++----------
 3 files changed, 182 insertions(+), 145 deletions(-)

(limited to 'main/app/sprinkles/admin/templates/forms')

diff --git a/main/app/sprinkles/admin/templates/forms/group.html.twig b/main/app/sprinkles/admin/templates/forms/group.html.twig
index 36d6632..fade5ab 100644
--- a/main/app/sprinkles/admin/templates/forms/group.html.twig
+++ b/main/app/sprinkles/admin/templates/forms/group.html.twig
@@ -1,69 +1,80 @@
-<form class="js-form" method="{{form.method | default('POST')}}" action="{{site.uri.public}}/{{form.action}}">
+<form class="js-form" method="{{ form.method | default('POST') }}" action="{{ site.uri.public }}/{{ form.action }}">
     {% include "forms/csrf.html.twig" %}
     <div class="js-form-alerts">
     </div>
     <div class="row">
         {% block group_form %}
             {% if 'name' not in form.fields.hidden %}
-            <div class="col-sm-12">
-                <div class="form-group">
-                    <label>{{translate("GROUP.NAME")}}</label>
-                    <div class="input-group">
-                        <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
-                        <input type="text" class="form-control" name="name" autocomplete="off" value="{{group.name}}" placeholder="{{translate("GROUP.NAME_EXPLAIN")}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label>{{ translate("GROUP.NAME") }}</label>
+                        <div class="input-group">
+                            <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
+                            <input type="text" class="form-control" name="name" autocomplete="off"
+                                   value="{{ group.name }}" placeholder="{{ translate("GROUP.NAME_EXPLAIN") }}"
+                                   {% if 'name' in form.fields.disabled %}disabled{% endif %}>
+                        </div>
                     </div>
                 </div>
-            </div>
             {% endif %}
             {% if 'slug' not in form.fields.hidden %}
-            <div class="col-sm-12">
-                <div class="form-group">
-                    <label>{{translate("SLUG")}}</label>
-                    <div class="input-group">
-                        <span class="input-group-addon"><i class="fa fa-tag fa-fw"></i></span>
-                        <input type="text" class="form-control" name="slug" autocomplete="off" value="{{group.slug}}" placeholder="{{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">
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label>{{ translate("SLUG") }}</label>
+                        <div class="input-group">
+                            <span class="input-group-addon"><i class="fa fa-tag fa-fw"></i></span>
+                            <input type="text" class="form-control" name="slug" autocomplete="off"
+                                   value="{{ group.slug }}" placeholder="{{ 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="form-group-slug-override" autocomplete="off"> {{translate("OVERRIDE")}}
+                                    <input type="checkbox" id="form-group-slug-override"
+                                           autocomplete="off"> {{ translate("OVERRIDE") }}
                                 </label>
                             </span>
-                        {% endif %}
+                            {% endif %}
+                        </div>
                     </div>
                 </div>
-            </div>
             {% endif %}
             {% if 'icon' not in fields.hidden %}
-            <div class="col-sm-12">
-                <div class="form-group">
-                    <label>{{translate("GROUP.ICON")}}</label>
-                    <div class="input-group">
-                        <span class="input-group-addon icon-preview"><i class="{{group.icon}} fa-fw"></i></span>
-                        <input type="text" class="form-control" name="icon" autocomplete="off" value="{{group.icon}}" placeholder="{{translate("GROUP.ICON_EXPLAIN")}}" {% if 'icon' in form.fields.disabled %}disabled{% endif %}>
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label>{{ translate("GROUP.ICON") }}</label>
+                        <div class="input-group">
+                            <span class="input-group-addon icon-preview"><i class="{{ group.icon }} fa-fw"></i></span>
+                            <input type="text" class="form-control" name="icon" autocomplete="off"
+                                   value="{{ group.icon }}" placeholder="{{ translate("GROUP.ICON_EXPLAIN") }}"
+                                   {% if 'icon' in form.fields.disabled %}disabled{% endif %}>
+                        </div>
                     </div>
                 </div>
-            </div>
             {% endif %}
             {% if 'description' not in fields.hidden %}
-            <div class="col-sm-12">
-                <div class="form-group">
-                    <label for="input_description">{{translate("DESCRIPTION")}}</label>
-                    <textarea id="input_description" class="form-control" type="text" name="description" {% if 'description' in form.fields.disabled %}disabled{% endif %} rows=6>{{group.description}}</textarea>
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label for="input_description">{{ translate("DESCRIPTION") }}</label>
+                        <textarea id="input_description" class="form-control" type="text" name="description"
+                                  {% if 'description' in form.fields.disabled %}disabled{% endif %}
+                                  rows=6>{{ group.description }}</textarea>
+                    </div>
                 </div>
-            </div>
             {% endif %}
         {% endblock %}
-    </div><br>
+    </div>
+    <br>
     <div class="row">
         <div class="col-xs-6 col-sm-4">
-            <button type="submit" class="btn btn-block btn-lg btn-success">{{form.submit_text}}</button>
+            <button type="submit" class="btn btn-block btn-lg btn-success">{{ form.submit_text }}</button>
         </div>
         <div class="col-xs-4 col-sm-3 pull-right">
-            <button type="button" class="btn btn-block btn-lg btn-link" data-dismiss="modal">{{translate("CANCEL")}}</button>
+            <button type="button" class="btn btn-block btn-lg btn-link"
+                    data-dismiss="modal">{{ translate("CANCEL") }}</button>
         </div>
     </div>
 </form>
 <!-- Include validation rules -->
 <script>
-{% include "pages/partials/page.js.twig" %}
+    {% include "pages/partials/page.js.twig" %}
 </script>
diff --git a/main/app/sprinkles/admin/templates/forms/role.html.twig b/main/app/sprinkles/admin/templates/forms/role.html.twig
index 46a4477..7759783 100644
--- a/main/app/sprinkles/admin/templates/forms/role.html.twig
+++ b/main/app/sprinkles/admin/templates/forms/role.html.twig
@@ -1,56 +1,65 @@
-<form class="js-form" method="{{form.method | default('POST')}}" action="{{site.uri.public}}/{{form.action}}">
+<form class="js-form" method="{{ form.method | default('POST') }}" action="{{ site.uri.public }}/{{ form.action }}">
     {% include "forms/csrf.html.twig" %}
     <div class="js-form-alerts">
     </div>
     <div class="row">
         {% if 'name' not in form.fields.hidden %}
-        <div class="col-sm-12">
-            <div class="form-group">
-                <label>{{translate("ROLE.NAME")}}</label>
-                <div class="input-group">
-                    <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
-                    <input type="text" class="form-control" name="name" autocomplete="off" value="{{role.name}}" placeholder="{{translate("ROLE.NAME_EXPLAIN")}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label>{{ translate("ROLE.NAME") }}</label>
+                    <div class="input-group">
+                        <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
+                        <input type="text" class="form-control" name="name" autocomplete="off" value="{{ role.name }}"
+                               placeholder="{{ translate("ROLE.NAME_EXPLAIN") }}"
+                               {% if 'name' in form.fields.disabled %}disabled{% endif %}>
+                    </div>
                 </div>
             </div>
-        </div>
         {% endif %}
         {% if 'slug' not in form.fields.hidden %}
-        <div class="col-sm-12">
-            <div class="form-group">
-                <label>{{translate("SLUG")}}</label>
-                <div class="input-group">
-                    <span class="input-group-addon"><i class="fa fa-tag fa-fw"></i></span>
-                    <input type="text" class="form-control" name="slug" autocomplete="off" value="{{role.slug}}" placeholder="{{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">
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label>{{ translate("SLUG") }}</label>
+                    <div class="input-group">
+                        <span class="input-group-addon"><i class="fa fa-tag fa-fw"></i></span>
+                        <input type="text" class="form-control" name="slug" autocomplete="off" value="{{ role.slug }}"
+                               placeholder="{{ 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="form-role-slug-override" autocomplete="off"> {{translate("OVERRIDE")}}
+                                <input type="checkbox" id="form-role-slug-override"
+                                       autocomplete="off"> {{ translate("OVERRIDE") }}
                             </label>
                         </span>
-                    {% endif %}
+                        {% endif %}
+                    </div>
                 </div>
             </div>
-        </div>
         {% endif %}
         {% if 'description' not in fields.hidden %}
-        <div class="col-sm-12">
-            <div class="form-group">
-                <label for="input_description">{{translate("DESCRIPTION")}}</label>
-                <textarea id="input_description" class="form-control" type="text" name="description" {% if 'description' in form.fields.disabled %}disabled{% endif %} rows=6>{{role.description}}</textarea>
+            <div class="col-sm-12">
+                <div class="form-group">
+                    <label for="input_description">{{ translate("DESCRIPTION") }}</label>
+                    <textarea id="input_description" class="form-control" type="text" name="description"
+                              {% if 'description' in form.fields.disabled %}disabled{% endif %}
+                              rows=6>{{ role.description }}</textarea>
+                </div>
             </div>
-        </div>
         {% endif %}
-    </div><br>
+    </div>
+    <br>
     <div class="row">
         <div class="col-xs-8 col-sm-4">
-            <button type="submit" class="btn btn-block btn-lg btn-success">{{form.submit_text}}</button>
+            <button type="submit" class="btn btn-block btn-lg btn-success">{{ form.submit_text }}</button>
         </div>
         <div class="col-xs-4 col-sm-4 pull-right">
-            <button type="button" class="btn btn-block btn-lg btn-link" data-dismiss="modal">{{translate("CANCEL")}}</button>
+            <button type="button" class="btn btn-block btn-lg btn-link"
+                    data-dismiss="modal">{{ translate("CANCEL") }}</button>
         </div>
     </div>
 </form>
 <!-- Include validation rules -->
 <script>
-{% include "pages/partials/page.js.twig" %}
+    {% include "pages/partials/page.js.twig" %}
 </script>
diff --git a/main/app/sprinkles/admin/templates/forms/user.html.twig b/main/app/sprinkles/admin/templates/forms/user.html.twig
index 3ee7fc9..e42cc6d 100644
--- a/main/app/sprinkles/admin/templates/forms/user.html.twig
+++ b/main/app/sprinkles/admin/templates/forms/user.html.twig
@@ -1,125 +1,142 @@
-<form class="js-form" method="{{form.method | default('POST')}}" action="{{site.uri.public}}/{{form.action}}">
+<form class="js-form" method="{{ form.method | default('POST') }}" action="{{ site.uri.public }}/{{ form.action }}">
     {% include "forms/csrf.html.twig" %}
     <div class="js-form-alerts">
     </div>
     <div class="row">
         {% block user_form %}
             {% if 'user_name' not in form.fields.hidden %}
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label>{{translate('USERNAME')}}</label>
-                    <div class="input-group">
-                        <span class="input-group-addon"><i class="fa 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 class="col-sm-6">
+                    <div class="form-group">
+                        <label>{{ translate('USERNAME') }}</label>
+                        <div class="input-group">
+                            <span class="input-group-addon"><i class="fa 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>
                 </div>
-            </div>
             {% endif %}
             {% if 'group' not in form.fields.hidden %}
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label for="input-group">{{translate('GROUP')}}</label>
-                    <div class="input-group">
-                        <span class="input-group-addon"><i class="fa 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">
-                                {% for group in groups %}
-                                <option value="{{group.id}}" {% if (group.id == user.group_id) %}selected{% endif %}>{{group.name}}</option>
-                                {% endfor %}
-                            </select>
-                        {% endif %}
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label for="input-group">{{ translate('GROUP') }}</label>
+                        <div class="input-group">
+                            <span class="input-group-addon"><i class="fa 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">
+                                    {% for group in groups %}
+                                        <option value="{{ group.id }}"
+                                                {% if (group.id == user.group_id) %}selected{% endif %}>{{ group.name }}</option>
+                                    {% endfor %}
+                                </select>
+                            {% endif %}
+                        </div>
                     </div>
                 </div>
-            </div>
             {% endif %}
             {% if 'name' not in form.fields.hidden %}
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label>{{translate('FIRST_NAME')}}</label>
-                    <div class="input-group">
-                        <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
-                        <input type="text" class="form-control" name="first_name" autocomplete="off" value="{{user.first_name}}" placeholder="{{translate('FIRST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label>{{ translate('FIRST_NAME') }}</label>
+                        <div class="input-group">
+                            <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
+                            <input type="text" class="form-control" name="first_name" autocomplete="off"
+                                   value="{{ user.first_name }}" placeholder="{{ translate('FIRST_NAME') }}"
+                                   {% if 'name' in form.fields.disabled %}disabled{% endif %}>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label>{{translate('LAST_NAME')}}</label>
-                    <div class="input-group">
-                        <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
-                        <input type="text" class="form-control" name="last_name" autocomplete="off" value="{{user.last_name}}" placeholder="{{translate('LAST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label>{{ translate('LAST_NAME') }}</label>
+                        <div class="input-group">
+                            <span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
+                            <input type="text" class="form-control" name="last_name" autocomplete="off"
+                                   value="{{ user.last_name }}" placeholder="{{ translate('LAST_NAME') }}"
+                                   {% if 'name' in form.fields.disabled %}disabled{% endif %}>
+                        </div>
                     </div>
                 </div>
-            </div>
             {% endif %}
             {% if 'email' not in form.fields.hidden %}
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label>{{translate('EMAIL')}}</label>
-                    <div class="input-group js-copy-container">
-                        <span class="input-group-addon"><i class="fa 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 %}
-                            <span class="input-group-btn">
-                                <button class="btn btn-default uf-copy-trigger js-copy-trigger" type="button"><i class="fa fa-clipboard"></i></button>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label>{{ translate('EMAIL') }}</label>
+                        <div class="input-group js-copy-container">
+                            <span class="input-group-addon"><i class="fa 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 %}
+                                <span class="input-group-btn">
+                                <button class="btn btn-default uf-copy-trigger js-copy-trigger" type="button"><i
+                                            class="fa fa-clipboard"></i></button>
                             </span>
-                        {% endif %}
+                            {% endif %}
+                        </div>
                     </div>
                 </div>
-            </div>
             {% endif %}
             {% if 'theme' not in form.fields.hidden %}
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label for="input-theme">{{translate('THEME')}}</label>
-                    <div class="input-group">
-                        <span class="input-group-addon"><i class="fa 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 class="col-sm-6">
+                    <div class="form-group">
+                        <label for="input-theme">{{ translate('THEME') }}</label>
+                        <div class="input-group">
+                            <span class="input-group-addon"><i class="fa 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>
                 </div>
-            </div>
             {% endif %}
             {% if 'locale' not in form.fields.hidden %}
-            <div class="col-sm-6">
-                <div class="form-group">
-                    <label for="input-locale">{{translate('LOCALE')}}</label>
-                    <div class="input-group">
-                        <span class="input-group-addon"><i class="fa 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 class="col-sm-6">
+                    <div class="form-group">
+                        <label for="input-locale">{{ translate('LOCALE') }}</label>
+                        <div class="input-group">
+                            <span class="input-group-addon"><i class="fa 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>
                 </div>
-            </div>
             {% endif %}
         {% endblock %}
-    </div><br>
+    </div>
+    <br>
     <div class="row">
         <div class="col-xs-8 col-sm-4">
-            <button type="submit" class="btn btn-block btn-lg btn-success">{{form.submit_text}}</button>
+            <button type="submit" class="btn btn-block btn-lg btn-success">{{ form.submit_text }}</button>
         </div>
         <div class="col-xs-4 col-sm-3 pull-right">
-            <button type="button" class="btn btn-block btn-lg btn-link" data-dismiss="modal">{{translate('CANCEL')}}</button>
+            <button type="button" class="btn btn-block btn-lg btn-link"
+                    data-dismiss="modal">{{ translate('CANCEL') }}</button>
         </div>
     </div>
 </form>
 <!-- Include validation rules -->
 <script>
-{% include "pages/partials/page.js.twig" %}
+    {% include "pages/partials/page.js.twig" %}
 </script>
-- 
cgit v1.2.3