From 279a1586815de16c1f879933d805823d33f14d7f Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Wed, 18 Apr 2018 15:05:30 +0200 Subject: Deployed to server - fixed settings page --- .../sprinkles/core/templates/forms/csrf.html.twig | 0 main/app/sprinkles/core/templates/mail/.gitkeep | 0 .../core/templates/modals/modal.html.twig | 0 .../core/templates/navigation/breadcrumb.html.twig | 0 .../core/templates/navigation/main-nav.html.twig | 0 .../sprinkles/core/templates/pages/about.html.twig | 0 .../core/templates/pages/abstract/base.html.twig | 62 +++--- .../templates/pages/abstract/default.html.twig | 62 +++--- .../core/templates/pages/abstract/error.html.twig | 0 .../templates/pages/abstract/mainsite.html.twig | 217 ++++++++++-------- .../core/templates/pages/error/400.html.twig | 0 .../core/templates/pages/error/404.html.twig | 0 .../templates/pages/error/config-errors.html.twig | 0 .../sprinkles/core/templates/pages/index.html.twig | 0 .../sprinkles/core/templates/pages/legal.html.twig | 0 .../core/templates/pages/partials/alerts.html.twig | 0 .../templates/pages/partials/analytics.html.twig | 0 .../core/templates/pages/partials/chat.js.twig | 244 ++++++++++----------- .../core/templates/pages/partials/config.js.twig | 0 .../templates/pages/partials/favicons.html.twig | 0 .../core/templates/pages/partials/footer.html.twig | 0 .../core/templates/pages/partials/legal.html.twig | 0 .../core/templates/pages/partials/page.js.twig | 0 .../templates/pages/partials/privacy.html.twig | 0 .../core/templates/pages/privacy.html.twig | 0 .../templates/tables/table-paginated.html.twig | 0 .../templates/tables/table-tool-menu.html.twig | 0 27 files changed, 309 insertions(+), 276 deletions(-) mode change 100755 => 100644 main/app/sprinkles/core/templates/forms/csrf.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/mail/.gitkeep mode change 100755 => 100644 main/app/sprinkles/core/templates/modals/modal.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/navigation/breadcrumb.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/navigation/main-nav.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/about.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/abstract/base.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/abstract/default.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/abstract/error.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/error/400.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/error/404.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/error/config-errors.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/index.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/legal.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/partials/alerts.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/partials/analytics.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/partials/config.js.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/partials/favicons.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/partials/footer.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/partials/legal.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/partials/page.js.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/partials/privacy.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/pages/privacy.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/tables/table-paginated.html.twig mode change 100755 => 100644 main/app/sprinkles/core/templates/tables/table-tool-menu.html.twig (limited to 'main/app/sprinkles/core/templates') diff --git a/main/app/sprinkles/core/templates/forms/csrf.html.twig b/main/app/sprinkles/core/templates/forms/csrf.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/mail/.gitkeep b/main/app/sprinkles/core/templates/mail/.gitkeep old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/modals/modal.html.twig b/main/app/sprinkles/core/templates/modals/modal.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/navigation/breadcrumb.html.twig b/main/app/sprinkles/core/templates/navigation/breadcrumb.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/navigation/main-nav.html.twig b/main/app/sprinkles/core/templates/navigation/main-nav.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/pages/about.html.twig b/main/app/sprinkles/core/templates/pages/about.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/pages/abstract/base.html.twig b/main/app/sprinkles/core/templates/pages/abstract/base.html.twig old mode 100755 new mode 100644 index 4b3f9cf..4d2b7cd --- a/main/app/sprinkles/core/templates/pages/abstract/base.html.twig +++ b/main/app/sprinkles/core/templates/pages/abstract/base.html.twig @@ -1,8 +1,8 @@ {# This is the base layout template for all pages. #} {% block page %} - - + + {% block head %} @@ -24,7 +24,7 @@ {# Override this block in a child layout template or page template to override site-level stylesheets. #} {% block stylesheets_site %} - {{ assets.css('css/main') | raw }} + {{ assets.css() | raw }} {% endblock %} {# Override this block in a child layout template or page template to specify or override stylesheets for groups of similar pages. #} @@ -54,8 +54,8 @@ {% include "pages/partials/analytics.html.twig" %} @@ -64,40 +64,40 @@ {% block body %} - {# Page Content #} - {% block content %}{% endblock %} + {# Page Content #} + {% block content %}{% endblock %} - {# Handlebars template for uf-alerts. #} - {% block uf_alerts_template %} - {% include "pages/partials/alerts.html.twig" %} - {% endblock %} + {# Handlebars template for uf-alerts. #} + {% block uf_alerts_template %} + {% include "pages/partials/alerts.html.twig" %} + {% endblock %} - - + - {% block scripts %} - {# Override this block in a child layout template or page template to override site-level scripts. #} - {% block scripts_site %} - - - - + {% block scripts %} + {# Override this block in a child layout template or page template to override site-level scripts. #} + {% block scripts_site %} + + + + - {{ assets.js() | raw }} - {% endblock %} + {{ assets.js() | raw }} + {% endblock %} - {# Override this block in a child layout template or page template to specify or override scripts for groups of similar pages. #} - {% block scripts_page_group %} - {% endblock %} + {# Override this block in a child layout template or page template to specify or override scripts for groups of similar pages. #} + {% block scripts_page_group %} + {% endblock %} - {# Override this block in a child layout template or page template to specify or override page-level scripts. #} - {% block scripts_page %} - {% endblock %} + {# Override this block in a child layout template or page template to specify or override page-level scripts. #} + {% block scripts_page %} {% endblock %} + {% endblock %} {% endblock %} - -{% endblock %} + +{% endblock %} \ No newline at end of file diff --git a/main/app/sprinkles/core/templates/pages/abstract/default.html.twig b/main/app/sprinkles/core/templates/pages/abstract/default.html.twig old mode 100755 new mode 100644 index b615790..9b81264 --- a/main/app/sprinkles/core/templates/pages/abstract/default.html.twig +++ b/main/app/sprinkles/core/templates/pages/abstract/default.html.twig @@ -1,4 +1,4 @@ -{% extends "pages/abstract/mainsite.html.twig" %} +{% extends "pages/abstract/base.html.twig" %} {% block stylesheets_page_group %} {% endblock %} @@ -9,37 +9,37 @@ {% block content %} -
- -
- {% include "navigation/main-nav.html.twig" %} -
- - -
-
- - {% block content_header %} -
-

{% block header_title %}{{ block('page_title') }}{% endblock %}

- {% if block('page_description') is not empty %}

{% block header_description %}{{ block('page_description') }}{% endblock %}

{% endif %} - {% block breadcrumb %} - {% include 'navigation/breadcrumb.html.twig' with {page_title: block('page_title')} %} - {% endblock %} -
-
+
+ +
+ {% include "navigation/main-nav.html.twig" %} +
+ + +
+
+ + {% block content_header %} +
+

{% block header_title %}{{ block('page_title') }}{% endblock %}

+ {% if block('page_description') is not empty %}

{% block header_description %}{{ block('page_description') }}{% endblock %}

{% endif %} + {% block breadcrumb %} + {% include 'navigation/breadcrumb.html.twig' with {page_title: block('page_title')} %} + {% endblock %} +
+
+ {% endblock %} +
+ {% block body_matter %}{% endblock %} +
+
+
+ + + {% block footer %} + {% include "pages/partials/footer.html.twig" %} {% endblock %} -
- {% block body_matter %}{% endblock %} -
-
- - - {% block footer %} - {% include "pages/partials/footer.html.twig" %} - {% endblock %} -
- + {% endblock %} \ No newline at end of file diff --git a/main/app/sprinkles/core/templates/pages/abstract/error.html.twig b/main/app/sprinkles/core/templates/pages/abstract/error.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/pages/abstract/mainsite.html.twig b/main/app/sprinkles/core/templates/pages/abstract/mainsite.html.twig index fe21d34..57e1ea1 100644 --- a/main/app/sprinkles/core/templates/pages/abstract/mainsite.html.twig +++ b/main/app/sprinkles/core/templates/pages/abstract/mainsite.html.twig @@ -1,92 +1,125 @@ -{# This is the base layout template for all pages. #} - -{% block page %} - - - {% block head %} - - - - - - - - - {{ site.title }} | {% block page_title %}New Page{% endblock %} - - {% include "pages/partials/favicons.html.twig" %} - - {# Use this block to add extra content in page head without having to override the entire base layout #} - {% block head_extra %}{% endblock %} - - {% block stylesheets %} - {# Override this block in a child layout template or page template to override site-level stylesheets. #} - {% block stylesheets_site %} - - {{ assets.css('css/main-site') | raw }} - {% endblock %} - - {# Override this block in a child layout template or page template to specify or override stylesheets for groups of similar pages. #} - {% block stylesheets_page_group %} - {% endblock %} - - {# Override this block in a child layout template or page template to specify or override page-level stylesheets. #} - {% block stylesheets_page %} - {% endblock %} - {% endblock %} - - {# Site author link #} - {% if site.uri.author %} - - {% endif %} - - {# Site publisher link #} - {% if site.uri.publisher %} - - {% endif %} - - {# Canonical page link #} - {% if block('page_canonical') %} - - {% endif %} - - - - - - {% include "pages/partials/analytics.html.twig" %} - - {% endblock %} - - {% block body %} - - {# Page Content #} - {% block content %}{% endblock %} - - - - - {% block scripts %} - {# Override this block in a child layout template or page template to override site-level scripts. #} - {% block scripts_site %} - {{ assets.js('js/main-site') | raw }} - {% endblock %} - - {# Override this block in a child layout template or page template to specify or override scripts for groups of similar pages. #} - {% block scripts_page_group %} - {% endblock %} - - {# Override this block in a child layout template or page template to specify or override page-level scripts. #} - {% block scripts_page %} - {% endblock %} - {% endblock %} - - - {% endblock %} - -{% endblock %} +{# This is the base layout template for all pages. #} + +{% block page %} + + + {% block head %} + + + + + + + + + {{ site.title }} | {% block page_title %}New Page{% endblock %} + + {% include "pages/partials/favicons.html.twig" %} + + {# Use this block to add extra content in page head without having to override the entire base layout #} + {% block head_extra %}{% endblock %} + + {% block stylesheets %} + {# Override this block in a child layout template or page template to override site-level stylesheets. #} + {% block stylesheets_site %} + + {{ assets.css('css/main-site') | raw }} + {% endblock %} + + {# Override this block in a child layout template or page template to specify or override stylesheets for groups of similar pages. #} + {% block stylesheets_page_group %} + {% endblock %} + + {# Override this block in a child layout template or page template to specify or override page-level stylesheets. #} + {% block stylesheets_page %} + {% endblock %} + {% endblock %} + + {# Site author link #} + {% if site.uri.author %} + + {% endif %} + + {# Site publisher link #} + {% if site.uri.publisher %} + + {% endif %} + + {# Canonical page link #} + {% if block('page_canonical') %} + + {% endif %} + + + + + + {% include "pages/partials/analytics.html.twig" %} + + {% endblock %} + + {% block body %} + + {# Page Content #} + {% block content %} +
+ +
+ {% include "navigation/main-nav.html.twig" %} +
+ + +
+
+ + {% block content_header %} +
+

{% block header_title %}{{ block('page_title') }}{% endblock %}

+ {% if block('page_description') is not empty %}

{% block header_description %}{{ block('page_description') }}{% endblock %}

{% endif %} + {% block breadcrumb %} + {% include 'navigation/breadcrumb.html.twig' with {page_title: block('page_title')} %} + {% endblock %} +
+
+ {% endblock %} +
+ {% block body_matter %}{% endblock %} +
+
+
+ + + {% block footer %} + {% include "pages/partials/footer.html.twig" %} + {% endblock %} +
+ + {% endblock %} + + + + + {% block scripts %} + {# Override this block in a child layout template or page template to override site-level scripts. #} + {% block scripts_site %} + {{ assets.js('js/main-site') | raw }} + {% endblock %} + + {# Override this block in a child layout template or page template to specify or override scripts for groups of similar pages. #} + {% block scripts_page_group %} + {% endblock %} + + {# Override this block in a child layout template or page template to specify or override page-level scripts. #} + {% block scripts_page %} + {% endblock %} + {% endblock %} + + + {% endblock %} + +{% endblock %} diff --git a/main/app/sprinkles/core/templates/pages/error/400.html.twig b/main/app/sprinkles/core/templates/pages/error/400.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/pages/error/404.html.twig b/main/app/sprinkles/core/templates/pages/error/404.html.twig old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/pages/legal.html.twig b/main/app/sprinkles/core/templates/pages/legal.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/pages/partials/alerts.html.twig b/main/app/sprinkles/core/templates/pages/partials/alerts.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/pages/partials/analytics.html.twig b/main/app/sprinkles/core/templates/pages/partials/analytics.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/pages/partials/chat.js.twig b/main/app/sprinkles/core/templates/pages/partials/chat.js.twig index 779008f..a160087 100644 --- a/main/app/sprinkles/core/templates/pages/partials/chat.js.twig +++ b/main/app/sprinkles/core/templates/pages/partials/chat.js.twig @@ -1,123 +1,123 @@ -{% autoescape 'js' %} - -/************ - GENERATE KEYS - ************/ -if (localStorage.getItem('KeysGenerated') === null || localStorage.getItem('KeysGenerated') !== "true") { - // GENERATE -- LATER ON LOGIN! - var EncryptionPhrase = "PASSWORD 123"; // THE USERS PASSWORD -- needs to generate on login! - var RSABitLength = 1024; - var PrivateKeyString = cryptico.generateRSAKey(EncryptionPhrase, RSABitLength); - var PublicKeyString = cryptico.publicKeyString(PrivateKeyString); - // SAVE TO DATABASE - $.ajax({ - type: "POST", - url: "assets/php/SavePublicKey.php", - data: { - UserID: "1", // TEMPORARY - PublicKeyString: PublicKeyString - }, - async: true, - error: function () { - console.error("Error while saving public key to database!"); - }, - success: function () { - localStorage.setItem('KeysGenerated', "true"); - } - }); -} - - -/****** - GENERAL - ******/ - -var ChatTextInput = $("#ChatTextInput"); -var SubscribeTextInput = $("#SubscribeTextInput"); -var ChatMessages = $("#ChatMessages"); - -var WebSocket = new WebSocket('wss://marvinborner.ddnss.de:1337'); - -WebSocket.onopen = function () { - console.log("Chat connection established!"); -}; - -WebSocket.onmessage = function (e) { - var LastMessage = $(".ChatMessage:last"); - var MessageObject = JSON.parse(e.data); - if (MessageObject.ServerMessage === false) { - if (MessageObject.WasHimself === true) { //MessageObject.Username - if (!LastMessage.hasClass("MessageSent")) { - ChatMessages.append("
" + MessageObject.Message + "


"); - } else if (LastMessage.hasClass("MessageSent")) { - if (LastMessage.hasClass("AloneMessage")) { - LastMessage.removeClass("AloneMessage"); - LastMessage.addClass("TopMessage"); - } else if (LastMessage.hasClass("BottomMessage")) { - LastMessage.removeClass("BottomMessage"); - LastMessage.addClass("MiddleMessage"); - } - ChatMessages.append("
" + MessageObject.Message + "


"); - } - $('.MessageSent').linkify({ - target: "_blank" - }); - } else if (MessageObject.WasHimself === false) { - if (!LastMessage.hasClass("MessageReceived")) { - ChatMessages.append("
" + MessageObject.Message + "


"); - } else if (LastMessage.hasClass("MessageReceived")) { - if (LastMessage.hasClass("AloneMessage")) { - LastMessage.removeClass("AloneMessage"); - LastMessage.addClass("TopMessage"); - } else if (LastMessage.hasClass("BottomMessage")) { - LastMessage.removeClass("BottomMessage"); - LastMessage.addClass("MiddleMessage"); - } - ChatMessages.append("
" + MessageObject.Message + "


"); - } - $('.MessageReceived').linkify({ - target: "_blank" - }); - } - } else if (MessageObject.ServerMessage === true) { - if (MessageObject.ServerMessageType === "GroupJoin") { - if (MessageObject.WasHimself === false) { - var TempJoinMessage = "{{ translate("CHAT_MESSAGES.USER_GROUP_JOIN", {user: "ConvertTranslatedMessageWithUsername"}) }}"; - var GeneratedJoinMessage = TempJoinMessage.replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); - ChatMessages.append("
" + GeneratedJoinMessage + ".


"); - } else if (MessageObject.WasHimself === true) { - ChatMessages.empty(); - ChatMessages.append("
{{ translate("CHAT_MESSAGES.YOU_GROUP_JOIN") }} " + MessageObject.GroupName + ".


"); - } - } else if (MessageObject.ServerMessageType === "UserDisconnect") { - var TempDisconnectMessage = "{{ translate("CHAT_MESSAGES.USER_DISCONNECT", {user: "ConvertTranslatedMessageWithUsername"}) }}"; - var GeneratedDisconnectMessage = TempDisconnectMessage.replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); - ChatMessages.append("
" + GeneratedDisconnectMessage + ".


"); - } - } -}; - -ChatTextInput.keyup(function (e) { - if (e.keyCode === 13) { - sendMessage(ChatTextInput.val()); - ChatTextInput.val(""); - } -}); - -SubscribeTextInput.keyup(function (e) { - if (e.keyCode === 13) { - subscribe(SubscribeTextInput.val()); - } -}); - -function subscribe(channel) { - WebSocket.send(JSON.stringify({ClientMessageType: "Subscribe", Channel: channel})); - SubscribeTextInput.hide(); - ChatTextInput.show(); -} - -function sendMessage(msg) { - WebSocket.send(JSON.stringify({ClientMessageType: "Message", Message: msg})); - ChatTextInput.val(""); -} +{% autoescape 'js' %} + +/************ + GENERATE KEYS + ************/ +if (localStorage.getItem('KeysGenerated') === null || localStorage.getItem('KeysGenerated') !== "true") { + // GENERATE -- LATER ON LOGIN! + var EncryptionPhrase = "PASSWORD 123"; // THE USERS PASSWORD -- needs to generate on login! + var RSABitLength = 1024; + var PrivateKeyString = cryptico.generateRSAKey(EncryptionPhrase, RSABitLength); + var PublicKeyString = cryptico.publicKeyString(PrivateKeyString); + // SAVE TO DATABASE + $.ajax({ + type: "POST", + url: "assets/php/SavePublicKey.php", + data: { + UserID: "1", // TEMPORARY + PublicKeyString: PublicKeyString + }, + async: true, + error: function () { + console.error("Error while saving public key to database!"); + }, + success: function () { + localStorage.setItem('KeysGenerated', "true"); + } + }); +} + + +/****** + GENERAL + ******/ + +var ChatTextInput = $("#ChatTextInput"); +var SubscribeTextInput = $("#SubscribeTextInput"); +var ChatMessages = $("#ChatMessages"); + +var WebSocket = new WebSocket('wss://marvinborner.ddnss.de:1337'); + +WebSocket.onopen = function () { + console.log("Chat connection established!"); +}; + +WebSocket.onmessage = function (e) { + var LastMessage = $(".ChatMessage:last"); + var MessageObject = JSON.parse(e.data); + if (MessageObject.ServerMessage === false) { + if (MessageObject.WasHimself === true) { //MessageObject.Username + if (!LastMessage.hasClass("MessageSent")) { + ChatMessages.append("
" + MessageObject.Message + "


"); + } else if (LastMessage.hasClass("MessageSent")) { + if (LastMessage.hasClass("AloneMessage")) { + LastMessage.removeClass("AloneMessage"); + LastMessage.addClass("TopMessage"); + } else if (LastMessage.hasClass("BottomMessage")) { + LastMessage.removeClass("BottomMessage"); + LastMessage.addClass("MiddleMessage"); + } + ChatMessages.append("
" + MessageObject.Message + "


"); + } + $('.MessageSent').linkify({ + target: "_blank" + }); + } else if (MessageObject.WasHimself === false) { + if (!LastMessage.hasClass("MessageReceived")) { + ChatMessages.append("
" + MessageObject.Message + "


"); + } else if (LastMessage.hasClass("MessageReceived")) { + if (LastMessage.hasClass("AloneMessage")) { + LastMessage.removeClass("AloneMessage"); + LastMessage.addClass("TopMessage"); + } else if (LastMessage.hasClass("BottomMessage")) { + LastMessage.removeClass("BottomMessage"); + LastMessage.addClass("MiddleMessage"); + } + ChatMessages.append("
" + MessageObject.Message + "


"); + } + $('.MessageReceived').linkify({ + target: "_blank" + }); + } + } else if (MessageObject.ServerMessage === true) { + if (MessageObject.ServerMessageType === "GroupJoin") { + if (MessageObject.WasHimself === false) { + var TempJoinMessage = "{{ translate("CHAT_MESSAGES.USER_GROUP_JOIN", {user: "ConvertTranslatedMessageWithUsername"}) }}"; + var GeneratedJoinMessage = TempJoinMessage.replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); + ChatMessages.append("
" + GeneratedJoinMessage + ".


"); + } else if (MessageObject.WasHimself === true) { + ChatMessages.empty(); + ChatMessages.append("
{{ translate("CHAT_MESSAGES.YOU_GROUP_JOIN") }} " + MessageObject.GroupName + ".


"); + } + } else if (MessageObject.ServerMessageType === "UserDisconnect") { + var TempDisconnectMessage = "{{ translate("CHAT_MESSAGES.USER_DISCONNECT", {user: "ConvertTranslatedMessageWithUsername"}) }}"; + var GeneratedDisconnectMessage = TempDisconnectMessage.replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); + ChatMessages.append("
" + GeneratedDisconnectMessage + ".


"); + } + } +}; + +ChatTextInput.keyup(function (e) { + if (e.keyCode === 13) { + sendMessage(ChatTextInput.val()); + ChatTextInput.val(""); + } +}); + +SubscribeTextInput.keyup(function (e) { + if (e.keyCode === 13) { + subscribe(SubscribeTextInput.val()); + } +}); + +function subscribe(channel) { + WebSocket.send(JSON.stringify({ClientMessageType: "Subscribe", Channel: channel})); + SubscribeTextInput.hide(); + ChatTextInput.show(); +} + +function sendMessage(msg) { + WebSocket.send(JSON.stringify({ClientMessageType: "Message", Message: msg})); + ChatTextInput.val(""); +} {% endautoescape %} \ No newline at end of file diff --git a/main/app/sprinkles/core/templates/pages/partials/config.js.twig b/main/app/sprinkles/core/templates/pages/partials/config.js.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/pages/partials/favicons.html.twig b/main/app/sprinkles/core/templates/pages/partials/favicons.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/pages/partials/footer.html.twig b/main/app/sprinkles/core/templates/pages/partials/footer.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/pages/partials/legal.html.twig b/main/app/sprinkles/core/templates/pages/partials/legal.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/pages/partials/page.js.twig b/main/app/sprinkles/core/templates/pages/partials/page.js.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/pages/partials/privacy.html.twig b/main/app/sprinkles/core/templates/pages/partials/privacy.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/pages/privacy.html.twig b/main/app/sprinkles/core/templates/pages/privacy.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/tables/table-paginated.html.twig b/main/app/sprinkles/core/templates/tables/table-paginated.html.twig old mode 100755 new mode 100644 diff --git a/main/app/sprinkles/core/templates/tables/table-tool-menu.html.twig b/main/app/sprinkles/core/templates/tables/table-tool-menu.html.twig old mode 100755 new mode 100644 -- cgit v1.2.3 From 696356df88011344bab6cf42273dee74460e6474 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Wed, 18 Apr 2018 17:48:45 +0200 Subject: Fixed color issues on several browsers and added authentication --- .../sprinkles/core/assets/SiteAssets/css/main.css | 17 +- .../assets/SiteAssets/icons/BurgerMenuShort.svg | 6 +- .../SiteAssets/icons/BurgerMenuShortActivated.svg | 57 ++++++ .../SiteAssets/icons/ExploreGlobeOutline.svg | 58 +++--- .../icons/ExploreGlobeOutlineActivated.svg | 210 +++++++++++++++++++++ .../assets/SiteAssets/icons/FriendFeedOutline.svg | 8 +- .../icons/FriendFeedOutlineActivated.svg | 82 ++++++++ .../SiteAssets/icons/MessageBubbleOutline.svg | 8 +- .../icons/MessageBubbleOutlineActivated.svg | 73 +++++++ .../assets/SiteAssets/icons/UserGroupOutline.svg | 16 +- .../SiteAssets/icons/UserGroupOutlineActivated.svg | 80 ++++++++ .../core/assets/SiteAssets/icons/UserOutline.svg | 4 +- .../SiteAssets/icons/UserOutlineActivated.svg | 54 ++++++ .../sprinkles/core/assets/SiteAssets/js/main.js | 10 +- main/app/sprinkles/core/config/default.php | 4 +- main/app/sprinkles/core/locale/de_DE/main.php | 2 +- main/app/sprinkles/core/locale/en_US/main.php | 2 +- main/app/sprinkles/core/locale/fr_FR/main.php | 2 +- main/app/sprinkles/core/routes/routes.php | 1 + .../sprinkles/core/templates/pages/index.html.twig | 12 +- .../core/templates/pages/partials/chat.js.twig | 20 +- 21 files changed, 642 insertions(+), 84 deletions(-) create mode 100644 main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShortActivated.svg create mode 100644 main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutlineActivated.svg create mode 100644 main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutlineActivated.svg create mode 100644 main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutlineActivated.svg create mode 100644 main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutlineActivated.svg create mode 100644 main/app/sprinkles/core/assets/SiteAssets/icons/UserOutlineActivated.svg (limited to 'main/app/sprinkles/core/templates') diff --git a/main/app/sprinkles/core/assets/SiteAssets/css/main.css b/main/app/sprinkles/core/assets/SiteAssets/css/main.css index c44727b..25c492a 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/css/main.css +++ b/main/app/sprinkles/core/assets/SiteAssets/css/main.css @@ -1,3 +1,7 @@ +svg path { + fill: green; +} + /****** GENERAL ******/ @@ -103,7 +107,7 @@ HEADER GENERAL TABS ***********/ .MainInTab { - height: 100%; + height: 100% } /********** @@ -226,9 +230,6 @@ NAVBAR .NavbarIconWrap img { height: 30px; width: 30px; - filter: invert(.5); - -webkit-filter: invert(.5); - -moz-filter: invert(.5); } .NavbarLine { @@ -240,11 +241,3 @@ NAVBAR background: #eb12b5; } -.ActiveTab { - -webkit-transition: -moz-transform .3s ease-out; - -moz-transition: -webkit-transform .3s ease-out; - - filter: invert(19%) sepia(93%) saturate(4612%) hue-rotate(303deg) brightness(98%) contrast(101%); - -webkit-filter: invert(19%) sepia(93%) saturate(4612%) hue-rotate(303deg) brightness(98%) contrast(101%); - -moz-filter: invert(19%) sepia(93%) saturate(4612%) hue-rotate(303deg) brightness(98%) contrast(101%); -} diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShort.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShort.svg index e8e825e..86f3718 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShort.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShort.svg @@ -4,11 +4,11 @@ viewBox="0 0 384.97 384.97" style="enable-background:new 0 0 384.97 384.97;" xml:space="preserve"> - - - diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShortActivated.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShortActivated.svg new file mode 100644 index 0000000..fa3c428 --- /dev/null +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/BurgerMenuShortActivated.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutline.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutline.svg index 3bd2b1c..ebec16b 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutline.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutline.svg @@ -4,176 +4,176 @@ viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutlineActivated.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutlineActivated.svg new file mode 100644 index 0000000..193a92f --- /dev/null +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/ExploreGlobeOutlineActivated.svg @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutline.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutline.svg index 1facc93..d4fd052 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutline.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutline.svg @@ -4,7 +4,7 @@ viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve"> - - diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutlineActivated.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutlineActivated.svg new file mode 100644 index 0000000..cfeea52 --- /dev/null +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/FriendFeedOutlineActivated.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutline.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutline.svg index 14322ff..b2706bc 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutline.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/MessageBubbleOutline.svg @@ -4,10 +4,10 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutline.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutline.svg index 0a8c0f4..dd98e46 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutline.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/UserGroupOutline.svg @@ -5,12 +5,12 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/app/sprinkles/core/assets/SiteAssets/icons/UserOutline.svg b/main/app/sprinkles/core/assets/SiteAssets/icons/UserOutline.svg index 32062dc..a15f174 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/icons/UserOutline.svg +++ b/main/app/sprinkles/core/assets/SiteAssets/icons/UserOutline.svg @@ -5,12 +5,12 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/main.js b/main/app/sprinkles/core/assets/SiteAssets/js/main.js index b359d2d..102b102 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/js/main.js +++ b/main/app/sprinkles/core/assets/SiteAssets/js/main.js @@ -14,7 +14,7 @@ NavbarLine .data("origWidth", NavbarLine.width()); NavbarIconWrap.on("click", function () { NavbarIconWrap.removeClass("ActiveTab"); - $(this).addClass("ActiveTab"); + $(this).children().attr("src", $(this).children().attr("src").split('.svg')[0] + "Activated.svg"); var index = $(this).attr('id'); MainTabWindows.slick('slickGoTo', index); //$('.MainTabWindows').flickity().flickity('select', index); @@ -39,9 +39,13 @@ MainTabWindows.slick({ }); MainTabWindows.on('beforeChange', function (event, slick, currentSlide, nextSlide) { + currentSlide = $("#" + currentSlide); + nextSlide = $("#" + nextSlide); //console.log(nextSlide); - NavbarIconWrap.removeClass("ActiveTab"); - $el = $("#" + nextSlide); + console.log(currentSlide.children().attr("src")); + currentSlide.children().attr("src", (currentSlide.children().attr("src").split('.svg')[0].replace('Activated','') + ".svg")); + nextSlide.children().attr("src", nextSlide.children().attr("src").split('.svg')[0] + "Activated.svg"); + $el = nextSlide; $el.addClass("ActiveTab"); leftPos = $el.position().left; NavbarLine.stop().animate({ diff --git a/main/app/sprinkles/core/config/default.php b/main/app/sprinkles/core/config/default.php index 134b5d4..3478fb6 100644 --- a/main/app/sprinkles/core/config/default.php +++ b/main/app/sprinkles/core/config/default.php @@ -124,8 +124,8 @@ ], 'analytics' => [ 'google' => [ - 'code' => '', - 'enabled' => false + 'code' => 'UA-109245179-2', + 'enabled' => true ] ], 'author' => 'Author', diff --git a/main/app/sprinkles/core/locale/de_DE/main.php b/main/app/sprinkles/core/locale/de_DE/main.php index 4677206..cd9e00c 100644 --- a/main/app/sprinkles/core/locale/de_DE/main.php +++ b/main/app/sprinkles/core/locale/de_DE/main.php @@ -9,7 +9,7 @@ return [ ], "CHAT_MESSAGES" => [ "USER_GROUP_JOIN" => "{{user}} ist der Gruppe beigetreten", - "YOU_GROUP_JOIN" => "Du bist der Gruppe beigetreten", + "YOU_GROUP_JOIN" => "Du bist der Gruppe {{group}} beigetreten", "USER_DISCONNECT" => "{{user}} hat sich vom Server getrennt" ] ]; \ No newline at end of file diff --git a/main/app/sprinkles/core/locale/en_US/main.php b/main/app/sprinkles/core/locale/en_US/main.php index 58393d8..06585fc 100644 --- a/main/app/sprinkles/core/locale/en_US/main.php +++ b/main/app/sprinkles/core/locale/en_US/main.php @@ -9,7 +9,7 @@ return [ ], "CHAT_MESSAGES" => [ "USER_GROUP_JOIN" => "{{user}} joined the group", - "YOU_GROUP_JOIN" => "You joined the group", + "YOU_GROUP_JOIN" => "You joined the group {{group}}", "USER_DISCONNECT" => "{{user}} has disconnected from the server" ] ]; \ No newline at end of file diff --git a/main/app/sprinkles/core/locale/fr_FR/main.php b/main/app/sprinkles/core/locale/fr_FR/main.php index 6e28f6e..f9e2f79 100644 --- a/main/app/sprinkles/core/locale/fr_FR/main.php +++ b/main/app/sprinkles/core/locale/fr_FR/main.php @@ -9,7 +9,7 @@ return [ ], "CHAT_MESSAGES" => [ "USER_GROUP_JOIN" => "{{user}} s'est joint au groupe", - "YOU_GROUP_JOIN" => "Vous avez rejoint le groupe", + "YOU_GROUP_JOIN" => "Vous avez rejoint le groupe {{group}}", "USER_DISCONNECT" => "{{user}} s'est déconnecté du serveur" ] ]; diff --git a/main/app/sprinkles/core/routes/routes.php b/main/app/sprinkles/core/routes/routes.php index 3598b7e..56a72ea 100644 --- a/main/app/sprinkles/core/routes/routes.php +++ b/main/app/sprinkles/core/routes/routes.php @@ -11,6 +11,7 @@ $config = $app->getContainer()->get('config'); $app->get('/', 'UserFrosting\Sprinkle\Core\Controller\CoreController:pageIndex') ->add('checkEnvironment') + ->add('authGuard') ->setName('index'); $app->get('/about','UserFrosting\Sprinkle\Core\Controller\CoreController:pageAbout')->add('checkEnvironment'); diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig index 5de2d30..3a78a16 100644 --- a/main/app/sprinkles/core/templates/pages/index.html.twig +++ b/main/app/sprinkles/core/templates/pages/index.html.twig @@ -32,10 +32,11 @@
-
+ +
- {{ translate("TAB_CAPTIONS.CHAT") }} @@ -52,6 +53,7 @@
+
@@ -73,6 +75,10 @@
+
+ {{current_user.first_name}} {{current_user.last_name}} + ({{current_user.user_name}}) +
@@ -84,7 +90,7 @@ - + diff --git a/main/app/sprinkles/core/templates/pages/partials/chat.js.twig b/main/app/sprinkles/core/templates/pages/partials/chat.js.twig index a160087..7ae258b 100644 --- a/main/app/sprinkles/core/templates/pages/partials/chat.js.twig +++ b/main/app/sprinkles/core/templates/pages/partials/chat.js.twig @@ -2,8 +2,8 @@ /************ GENERATE KEYS - ************/ -if (localStorage.getItem('KeysGenerated') === null || localStorage.getItem('KeysGenerated') !== "true") { + ************ + if (localStorage.getItem('KeysGenerated') === null || localStorage.getItem('KeysGenerated') !== "true") { // GENERATE -- LATER ON LOGIN! var EncryptionPhrase = "PASSWORD 123"; // THE USERS PASSWORD -- needs to generate on login! var RSABitLength = 1024; @@ -28,10 +28,9 @@ if (localStorage.getItem('KeysGenerated') === null || localStorage.getItem('Keys } -/****** + /****** GENERAL ******/ - var ChatTextInput = $("#ChatTextInput"); var SubscribeTextInput = $("#SubscribeTextInput"); var ChatMessages = $("#ChatMessages"); @@ -82,17 +81,16 @@ WebSocket.onmessage = function (e) { } else if (MessageObject.ServerMessage === true) { if (MessageObject.ServerMessageType === "GroupJoin") { if (MessageObject.WasHimself === false) { - var TempJoinMessage = "{{ translate("CHAT_MESSAGES.USER_GROUP_JOIN", {user: "ConvertTranslatedMessageWithUsername"}) }}"; - var GeneratedJoinMessage = TempJoinMessage.replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); - ChatMessages.append("
" + GeneratedJoinMessage + ".


"); + var TranslatedUserJoinMessage = "{{ translate("CHAT_MESSAGES.USER_GROUP_JOIN", {user: "ConvertTranslatedMessageWithUsername"}) }}".replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); + ChatMessages.append("
" + TranslatedUserJoinMessage + ".


"); } else if (MessageObject.WasHimself === true) { ChatMessages.empty(); - ChatMessages.append("
{{ translate("CHAT_MESSAGES.YOU_GROUP_JOIN") }} " + MessageObject.GroupName + ".


"); + var TranslatedYouJoinMessage = "{{ translate("CHAT_MESSAGES.YOU_GROUP_JOIN", {group: "ConvertTranslatedMessageWithGroupName"}) }}".replace("ConvertTranslatedMessageWithGroupName", '"' + MessageObject.GroupName + '"'); + ChatMessages.append("
" + TranslatedYouJoinMessage + ".


"); } } else if (MessageObject.ServerMessageType === "UserDisconnect") { - var TempDisconnectMessage = "{{ translate("CHAT_MESSAGES.USER_DISCONNECT", {user: "ConvertTranslatedMessageWithUsername"}) }}"; - var GeneratedDisconnectMessage = TempDisconnectMessage.replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); - ChatMessages.append("
" + GeneratedDisconnectMessage + ".


"); + var TranslatedDisconnectMessage = "{{ translate("CHAT_MESSAGES.USER_DISCONNECT", {user: "ConvertTranslatedMessageWithUsername"}) }}".replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); + ChatMessages.append("
" + TranslatedDisconnectMessage + ".


"); } } }; -- cgit v1.2.3 From 7821728b80abdd69011d0a1917f495415dcf8c94 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Wed, 18 Apr 2018 21:46:24 +0200 Subject: Added personal information --- .../admin/assets/userfrosting/js/widgets/users.js | 71 +++++++++++----------- .../sprinkles/core/assets/SiteAssets/css/main.css | 58 ++++++++++++++++++ .../sprinkles/core/assets/SiteAssets/js/main.js | 2 +- .../templates/pages/abstract/mainsite.html.twig | 1 + .../sprinkles/core/templates/pages/index.html.twig | 28 ++++++--- 5 files changed, 114 insertions(+), 46 deletions(-) (limited to 'main/app/sprinkles/core/templates') diff --git a/main/app/sprinkles/admin/assets/userfrosting/js/widgets/users.js b/main/app/sprinkles/admin/assets/userfrosting/js/widgets/users.js index 2e153e5..952b241 100644 --- a/main/app/sprinkles/admin/assets/userfrosting/js/widgets/users.js +++ b/main/app/sprinkles/admin/assets/userfrosting/js/widgets/users.js @@ -18,7 +18,7 @@ function attachUserForm() { // Set up the form for submission form.ufForm({ validators: page.validators - }).on("submitSuccess.ufForm", function() { + }).on("submitSuccess.ufForm", function () { // Reload page on success window.location.reload(); }); @@ -41,14 +41,14 @@ function toggleChangePasswordMode(el, userName, changePasswordMode) { var validator = form.validate(); if (validator) { //Iterate through named elements inside of the form, and mark them as error free - el.find("input[type='password']").each(function() { - validator.successList.push(this); //mark as error free + el.find("input[type='password']").each(function () { + validator.successList.push(this); //mark as error free }); validator.resetForm();//remove error class on name elements and clear history validator.reset();//remove all error and success data } el.find("input[type='password']").closest('.form-group') - .removeClass('has-error has-success'); + .removeClass('has-error has-success'); el.find('.form-control-feedback').each(function () { $(this).remove(); }); @@ -66,7 +66,7 @@ function toggleChangePasswordMode(el, userName, changePasswordMode) { * Update user field(s) */ function updateUser(userName, fieldName, fieldValue) { - var data = { + var data = { 'value': fieldValue }; @@ -83,7 +83,7 @@ function updateUser(userName, fieldName, fieldValue) { dataType: debugAjax ? 'html' : 'json', converters: { // Override jQuery's strict JSON parsing - 'text json': function(result) { + 'text json': function (result) { try { // First try to use native browser parsing if (typeof JSON === 'object' && typeof JSON.parse === 'function') { @@ -92,19 +92,19 @@ function updateUser(userName, fieldName, fieldValue) { return $.parseJSON(result); } } catch (e) { - // statements to handle any exceptions - console.log("Warning: Could not parse expected JSON response."); - return {}; + // statements to handle any exceptions + console.log("Warning: Could not parse expected JSON response."); + return {}; } } } - }).fail(function (jqXHR) { + }).fail(function (jqXHR) { // Error messages if (debugAjax && jqXHR.responseText) { document.write(jqXHR.responseText); document.close(); } else { - console.log("Error (" + jqXHR.status + "): " + jqXHR.responseText ); + console.log("Error (" + jqXHR.status + "): " + jqXHR.responseText); // Display errors on failure // TODO: ufAlerts widget should have a 'destroy' method @@ -113,7 +113,7 @@ function updateUser(userName, fieldName, fieldValue) { } else { $("#alerts-page").ufAlerts('clear'); } - + $("#alerts-page").ufAlerts('fetch').ufAlerts('render'); } @@ -126,13 +126,13 @@ function updateUser(userName, fieldName, fieldValue) { /** * Link user action buttons, for example in a table or on a specific user's page. */ - function bindUserButtons(el) { +function bindUserButtons(el) { /** * Buttons that launch a modal dialog */ // Edit general user details button - el.find('.js-user-edit').click(function() { + el.find('.js-user-edit').click(function () { $("body").ufModal({ sourceUrl: site.uri.public + "/modals/users/edit", ajaxParams: { @@ -145,7 +145,7 @@ function updateUser(userName, fieldName, fieldValue) { }); // Manage user roles button - el.find('.js-user-roles').click(function() { + el.find('.js-user-roles').click(function () { var userName = $(this).data('user_name'); $("body").ufModal({ sourceUrl: site.uri.public + "/modals/users/roles", @@ -162,28 +162,27 @@ function updateUser(userName, fieldName, fieldValue) { // Set up collection widget var roleWidget = modal.find('.js-form-roles'); roleWidget.ufCollection({ - dropdown : { + dropdown: { ajax: { - url : site.uri.public + '/api/roles' + url: site.uri.public + '/api/roles' }, - placeholder : "Select a role" + placeholder: "Select a role" }, dropdownTemplate: modal.find('#user-roles-select-option').html(), - rowTemplate : modal.find('#user-roles-row').html() + rowTemplate: modal.find('#user-roles-row').html() }); // Get current roles and add to widget $.getJSON(site.uri.public + '/api/users/u/' + userName + '/roles') - .done(function (data) { - $.each(data.rows, function (idx, role) { - role.text = role.name; - roleWidget.ufCollection('addRow', role); + .done(function (data) { + $.each(data.rows, function (idx, role) { + role.text = role.name; + roleWidget.ufCollection('addRow', role); + }); }); - }); // Set up form for submission - form.ufForm({ - }).on("submitSuccess.ufForm", function() { + form.ufForm({}).on("submitSuccess.ufForm", function () { // Reload page on success window.location.reload(); }); @@ -191,7 +190,7 @@ function updateUser(userName, fieldName, fieldValue) { }); // Change user password button - el.find('.js-user-password').click(function() { + el.find('.js-user-password').click(function () { var userName = $(this).data('user_name'); $("body").ufModal({ sourceUrl: site.uri.public + "/modals/users/password", @@ -208,7 +207,7 @@ function updateUser(userName, fieldName, fieldValue) { // Set up form for submission form.ufForm({ validators: page.validators - }).on("submitSuccess.ufForm", function() { + }).on("submitSuccess.ufForm", function () { // Reload page on success window.location.reload(); }); @@ -216,7 +215,7 @@ function updateUser(userName, fieldName, fieldValue) { toggleChangePasswordMode(modal, userName, 'link'); // On submission, submit either the PUT request, or POST for a password reset, depending on the toggle state - modal.find("input[name='change_password_mode']").click(function() { + modal.find("input[name='change_password_mode']").click(function () { var changePasswordMode = $(this).val(); toggleChangePasswordMode(modal, userName, changePasswordMode); }); @@ -224,7 +223,7 @@ function updateUser(userName, fieldName, fieldValue) { }); // Delete user button - el.find('.js-user-delete').click(function() { + el.find('.js-user-delete').click(function () { $("body").ufModal({ sourceUrl: site.uri.public + "/modals/users/confirm-delete", ajaxParams: { @@ -238,17 +237,17 @@ function updateUser(userName, fieldName, fieldValue) { var form = modal.find('.js-form'); form.ufForm() - .on("submitSuccess.ufForm", function() { - // Reload page on success - window.location.reload(); - }); + .on("submitSuccess.ufForm", function () { + // Reload page on success + window.location.reload(); + }); }); }); /** * Direct action buttons */ - el.find('.js-user-activate').click(function() { + el.find('.js-user-activate').click(function () { var btn = $(this); updateUser(btn.data('user_name'), 'flag_verified', '1'); }); @@ -266,7 +265,7 @@ function updateUser(userName, fieldName, fieldValue) { function bindUserCreationButton(el) { // Link create button - el.find('.js-user-create').click(function() { + el.find('.js-user-create').click(function () { $("body").ufModal({ sourceUrl: site.uri.public + "/modals/users/create", msgTarget: $("#alerts-page") diff --git a/main/app/sprinkles/core/assets/SiteAssets/css/main.css b/main/app/sprinkles/core/assets/SiteAssets/css/main.css index 4f0733f..ff3295a 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/css/main.css +++ b/main/app/sprinkles/core/assets/SiteAssets/css/main.css @@ -52,6 +52,11 @@ hr { padding: 0; } +hr.ShorterLine { + margin: 0 auto; + width: 90%; +} + /******* FLICKITY *******/ @@ -203,6 +208,59 @@ CHAT WINDOW display: none; } +/*********** +PERSONAL TAB +***********/ +.PersonalTabWindow { + position: relative; + height: 100%; + margin: 5px; +} + +.PersonalOverviewHeader { + display: flex; + justify-content: space-evenly; + align-items: flex-end; + width: 100%; +} + +.GenderFab { + height: 50px; + width: 50px; + -webkit-border-radius: 100%; + -moz-border-radius: 100%; + border-radius: 100%; + color: white; + font-size: 25px; + line-height: 50px; + text-align: center; +} + +.GenderFab.Female { + background: linear-gradient(to right, #ff7a88, #ff9676); +} + +.AvatarImage { + height: 110px; + width: 110px; + -webkit-border-radius: 100%; + -moz-border-radius: 100%; + border-radius: 100%; +} + +.GenderFab.Male { + background: linear-gradient(to right, #11c1d5, #1ddcb6); +} + +.DisplayNames { + text-align: center; +} + +.DisplayNames .FullName { + font-weight: bold; + font-size: 20px; +} + /***** NAVBAR *****/ diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/main.js b/main/app/sprinkles/core/assets/SiteAssets/js/main.js index 6f9147b..9f89394 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/js/main.js +++ b/main/app/sprinkles/core/assets/SiteAssets/js/main.js @@ -14,7 +14,7 @@ NavbarLine .data("origWidth", NavbarLine.width()); NavbarIconWrap.on("click", function () { NavbarIconWrap.removeClass("ActiveTab"); - $(this).children().attr("src", $(this).children().attr("src").split('.svg')[0] + "Activated.svg"); + //$(this).children().attr("src", $(this).children().attr("src").split('.svg')[0] + "Activated.svg"); var index = $(this).attr('id'); MainTabWindows.slick('slickGoTo', index); //$('.MainTabWindows').flickity().flickity('select', index); diff --git a/main/app/sprinkles/core/templates/pages/abstract/mainsite.html.twig b/main/app/sprinkles/core/templates/pages/abstract/mainsite.html.twig index 57e1ea1..2783358 100644 --- a/main/app/sprinkles/core/templates/pages/abstract/mainsite.html.twig +++ b/main/app/sprinkles/core/templates/pages/abstract/mainsite.html.twig @@ -24,6 +24,7 @@ {% block stylesheets_site %} {{ assets.css('css/main-site') | raw }} + {{ assets.css('css/form-widgets') | raw }} {% endblock %} {# Override this block in a child layout template or page template to specify or override stylesheets for groups of similar pages. #} diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig index 3a78a16..f064cea 100644 --- a/main/app/sprinkles/core/templates/pages/index.html.twig +++ b/main/app/sprinkles/core/templates/pages/index.html.twig @@ -10,6 +10,7 @@ {% block content %}
+
@@ -21,6 +22,7 @@
+
@@ -43,18 +45,16 @@
-
-
+
-
-
+
-
+ +
-
- {{current_user.first_name}} {{current_user.last_name}} - ({{current_user.user_name}}) +
+
+
♀
+ +
♂
+
+
+
+ {{ current_user.first_name}} {{current_user.last_name}}
+ {{current_user.user_name}} +

+
@@ -90,7 +100,7 @@ - + -- cgit v1.2.3 From e4b886d9c0f686dea3272fec4e62b9746c09d331 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Thu, 19 Apr 2018 16:31:17 +0200 Subject: Added chat connection retry interval --- .../core/templates/pages/partials/chat.js.twig | 163 +++++++++++---------- 1 file changed, 86 insertions(+), 77 deletions(-) (limited to 'main/app/sprinkles/core/templates') diff --git a/main/app/sprinkles/core/templates/pages/partials/chat.js.twig b/main/app/sprinkles/core/templates/pages/partials/chat.js.twig index 7ae258b..da9d9f5 100644 --- a/main/app/sprinkles/core/templates/pages/partials/chat.js.twig +++ b/main/app/sprinkles/core/templates/pages/partials/chat.js.twig @@ -31,91 +31,100 @@ /****** GENERAL ******/ -var ChatTextInput = $("#ChatTextInput"); -var SubscribeTextInput = $("#SubscribeTextInput"); -var ChatMessages = $("#ChatMessages"); +function InitializeChatServer() { + var ChatTextInput = $("#ChatTextInput"); + var SubscribeTextInput = $("#SubscribeTextInput"); + var ChatMessages = $("#ChatMessages"); -var WebSocket = new WebSocket('wss://marvinborner.ddnss.de:1337'); - -WebSocket.onopen = function () { - console.log("Chat connection established!"); -}; - -WebSocket.onmessage = function (e) { - var LastMessage = $(".ChatMessage:last"); - var MessageObject = JSON.parse(e.data); - if (MessageObject.ServerMessage === false) { - if (MessageObject.WasHimself === true) { //MessageObject.Username - if (!LastMessage.hasClass("MessageSent")) { - ChatMessages.append("
" + MessageObject.Message + "


"); - } else if (LastMessage.hasClass("MessageSent")) { - if (LastMessage.hasClass("AloneMessage")) { - LastMessage.removeClass("AloneMessage"); - LastMessage.addClass("TopMessage"); - } else if (LastMessage.hasClass("BottomMessage")) { - LastMessage.removeClass("BottomMessage"); - LastMessage.addClass("MiddleMessage"); + var ChatSocket = new WebSocket('wss://marvinborner.ddnss.de:1337'); + ChatSocket.onerror = function () { + setTimeout(function(){ + console.log("Connection failed. Trying again..."); + InitializeChatServer(); + }, 5000); + }; + ChatSocket.onopen = function () { + console.log("Chat connection established!"); + ChatSocket.onmessage = function (e) { + var LastMessage = $(".ChatMessage:last"); + var MessageObject = JSON.parse(e.data); + if (MessageObject.ServerMessage === false) { + if (MessageObject.WasHimself === true) { //MessageObject.Username + if (!LastMessage.hasClass("MessageSent")) { + ChatMessages.append("
" + MessageObject.Message + "


"); + } else if (LastMessage.hasClass("MessageSent")) { + if (LastMessage.hasClass("AloneMessage")) { + LastMessage.removeClass("AloneMessage"); + LastMessage.addClass("TopMessage"); + } else if (LastMessage.hasClass("BottomMessage")) { + LastMessage.removeClass("BottomMessage"); + LastMessage.addClass("MiddleMessage"); + } + ChatMessages.append("
" + MessageObject.Message + "


"); + } + $('.MessageSent').linkify({ + target: "_blank" + }); + } else if (MessageObject.WasHimself === false) { + if (!LastMessage.hasClass("MessageReceived")) { + ChatMessages.append("
" + MessageObject.Message + "


"); + } else if (LastMessage.hasClass("MessageReceived")) { + if (LastMessage.hasClass("AloneMessage")) { + LastMessage.removeClass("AloneMessage"); + LastMessage.addClass("TopMessage"); + } else if (LastMessage.hasClass("BottomMessage")) { + LastMessage.removeClass("BottomMessage"); + LastMessage.addClass("MiddleMessage"); + } + ChatMessages.append("
" + MessageObject.Message + "


"); + } + $('.MessageReceived').linkify({ + target: "_blank" + }); } - ChatMessages.append("
" + MessageObject.Message + "


"); - } - $('.MessageSent').linkify({ - target: "_blank" - }); - } else if (MessageObject.WasHimself === false) { - if (!LastMessage.hasClass("MessageReceived")) { - ChatMessages.append("
" + MessageObject.Message + "


"); - } else if (LastMessage.hasClass("MessageReceived")) { - if (LastMessage.hasClass("AloneMessage")) { - LastMessage.removeClass("AloneMessage"); - LastMessage.addClass("TopMessage"); - } else if (LastMessage.hasClass("BottomMessage")) { - LastMessage.removeClass("BottomMessage"); - LastMessage.addClass("MiddleMessage"); + } else if (MessageObject.ServerMessage === true) { + if (MessageObject.ServerMessageType === "GroupJoin") { + if (MessageObject.WasHimself === false) { + var TranslatedUserJoinMessage = "{{ translate("CHAT_MESSAGES.USER_GROUP_JOIN", {user: "ConvertTranslatedMessageWithUsername"}) }}".replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); + ChatMessages.append("
" + TranslatedUserJoinMessage + ".


"); + } else if (MessageObject.WasHimself === true) { + ChatMessages.empty(); + var TranslatedYouJoinMessage = "{{ translate("CHAT_MESSAGES.YOU_GROUP_JOIN", {group: "ConvertTranslatedMessageWithGroupName"}) }}".replace("ConvertTranslatedMessageWithGroupName", '"' + MessageObject.GroupName + '"'); + ChatMessages.append("
" + TranslatedYouJoinMessage + ".


"); + } + } else if (MessageObject.ServerMessageType === "UserDisconnect") { + var TranslatedDisconnectMessage = "{{ translate("CHAT_MESSAGES.USER_DISCONNECT", {user: "ConvertTranslatedMessageWithUsername"}) }}".replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); + ChatMessages.append("
" + TranslatedDisconnectMessage + ".


"); } - ChatMessages.append("
" + MessageObject.Message + "


"); } - $('.MessageReceived').linkify({ - target: "_blank" - }); - } - } else if (MessageObject.ServerMessage === true) { - if (MessageObject.ServerMessageType === "GroupJoin") { - if (MessageObject.WasHimself === false) { - var TranslatedUserJoinMessage = "{{ translate("CHAT_MESSAGES.USER_GROUP_JOIN", {user: "ConvertTranslatedMessageWithUsername"}) }}".replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); - ChatMessages.append("
" + TranslatedUserJoinMessage + ".


"); - } else if (MessageObject.WasHimself === true) { - ChatMessages.empty(); - var TranslatedYouJoinMessage = "{{ translate("CHAT_MESSAGES.YOU_GROUP_JOIN", {group: "ConvertTranslatedMessageWithGroupName"}) }}".replace("ConvertTranslatedMessageWithGroupName", '"' + MessageObject.GroupName + '"'); - ChatMessages.append("
" + TranslatedYouJoinMessage + ".


"); + }; + + ChatTextInput.keyup(function (e) { + if (e.keyCode === 13) { + sendMessage(ChatTextInput.val()); + ChatTextInput.val(""); } - } else if (MessageObject.ServerMessageType === "UserDisconnect") { - var TranslatedDisconnectMessage = "{{ translate("CHAT_MESSAGES.USER_DISCONNECT", {user: "ConvertTranslatedMessageWithUsername"}) }}".replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); - ChatMessages.append("
" + TranslatedDisconnectMessage + ".


"); - } - } -}; + }); -ChatTextInput.keyup(function (e) { - if (e.keyCode === 13) { - sendMessage(ChatTextInput.val()); - ChatTextInput.val(""); - } -}); + SubscribeTextInput.keyup(function (e) { + if (e.keyCode === 13) { + subscribe(SubscribeTextInput.val()); + } + }); -SubscribeTextInput.keyup(function (e) { - if (e.keyCode === 13) { - subscribe(SubscribeTextInput.val()); - } -}); + function subscribe(channel) { + ChatSocket.send(JSON.stringify({ClientMessageType: "Subscribe", Channel: channel})); + SubscribeTextInput.hide(); + ChatTextInput.show(); + } -function subscribe(channel) { - WebSocket.send(JSON.stringify({ClientMessageType: "Subscribe", Channel: channel})); - SubscribeTextInput.hide(); - ChatTextInput.show(); + function sendMessage(msg) { + ChatSocket.send(JSON.stringify({ClientMessageType: "Message", Message: msg})); + ChatTextInput.val(""); + } + }; } -function sendMessage(msg) { - WebSocket.send(JSON.stringify({ClientMessageType: "Message", Message: msg})); - ChatTextInput.val(""); -} +InitializeChatServer(); + {% endautoescape %} \ No newline at end of file -- cgit v1.2.3 From d47736334a0b2a2f3b6f79bfb2cdf42d521ff772 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Thu, 19 Apr 2018 21:46:43 +0200 Subject: Chat design, began TODO list --- TODO.md | 4 ++++ main/app/sprinkles/core/assets/SiteAssets/css/main.css | 18 +++++++++++++----- main/app/sprinkles/core/locale/de_DE/messages.php | 6 +++--- .../app/sprinkles/core/templates/pages/index.html.twig | 6 +++--- .../core/templates/pages/partials/favicons.html.twig | 8 ++++---- 5 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 TODO.md (limited to 'main/app/sprinkles/core/templates') diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..6ffdff9 --- /dev/null +++ b/TODO.md @@ -0,0 +1,4 @@ +### TODO +* User implementation in main site (Tabs) +* Add image upload +* Much much more..... \ No newline at end of file diff --git a/main/app/sprinkles/core/assets/SiteAssets/css/main.css b/main/app/sprinkles/core/assets/SiteAssets/css/main.css index ff3295a..3bf1b55 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/css/main.css +++ b/main/app/sprinkles/core/assets/SiteAssets/css/main.css @@ -193,17 +193,25 @@ CHAT WINDOW .ChatInput { position: absolute; - margin: auto; - bottom: 90px; /* 75+15 */ - left: 0; - z-index: 600; + box-sizing: border-box; width: 100%; height: 40px; + padding-left: 15px; + padding-right: 15px; + bottom: 90px; /* 75+15 */ + z-index: 600; border: none; - color: #FFF; + -webkit-border-radius: 25px; + -moz-border-radius: 25px; + border-radius: 25px; + color: #426A91; background-color: #13223C; } +#SubscribeTextInput { + color: #FFF; +} + #ChatTextInput { display: none; } diff --git a/main/app/sprinkles/core/locale/de_DE/messages.php b/main/app/sprinkles/core/locale/de_DE/messages.php index 999947d..1af7c57 100644 --- a/main/app/sprinkles/core/locale/de_DE/messages.php +++ b/main/app/sprinkles/core/locale/de_DE/messages.php @@ -73,9 +73,9 @@ return [ "DESCRIPTION" => "In unsere Datenschutzbestimmungen erklären wir Ihnen, welche Daten wir sammeln und wozu wir diese benutzen." ], - "SLUG" => "Schnecke", - "SLUG_CONDITION" => "Schnecke/Bedingungen", - "SLUG_IN_USE" => "Die Schnecke {{slug}} existiert bereits", + "SLUG" => "Abkürzung", + "SLUG_CONDITION" => "Abkürzung/Bedingungen", + "SLUG_IN_USE" => "Die Abkürzung {{slug}} existiert bereits", "STATUS" => "Status", "SUGGEST" => "Vorschlagen", diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig index f064cea..417b7ab 100644 --- a/main/app/sprinkles/core/templates/pages/index.html.twig +++ b/main/app/sprinkles/core/templates/pages/index.html.twig @@ -49,8 +49,8 @@
- - + +
@@ -100,7 +100,7 @@ - + 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 11b0c52..eda4dcf 100644 --- a/main/app/sprinkles/core/templates/pages/partials/favicons.html.twig +++ b/main/app/sprinkles/core/templates/pages/partials/favicons.html.twig @@ -11,12 +11,12 @@ IE 10 Metro tile icon (Metro equivalent of apple-touch-icon-precomposed) (see https://github.com/audreyr/favicon-cheat-sheet) #} - + {# IE 11 Tile for Windows 8.1 Start Screen #} - - + + {# Apple touch icons #} @@ -33,7 +33,7 @@ {# Chrome icons and manifest #} - + {# Safari pinned sites icons #} -- cgit v1.2.3 From 73dc17ae28cd16a1f1c5f9933779c559ea6ce329 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Sat, 21 Apr 2018 19:20:02 +0200 Subject: Added some translations - including Klingon! --- .../sprinkles/core/assets/SiteAssets/css/main.css | 23 ++-- .../core/assets/SiteAssets/languages/ExcelFile.xls | Bin 52736 -> 0 bytes .../SiteAssets/languages/json/Translations.json | 50 --------- .../core/assets/SiteAssets/languages/json/de.json | 14 --- .../core/assets/SiteAssets/languages/json/en.json | 14 --- .../core/assets/SiteAssets/languages/json/fr.json | 14 --- .../core/assets/SiteAssets/languages/json/kl.json | 14 --- main/app/sprinkles/core/config/default.php | 1 + main/app/sprinkles/core/locale/de_DE/main.php | 4 +- main/app/sprinkles/core/locale/en_US/main.php | 4 +- main/app/sprinkles/core/locale/fr_FR/main.php | 4 +- main/app/sprinkles/core/locale/tlh/errors.php | 53 +++++++++ main/app/sprinkles/core/locale/tlh/main.php | 17 +++ main/app/sprinkles/core/locale/tlh/messages.php | 123 +++++++++++++++++++++ main/app/sprinkles/core/locale/tlh/validate.php | 32 ++++++ .../sprinkles/core/templates/pages/index.html.twig | 41 ++++--- 16 files changed, 272 insertions(+), 136 deletions(-) delete mode 100644 main/app/sprinkles/core/assets/SiteAssets/languages/ExcelFile.xls delete mode 100644 main/app/sprinkles/core/assets/SiteAssets/languages/json/Translations.json delete mode 100644 main/app/sprinkles/core/assets/SiteAssets/languages/json/de.json delete mode 100644 main/app/sprinkles/core/assets/SiteAssets/languages/json/en.json delete mode 100644 main/app/sprinkles/core/assets/SiteAssets/languages/json/fr.json delete mode 100644 main/app/sprinkles/core/assets/SiteAssets/languages/json/kl.json create mode 100644 main/app/sprinkles/core/locale/tlh/errors.php create mode 100644 main/app/sprinkles/core/locale/tlh/main.php create mode 100644 main/app/sprinkles/core/locale/tlh/messages.php create mode 100644 main/app/sprinkles/core/locale/tlh/validate.php (limited to 'main/app/sprinkles/core/templates') diff --git a/main/app/sprinkles/core/assets/SiteAssets/css/main.css b/main/app/sprinkles/core/assets/SiteAssets/css/main.css index 3bf1b55..1f3b8c0 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/css/main.css +++ b/main/app/sprinkles/core/assets/SiteAssets/css/main.css @@ -1,6 +1,8 @@ /****** GENERAL ******/ +@import url('https://fonts.googleapis.com/css?family=Nanum+Gothic'); + * { -webkit-touch-callout: none; -webkit-user-select: none; @@ -22,7 +24,7 @@ GENERAL } body { - font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; + font-family: 'Nanum Gothic', sans-serif; height: 100%; width: 100%; overflow: hidden; @@ -140,6 +142,7 @@ CHAT WINDOW word-wrap: break-word; text-align: center; padding: 10px; + font-size: 0.9em; } .ServerChatMessage { @@ -160,6 +163,13 @@ CHAT WINDOW .MessageSent { float: right; background-color: #12213b; + color: #345679; +} + +.MessageReceived { + float: left; + background-color: #13223c; + color: #f3f4f5; } .AloneMessage { @@ -186,11 +196,6 @@ CHAT WINDOW border-radius: 10px 10px 25px 25px; } -.MessageReceived { - float: left; - background-color: #13223c; -} - .ChatInput { position: absolute; box-sizing: border-box; @@ -204,14 +209,10 @@ CHAT WINDOW -webkit-border-radius: 25px; -moz-border-radius: 25px; border-radius: 25px; - color: #426A91; + color: #f3f4f5; background-color: #13223C; } -#SubscribeTextInput { - color: #FFF; -} - #ChatTextInput { display: none; } diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/ExcelFile.xls b/main/app/sprinkles/core/assets/SiteAssets/languages/ExcelFile.xls deleted file mode 100644 index ffc5552..0000000 Binary files a/main/app/sprinkles/core/assets/SiteAssets/languages/ExcelFile.xls and /dev/null differ diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/json/Translations.json b/main/app/sprinkles/core/assets/SiteAssets/languages/json/Translations.json deleted file mode 100644 index 3406ffb..0000000 --- a/main/app/sprinkles/core/assets/SiteAssets/languages/json/Translations.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "en": { - "Translator": "Marvin Borner", - "you": "you", - "Feed": "New", - "Explore": "Explore", - "Chat": "Chat", - "Friends": "Friends", - "Personal": "Personal", - "joined the group": "joined the group", - "You joined the group": "You joined the group", - "has disconnected from the server": "has disconnected from the server" - }, - "de": { - "Translator": "Marvin Borner", - "you": "du", - "Feed": "Neues", - "Explore": "Entdecken", - "Chat": "Nachrichten", - "Friends": "Freunde", - "Personal": "Persönliche Daten", - "joined the group": "ist der Gruppe beigetreten", - "You joined the group": "Du bist der Gruppe beigetreten", - "has disconnected from the server": "hat sich vom Server getrennt" - }, - "fr": { - "Translator": "Marvin Borner (non-french)", - "you": "vous", - "Feed": "D'actualités", - "Explore": "Dépister", - "Chat": "Message", - "Friends": "Camarades", - "Personal": "Personnelles", - "joined the group": "s'est joint au groupe", - "You joined the group": "Vous avez rejoint le groupe", - "has disconnected from the server": "s'est déconnecté du serveur." - }, - "kl": { - "Translator": "Marvin Borner (probably needs corrections)", - "you": "SoH", - "Feed": "De'", - "Explore": "Tu'", - "Chat": "Qin", - "Friends": "Jup", - "Personal": "Ghot", - "joined the group": "ghom muv", - "You joined the group": "Ghom muv SoH", - "has disconnected from the server": "disconnected vo' jabwI'" - } -} diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/json/de.json b/main/app/sprinkles/core/assets/SiteAssets/languages/json/de.json deleted file mode 100644 index 74d522a..0000000 --- a/main/app/sprinkles/core/assets/SiteAssets/languages/json/de.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "de": { - "Translator": "Marvin Borner", - "you": "du", - "Feed": "Neues", - "Explore": "Entdecken", - "Chat": "Nachrichten", - "Friends": "Freunde", - "Personal": "Persönliche Daten", - "joined the group": "ist der Gruppe beigetreten", - "You joined the group": "Du bist der Gruppe beigetreten", - "has disconnected from the server": "hat sich vom Server getrennt" - } -} diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/json/en.json b/main/app/sprinkles/core/assets/SiteAssets/languages/json/en.json deleted file mode 100644 index 981bb83..0000000 --- a/main/app/sprinkles/core/assets/SiteAssets/languages/json/en.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "en": { - "Translator": "Marvin Borner", - "you": "you", - "Feed": "New", - "Explore": "Explore", - "Chat": "Chat", - "Friends": "Friends", - "Personal": "Personal", - "joined the group": "joined the group", - "You joined the group": "You joined the group", - "has disconnected from the server": "has disconnected from the server" - } -} diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/json/fr.json b/main/app/sprinkles/core/assets/SiteAssets/languages/json/fr.json deleted file mode 100644 index 5c59619..0000000 --- a/main/app/sprinkles/core/assets/SiteAssets/languages/json/fr.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "fr": { - "Translator": "Marvin Borner (non-french)", - "you": "vous", - "Feed": "D'actualités", - "Explore": "Dépister", - "Chat": "Message", - "Friends": "Camarades", - "Personal": "Personnelles", - "joined the group": "s'est joint au groupe", - "You joined the group": "Vous avez rejoint le groupe", - "has disconnected from the server": "s'est déconnecté du serveur." - } -} diff --git a/main/app/sprinkles/core/assets/SiteAssets/languages/json/kl.json b/main/app/sprinkles/core/assets/SiteAssets/languages/json/kl.json deleted file mode 100644 index b21768e..0000000 --- a/main/app/sprinkles/core/assets/SiteAssets/languages/json/kl.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "kl": { - "Translator": "Marvin Borner (probably needs corrections)", - "you": "SoH", - "Feed": "De'", - "Explore": "Tu'", - "Chat": "Qin", - "Friends": "Jup", - "Personal": "Ghot", - "joined the group": "ghom muv", - "You joined the group": "Ghom muv SoH", - "has disconnected from the server": "disconnected vo' jabwI'" - } -} diff --git a/main/app/sprinkles/core/config/default.php b/main/app/sprinkles/core/config/default.php index 3478fb6..4e997d3 100644 --- a/main/app/sprinkles/core/config/default.php +++ b/main/app/sprinkles/core/config/default.php @@ -144,6 +144,7 @@ 'ar' => 'العربية', 'pt_PT' => 'Português', 'ru_RU' => 'русский', + 'tlh' => 'tlhIngan Hol', 'de_DE' => 'Deutsch', 'fr_FR' => 'Français', 'tr' => 'Türk', diff --git a/main/app/sprinkles/core/locale/de_DE/main.php b/main/app/sprinkles/core/locale/de_DE/main.php index cd9e00c..3aec435 100644 --- a/main/app/sprinkles/core/locale/de_DE/main.php +++ b/main/app/sprinkles/core/locale/de_DE/main.php @@ -10,6 +10,8 @@ return [ "CHAT_MESSAGES" => [ "USER_GROUP_JOIN" => "{{user}} ist der Gruppe beigetreten", "YOU_GROUP_JOIN" => "Du bist der Gruppe {{group}} beigetreten", - "USER_DISCONNECT" => "{{user}} hat sich vom Server getrennt" + "USER_DISCONNECT" => "{{user}} hat sich vom Server getrennt", + "JOIN_GROUP_PH" => "Betrete eine Gruppe...", + "WRITE_MESSAGE_PH" => "Schreibe eine Nachricht..." ] ]; \ No newline at end of file diff --git a/main/app/sprinkles/core/locale/en_US/main.php b/main/app/sprinkles/core/locale/en_US/main.php index 06585fc..9244f30 100644 --- a/main/app/sprinkles/core/locale/en_US/main.php +++ b/main/app/sprinkles/core/locale/en_US/main.php @@ -10,6 +10,8 @@ return [ "CHAT_MESSAGES" => [ "USER_GROUP_JOIN" => "{{user}} joined the group", "YOU_GROUP_JOIN" => "You joined the group {{group}}", - "USER_DISCONNECT" => "{{user}} has disconnected from the server" + "USER_DISCONNECT" => "{{user}} has disconnected from the server", + "JOIN_GROUP_PH" => "Join a group...", + "WRITE_MESSAGE_PH" => "Write a message..." ] ]; \ No newline at end of file diff --git a/main/app/sprinkles/core/locale/fr_FR/main.php b/main/app/sprinkles/core/locale/fr_FR/main.php index f9e2f79..bd12cf1 100644 --- a/main/app/sprinkles/core/locale/fr_FR/main.php +++ b/main/app/sprinkles/core/locale/fr_FR/main.php @@ -10,6 +10,8 @@ return [ "CHAT_MESSAGES" => [ "USER_GROUP_JOIN" => "{{user}} s'est joint au groupe", "YOU_GROUP_JOIN" => "Vous avez rejoint le groupe {{group}}", - "USER_DISCONNECT" => "{{user}} s'est déconnecté du serveur" + "USER_DISCONNECT" => "{{user}} s'est déconnecté du serveur", + "JOIN_GROUP_PH" => "Rejoindre un groupe...", + "WRITE_MESSAGE_PH" => "Ecrire un message..." ] ]; diff --git a/main/app/sprinkles/core/locale/tlh/errors.php b/main/app/sprinkles/core/locale/tlh/errors.php new file mode 100644 index 0000000..cde296b --- /dev/null +++ b/main/app/sprinkles/core/locale/tlh/errors.php @@ -0,0 +1,53 @@ + [ + "@TRANSLATION" => "Fehler", + + "400" => [ + "TITLE" => "Fehler 400: Ungültige Anforderung", + "DESCRIPTION" => "Die Anfrage-Nachricht war fehlerhaft aufgebaut.", + ], + + "404" => [ + "TITLE" => "Fehler 404: Seite nicht gefunden", + "DESCRIPTION" => "Die angeforderte Ressource wurde nicht gefunden.", + "DETAIL" => "Wir haben versucht Ihre Seite zu finden ...", + "EXPLAIN" => "Die von Ihnen gesuchte Seite konnte nicht gefunden werden.", + "RETURN" => "Klicken Sie Hier, um zur Startseite zurückzukehren." + ], + + "CONFIG" => [ + "TITLE" => "UserFrosting Konfigurationsproblem!", + "DESCRIPTION" => "Einige UserFrosting-Konfigurationsanforderungen wurden nicht erfüllt.", + "DETAIL" => "Etwas stimmt hier nicht.", + "RETURN" => "Bitte beheben Sie die folgenden Fehler dann laden Sie die Website neu." + ], + + "DESCRIPTION" => "Wir haben eine große Störung in der Macht erkannt.", + "DETAIL" => "Hier haben wir:", + + "ENCOUNTERED" => "Uhhh ... etwas ist passiert. Wir wissen nicht was.", + + "MAIL" => "Schwerwiegender Fehler beim Mailversand, wenden Sie sich an Ihren Serveradministrator. Wenn Sie der Administrator sind, überprüfen Sie bitte das UF-Mail-Protokoll.", + + "RETURN" => "Klicken Sie Hier, um zur Startseite zurückzukehren.", + + "SERVER" => "Hoppla, sieht aus als hätte der Server möglicherweise gepatzt. Wenn Sie ein Administrator sind, überprüfen Sie bitte die PHP- oder UF-Fehlerprotokolle.", + + "TITLE" => "Störung in der Kraft" + ] +]; diff --git a/main/app/sprinkles/core/locale/tlh/main.php b/main/app/sprinkles/core/locale/tlh/main.php new file mode 100644 index 0000000..6f7f533 --- /dev/null +++ b/main/app/sprinkles/core/locale/tlh/main.php @@ -0,0 +1,17 @@ + [ + "FEED" => "De'", + "EXPLORE" => "Tu'", + "CHAT" => "Jaw", + "FRIENDS" => "Jup", + "PERSONAL" => "Ghot" + ], + "CHAT_MESSAGES" => [ + "USER_GROUP_JOIN" => "Ghom muv {{user}}", + "YOU_GROUP_JOIN" => "Ghom {{group}} muv SoH", + "USER_DISCONNECT" => "{{user}} chev vo' jabwI'", + "JOIN_GROUP_PH" => "Ghom muv...", + "WRITE_MESSAGE_PH" => "QIn ghItlh...", + ] +]; \ No newline at end of file diff --git a/main/app/sprinkles/core/locale/tlh/messages.php b/main/app/sprinkles/core/locale/tlh/messages.php new file mode 100644 index 0000000..1af7c57 --- /dev/null +++ b/main/app/sprinkles/core/locale/tlh/messages.php @@ -0,0 +1,123 @@ + 1, + + "ABOUT" => "Über", + + "CAPTCHA" => [ + "@TRANSLATION" => "Sicherheitscode", + "FAIL" => "Sie haben den Sicherheitscode nicht korrekt eingegeben.", + "SPECIFY" => "Geben Sie den Sicherheitscode ein", + "VERIFY" => "Überprüfen Sie den Sicherheitscode" + ], + + "CSRF_MISSING" => "Fehlender CSRF-Token. Versuchen, die Seite zu aktualisieren und erneut zu senden?", + + "DB_INVALID" => "Keine Verbindung zur Datenbank möglich. Wenn Sie ein Administrator sind, überprüfen Sie bitte Ihr Fehlerprotokoll.", + "DESCRIPTION" => "Beschreibung", + "DOWNLOAD" => [ + "@TRANSLATION" => "Herunterladen", + "CSV" => "CSV herunterladen" + ], + + "EMAIL" => [ + "@TRANSLATION" => "E-Mail", + "YOUR" => "Ihre E-Mail-Adresse" + ], + + "HOME" => "Startseite", + + "LEGAL" => [ + "@TRANSLATION" => "Rechtsgrundsatz", + "DESCRIPTION" => "Unser Rechtsgrundsatz gilt für die Benutzung dieser Internetseite und unserer Dienste." + ], + + "LOCALE" => [ + "@TRANSLATION" => "Sprache" + ], + + "NAME" => "Name", + "NAVIGATION" => "Navigation", + "NO_RESULTS" => "Sorry, hier gibt es bisher nichts zu sehen.", + + "PAGINATION" => [ + "GOTO" => "Gehe zu Seite", + "SHOW" => "Anzeigen", + + // Paginator + // possible variables: {size}, {page}, {totalPages}, {filteredPages}, {startRow}, {endRow}, {filteredRows} and {totalRows} + // also {page:input} & {startRow:input} will add a modifiable input in place of the value + "OUTPUT" => "{startRow} bis {endRow} von {filteredRows} ({totalRows})", + + "NEXT" => "Nächste Seite", + "PREVIOUS" => "Vorherige Seite", + "FIRST" => "Erste Seite", + "LAST" => "Letzte Seite" + ], + "PRIVACY" => [ + "@TRANSLATION" => "Datenschutzbestimmungen", + "DESCRIPTION" => "In unsere Datenschutzbestimmungen erklären wir Ihnen, welche Daten wir sammeln und wozu wir diese benutzen." + ], + + "SLUG" => "Abkürzung", + "SLUG_CONDITION" => "Abkürzung/Bedingungen", + "SLUG_IN_USE" => "Die Abkürzung {{slug}} existiert bereits", + "STATUS" => "Status", + "SUGGEST" => "Vorschlagen", + + "UNKNOWN" => "Unbekannt", + + // Actions words + "ACTIONS" => "Aktionen", + "ACTIVATE" => "Aktivieren", + "ACTIVE" => "Aktiv", + "ADD" => "Hinzufügen", + "CANCEL" => "Abbrechen", + "CONFIRM" => "Bestätigen", + "CREATE" => "Erstellen", + "DELETE" => "Löschen", + "DELETE_CONFIRM" => "Möchten Sie diese wirklich löschen?", + "DELETE_CONFIRM_YES" => "Ja, löschen", + "DELETE_CONFIRM_NAMED" => "Möchten Sie {{name}} wirklich löschen?", + "DELETE_CONFIRM_YES_NAMED" => "Ja, {{name}} löschen", + "DELETE_CANNOT_UNDONE" => "Diese Aktion kann nicht rückgängig gemacht werden.", + "DELETE_NAMED" => "{{name}} löschen", + "DENY" => "Verweigern", + "DISABLE" => "Deaktivieren", + "DISABLED" => "Deaktiviert", + "EDIT" => "Bearbeiten", + "ENABLE" => "Aktivieren", + "ENABLED" => "Aktiviert", + "OVERRIDE" => "Überschreiben", + "RESET" => "Zurücksetzen", + "SAVE" => "Speichern", + "SEARCH" => "Suchen", + "SORT" => "Sortieren", + "SUBMIT" => "Einreichen", + "PRINT" => "Drucken", + "REMOVE" => "Entfernen", + "UNACTIVATED" => "Unaktiviert", + "UPDATE" => "Aktualisieren", + "YES" => "Ja", + "NO" => "Nein", + "OPTIONAL" => "Optional", + + // Misc. + "BUILT_WITH_UF" => "Errichtet mit UserFrosting", + "ADMINLTE_THEME_BY" => "Theme von Almsaeed Studio. Alle Rechte vorbehalten", + "WELCOME_TO" => "Willkommen auf {{title}}!" +]; diff --git a/main/app/sprinkles/core/locale/tlh/validate.php b/main/app/sprinkles/core/locale/tlh/validate.php new file mode 100644 index 0000000..c10a20a --- /dev/null +++ b/main/app/sprinkles/core/locale/tlh/validate.php @@ -0,0 +1,32 @@ + [ + "ARRAY" => "Die Werte für {{label}} müssen in einem Feld liegen.", + "BOOLEAN" => "Der Wert für {{label}} muss entweder '0' oder '1' sein.", + "INTEGER" => "Der Wert für {{label}} muss eine ganze Zahl sein.", + "INVALID_EMAIL" => "Ungültige E-Mail-Adresse.", + "LENGTH_RANGE" => "{{label}} muss zwischen {{min}} und {{max}} Zeichen lang sein.", + "NO_LEAD_WS" => "Der Wert für {{label}} kann nicht mit Leerzeichen, Tabulatoren oder anderen Leerzeichen beginnen.", + "NO_TRAIL_WS" => "Der Wert für {{label}} kann nicht mit Leerzeichen, Tabulatoren oder anderen Leerzeichen enden.", + "REQUIRED" => "Bitte geben Sie einen Wert für {{label}} an.", + "SPRUNJE" => [ + "BAD_FILTER" => "{{name}} ist kein gültiger Filter für dieses Sprunje.", + "BAD_LIST" => "{{name}} ist kein gültige Liste für dieses Sprunje.", + "BAD_SORT" => "{{name}} ist kein gültiges Sortierungsfeld für dieses Sprunje." + ] + ] +]; diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig index 417b7ab..26b0188 100644 --- a/main/app/sprinkles/core/templates/pages/index.html.twig +++ b/main/app/sprinkles/core/templates/pages/index.html.twig @@ -3,9 +3,9 @@ {% set page_active = "home" %} {# Overrides blocks in head of base template #} -{% block page_title %}{{translate("HOME")}}{% endblock %} +{% block page_title %}{{ translate("HOME") }}{% endblock %} -{% block page_description %}{{translate("WELCOME_TO", {'title': site.title})}}{% endblock %} +{% block page_description %}{{ translate("WELCOME_TO", {'title': site.title}) }}{% endblock %} {% block content %}
@@ -46,11 +46,13 @@
-
- -
- - +
+ +
+ +
@@ -79,14 +81,16 @@
♀
- +
♂

- {{ current_user.first_name}} {{current_user.last_name}}
- {{current_user.user_name}} -

+ {{ current_user.first_name }} {{ current_user.last_name }} +
+ {{ current_user.user_name }} +
+
@@ -94,19 +98,24 @@
- + - + - + - + - +
-- cgit v1.2.3