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

---
 .../sprinkles/admin/templates/pages/user.html.twig | 141 +++++++++++----------
 1 file changed, 77 insertions(+), 64 deletions(-)

(limited to 'main/app/sprinkles/admin/templates/pages/user.html.twig')

diff --git a/main/app/sprinkles/admin/templates/pages/user.html.twig b/main/app/sprinkles/admin/templates/pages/user.html.twig
index d9c9ab2..47228fd 100644
--- a/main/app/sprinkles/admin/templates/pages/user.html.twig
+++ b/main/app/sprinkles/admin/templates/pages/user.html.twig
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {# Overrides blocks in head of base template #}
-{% block page_title %}{{ translate("USER", 2)}} | {{user.full_name}}{% endblock %}
+{% block page_title %}{{ translate("USER", 2) }} | {{ user.full_name }}{% endblock %}
 
 {% block page_description %}{{ translate("USER.INFO_PAGE", {name: user.user_name}) }}{% endblock %}
 
@@ -19,60 +19,69 @@
                 {% block user_box %}
                     <div class="box box-primary">
                         <div class="box-header with-border">
-                            <h3 class="box-title">{{translate('USER.SUMMARY')}}</h3>
+                            <h3 class="box-title">{{ translate('USER.SUMMARY') }}</h3>
                             {% if 'tools' not in tools.hidden %}
                                 <div class="box-tools pull-right">
                                     <div class="btn-group">
-                                        <button type="button" class="btn btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                          <i class="fa fa-gear"></i> <span class="caret"></span>
+                                        <button type="button" class="btn btn-sm dropdown-toggle" data-toggle="dropdown"
+                                                aria-haspopup="true" aria-expanded="false">
+                                            <i class="fa fa-gear"></i>
+                                            <span class="caret"></span>
                                         </button>
                                         <ul class="dropdown-menu box-tool-menu">
                                             {% block tools %}
                                                 <li>
-                                                    <a href="#" class="js-user-edit" data-user_name="{{user.user_name}}">
-                                                        <i class="fa fa-edit fa-fw"></i> {{translate('EDIT')}}
+                                                    <a href="#" class="js-user-edit"
+                                                       data-user_name="{{ user.user_name }}">
+                                                        <i class="fa fa-edit fa-fw"></i> {{ translate('EDIT') }}
                                                     </a>
                                                 </li>
                                                 {% if 'password' not in tools.hidden %}
                                                     <li>
-                                                        <a href="#" class="js-user-password" data-user_name="{{user.user_name}}">
-                                                            <i class="fa fa-lock fa-fw"></i> {{translate('PASSWORD')}}
+                                                        <a href="#" class="js-user-password"
+                                                           data-user_name="{{ user.user_name }}">
+                                                            <i class="fa fa-lock fa-fw"></i> {{ translate('PASSWORD') }}
                                                         </a>
                                                     </li>
                                                 {% endif %}
                                                 {% if 'roles' not in tools.hidden %}
                                                     <li>
-                                                        <a href="#" class="js-user-roles" data-user_name="{{user.user_name}}">
-                                                            <i class="fa fa-drivers-license fa-fw"></i> {{translate('ROLE', 2)}}
+                                                        <a href="#" class="js-user-roles"
+                                                           data-user_name="{{ user.user_name }}">
+                                                            <i class="fa fa-drivers-license fa-fw"></i> {{ translate('ROLE', 2) }}
                                                         </a>
                                                     </li>
                                                 {% endif %}
                                                 {% if 'activate' not in tools.hidden and user.flag_verified == "0" %}
                                                     <li>
-                                                        <a href="#" class="js-user-activate" data-user_name="{{user.user_name}}">
-                                                            <i class="fa fa-bolt fa-fw"></i> {{translate('ACTIVATE')}}
+                                                        <a href="#" class="js-user-activate"
+                                                           data-user_name="{{ user.user_name }}">
+                                                            <i class="fa fa-bolt fa-fw"></i> {{ translate('ACTIVATE') }}
                                                         </a>
                                                     </li>
                                                 {% endif %}
                                                 {% if 'enable' not in tools.hidden %}
                                                     {% if user.flag_enabled == "1" %}
                                                         <li>
-                                                            <a href="#" class="js-user-disable" data-user_name="{{user.user_name}}">
-                                                                <i class="fa fa-minus-circle fa-fw"></i> {{translate('DISABLE')}}
+                                                            <a href="#" class="js-user-disable"
+                                                               data-user_name="{{ user.user_name }}">
+                                                                <i class="fa fa-minus-circle fa-fw"></i> {{ translate('DISABLE') }}
                                                             </a>
                                                         </li>
                                                     {% else %}
                                                         <li>
-                                                            <a href="#" class="js-user-enable" data-user_name="{{user.user_name}}">
-                                                                <i class="fa fa-plus-circle fa-fw"></i> {{translate('ENABLE')}}
+                                                            <a href="#" class="js-user-enable"
+                                                               data-user_name="{{ user.user_name }}">
+                                                                <i class="fa fa-plus-circle fa-fw"></i> {{ translate('ENABLE') }}
                                                             </a>
                                                         </li>
                                                     {% endif %}
                                                 {% endif %}
                                                 {% if 'delete' not in tools.hidden %}
                                                     <li>
-                                                        <a href="#" class="js-user-delete" data-user_name="{{user.user_name}}">
-                                                            <i class="fa fa-trash-o fa-fw"></i> {{translate('DELETE')}}
+                                                        <a href="#" class="js-user-delete"
+                                                           data-user_name="{{ user.user_name }}">
+                                                            <i class="fa fa-trash-o fa-fw"></i> {{ translate('DELETE') }}
                                                         </a>
                                                     </li>
                                                 {% endif %}
@@ -83,33 +92,36 @@
                             {% endif %}
                         </div>
                         <div class="box-body box-profile">
-                            <img class="profile-user-img img-responsive img-circle" src="{{user.avatar}}" alt="{{user.user_name}}">
+                            <img class="profile-user-img img-responsive img-circle" src="{{ user.avatar }}"
+                                 alt="{{ user.user_name }}">
 
-                            <h3 class="profile-username text-center">{{user.full_name}}</h3>
+                            <h3 class="profile-username text-center">{{ user.full_name }}</h3>
                             <div class="text-center">
                                 {% if user.flag_enabled == 0 %}
-                                    <i class="fa fa-fw fa-minus-circle fa-lg text-red" title="{{translate('DISABLED')}}"></i>
+                                    <i class="fa fa-fw fa-minus-circle fa-lg text-red"
+                                       title="{{ translate('DISABLED') }}"></i>
                                 {% endif %}
                                 {% if user.flag_verified == 0 %}
-                                    <i class="fa fa-fw fa-bolt fa-lg text-yellow" title="{{translate('UNACTIVATED')}}"></i>
+                                    <i class="fa fa-fw fa-bolt fa-lg text-yellow"
+                                       title="{{ translate('UNACTIVATED') }}"></i>
                                 {% endif %}
                             </div>
-                            <h4 class="text-muted text-center">{{user.user_name}}{% if 'group' not in fields.hidden %} • {{user.group.name}}{% endif %}</h4>
+                            <h4 class="text-muted text-center">{{ user.user_name }}{% if 'group' not in fields.hidden %} • {{ user.group.name }}{% endif %}</h4>
 
                             {% if 'email' not in fields.hidden %}
                                 <hr>
-                                <strong><i class="fa fa-envelope margin-r-5"></i> {{translate("EMAIL")}}</strong>
+                                <strong><i class="fa fa-envelope margin-r-5"></i> {{ translate("EMAIL") }}</strong>
                                 <p class="text-muted box-profile-property js-copy-container">
                                     <i class="fa fa-copy uf-copy-trigger js-copy-trigger"></i>
-                                    <span class="js-copy-target">{{user.email}}</span>
+                                    <span class="js-copy-target">{{ user.email }}</span>
                                 </p>
                             {% endif %}
 
                             {% if 'locale' not in fields.hidden %}
                                 <hr>
-                                <strong><i class="fa fa-language margin-r-5"></i> {{translate("LOCALE")}}</strong>
+                                <strong><i class="fa fa-language margin-r-5"></i> {{ translate("LOCALE") }}</strong>
                                 <p class="text-muted box-profile-property">
-                                    {{locales[user.locale]}}
+                                    {{ locales[user.locale] }}
                                 </p>
                             {% endif %}
 
@@ -117,10 +129,12 @@
 
                             {% if 'roles' not in fields.hidden %}
                                 <hr>
-                                <strong><i class="fa fa-drivers-license margin-r-5"></i> {{translate("ROLE", 2)}}</strong>
+                                <strong><i class="fa fa-drivers-license margin-r-5"></i> {{ translate("ROLE", 2) }}
+                                </strong>
                                 <p class="box-profile-property">
                                     {% for role in user.roles %}
-                                        <span class="label label-primary" title="{{role.description}}">{{role.name}}</span>
+                                        <span class="label label-primary"
+                                              title="{{ role.description }}">{{ role.name }}</span>
                                     {% endfor %}
                                 </p>
                             {% endif %}
@@ -130,61 +144,60 @@
             </div>
         </div>
         {% if 'activities' not in widgets.hidden %}
-        <div class="col-lg-8">
-            {% block activity_box %}
-                <div id="widget-user-activities" class="box box-primary">
-                    <div class="box-header">
-                        <h3 class="box-title"><i class="fa fa-fw fa-tasks"></i> {{translate('ACTIVITY', 2)}}</h3>
-                        {% include "tables/table-tool-menu.html.twig" %}
-                    </div>
-                    <div class="box-body">
-                        {% include "tables/activities.html.twig" with {
+            <div class="col-lg-8">
+                {% block activity_box %}
+                    <div id="widget-user-activities" class="box box-primary">
+                        <div class="box-header">
+                            <h3 class="box-title"><i class="fa fa-fw fa-tasks"></i> {{ translate('ACTIVITY', 2) }}</h3>
+                            {% include "tables/table-tool-menu.html.twig" %}
+                        </div>
+                        <div class="box-body">
+                            {% include "tables/activities.html.twig" with {
                                 "table" : {
                                     "id" : "table-user-activities"
                                 }
-                            }
-                        %}
+                            } %}
+                        </div>
                     </div>
-                </div>
-            {% endblock %}
-        </div>
+                {% endblock %}
+            </div>
         {% endif %}
     </div>
     {% if 'permissions' not in widgets.hidden %}
-    <div class="row">
-        <div class="col-md-12">
-            <div id="widget-permissions" class="box box-primary">
-                <div class="box-header">
-                    <h3 class="box-title pull-left"><i class="fa fa-key fa-fw"></i> {{translate('PERMISSION', 2)}}</h3>
-                    {% include "tables/table-tool-menu.html.twig" %}
-                </div>
-                <div class="box-body">
-                    {% include "tables/permissions.html.twig" with {
+        <div class="row">
+            <div class="col-md-12">
+                <div id="widget-permissions" class="box box-primary">
+                    <div class="box-header">
+                        <h3 class="box-title pull-left"><i class="fa fa-key fa-fw"></i> {{ translate('PERMISSION', 2) }}
+                        </h3>
+                        {% include "tables/table-tool-menu.html.twig" %}
+                    </div>
+                    <div class="box-body">
+                        {% include "tables/permissions.html.twig" with {
                             "table" : {
                                 "id" : "table-permissions",
                                 "columns" : ["via_roles"]
                             }
-                        }
-                    %}
+                        } %}
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
     {% endif %}
 {% endblock %}
 {% block scripts_page %}
     <!-- Include page variables -->
     <script>
-    {% include "pages/partials/page.js.twig" %}
+        {% include "pages/partials/page.js.twig" %}
 
-    // Add user name
-    page = $.extend(
-        true,               // deep extend
-        {
-            "user_name": "{{user.user_name}}"
-        },
-        page
-    );
+        // Add user name
+        page = $.extend(
+            true,               // deep extend
+            {
+                "user_name": "{{ user.user_name }}"
+            },
+            page
+        );
     </script>
 
     <!-- Include form widgets JS -->
-- 
cgit v1.2.3