Refactored code, many fixes and improvements in chat backend+frontend

2 files changed, 25 insertions, 18 deletions

diff --git a/main/app/sprinkles/core/templates/tables/table-paginated.html.twig b/main/app/sprinkles/core/templates/tables/table-paginated.html.twig
index 5b94120..49b4a1a 100644
--- a/main/app/sprinkles/core/templates/tables/table-paginated.html.twig
+++ b/main/app/sprinkles/core/templates/tables/table-paginated.html.twig
@@ -4,10 +4,9 @@
 
 {# Set some default values for the child template. #}
 {% set table = {
-        'id': "uf-table",
-        'sortlist': "[[0, 0]]"
-    } | merge(table)
-%}
+    'id': "uf-table",
+    'sortlist': "[[0, 0]]"
+} | merge(table) %}
 
 {#
    Global search field for the table.  By default, only shown in mobile sizes.
@@ -29,23 +28,29 @@
     {% endblock %}
 
     {% block table_info %}
-        <div class="uf-table-info js-uf-table-info" data-message-empty-rows="{{translate('NO_RESULTS')}}">
+        <div class="uf-table-info js-uf-table-info" data-message-empty-rows="{{ translate('NO_RESULTS') }}">
         </div>
     {% endblock %}
 
     {% block table_pager_controls %}
-        <div class="pager pager-lg tablesorter-pager js-uf-table-pager" data-output-template="{{translate('PAGINATION.OUTPUT')}}">
-            <span class="pager-control first" title="{{translate("PAGINATION.FIRST")}}"><i class="fa fa-angle-double-left"></i></span>
-            <span class="pager-control prev" title="{{translate("PAGINATION.PREVIOUS")}}"><i class="fa fa-angle-left"></i></span>
+        <div class="pager pager-lg tablesorter-pager js-uf-table-pager"
+             data-output-template="{{ translate('PAGINATION.OUTPUT') }}">
+            <span class="pager-control first" title="{{ translate("PAGINATION.FIRST") }}"><i
+                        class="fa fa-angle-double-left"></i></span>
+            <span class="pager-control prev" title="{{ translate("PAGINATION.PREVIOUS") }}"><i
+                        class="fa fa-angle-left"></i></span>
             <span class="pagedisplay"></span> {# this can be any element, including an input #}
-            <span class="pager-control next" title="{{translate("PAGINATION.NEXT")}}"><i class="fa fa-angle-right"></i></span>
-            <span class="pager-control last" title= "{{translate("PAGINATION.LAST")}}"><i class="fa fa-angle-double-right"></i></span>
+            <span class="pager-control next" title="{{ translate("PAGINATION.NEXT") }}"><i
+                        class="fa fa-angle-right"></i></span>
+            <span class="pager-control last" title="{{ translate("PAGINATION.LAST") }}"><i
+                        class="fa fa-angle-double-right"></i></span>
             <br><br>
-            {{translate("PAGINATION.GOTO")}}: <select class="gotoPage"></select> &bull; {{translate("PAGINATION.SHOW")}}:
+            {{ translate("PAGINATION.GOTO") }}: <select class="gotoPage"></select>
+            &bull; {{ translate("PAGINATION.SHOW") }}:
             <select class="pagesize">
-            {% for count in pager.take|default([5, 10, 50, 100]) %}
-                <option value="{{count}}">{{count}}</option>
-            {% endfor %}
+                {% for count in pager.take|default([5, 10, 50, 100]) %}
+                    <option value="{{ count }}">{{ count }}</option>
+                {% endfor %}
             </select>
         </div>
     {% endblock %}
diff --git a/main/app/sprinkles/core/templates/tables/table-tool-menu.html.twig b/main/app/sprinkles/core/templates/tables/table-tool-menu.html.twig
index 0c4dfed..2e00d60 100644
--- a/main/app/sprinkles/core/templates/tables/table-tool-menu.html.twig
+++ b/main/app/sprinkles/core/templates/tables/table-tool-menu.html.twig
@@ -2,8 +2,10 @@
 
 <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-bars"></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-bars"></i>
+            <span class="caret"></span>
         </button>
         <ul class="dropdown-menu box-tool-menu">
             <li>
@@ -14,10 +16,10 @@
             <li role="separator" class="divider"></li>
             <li>
                 <div class="uf-table-cs-title">
-                    {{translate('TOGGLE_COLUMNS')}}:
+                    {{ translate('TOGGLE_COLUMNS') }}:
                 </div>
                 <div class="uf-table-cs-options js-uf-table-cs-options">
-                
+
                 </div>
             </li>
         </ul>