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

1 files changed, 43 insertions, 42 deletions

diff --git a/main/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig b/main/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig
index b41c60b..3c0fe18 100644
--- a/main/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig
+++ b/main/app/sprinkles/admin/templates/modals/user-manage-roles.html.twig
@@ -1,49 +1,50 @@
 {% extends "modals/modal.html.twig" %}
 
-{% block modal_title %}{{translate("ROLE.MANAGE")}}{% endblock %}
+{% block modal_title %}{{ translate("ROLE.MANAGE") }}{% endblock %}
 
 {% block modal_body %}
-<form class="js-form" method="PUT" action="{{site.uri.public}}/api/users/u/{{user.user_name}}/roles">
-    {% include "forms/csrf.html.twig" %}
-    <div class="js-form-alerts">
-    </div>
-    <div class="js-form-roles">
-        <table class="table table-striped">
-            <thead>
-                <tr>
-                    <th>{{translate("NAME")}}</th>
-                    <th>{{translate("DESCRIPTION")}}</th>
-                    <th>{{translate("REMOVE")}}</th>
-                </tr>
-            </thead>
-            <tbody>
-            </tbody>
-        </table>
-        <div class="padding-bottom">
-            <label>{{translate("ROLE.ASSIGN_NEW")}}:</label>
-            <select class="form-control js-select-new" type="text">
-            <option></option>
-            </select>
+    <form class="js-form" method="PUT" action="{{ site.uri.public }}/api/users/u/{{ user.user_name }}/roles">
+        {% include "forms/csrf.html.twig" %}
+        <div class="js-form-alerts">
         </div>
-    </div>
-    <br>
-    <div class="row">
-        <div class="col-xs-8 col-sm-4">
-            <button type="submit" class="btn btn-block btn-lg btn-success">{{translate("UPDATE")}}</button>
+        <div class="js-form-roles">
+            <table class="table table-striped">
+                <thead>
+                    <tr>
+                        <th>{{ translate("NAME") }}</th>
+                        <th>{{ translate("DESCRIPTION") }}</th>
+                        <th>{{ translate("REMOVE") }}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                </tbody>
+            </table>
+            <div class="padding-bottom">
+                <label>{{ translate("ROLE.ASSIGN_NEW") }}:</label>
+                <select class="form-control js-select-new" type="text">
+                    <option></option>
+                </select>
+            </div>
         </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>
+        <br>
+        <div class="row">
+            <div class="col-xs-8 col-sm-4">
+                <button type="submit" class="btn btn-block btn-lg btn-success">{{ translate("UPDATE") }}</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>
+            </div>
         </div>
-    </div>
-</form>
+    </form>
 
-{# This contains a series of <script> blocks, each of which is a client-side Handlebars template.
- # Note that these are NOT Twig templates, although the syntax is similar.  We wrap them in the `verbatim` tag,
- # so that Twig will output them directly into the DOM instead of trying to treat them like Twig templates.
- #
- # These templates require handlebars-helpers.js, moment.js
-#}
-{% verbatim %}
+    {# This contains a series of <script> blocks, each of which is a client-side Handlebars template.
+     # Note that these are NOT Twig templates, although the syntax is similar.  We wrap them in the `verbatim` tag,
+     # so that Twig will output them directly into the DOM instead of trying to treat them like Twig templates.
+     #
+     # These templates require handlebars-helpers.js, moment.js
+    #}
+    {% verbatim %}
 <script id="user-roles-select-option" type="text/x-handlebars-template">
     <div>
         <strong>
@@ -70,8 +71,8 @@
 </script>
 {% endverbatim %}
 
-<!-- Include validation rules -->
-<script>
-    {% include "pages/partials/page.js.twig" %}
-</script>
+    <!-- Include validation rules -->
+    <script>
+        {% include "pages/partials/page.js.twig" %}
+    </script>
 {% endblock %}