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/tables/activities.html.twig    | 19 ++++++---
 .../admin/templates/tables/groups.html.twig        | 19 +++++----
 .../admin/templates/tables/permissions.html.twig   | 15 ++++---
 .../admin/templates/tables/roles.html.twig         | 21 ++++++----
 .../admin/templates/tables/users.html.twig         | 46 +++++++++++++---------
 5 files changed, 75 insertions(+), 45 deletions(-)

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

diff --git a/main/app/sprinkles/admin/templates/tables/activities.html.twig b/main/app/sprinkles/admin/templates/tables/activities.html.twig
index d70541b..dce1d99 100644
--- a/main/app/sprinkles/admin/templates/tables/activities.html.twig
+++ b/main/app/sprinkles/admin/templates/tables/activities.html.twig
@@ -8,14 +8,21 @@
 {% extends "tables/table-paginated.html.twig" %}
 
 {% block table %}
-    <table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="[[0, 1]]">
+    <table id="{{ table.id }}" class="tablesorter table table-bordered table-hover table-striped"
+           data-sortlist="[[0, 1]]">
         <thead>
             <tr>
-                <th class="sorter-metanum" data-column-name="occurred_at" data-column-template="#activity-table-column-occurred-at" data-priority="1">{{translate('ACTIVITY.TIME')}} <i class="fa fa-sort"></i></th>
+                <th class="sorter-metanum" data-column-name="occurred_at"
+                    data-column-template="#activity-table-column-occurred-at"
+                    data-priority="1">{{ translate('ACTIVITY.TIME') }} <i class="fa fa-sort"></i></th>
                 {% if 'user' in table.columns %}
-                    <th class="sorter-metatext" data-column-name="user" data-column-template="#activity-table-column-user" data-priority="1">{{translate('USER')}} <i class="fa fa-sort"></i></th>
+                    <th class="sorter-metatext" data-column-name="user"
+                        data-column-template="#activity-table-column-user" data-priority="1">{{ translate('USER') }} <i
+                                class="fa fa-sort"></i></th>
                 {% endif %}
-                <th class="sorter-metatext" data-column-name="description" data-column-template="#activity-table-column-description" data-priority="1">{{translate("DESCRIPTION")}} <i class="fa fa-sort"></i></th>
+                <th class="sorter-metatext" data-column-name="description"
+                    data-column-template="#activity-table-column-description"
+                    data-priority="1">{{ translate("DESCRIPTION") }} <i class="fa fa-sort"></i></th>
             </tr>
         </thead>
         <tbody>
@@ -38,7 +45,7 @@
         </td>
         {{ else }}
         <td data-num="0">
-            <i>{% endverbatim %}{{translate("UNKNOWN")}}{% verbatim %}</i>
+            <i>{% endverbatim %}{{ translate("UNKNOWN") }}{% verbatim %}</i>
         </td>
         {{/if }}
     </script>
@@ -54,7 +61,7 @@
                     <button class="btn btn-xs uf-copy-trigger js-copy-trigger"><i class="fa fa-copy"></i></button>
                 </div>
             {{ else }}
-                <i>{% endverbatim %}{{translate("USER.DELETED")}}{% verbatim %}</i>
+                <i>{% endverbatim %}{{ translate("USER.DELETED") }}{% verbatim %}</i>
             {{/if }}
         </td>
     </script>
diff --git a/main/app/sprinkles/admin/templates/tables/groups.html.twig b/main/app/sprinkles/admin/templates/tables/groups.html.twig
index 2c5a84a..8d14e98 100644
--- a/main/app/sprinkles/admin/templates/tables/groups.html.twig
+++ b/main/app/sprinkles/admin/templates/tables/groups.html.twig
@@ -8,12 +8,17 @@
 {% extends "tables/table-paginated.html.twig" %}
 
 {% block table %}
-    <table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="{{table.sortlist}}">
+    <table id="{{ table.id }}" class="tablesorter table table-bordered table-hover table-striped"
+           data-sortlist="{{ table.sortlist }}">
         <thead>
             <tr>
-                <th class="sorter-metatext" data-column-name="name" data-column-template="#group-table-column-info" data-priority="1">{{translate('GROUP')}} <i class="fa fa-sort"></i></th>
-                <th class="sorter-metatext" data-column-name="description" data-column-template="#group-table-column-description" data-priority="2">{{translate("DESCRIPTION")}} <i class="fa fa-sort"></i></th>
-                <th data-column-template="#group-table-column-actions" data-sorter="false" data-filter="false" data-priority="1">{{translate("ACTIONS")}}</th>
+                <th class="sorter-metatext" data-column-name="name" data-column-template="#group-table-column-info"
+                    data-priority="1">{{ translate('GROUP') }} <i class="fa fa-sort"></i></th>
+                <th class="sorter-metatext" data-column-name="description"
+                    data-column-template="#group-table-column-description"
+                    data-priority="2">{{ translate("DESCRIPTION") }} <i class="fa fa-sort"></i></th>
+                <th data-column-template="#group-table-column-actions" data-sorter="false" data-filter="false"
+                    data-priority="1">{{ translate("ACTIONS") }}</th>
             </tr>
         </thead>
         <tbody>
@@ -47,18 +52,18 @@
         <td>
             <div class="btn-group">
                 <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-                    {% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}
+                    {% endverbatim %}{{ translate("ACTIONS") }}{% verbatim %}
                     <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu dropdown-menu-right" role="menu">
                     <li>
                         <a href="#" data-slug="{{row.slug}}" class="js-group-edit">
-                        <i class="fa fa-edit"></i> {% endverbatim %}{{translate("GROUP.EDIT")}}{% verbatim %}
+                        <i class="fa fa-edit"></i> {% endverbatim %}{{ translate("GROUP.EDIT") }}{% verbatim %}
                         </a>
                     </li>
                     <li>
                         <a href="#" data-slug="{{row.slug}}" class="js-group-delete">
-                        <i class="fa fa-trash-o"></i> {% endverbatim %}{{translate("GROUP.DELETE")}}{% verbatim %}
+                        <i class="fa fa-trash-o"></i> {% endverbatim %}{{ translate("GROUP.DELETE") }}{% verbatim %}
                         </a>
                     </li>
                 </ul>
diff --git a/main/app/sprinkles/admin/templates/tables/permissions.html.twig b/main/app/sprinkles/admin/templates/tables/permissions.html.twig
index 92e236a..6ff13c6 100644
--- a/main/app/sprinkles/admin/templates/tables/permissions.html.twig
+++ b/main/app/sprinkles/admin/templates/tables/permissions.html.twig
@@ -8,13 +8,18 @@
 {% extends "tables/table-paginated.html.twig" %}
 
 {% block table %}
-    <table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="{{table.sortlist}}">
+    <table id="{{ table.id }}" class="tablesorter table table-bordered table-hover table-striped"
+           data-sortlist="{{ table.sortlist }}">
         <thead>
             <tr>
-                <th class="sorter-metatext" data-column-name="name" data-column-template="#permission-table-column-name" data-priority="1">{{translate('PERMISSION')}} <i class="fa fa-sort"></i></th>
-                <th class="sorter-metatext" data-column-name="properties" data-column-template="#permission-table-column-properties" data-priority="1">{{translate('SLUG_CONDITION')}} <i class="fa fa-sort"></i></th>
+                <th class="sorter-metatext" data-column-name="name" data-column-template="#permission-table-column-name"
+                    data-priority="1">{{ translate('PERMISSION') }} <i class="fa fa-sort"></i></th>
+                <th class="sorter-metatext" data-column-name="properties"
+                    data-column-template="#permission-table-column-properties"
+                    data-priority="1">{{ translate('SLUG_CONDITION') }} <i class="fa fa-sort"></i></th>
                 {% if 'via_roles' in table.columns %}
-                    <th data-column-template="#permission-table-column-via-roles" data-sorter="false" data-filter="false" data-priority="2">{{translate('PERMISSION.VIA_ROLES')}}</th>
+                    <th data-column-template="#permission-table-column-via-roles" data-sorter="false"
+                        data-filter="false" data-priority="2">{{ translate('PERMISSION.VIA_ROLES') }}</th>
                 {% endif %}
             </tr>
         </thead>
@@ -58,7 +63,7 @@
     <script id="permission-table-column-via-roles" type="text/x-handlebars-template">
         <td>
             {{#each row.roles_via }}
-                <a href="{% endverbatim %}{# Handlebars can't access variables in the global scope, so we have to use Twig to insert the base url #}{{site.uri.public}}{% verbatim %}/roles/r/{{this.slug}}" class="label label-primary" title="{{this.description}}">{{this.name}}</a>
+                <a href="{% endverbatim %}{# Handlebars can't access variables in the global scope, so we have to use Twig to insert the base url #}{{ site.uri.public }}{% verbatim %}/roles/r/{{this.slug}}" class="label label-primary" title="{{this.description}}">{{this.name}}</a>
             {{/each}}
         </td>
     </script>
diff --git a/main/app/sprinkles/admin/templates/tables/roles.html.twig b/main/app/sprinkles/admin/templates/tables/roles.html.twig
index dbdb49e..f8e136b 100644
--- a/main/app/sprinkles/admin/templates/tables/roles.html.twig
+++ b/main/app/sprinkles/admin/templates/tables/roles.html.twig
@@ -8,12 +8,17 @@
 {% extends "tables/table-paginated.html.twig" %}
 
 {% block table %}
-    <table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="{{table.sortlist}}">
+    <table id="{{ table.id }}" class="tablesorter table table-bordered table-hover table-striped"
+           data-sortlist="{{ table.sortlist }}">
         <thead>
             <tr>
-                <th class="sorter-metatext" data-column-name="name" data-column-template="#role-table-column-info" data-priority="1">{{translate('ROLE')}} <i class="fa fa-sort"></i></th>
-                <th class="sorter-metatext" data-column-name="description" data-column-template="#role-table-column-description" data-priority="2">{{translate('DESCRIPTION')}} <i class="fa fa-sort"></i></th>
-                <th data-column-template="#role-table-column-actions" data-sorter="false" data-filter="false" data-priority="1">{{translate('ACTIONS')}}</th>
+                <th class="sorter-metatext" data-column-name="name" data-column-template="#role-table-column-info"
+                    data-priority="1">{{ translate('ROLE') }} <i class="fa fa-sort"></i></th>
+                <th class="sorter-metatext" data-column-name="description"
+                    data-column-template="#role-table-column-description"
+                    data-priority="2">{{ translate('DESCRIPTION') }} <i class="fa fa-sort"></i></th>
+                <th data-column-template="#role-table-column-actions" data-sorter="false" data-filter="false"
+                    data-priority="1">{{ translate('ACTIONS') }}</th>
             </tr>
         </thead>
         <tbody>
@@ -47,23 +52,23 @@
         <td>
             <div class="btn-group">
                 <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-                    {% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}
+                    {% endverbatim %}{{ translate("ACTIONS") }}{% verbatim %}
                     <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu dropdown-menu-right" role="menu">
                     <li>
                         <a href="#" data-slug="{{row.slug}}" class="js-role-permissions">
-                        <i class="fa fa-key"></i> {% endverbatim %}{{translate("PERMISSION.MANAGE")}}{% verbatim %}
+                        <i class="fa fa-key"></i> {% endverbatim %}{{ translate("PERMISSION.MANAGE") }}{% verbatim %}
                         </a>
                     </li>
                     <li>
                         <a href="#" data-slug="{{row.slug}}" class="js-role-edit">
-                        <i class="fa fa-edit"></i> {% endverbatim %}{{translate("ROLE.EDIT")}}{% verbatim %}
+                        <i class="fa fa-edit"></i> {% endverbatim %}{{ translate("ROLE.EDIT") }}{% verbatim %}
                         </a>
                     </li>
                     <li>
                         <a href="#" data-slug="{{row.slug}}" class="js-role-delete">
-                        <i class="fa fa-trash-o"></i> {% endverbatim %}{{translate("ROLE.DELETE")}}{% verbatim %}
+                        <i class="fa fa-trash-o"></i> {% endverbatim %}{{ translate("ROLE.DELETE") }}{% verbatim %}
                         </a>
                     </li>
                 </ul>
diff --git a/main/app/sprinkles/admin/templates/tables/users.html.twig b/main/app/sprinkles/admin/templates/tables/users.html.twig
index 1cebb47..bd9fffe 100644
--- a/main/app/sprinkles/admin/templates/tables/users.html.twig
+++ b/main/app/sprinkles/admin/templates/tables/users.html.twig
@@ -8,18 +8,26 @@
 {% extends "tables/table-paginated.html.twig" %}
 
 {% block table %}
-    <table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="{{table.sortlist}}">
+    <table id="{{ table.id }}" class="tablesorter table table-bordered table-hover table-striped"
+           data-sortlist="{{ table.sortlist }}">
         <thead>
             <tr>
-                <th class="sorter-metatext" data-column-name="name" data-column-template="#user-table-column-info" data-priority="1">{{translate('USER')}} <i class="fa fa-sort"></i></th>
+                <th class="sorter-metatext" data-column-name="name" data-column-template="#user-table-column-info"
+                    data-priority="1">{{ translate('USER') }} <i class="fa fa-sort"></i></th>
                 {% if 'last_activity' in table.columns %}
-                    <th class="sorter-metanum" data-column-name="last_activity" data-column-template="#user-table-column-last-activity" data-priority="3">{{translate("ACTIVITY.LAST")}} <i class="fa fa-sort"></i></th>
+                    <th class="sorter-metanum" data-column-name="last_activity"
+                        data-column-template="#user-table-column-last-activity"
+                        data-priority="3">{{ translate("ACTIVITY.LAST") }} <i class="fa fa-sort"></i></th>
                 {% endif %}
                 {% if 'via_roles' in table.columns %}
-                    <th data-column-template="#user-table-column-via-roles" data-sorter="false" data-filter="false" data-priority="1">{{translate('PERMISSION.VIA_ROLES')}}</th>
+                    <th data-column-template="#user-table-column-via-roles" data-sorter="false" data-filter="false"
+                        data-priority="1">{{ translate('PERMISSION.VIA_ROLES') }}</th>
                 {% endif %}
-                <th class="filter-select filter-metatext" data-column-name="status" data-column-template="#user-table-column-status" data-priority="2">{{translate("STATUS")}} <i class="fa fa-sort"></i></th>
-                <th data-column-name="actions" data-column-template="#user-table-column-actions" data-sorter="false" data-filter="false" data-priority="1">{{translate("ACTIONS")}}</th>
+                <th class="filter-select filter-metatext" data-column-name="status"
+                    data-column-template="#user-table-column-status" data-priority="2">{{ translate("STATUS") }} <i
+                            class="fa fa-sort"></i></th>
+                <th data-column-name="actions" data-column-template="#user-table-column-actions" data-sorter="false"
+                    data-filter="false" data-priority="1">{{ translate("ACTIONS") }}</th>
             </tr>
         </thead>
         <tbody>
@@ -56,7 +64,7 @@
         </td>
         {{ else }}
         <td data-num="0">
-                <i>{% endverbatim %}{{translate("UNKNOWN")}}{% verbatim %}</i>
+                <i>{% endverbatim %}{{ translate("UNKNOWN") }}{% verbatim %}</i>
         </td>
         {{/if }}
     </script>
@@ -75,16 +83,16 @@
         >
             {{#ifx row.flag_enabled '==' 0 }}
                 <span class="text-muted">
-                    {% endverbatim %}{{translate("DISABLED")}}{% verbatim %}
+                    {% endverbatim %}{{ translate("DISABLED") }}{% verbatim %}
                 </span>
             {{ else }}
                 {{#ifx row.flag_verified '==' 0 }}
                     <span class="text-yellow">
-                        {% endverbatim %}{{translate("UNACTIVATED")}}{% verbatim %}
+                        {% endverbatim %}{{ translate("UNACTIVATED") }}{% verbatim %}
                     </span>
                 {{ else }}
                     <span>
-                        {% endverbatim %}{{translate("ACTIVE")}}{% verbatim %}
+                        {% endverbatim %}{{ translate("ACTIVE") }}{% verbatim %}
                     </span>
                 {{/ifx }}
             {{/ifx }}
@@ -93,44 +101,44 @@
     <script id="user-table-column-actions" type="text/x-handlebars-template">
         <td class="uf-table-fit-width">
             <div class="btn-group">
-                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">{% endverbatim %}{{translate("ACTIONS")}}{% verbatim %}<span class="caret"></span></button>
+                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">{% endverbatim %}{{ translate("ACTIONS") }}{% verbatim %}<span class="caret"></span></button>
                 <ul class="dropdown-menu dropdown-menu-right-responsive" role="menu">
                     {{#ifx row.flag_verified '==' 0 }}
                     <li>
                         <a href="#" data-user_name="{{row.user_name}}" class="js-user-activate">
-                        <i class="fa fa-bolt"></i> {% endverbatim %}{{translate("USER.ACTIVATE")}}{% verbatim %}
+                        <i class="fa fa-bolt"></i> {% endverbatim %}{{ translate("USER.ACTIVATE") }}{% verbatim %}
                         </a>
                     </li>
                     {{/ifx }}
                     <li>
                         <a href="#" data-user_name="{{row.user_name}}" class="js-user-edit">
-                        <i class="fa fa-edit"></i> {% endverbatim %}{{translate("USER.EDIT")}}{% verbatim %}
+                        <i class="fa fa-edit"></i> {% endverbatim %}{{ translate("USER.EDIT") }}{% verbatim %}
                         </a>
                     </li>
                     <li>
                         <a href="#" data-user_name="{{row.user_name}}" class="js-user-roles">
-                        <i class="fa fa-drivers-license"></i> {% endverbatim %}{{translate("ROLE.MANAGE")}}{% verbatim %}
+                        <i class="fa fa-drivers-license"></i> {% endverbatim %}{{ translate("ROLE.MANAGE") }}{% verbatim %}
                         </a>
                     </li>
                     <li>
                         <a href="#" data-user_name="{{row.user_name}}" class="js-user-password">
-                        <i class="fa fa-key"></i> {% endverbatim %}{{translate("USER.ADMIN.CHANGE_PASSWORD")}}{% verbatim %}
+                        <i class="fa fa-key"></i> {% endverbatim %}{{ translate("USER.ADMIN.CHANGE_PASSWORD") }}{% verbatim %}
                         </a>
                     </li>
                     <li>
                     {{#ifx row.flag_enabled '==' 1 }}
                         <a href="#" data-user_name="{{row.user_name}}" class="js-user-disable">
-                        <i class="fa fa-minus-circle"></i> {% endverbatim %}{{translate("USER.DISABLE")}}{% verbatim %}
+                        <i class="fa fa-minus-circle"></i> {% endverbatim %}{{ translate("USER.DISABLE") }}{% verbatim %}
                         </a>
                     {{ else }}
                         <a href="#" data-user_name="{{row.user_name}}" class="js-user-enable">
-                        <i class="fa fa-plus-circle"></i> {% endverbatim %}{{translate("USER.ENABLE")}}{% verbatim %}
+                        <i class="fa fa-plus-circle"></i> {% endverbatim %}{{ translate("USER.ENABLE") }}{% verbatim %}
                         </a>
                     {{/ifx }}
                     </li>
                     <li>
                         <a href="#" data-user_name="{{row.user_name}}" class="js-user-delete">
-                        <i class="fa fa-trash-o"></i> {% endverbatim %}{{translate("USER.DELETE")}}{% verbatim %}
+                        <i class="fa fa-trash-o"></i> {% endverbatim %}{{ translate("USER.DELETE") }}{% verbatim %}
                         </a>
                     </li>
                 </ul>
@@ -141,7 +149,7 @@
     <script id="user-table-column-via-roles" type="text/x-handlebars-template">
         <td>
             {{#each row.roles_via }}
-                <a href="{% endverbatim %}{# Handlebars can't access variables in the global scope, so we have to use Twig to insert the base url #}{{site.uri.public}}{% verbatim %}/roles/r/{{this.slug}}" class="label label-primary" title="{{this.description}}">{{this.name}}</a>
+                <a href="{% endverbatim %}{# Handlebars can't access variables in the global scope, so we have to use Twig to insert the base url #}{{ site.uri.public }}{% verbatim %}/roles/r/{{this.slug}}" class="label label-primary" title="{{this.description}}">{{this.name}}</a>
             {{/each}}
         </td>
     </script>
-- 
cgit v1.2.3