-
-
- {% include "navigation/main-nav.html.twig" %}
-
-
-
-
-
-
- {% block content_header %}
-
+
+
+
+ {% include "navigation/main-nav.html.twig" %}
+
+
+
+
+
+
+ {% block content_header %}
+
+ {% 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 %}
+
+ {% 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
--
cgit v1.2.3