Some fixes + added profile customization

3 files changed, 19 insertions, 3 deletions

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({