From d9b91ddf086d41472410bb4a2f6df8f0a6c56daf Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 9 Jun 2018 17:12:05 +0200
Subject: Some fixes + added profile customization

---
 main/app/sprinkles/core/assets/SiteAssets/css/main.css  |  9 ++++++++-
 main/app/sprinkles/core/assets/SiteAssets/js/chat.js    |  7 +++++++
 main/app/sprinkles/core/assets/SiteAssets/js/main.js    |  6 ++++--
 main/app/sprinkles/core/templates/pages/index.html.twig | 17 ++++++++++++++++-
 4 files changed, 35 insertions(+), 4 deletions(-)

(limited to 'main/app')

diff --git a/main/app/sprinkles/core/assets/SiteAssets/css/main.css b/main/app/sprinkles/core/assets/SiteAssets/css/main.css
index f68fab7..6816e33 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/css/main.css
+++ b/main/app/sprinkles/core/assets/SiteAssets/css/main.css
@@ -427,7 +427,9 @@ PERSONAL TAB
 ***********/
 .PersonalTabWindow {
     position: relative;
-    height: 100%;
+    max-height: calc(100% - 155px); /* navbar + some margin*/
+    max-height: -moz-calc(100% - 155px);
+    max-height: -webkit-calc(100% - 155px);
     margin: 5px;
 }
 
@@ -466,6 +468,11 @@ PERSONAL TAB
     font-size: 20px;
 }
 
+.EditProfileForm {
+    max-height: inherit;
+    overflow: scroll;
+}
+
 /*****
 NAVBAR
 *****/
diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/chat.js b/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
index 354120e..0989860 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
+++ b/main/app/sprinkles/core/assets/SiteAssets/js/chat.js
@@ -327,6 +327,13 @@ function InitializeChatServer() {
             InitializeChatServer();
         }
 
+        // CHECK EVERY 5 SEC IF CLIENT IS STILL CONNECTED
+        setTimeout(function() {
+            if (ChatSocket.readyState !== 1) {
+                NotConnectedAnymore();
+            }
+        }, 5000);
+
         // BACK BUTTON
         $(document).on("click", "#BackToChatSelectorButton", function () {
             $(".SelectReceiver > *").addClass("animated slideInLeft");
diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/main.js b/main/app/sprinkles/core/assets/SiteAssets/js/main.js
index 335f59a..dcbd7c6 100644
--- a/main/app/sprinkles/core/assets/SiteAssets/js/main.js
+++ b/main/app/sprinkles/core/assets/SiteAssets/js/main.js
@@ -122,12 +122,14 @@ $("#ImageUploadButton").on("click", function () {
         title: 'Choose an image to upload!',
         html: "<form id='ImageUploadForm'>" +
             "<input formenctype='multipart/form-data' type='file' name='image' />" +
-            "<input formenctype='multipart/form-data' type='submit' />" +
+            "<input formenctype='multipart/form-data' type='submit' value='Upload!' />" +
             "<input type='hidden' name='" + site.csrf.keys.name + "' value='" + site.csrf.name + "' />" +
             "<input type='hidden' name='" + site.csrf.keys.value + "' value='" + site.csrf.value + "' />" +
-            "</form>",
+            "</form>"
     });
 
+    $(".swal2-confirm").text("Close");
+
     $("#ImageUploadForm")
         .submit(function (e) {
             $.ajax({
diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig
index 7a28637..6eec2cc 100644
--- a/main/app/sprinkles/core/templates/pages/index.html.twig
+++ b/main/app/sprinkles/core/templates/pages/index.html.twig
@@ -108,12 +108,27 @@
                     </div>
                     <br>
                     <div class="DisplayNames">
-                        <span class="FullName">{{ current_user.first_name }} {{ current_user.last_name }}</span>
+                        <span class="FullName">{{ current_user.full_name }}</span> {# TODO: Onclick edit popup #}
                         <br>
                         <small class="Username">{{ current_user.user_name }}</small>
                     </div>
                     <br>
                     <hr class="ShorterLine" align="center">
+
+                    <br>
+                    <div class="EditProfileForm">
+                        <p class="EditFieldLabel">{{ translate('USERNAME') }}</p>
+                        <p class="EditFieldText">{{ current_user.user_name }}</p><br>
+
+                        <p class="EditFieldLabel">{{ translate('EMAIL') }}</p>
+                        <p class="EditFieldText">{{ current_user.email }}</p><br>
+
+                        <p class="EditFieldLabel">{{ translate('LOCALE') }}</p>
+                        <p class="EditFieldText">{{ site.locales.available[current_user.locale] }}</p><br> {# more in admin/templates/forms/user.html.twig #}
+
+                        <p class="EditFieldLabel">{{ translate('THEME') }}</p>
+                        <p class="EditFieldText">{{ current_user.theme }}</p>
+                    </div>
                 </div>
             </div>
         </div>
-- 
cgit v1.2.3