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

---
 .../templates/forms/settings-account.html.twig     | 28 ++++++++++++----------
 .../templates/forms/settings-profile.html.twig     | 27 ++++++++++++---------
 2 files changed, 32 insertions(+), 23 deletions(-)

(limited to 'main/app/sprinkles/account/templates/forms')

diff --git a/main/app/sprinkles/account/templates/forms/settings-account.html.twig b/main/app/sprinkles/account/templates/forms/settings-account.html.twig
index 996b27b..19281d5 100644
--- a/main/app/sprinkles/account/templates/forms/settings-account.html.twig
+++ b/main/app/sprinkles/account/templates/forms/settings-account.html.twig
@@ -1,6 +1,6 @@
-<form id="account-settings" role="form" action="{{site.uri.public}}/account/settings" method="post">
+<form id="account-settings" role="form" action="{{ site.uri.public }}/account/settings" method="post">
     <div class="box-header">
-        <h3 class="box-title"><i class="fa fa-gear fa-fw"></i> {{translate("ACCOUNT.SETTINGS")}}</h3>
+        <h3 class="box-title"><i class="fa fa-gear fa-fw"></i> {{ translate("ACCOUNT.SETTINGS") }}</h3>
     </div>
     <div class="box-body">
         {% include "forms/csrf.html.twig" %}
@@ -10,28 +10,32 @@
 
         {% block settings_account %}
             <div class="form-group">
-                <label for="input-email" class="ccontrol-label">{{translate("EMAIL")}}</label>
-                <input type="text" id="input-email" class="form-control" name="email" value="{{current_user.email}}" autocomplete="off" placeholder="{{translate("EMAIL.YOUR")}}" {{page.visibility}}>
+                <label for="input-email" class="ccontrol-label">{{ translate("EMAIL") }}</label>
+                <input type="text" id="input-email" class="form-control" name="email" value="{{ current_user.email }}"
+                       autocomplete="off" placeholder="{{ translate("EMAIL.YOUR") }}" {{ page.visibility }}>
             </div>
             {% if page.visibility != "disabled" %}
                 <div class="form-group">
-                    <label for="input-password" class="control-label">{{translate("PASSWORD.NEW")}}</label>
-                    <input type="password" id="input-password" class="form-control" name="password" placeholder="{{translate("PASSWORD.BETWEEN", {min: 12, max: 100})}} ({{translate("OPTIONAL")}})">
+                    <label for="input-password" class="control-label">{{ translate("PASSWORD.NEW") }}</label>
+                    <input type="password" id="input-password" class="form-control" name="password"
+                           placeholder="{{ translate("PASSWORD.BETWEEN", {min: 12, max: 100}) }} ({{ translate("OPTIONAL") }})">
                 </div>
                 <div class="form-group">
-                    <label for="input-passwordc" class="control-label">{{translate("PASSWORD.CONFIRM_NEW")}}</label>
-                    <input type="password" id="input-passwordc" class="form-control" name="passwordc" placeholder="{{translate("PASSWORD.CONFIRM_NEW_HELP")}}">
+                    <label for="input-passwordc" class="control-label">{{ translate("PASSWORD.CONFIRM_NEW") }}</label>
+                    <input type="password" id="input-passwordc" class="form-control" name="passwordc"
+                           placeholder="{{ translate("PASSWORD.CONFIRM_NEW_HELP") }}">
                 </div>
                 <hr>
                 <div class="form-group">
-                    <label for="input-passwordcheck" class="control-label">{{translate("PASSWORD.CURRENT")}}</label>
-                    <input type="password" id="input-passwordcheck" class="form-control" name="passwordcheck" placeholder="{{translate("PASSWORD.CURRENT_EXPLAIN")}}">
+                    <label for="input-passwordcheck" class="control-label">{{ translate("PASSWORD.CURRENT") }}</label>
+                    <input type="password" id="input-passwordcheck" class="form-control" name="passwordcheck"
+                           placeholder="{{ translate("PASSWORD.CURRENT_EXPLAIN") }}">
                 </div>
             {% endif %}
         {% endblock %}
     </div>
     <div class="box-footer text-center">
-        <button type="reset" class="btn btn-default">{{translate('RESET')}}</button>
-        <button type="submit" class="btn btn-primary js-submit">{{translate('SAVE')}}</button>
+        <button type="reset" class="btn btn-default">{{ translate('RESET') }}</button>
+        <button type="submit" class="btn btn-primary js-submit">{{ translate('SAVE') }}</button>
     </div>
 </form>
\ No newline at end of file
diff --git a/main/app/sprinkles/account/templates/forms/settings-profile.html.twig b/main/app/sprinkles/account/templates/forms/settings-profile.html.twig
index 0b0a788..09f4e40 100644
--- a/main/app/sprinkles/account/templates/forms/settings-profile.html.twig
+++ b/main/app/sprinkles/account/templates/forms/settings-profile.html.twig
@@ -1,40 +1,45 @@
-<form id="profile-settings" role="form" action="{{site.uri.public}}/account/settings/profile" method="post">
+<form id="profile-settings" role="form" action="{{ site.uri.public }}/account/settings/profile" method="post">
     <div class="box-header">
-        <h3 class="box-title"><i class="fa fa-user fa-fw"></i> {{translate("PROFILE.SETTINGS")}}</h3>
+        <h3 class="box-title"><i class="fa fa-user fa-fw"></i> {{ translate("PROFILE.SETTINGS") }}</h3>
     </div>
     <div class="box-body">
         {% include "forms/csrf.html.twig" %}
 
         {% block settings_profile %}
-            <label for="input-first-name" class="control-label">{{translate("NAME")}}</label>
+            <label for="input-first-name" class="control-label">{{ translate("NAME") }}</label>
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <input type="text" id="input-first-name" class="form-control" name="first_name" value="{{current_user.first_name}}" placeholder="{{translate("FIRST_NAME")}}" {{page.visibility}}>
+                        <input type="text" id="input-first-name" class="form-control" name="first_name"
+                               value="{{ current_user.first_name }}"
+                               placeholder="{{ translate("FIRST_NAME") }}" {{ page.visibility }}>
                     </div>
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <input type="text" id="input-last-name" class="form-control" name="last_name" value="{{current_user.last_name}}" placeholder="{{translate("LAST_NAME")}}" {{page.visibility}}>
+                        <input type="text" id="input-last-name" class="form-control" name="last_name"
+                               value="{{ current_user.last_name }}"
+                               placeholder="{{ translate("LAST_NAME") }}" {{ page.visibility }}>
                     </div>
                 </div>
             </div>
 
             <div class="form-group">
-                <label for="input-locale" class="control-label">{{translate("LOCALE")}}</label>
-                <select id="input-locale" class="form-control js-select2" name="locale" {{page.visibility}}>
+                <label for="input-locale" class="control-label">{{ translate("LOCALE") }}</label>
+                <select id="input-locale" class="form-control js-select2" name="locale" {{ page.visibility }}>
                     {% for option, label in locales %}
                         {% if label is not empty %}
-                            <option value="{{option}}" {% if (option == current_user.locale) %}selected{% endif %}>{{label}}</option>
+                            <option value="{{ option }}"
+                                    {% if (option == current_user.locale) %}selected{% endif %}>{{ label }}</option>
                         {% endif %}
                     {% endfor %}
                 </select>
-                <p class="help-block">{{translate("LOCALE.ACCOUNT")}}.</p>
+                <p class="help-block">{{ translate("LOCALE.ACCOUNT") }}.</p>
             </div>
         {% endblock %}
     </div>
     <div class="box-footer text-center">
-        <button type="reset" class="btn btn-default">{{translate('RESET')}}</button>
-        <button type="submit" class="btn btn-primary js-submit">{{translate('SAVE')}}</button>
+        <button type="reset" class="btn btn-default">{{ translate('RESET') }}</button>
+        <button type="submit" class="btn btn-primary js-submit">{{ translate('SAVE') }}</button>
     </div>
 </form>
-- 
cgit v1.2.3