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

16 files changed, 232 insertions, 153 deletions

diff --git a/main/app/sprinkles/core/templates/pages/about.html.twig b/main/app/sprinkles/core/templates/pages/about.html.twig
index 95f9b72..09b11a3 100644
--- a/main/app/sprinkles/core/templates/pages/about.html.twig
+++ b/main/app/sprinkles/core/templates/pages/about.html.twig
@@ -3,7 +3,7 @@
 {% set page_active = "about" %}
 
 {# Overrides blocks in head of base template #}
-{% block page_title %}{{translate("ABOUT")}}{% endblock %}
+{% block page_title %}{{ translate("ABOUT") }}{% endblock %}
 
 {% block page_description %}All about my UserFrosting website.{% endblock %}
 
@@ -16,9 +16,15 @@
         </div>
         <div class="col-md-6">
             <h2>About Modern Business</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sed voluptate nihil eum consectetur similique? Consectetur, quod, incidunt, harum nisi dolores delectus reprehenderit voluptatem perferendis dicta dolorem non blanditiis ex fugiat.</p>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Saepe, magni, aperiam vitae illum voluptatum aut sequi impedit non velit ab ea pariatur sint quidem corporis eveniet. Odit, temporibus reprehenderit dolorum!</p>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Et, consequuntur, modi mollitia corporis ipsa voluptate corrupti eum ratione ex ea praesentium quibusdam? Aut, in eum facere corrupti necessitatibus perspiciatis quis?</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sed voluptate nihil eum consectetur similique?
+                Consectetur, quod, incidunt, harum nisi dolores delectus reprehenderit voluptatem perferendis dicta
+                dolorem non blanditiis ex fugiat.</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Saepe, magni, aperiam vitae illum voluptatum
+                aut sequi impedit non velit ab ea pariatur sint quidem corporis eveniet. Odit, temporibus reprehenderit
+                dolorum!</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Et, consequuntur, modi mollitia corporis ipsa
+                voluptate corrupti eum ratione ex ea praesentium quibusdam? Aut, in eum facere corrupti necessitatibus
+                perspiciatis quis?</p>
         </div>
     </div>
     <!-- /.row -->
@@ -35,7 +41,8 @@
                     <h3>John Smith<br>
                         <small>Job Title</small>
                     </h3>
-                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iste saepe et quisquam nesciunt maxime.</p>
+                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iste saepe et quisquam nesciunt
+                        maxime.</p>
                     <ul class="list-inline">
                         <li><a href="#"><i class="fa fa-2x fa-facebook-square"></i></a>
                         </li>
@@ -54,7 +61,8 @@
                     <h3>John Smith<br>
                         <small>Job Title</small>
                     </h3>
-                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iste saepe et quisquam nesciunt maxime.</p>
+                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iste saepe et quisquam nesciunt
+                        maxime.</p>
                     <ul class="list-inline">
                         <li><a href="#"><i class="fa fa-2x fa-facebook-square"></i></a>
                         </li>
@@ -73,7 +81,8 @@
                     <h3>John Smith<br>
                         <small>Job Title</small>
                     </h3>
-                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iste saepe et quisquam nesciunt maxime.</p>
+                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iste saepe et quisquam nesciunt
+                        maxime.</p>
                     <ul class="list-inline">
                         <li><a href="#"><i class="fa fa-2x fa-facebook-square"></i></a>
                         </li>
@@ -92,7 +101,8 @@
                     <h3>John Smith<br>
                         <small>Job Title</small>
                     </h3>
-                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iste saepe et quisquam nesciunt maxime.</p>
+                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iste saepe et quisquam nesciunt
+                        maxime.</p>
                     <ul class="list-inline">
                         <li><a href="#"><i class="fa fa-2x fa-facebook-square"></i></a>
                         </li>
@@ -111,7 +121,8 @@
                     <h3>John Smith<br>
                         <small>Job Title</small>
                     </h3>
-                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iste saepe et quisquam nesciunt maxime.</p>
+                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iste saepe et quisquam nesciunt
+                        maxime.</p>
                     <ul class="list-inline">
                         <li><a href="#"><i class="fa fa-2x fa-facebook-square"></i></a>
                         </li>
@@ -130,7 +141,8 @@
                     <h3>John Smith<br>
                         <small>Job Title</small>
                     </h3>
-                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iste saepe et quisquam nesciunt maxime.</p>
+                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iste saepe et quisquam nesciunt
+                        maxime.</p>
                     <ul class="list-inline">
                         <li><a href="#"><i class="fa fa-2x fa-facebook-square"></i></a>
                         </li>
diff --git a/main/app/sprinkles/core/templates/pages/abstract/base.html.twig b/main/app/sprinkles/core/templates/pages/abstract/base.html.twig
index a54375a..8135162 100644
--- a/main/app/sprinkles/core/templates/pages/abstract/base.html.twig
+++ b/main/app/sprinkles/core/templates/pages/abstract/base.html.twig
@@ -10,7 +10,8 @@
             <meta charset="utf-8">
             <meta name="generator" content="UserFrosting" />
             <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-            <meta name="description" content="{% block page_description %}This page has not yet been configured.{% endblock %}">
+            <meta name="description"
+                  content="{% block page_description %}This page has not yet been configured.{% endblock %}">
             <meta name="author" content="{% block page_author %}{{ site.author }}{% endblock %}">
 
             <title>{{ site.title }} | {% block page_title %}New Page{% endblock %}</title>
@@ -48,7 +49,7 @@
 
             {# Canonical page link #}
             {% if block('page_canonical') %}
-                <link href="{{site.uri.base.scheme}}://{% block page_canonical %}{% endblock %}" rel="canonical" />
+                <link href="{{ site.uri.base.scheme }}://{% block page_canonical %}{% endblock %}" rel="canonical" />
             {% endif %}
 
             <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
diff --git a/main/app/sprinkles/core/templates/pages/abstract/default.html.twig b/main/app/sprinkles/core/templates/pages/abstract/default.html.twig
index 9b81264..b39619e 100644
--- a/main/app/sprinkles/core/templates/pages/abstract/default.html.twig
+++ b/main/app/sprinkles/core/templates/pages/abstract/default.html.twig
@@ -4,7 +4,7 @@
 {% endblock %}
 
 {% block body_attributes %}
-    class="hold-transition skin-{{site.AdminLTE.skin}} layout-top-nav"
+    class="hold-transition skin-{{ site.AdminLTE.skin }} layout-top-nav"
 {% endblock %}
 
 {% block content %}
@@ -22,7 +22,10 @@
                 {% block content_header %}
                     <section class="content-header">
                         <h1>{% block header_title %}{{ block('page_title') }}{% endblock %}</h1>
-                        {% if block('page_description') is not empty %}<h1><small>{% block header_description %}{{ block('page_description') }}{% endblock %}</small></h1>{% endif %}
+                        {% if block('page_description') is not empty %}
+                            <h1>
+                            <small>{% block header_description %}{{ block('page_description') }}{% endblock %}</small>
+                            </h1>{% endif %}
                         {% block breadcrumb %}
                             {% include 'navigation/breadcrumb.html.twig' with {page_title: block('page_title')} %}
                         {% endblock %}
diff --git a/main/app/sprinkles/core/templates/pages/abstract/error.html.twig b/main/app/sprinkles/core/templates/pages/abstract/error.html.twig
index c7c7205..95908a2 100644
--- a/main/app/sprinkles/core/templates/pages/abstract/error.html.twig
+++ b/main/app/sprinkles/core/templates/pages/abstract/error.html.twig
@@ -7,26 +7,29 @@
 
 {% block body %}
     <body {% block body_attributes %}{% endblock %}>
-        <!-- Main content -->
-        <section class="content">
-          <div class="error-page">
-            {% block headline %}<h2 class="headline text-red"><i class="fa fa-terminal" aria-hidden="true"></i></h2>{% endblock %}
+    <!-- Main content -->
+    <section class="content">
+        <div class="error-page">
+            {% block headline %}<h2 class="headline text-red"><i class="fa fa-terminal" aria-hidden="true"></i>
+            </h2>{% endblock %}
 
             <div class="error-content">
-              <br /><h3>{% block heading %}<i class="fa fa-warning text-red"></i> {{ translate('ERROR.ENCOUNTERED') }}{% endblock %}</h3>
+                <br />
+                <h3>{% block heading %}<i
+                            class="fa fa-warning text-red"></i> {{ translate('ERROR.ENCOUNTERED') }}{% endblock %}</h3>
 
-              {% block content %}
-                  {% if messages %}<p>{{ translate('ERROR.DETAIL') }}</p>{% endif %}
-                  {% for message in messages %}
-                    <div class="alert alert-danger">{{ translate(message.message, message.parameters) }}</div>
-                  {% endfor %}
-                  <p class="lead">{{ translate('ERROR.RETURN', {url : site.uri.public})|raw }}</p>
-              {% endblock %}
+                {% block content %}
+                    {% if messages %}<p>{{ translate('ERROR.DETAIL') }}</p>{% endif %}
+                    {% for message in messages %}
+                        <div class="alert alert-danger">{{ translate(message.message, message.parameters) }}</div>
+                    {% endfor %}
+                    <p class="lead">{{ translate('ERROR.RETURN', {url : site.uri.public})|raw }}</p>
+                {% endblock %}
             </div>
             <!-- /.error-content -->
-          </div>
-          <!-- /.error-page -->
-        </section>
-        <!-- /.content -->
+        </div>
+        <!-- /.error-page -->
+    </section>
+    <!-- /.content -->
     </body>
 {% endblock %}
\ No newline at end of file
diff --git a/main/app/sprinkles/core/templates/pages/error/config-errors.html.twig b/main/app/sprinkles/core/templates/pages/error/config-errors.html.twig
index 314b3b8..ee87069 100644
--- a/main/app/sprinkles/core/templates/pages/error/config-errors.html.twig
+++ b/main/app/sprinkles/core/templates/pages/error/config-errors.html.twig
@@ -10,13 +10,13 @@
     <p>{{ translate('ERROR.CONFIG.RETURN', {url: "#{site.uri.public}"})|raw }}.</p>
 
     {% autoescape false %}
-    {% for message in messages %}
-        <div class="list-group">
-          <div class="list-group-item {% if message.success %}list-group-item-success{% else %}list-group-item-danger{% endif %}">
-            <h4 class="list-group-item-heading">{{message.title}}</h4>
-            <p class="list-group-item-text">{{message.message | raw}}</p>
-          </div>
-        </div>
-    {% endfor %}
+        {% for message in messages %}
+            <div class="list-group">
+                <div class="list-group-item {% if message.success %}list-group-item-success{% else %}list-group-item-danger{% endif %}">
+                    <h4 class="list-group-item-heading">{{ message.title }}</h4>
+                    <p class="list-group-item-text">{{ message.message | raw }}</p>
+                </div>
+            </div>
+        {% endfor %}
     {% endautoescape %}
 {% endblock %}
diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig
index fc29294..9b21dd4 100644
--- a/main/app/sprinkles/core/templates/pages/index.html.twig
+++ b/main/app/sprinkles/core/templates/pages/index.html.twig
@@ -23,7 +23,8 @@
                 </div>
                 <div class="MainInTab FeedTabWindow">
                     {% for FeedImage in FeedImages %}
-                        <img class="FeedImage" src="{{ site.uri.public }}/image/{{ FeedImage.PostID }}" alt="You probably don't have an permission to see this image.">
+                        <img class="FeedImage" src="{{ site.uri.public }}/image/{{ FeedImage.PostID }}"
+                             alt="You probably don't have an permission to see this image.">
                         <br>
                     {% endfor %}
                 </div>
@@ -107,7 +108,8 @@
                 <div class="MainInTab PersonalTabWindow">
                     <div class="PersonalOverviewHeader">
                         <div class="GenderFab Female">&#9792;</div>
-                        <img class="Avatar" src="{{ current_user.avatar }}" data-caching-key="{{ current_user.user_name }}_avatar_cached" />
+                        <img class="Avatar" src="{{ current_user.avatar }}"
+                             data-caching-key="{{ current_user.user_name }}_avatar_cached" />
                         <div class="GenderFab Male">&#9794;</div>
                     </div>
                     <br>
@@ -124,19 +126,24 @@
 
         <div class="Navbar">
             <span id="0" class="NavbarIconWrap">
-                <img src="{{ assets.url('assets://SiteAssets/icons/FriendFeedOutline.svg') }}" data-caching-key="FriendFeedOutline_nav_cached">
+                <img src="{{ assets.url('assets://SiteAssets/icons/FriendFeedOutline.svg') }}"
+                     data-caching-key="FriendFeedOutline_nav_cached">
             </span>
             <span id="1" class="NavbarIconWrap">
-                <img src="{{ assets.url('assets://SiteAssets/icons/ExploreGlobeOutline.svg') }}" data-caching-key="ExploreGlobeOutline_nav_cached">
+                <img src="{{ assets.url('assets://SiteAssets/icons/ExploreGlobeOutline.svg') }}"
+                     data-caching-key="ExploreGlobeOutline_nav_cached">
             </span>
             <span id="2" class="NavbarIconWrap ActiveTab">
-                <img src="{{ assets.url('assets://SiteAssets/icons/MessageBubbleOutlineActivated.svg') }}" data-caching-key="MessageBubbleOutlineActivated_nav_cached">
+                <img src="{{ assets.url('assets://SiteAssets/icons/MessageBubbleOutlineActivated.svg') }}"
+                     data-caching-key="MessageBubbleOutlineActivated_nav_cached">
             </span>
             <span id="3" class="NavbarIconWrap">
-                <img src="{{ assets.url('assets://SiteAssets/icons/UserGroupOutline.svg') }}" data-caching-key="UserGroupOutline_nav_cached">
+                <img src="{{ assets.url('assets://SiteAssets/icons/UserGroupOutline.svg') }}"
+                     data-caching-key="UserGroupOutline_nav_cached">
             </span>
             <span id="4" class="NavbarIconWrap">
-                <img src="{{ assets.url('assets://SiteAssets/icons/UserOutline.svg') }}" data-caching-key="UserOutline_nav_cached">
+                <img src="{{ assets.url('assets://SiteAssets/icons/UserOutline.svg') }}"
+                     data-caching-key="UserOutline_nav_cached">
             </span>
         </div>
         <span class='NavbarLine'></span>
@@ -153,6 +160,7 @@
     </script>
     <script>
         var NotifySound = new Audio("{{ assets.url('assets://SiteAssets/notisound.mp3') }}");
+
         function ReplaceServerMessage(Type) { // translation service
             var LastServerMessage = $(".MessageWrapper:last .ServerChatMessage");
             if (Type === "YouGroupJoin") {
diff --git a/main/app/sprinkles/core/templates/pages/legal.html.twig b/main/app/sprinkles/core/templates/pages/legal.html.twig
index c1eac19..4ec0b4c 100644
--- a/main/app/sprinkles/core/templates/pages/legal.html.twig
+++ b/main/app/sprinkles/core/templates/pages/legal.html.twig
@@ -3,9 +3,9 @@
 {% set page_active = "home" %}
 
 {# Overrides blocks in head of base template #}
-{% block page_title %}{{translate("LEGAL")}}{% endblock %}
+{% block page_title %}{{ translate("LEGAL") }}{% endblock %}
 
-{% block page_description %}{{translate("LEGAL.DESCRIPTION")}}{% endblock %}
+{% block page_description %}{{ translate("LEGAL.DESCRIPTION") }}{% endblock %}
 
 {% block body_matter %}
     {% include 'pages/partials/legal.html.twig' %}
diff --git a/main/app/sprinkles/core/templates/pages/partials/analytics.html.twig b/main/app/sprinkles/core/templates/pages/partials/analytics.html.twig
index 3fbeeed..649d616 100644
--- a/main/app/sprinkles/core/templates/pages/partials/analytics.html.twig
+++ b/main/app/sprinkles/core/templates/pages/partials/analytics.html.twig
@@ -1,11 +1,18 @@
 {% if site.analytics.google.code and site.analytics.google.enabled %}
     <script>
-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+        (function (i, s, o, g, r, a, m) {
+            i['GoogleAnalyticsObject'] = r;
+            i[r] = i[r] || function () {
+                (i[r].q = i[r].q || []).push(arguments)
+            }, i[r].l = 1 * new Date();
+            a = s.createElement(o),
+                m = s.getElementsByTagName(o)[0];
+            a.async = 1;
+            a.src = g;
+            m.parentNode.insertBefore(a, m)
+        })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
 
-        ga('create', '{{site.analytics.google.code}}', 'auto');
+        ga('create', '{{ site.analytics.google.code }}', 'auto');
         ga('send', 'pageview');
     </script>
 {% elseif site.debug.info %}
diff --git a/main/app/sprinkles/core/templates/pages/partials/config.js.twig b/main/app/sprinkles/core/templates/pages/partials/config.js.twig
index a7a60f0..6044d1f 100644
--- a/main/app/sprinkles/core/templates/pages/partials/config.js.twig
+++ b/main/app/sprinkles/core/templates/pages/partials/config.js.twig
@@ -1,13 +1,13 @@
 {# Configuration variables needed by client-side code (Javascript). #}
 {% autoescape 'js' %}
-    var site = {
-        "uri": {
-            "public": "{{ site.uri.public | raw }}"
-        },
-        "debug": {
-            "ajax": {{ site.debug.ajax ? 'true' : 'false' }}
-        },
-        "csrf": {{ site.csrf | json_encode(constant('JSON_PRETTY_PRINT')) | raw }},
-        "uf_table": {{ site.uf_table | json_encode(constant('JSON_PRETTY_PRINT')) | raw }}
-    };
+var site = {
+    "uri": {
+        "public": "{{ site.uri.public | raw }}"
+    },
+    "debug": {
+        "ajax": {{ site.debug.ajax ? 'true' : 'false' }}
+    },
+    "csrf": {{ site.csrf | json_encode(constant('JSON_PRETTY_PRINT')) | raw }},
+    "uf_table": {{ site.uf_table | json_encode(constant('JSON_PRETTY_PRINT')) | raw }}
+};
 {% endautoescape %}
diff --git a/main/app/sprinkles/core/templates/pages/partials/favicons.html.twig b/main/app/sprinkles/core/templates/pages/partials/favicons.html.twig
index eda4dcf..ea4a143 100644
--- a/main/app/sprinkles/core/templates/pages/partials/favicons.html.twig
+++ b/main/app/sprinkles/core/templates/pages/partials/favicons.html.twig
@@ -4,8 +4,10 @@
 <link rel="shortcut icon" type="image/x-icon" href="{{ assets.url('assets://userfrosting/favicons/favicon.ico') }}">
 
 {# PNG versions #}
-<link rel="icon" type="image/png" sizes="32x32" href="{{ assets.url('assets://userfrosting/favicons/favicon-32x32.png') }}">
-<link rel="icon" type="image/png" sizes="16x16" href="{{ assets.url('assets://userfrosting/favicons/favicon-16x16.png') }}">
+<link rel="icon" type="image/png" sizes="32x32"
+      href="{{ assets.url('assets://userfrosting/favicons/favicon-32x32.png') }}">
+<link rel="icon" type="image/png" sizes="16x16"
+      href="{{ assets.url('assets://userfrosting/favicons/favicon-16x16.png') }}">
 
 {#
     IE 10 Metro tile icon (Metro equivalent of apple-touch-icon-precomposed)
@@ -20,18 +22,28 @@
 <meta name="msapplication-config" content="{{ assets.url('assets://userfrosting/favicons/ieconfig.xml') }}">
 
 {# Apple touch icons #}
-<link rel="apple-touch-icon-precomposed" href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-precomposed.png') }}">
-<link rel="apple-touch-icon-precomposed" sizes="60x60" href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-60x60-precomposed.png') }}">
-<link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-72x72-precomposed.png') }}">
-<link rel="apple-touch-icon-precomposed" sizes="76x76" href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-76x76-precomposed.png') }}">
-<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-114x114-precomposed.png') }}">
-<link rel="apple-touch-icon-precomposed" sizes="120x120" href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-120x120-precomposed.png') }}">
-<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-144x144-precomposed.png') }}">
-<link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-152x152-precomposed.png') }}">
-<link rel="apple-touch-icon-precomposed" sizes="180x180" href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-180x180-precomposed.png') }}">
+<link rel="apple-touch-icon-precomposed"
+      href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-precomposed.png') }}">
+<link rel="apple-touch-icon-precomposed" sizes="60x60"
+      href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-60x60-precomposed.png') }}">
+<link rel="apple-touch-icon-precomposed" sizes="72x72"
+      href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-72x72-precomposed.png') }}">
+<link rel="apple-touch-icon-precomposed" sizes="76x76"
+      href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-76x76-precomposed.png') }}">
+<link rel="apple-touch-icon-precomposed" sizes="114x114"
+      href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-114x114-precomposed.png') }}">
+<link rel="apple-touch-icon-precomposed" sizes="120x120"
+      href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-120x120-precomposed.png') }}">
+<link rel="apple-touch-icon-precomposed" sizes="144x144"
+      href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-144x144-precomposed.png') }}">
+<link rel="apple-touch-icon-precomposed" sizes="152x152"
+      href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-152x152-precomposed.png') }}">
+<link rel="apple-touch-icon-precomposed" sizes="180x180"
+      href="{{ assets.url('assets://userfrosting/favicons/apple-touch-icon-180x180-precomposed.png') }}">
 
 {# Chrome icons and manifest #}
-<link rel="icon" type="image/png" sizes="192x192" href="{{ assets.url('assets://userfrosting/favicons/android-chrome-192x192.png') }}">
+<link rel="icon" type="image/png" sizes="192x192"
+      href="{{ assets.url('assets://userfrosting/favicons/android-chrome-192x192.png') }}">
 <link rel="manifest" href="{{ assets.url('assets://userfrosting/favicons/manifest.json') }}">
 <meta name="theme-color" content="#0c1d34">
 
diff --git a/main/app/sprinkles/core/templates/pages/partials/footer.html.twig b/main/app/sprinkles/core/templates/pages/partials/footer.html.twig
index e7a93c3..91ecd1b 100644
--- a/main/app/sprinkles/core/templates/pages/partials/footer.html.twig
+++ b/main/app/sprinkles/core/templates/pages/partials/footer.html.twig
@@ -1,8 +1,9 @@
 <footer class="main-footer">
     <div class="pull-right hidden-xs">
-      {{ translate("BUILT_WITH_UF") | raw }} &middot;
-      <a href="{{site.uri.public}}/legal">{{ translate("TOS") }}</a> &middot;
-      <a href="{{site.uri.public}}/privacy">{{ translate("PRIVACY") }}</a>
+        {{ translate("BUILT_WITH_UF") | raw }} &middot;
+        <a href="{{ site.uri.public }}/legal">{{ translate("TOS") }}</a> &middot;
+        <a href="{{ site.uri.public }}/privacy">{{ translate("PRIVACY") }}</a>
     </div>
-    &copy; <a href="{{site.uri.public}}">{{site.title}}</a>, {{ "now"|date("Y") }}. <span class="hidden-xs">{{ translate("ADMINLTE_THEME_BY") | raw }}.</span>
+    &copy; <a href="{{ site.uri.public }}">{{ site.title }}</a>, {{ "now"|date("Y") }}.
+    <span class="hidden-xs">{{ translate("ADMINLTE_THEME_BY") | raw }}.</span>
 </footer>
\ No newline at end of file
diff --git a/main/app/sprinkles/core/templates/pages/partials/legal.html.twig b/main/app/sprinkles/core/templates/pages/partials/legal.html.twig
index 65fe61c..0208aa8 100644
--- a/main/app/sprinkles/core/templates/pages/partials/legal.html.twig
+++ b/main/app/sprinkles/core/templates/pages/partials/legal.html.twig
@@ -1,95 +1,117 @@
 <!-- Generated by http://www.bennadel.com/coldfusion/privacy-policy-generator.htm -->
 <h2>
-	Web Site Terms and Conditions of Use
+    Web Site Terms and Conditions of Use
 </h2>
 
 <h3>
-	1. Terms
+    1. Terms
 </h3>
 
 <p>
-	By accessing this web site, you are agreeing to be bound by these
-	web site Terms and Conditions of Use, all applicable laws and regulations,
-	and agree that you are responsible for compliance with any applicable local
-	laws. If you do not agree with any of these terms, you are prohibited from
-	using or accessing this site. The materials contained in this web site are
-	protected by applicable copyright and trade mark law.
+    By accessing this web site, you are agreeing to be bound by these
+    web site Terms and Conditions of Use, all applicable laws and regulations,
+    and agree that you are responsible for compliance with any applicable local
+    laws. If you do not agree with any of these terms, you are prohibited from
+    using or accessing this site. The materials contained in this web site are
+    protected by applicable copyright and trade mark law.
 </p>
 
 <h3>
-	2. Use License
+    2. Use License
 </h3>
 
 <ol type="a">
-	<li>
-		Permission is granted to temporarily download one copy of the materials
-		(information or software) on {{site.title}}'s web site for personal,
-		non-commercial transitory viewing only. This is the grant of a license,
-		not a transfer of title, and under this license you may not:
-
-		<ol type="i">
-			<li>modify or copy the materials;</li>
-			<li>use the materials for any commercial purpose, or for any public display (commercial or non-commercial);</li>
-			<li>attempt to decompile or reverse engineer any software contained on {{site.title}}'s web site;</li>
-			<li>remove any copyright or other proprietary notations from the materials; or</li>
-			<li>transfer the materials to another person or "mirror" the materials on any other server.</li>
-		</ol>
-	</li>
-	<li>
-		This license shall automatically terminate if you violate any of these restrictions and may be terminated by {{site.title}} at any time. Upon terminating your viewing of these materials or upon the termination of this license, you must destroy any downloaded materials in your possession whether in electronic or printed format.
-	</li>
+    <li>
+        Permission is granted to temporarily download one copy of the materials
+        (information or software) on {{ site.title }}'s web site for personal,
+        non-commercial transitory viewing only. This is the grant of a license,
+        not a transfer of title, and under this license you may not:
+
+        <ol type="i">
+            <li>modify or copy the materials;</li>
+            <li>use the materials for any commercial purpose, or for any public display (commercial or
+                non-commercial);
+            </li>
+            <li>attempt to decompile or reverse engineer any software contained on {{ site.title }}'s web site;</li>
+            <li>remove any copyright or other proprietary notations from the materials; or</li>
+            <li>transfer the materials to another person or "mirror" the materials on any other server.</li>
+        </ol>
+    </li>
+    <li>
+        This license shall automatically terminate if you violate any of these restrictions and may be terminated
+        by {{ site.title }} at any time. Upon terminating your viewing of these materials or upon the termination of
+        this license, you must destroy any downloaded materials in your possession whether in electronic or printed
+        format.
+    </li>
 </ol>
 
 <h3>
-	3. Disclaimer
+    3. Disclaimer
 </h3>
 
 <ol type="a">
-	<li>
-		The materials on {{site.title}}'s web site are provided "as is". {{site.title}} makes no warranties, expressed or implied, and hereby disclaims and negates all other warranties, including without limitation, implied warranties or conditions of merchantability, fitness for a particular purpose, or non-infringement of intellectual property or other violation of rights. Further, {{site.title}} does not warrant or make any representations concerning the accuracy, likely results, or reliability of the use of the materials on its Internet web site or otherwise relating to such materials or on any sites linked to this site.
-	</li>
+    <li>
+        The materials on {{ site.title }}'s web site are provided "as is". {{ site.title }} makes no warranties,
+        expressed or implied, and hereby disclaims and negates all other warranties, including without limitation,
+        implied warranties or conditions of merchantability, fitness for a particular purpose, or non-infringement of
+        intellectual property or other violation of rights. Further, {{ site.title }} does not warrant or make any
+        representations concerning the accuracy, likely results, or reliability of the use of the materials on its
+        Internet web site or otherwise relating to such materials or on any sites linked to this site.
+    </li>
 </ol>
 
 <h3>
-	4. Limitations
+    4. Limitations
 </h3>
 
 <p>
-	In no event shall {{site.title}} or its suppliers be liable for any damages (including, without limitation, damages for loss of data or profit, or due to business interruption,) arising out of the use or inability to use the materials on {{site.title}}'s Internet site, even if {{site.title}} or a {{site.title}} authorized representative has been notified orally or in writing of the possibility of such damage. Because some jurisdictions do not allow limitations on implied warranties, or limitations of liability for consequential or incidental damages, these limitations may not apply to you.
+    In no event shall {{ site.title }} or its suppliers be liable for any damages (including, without limitation,
+    damages for loss of data or profit, or due to business interruption,) arising out of the use or inability to use the
+    materials on {{ site.title }}'s Internet site, even if {{ site.title }} or a {{ site.title }} authorized
+    representative has been notified orally or in writing of the possibility of such damage. Because some jurisdictions
+    do not allow limitations on implied warranties, or limitations of liability for consequential or incidental damages,
+    these limitations may not apply to you.
 </p>
 
 <h3>
-	5. Revisions and Errata
+    5. Revisions and Errata
 </h3>
 
 <p>
-	The materials appearing on {{site.title}}'s web site could include technical, typographical, or photographic errors. {{site.title}} does not warrant that any of the materials on its web site are accurate, complete, or current. {{site.title}} may make changes to the materials contained on its web site at any time without notice. {{site.title}} does not, however, make any commitment to update the materials.
+    The materials appearing on {{ site.title }}'s web site could include technical, typographical, or photographic
+    errors. {{ site.title }} does not warrant that any of the materials on its web site are accurate, complete, or
+    current. {{ site.title }} may make changes to the materials contained on its web site at any time without
+    notice. {{ site.title }} does not, however, make any commitment to update the materials.
 </p>
 
 <h3>
-	6. Links
+    6. Links
 </h3>
 
 <p>
-	{{site.title}} has not reviewed all of the sites linked to its Internet web site and is not responsible for the contents of any such linked site. The inclusion of any link does not imply endorsement by {{site.title}} of the site. Use of any such linked web site is at the user's own risk.
+    {{ site.title }} has not reviewed all of the sites linked to its Internet web site and is not responsible for the
+    contents of any such linked site. The inclusion of any link does not imply endorsement by {{ site.title }} of the
+    site. Use of any such linked web site is at the user's own risk.
 </p>
 
 <h3>
-	7. Site Terms of Use Modifications
+    7. Site Terms of Use Modifications
 </h3>
 
 <p>
-	{{site.title}} may revise these terms of use for its web site at any time without notice. By using this web site you are agreeing to be bound by the then current version of these Terms and Conditions of Use.
+    {{ site.title }} may revise these terms of use for its web site at any time without notice. By using this web site
+    you are agreeing to be bound by the then current version of these Terms and Conditions of Use.
 </p>
 
 <h3>
-	8. Governing Law
+    8. Governing Law
 </h3>
 
 <p>
-	Any claim relating to {{site.title}}'s web site shall be governed by the laws of {{site.site_location}} without regard to its conflict of law provisions.
+    Any claim relating to {{ site.title }}'s web site shall be governed by the laws of {{ site.site_location }} without
+    regard to its conflict of law provisions.
 </p>
 
 <p>
-	General Terms and Conditions applicable to Use of a Web Site.
+    General Terms and Conditions applicable to Use of a Web Site.
 </p>
diff --git a/main/app/sprinkles/core/templates/pages/partials/page.js.twig b/main/app/sprinkles/core/templates/pages/partials/page.js.twig
index 51a1703..c8ce880 100644
--- a/main/app/sprinkles/core/templates/pages/partials/page.js.twig
+++ b/main/app/sprinkles/core/templates/pages/partials/page.js.twig
@@ -1,4 +1,4 @@
 {# Page variables needed by client-side code (Javascript). #}
 {% autoescape 'js' %}
-    var page = {{ page | json_encode(constant('JSON_PRETTY_PRINT')) | raw }};
-{% endautoescape %}
+{{ page | json_encode(constant('JSON_PRETTY_PRINT')) | raw }}
+{%    au t esca e%}
diff --git a/main/app/sprinkles/core/templates/pages/partials/privacy.html.twig b/main/app/sprinkles/core/templates/pages/partials/privacy.html.twig
index 6a6cafc..cc6f965 100644
--- a/main/app/sprinkles/core/templates/pages/partials/privacy.html.twig
+++ b/main/app/sprinkles/core/templates/pages/partials/privacy.html.twig
@@ -1,35 +1,45 @@
 <h2>
-	Privacy Policy
+    Privacy Policy
 </h2>
 
 <p>
-	Your privacy is very important to us. Accordingly, we have developed this Policy in order for you to understand how we collect, use, communicate and disclose and make use of personal information. The following outlines our privacy policy.
+    Your privacy is very important to us. Accordingly, we have developed this Policy in order for you to understand how
+    we collect, use, communicate and disclose and make use of personal information. The following outlines our privacy
+    policy.
 </p>
 
 <ul>
-	<li>
-		Before or at the time of collecting personal information, we will identify the purposes for which information is being collected.
-	</li>
-	<li>
-		We will collect and use of personal information solely with the objective of fulfilling those purposes specified by us and for other compatible purposes, unless we obtain the consent of the individual concerned or as required by law.
-	</li>
-	<li>
-		We will only retain personal information as long as necessary for the fulfillment of those purposes.
-	</li>
-	<li>
-		We will collect personal information by lawful and fair means and, where appropriate, with the knowledge or consent of the individual concerned.
-	</li>
-	<li>
-		Personal data should be relevant to the purposes for which it is to be used, and, to the extent necessary for those purposes, should be accurate, complete, and up-to-date.
-	</li>
-	<li>
-		We will protect personal information by reasonable security safeguards against loss or theft, as well as unauthorized access, disclosure, copying, use or modification.
-	</li>
-	<li>
-		We will make readily available to customers information about our policies and practices relating to the management of personal information.
-	</li>
+    <li>
+        Before or at the time of collecting personal information, we will identify the purposes for which information is
+        being collected.
+    </li>
+    <li>
+        We will collect and use of personal information solely with the objective of fulfilling those purposes specified
+        by us and for other compatible purposes, unless we obtain the consent of the individual concerned or as required
+        by law.
+    </li>
+    <li>
+        We will only retain personal information as long as necessary for the fulfillment of those purposes.
+    </li>
+    <li>
+        We will collect personal information by lawful and fair means and, where appropriate, with the knowledge or
+        consent of the individual concerned.
+    </li>
+    <li>
+        Personal data should be relevant to the purposes for which it is to be used, and, to the extent necessary for
+        those purposes, should be accurate, complete, and up-to-date.
+    </li>
+    <li>
+        We will protect personal information by reasonable security safeguards against loss or theft, as well as
+        unauthorized access, disclosure, copying, use or modification.
+    </li>
+    <li>
+        We will make readily available to customers information about our policies and practices relating to the
+        management of personal information.
+    </li>
 </ul>
 
 <p>
-	We are committed to conducting our business in accordance with these principles in order to ensure that the confidentiality of personal information is protected and maintained.
+    We are committed to conducting our business in accordance with these principles in order to ensure that the
+    confidentiality of personal information is protected and maintained.
 </p>
diff --git a/main/app/sprinkles/core/templates/pages/privacy.html.twig b/main/app/sprinkles/core/templates/pages/privacy.html.twig
index 75db423..ca9e705 100644
--- a/main/app/sprinkles/core/templates/pages/privacy.html.twig
+++ b/main/app/sprinkles/core/templates/pages/privacy.html.twig
@@ -3,9 +3,9 @@
 {% set page_active = "home" %}
 
 {# Overrides blocks in head of base template #}
-{% block page_title %}{{translate("PRIVACY")}}{% endblock %}
+{% block page_title %}{{ translate("PRIVACY") }}{% endblock %}
 
-{% block page_description %}{{translate("PRIVACY.DESCRIPTION")}}{% endblock %}
+{% block page_description %}{{ translate("PRIVACY.DESCRIPTION") }}{% endblock %}
 
 {% block body_matter %}
     {% include 'pages/partials/privacy.html.twig' %}
diff --git a/main/app/sprinkles/core/templates/pages/test.html.twig b/main/app/sprinkles/core/templates/pages/test.html.twig
index 4edfaa0..bcd1b26 100644
--- a/main/app/sprinkles/core/templates/pages/test.html.twig
+++ b/main/app/sprinkles/core/templates/pages/test.html.twig
@@ -1,18 +1,18 @@
 <form method="post" action="{{ site.uri.public }}/api/posts/image">
     {% include "forms/csrf.html.twig" %}
     <p>
-        <label>Upload file:</label><br/>
-        <input formenctype="multipart/form-data" type="file" name="image"/>
+        <label>Upload file:</label><br />
+        <input formenctype="multipart/form-data" type="file" name="image" />
     </p>
-    <input formenctype="multipart/form-data" type="submit"/>
+    <input formenctype="multipart/form-data" type="submit" />
 </form>
 
 <form method="post" action="{{ site.uri.public }}/api/users/u/marvinborner/publickey">
     {% include "forms/csrf.html.twig" %}
     <p>
-        <input type="text" name="PublicKey"/>
+        <input type="text" name="PublicKey" />
     </p>
-    <input type="submit"/>
+    <input type="submit" />
 </form>
 
 <script>
@@ -28,7 +28,7 @@
     $.ajax({
         type: 'GET',
         url: site.uri.public + '/api/users/u/' + 'marvinborner' + '/publickey',
-        dataType : "json",
+        dataType: "json",
         success: function (response) {
             console.log(response);
             //window.location.reload();