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

1 files changed, 37 insertions, 28 deletions

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>