diff options
| author | marvin-borner@live.com | 2018-04-22 16:54:30 +0200 |
|---|---|---|
| committer | marvin-borner@live.com | 2018-04-22 16:54:30 +0200 |
| commit | 2fdb14bb97e4f2dbf36b632ec891772bebe41b7d (patch) | |
| tree | 381a7875540bb210cb86954870c14e8b6465c3ff /main/app/sprinkles/core/templates | |
| parent | aad9b3116ce1158bc43c41b1eb6c78fc42d6c038 (diff) | |
| parent | 9786120e568278ae8e3af33fc5d86dcc0798f258 (diff) | |
Merge branch 'master' of github.com:marvinborner/SocialNetwork
Diffstat (limited to 'main/app/sprinkles/core/templates')
27 files changed, 364 insertions, 298 deletions
diff --git a/main/app/sprinkles/core/templates/forms/csrf.html.twig b/main/app/sprinkles/core/templates/forms/csrf.html.twig index 989f88c..989f88c 100755..100644 --- a/main/app/sprinkles/core/templates/forms/csrf.html.twig +++ b/main/app/sprinkles/core/templates/forms/csrf.html.twig diff --git a/main/app/sprinkles/core/templates/mail/.gitkeep b/main/app/sprinkles/core/templates/mail/.gitkeep index e69de29..e69de29 100755..100644 --- a/main/app/sprinkles/core/templates/mail/.gitkeep +++ b/main/app/sprinkles/core/templates/mail/.gitkeep diff --git a/main/app/sprinkles/core/templates/modals/modal.html.twig b/main/app/sprinkles/core/templates/modals/modal.html.twig index cb17dfd..cb17dfd 100755..100644 --- a/main/app/sprinkles/core/templates/modals/modal.html.twig +++ b/main/app/sprinkles/core/templates/modals/modal.html.twig diff --git a/main/app/sprinkles/core/templates/navigation/breadcrumb.html.twig b/main/app/sprinkles/core/templates/navigation/breadcrumb.html.twig index e95e302..e95e302 100755..100644 --- a/main/app/sprinkles/core/templates/navigation/breadcrumb.html.twig +++ b/main/app/sprinkles/core/templates/navigation/breadcrumb.html.twig diff --git a/main/app/sprinkles/core/templates/navigation/main-nav.html.twig b/main/app/sprinkles/core/templates/navigation/main-nav.html.twig index 3acbb87..3acbb87 100755..100644 --- a/main/app/sprinkles/core/templates/navigation/main-nav.html.twig +++ b/main/app/sprinkles/core/templates/navigation/main-nav.html.twig diff --git a/main/app/sprinkles/core/templates/pages/about.html.twig b/main/app/sprinkles/core/templates/pages/about.html.twig index 95f9b72..95f9b72 100755..100644 --- a/main/app/sprinkles/core/templates/pages/about.html.twig +++ b/main/app/sprinkles/core/templates/pages/about.html.twig diff --git a/main/app/sprinkles/core/templates/pages/abstract/base.html.twig b/main/app/sprinkles/core/templates/pages/abstract/base.html.twig index 4b3f9cf..4d2b7cd 100755..100644 --- 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 %} -<!DOCTYPE html> -<html lang="en-US"> + <!DOCTYPE html> + <html lang="en-US"> {% block head %} <head> <!-- The 'X-UA-Compatible' tag must be first, otherwise IE will not respect it. See http://stackoverflow.com/questions/25557299/internet-explorer-11-disable-display-intranet-sites-in-compatibility-view-via --> @@ -24,7 +24,7 @@ {# Override this block in a child layout template or page template to override site-level stylesheets. #} {% block stylesheets_site %} <!-- Include main CSS asset bundle --> - {{ 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 @@ <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!--[if lt IE 9]> - <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> - <script src="//oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script> + <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> + <script src="//oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script> <![endif]--> {% include "pages/partials/analytics.html.twig" %} @@ -64,40 +64,40 @@ {% block body %} <body {% block body_attributes %}{% endblock %}> - {# 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 %} - <!-- Javascript configuration --> - <script> + <!-- Javascript configuration --> + <script> {% include "pages/partials/config.js.twig" %} - </script> + </script> - {% block scripts %} - {# Override this block in a child layout template or page template to override site-level scripts. #} - {% block scripts_site %} - <!-- Load jQuery --> - <script src="//code.jquery.com/jquery-latest.min.js" ></script> - <!-- Fallback if CDN is unavailable --> - <script>window.jQuery || document.write('<script src="{{ assets.url('assets://vendor/jquery/dist/jquery.min.js', true) }}"><\/script>')</script> + {% block scripts %} + {# Override this block in a child layout template or page template to override site-level scripts. #} + {% block scripts_site %} + <!-- Load jQuery --> + <script src="//code.jquery.com/jquery-2.2.4.min.js" ></script> + <!-- Fallback if CDN is unavailable --> + <script>window.jQuery || document.write('<script src="{{ assets.url('assets://vendor/jquery/dist/jquery.min.js', true) }}"><\/script>')</script> - {{ 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 %} </body> {% endblock %} -</html> -{% endblock %} + </html> +{% 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 index b615790..9b81264 100755..100644 --- 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 %} -<div class="wrapper"> - - <header class="main-header"> - {% include "navigation/main-nav.html.twig" %} - </header> - - <!-- Full Width Column --> - <div class="content-wrapper"> - <div class="container"> - <!-- Content Header (Page header) --> - {% block content_header %} - <section class="content-header"> - <h1>{% block header_title %}{{ block('page_title') }}{% endblock %}</h1> - {% if block('page_description') is not empty %}<h1><small>{% block header_description %}{{ block('page_description') }}{% endblock %}</small></h1>{% endif %} - {% block breadcrumb %} - {% include 'navigation/breadcrumb.html.twig' with {page_title: block('page_title')} %} - {% endblock %} - <div id="alerts-page"></div> - </section> + <div class="wrapper"> + + <header class="main-header"> + {% include "navigation/main-nav.html.twig" %} + </header> + + <!-- Full Width Column --> + <div class="content-wrapper"> + <div class="container"> + <!-- Content Header (Page header) --> + {% block content_header %} + <section class="content-header"> + <h1>{% block header_title %}{{ block('page_title') }}{% endblock %}</h1> + {% if block('page_description') is not empty %}<h1><small>{% block header_description %}{{ block('page_description') }}{% endblock %}</small></h1>{% endif %} + {% block breadcrumb %} + {% include 'navigation/breadcrumb.html.twig' with {page_title: block('page_title')} %} + {% endblock %} + <div id="alerts-page"></div> + </section> + {% endblock %} + <section class="content"> + {% block body_matter %}{% endblock %} + </section> + </div> + </div> + <!-- /.content-wrapper --> + + {% block footer %} + {% include "pages/partials/footer.html.twig" %} {% endblock %} - <section class="content"> - {% block body_matter %}{% endblock %} - </section> </div> - </div> - <!-- /.content-wrapper --> - - {% block footer %} - {% include "pages/partials/footer.html.twig" %} - {% endblock %} -</div> -<!-- ./wrapper --> + <!-- ./wrapper --> {% 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 index c7c7205..c7c7205 100755..100644 --- a/main/app/sprinkles/core/templates/pages/abstract/error.html.twig +++ b/main/app/sprinkles/core/templates/pages/abstract/error.html.twig 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..2783358 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,126 @@ -{# This is the base layout template for all pages. #}
-
-{% block page %}
- <!DOCTYPE html>
- <html lang="en-US">
- {% block head %}
- <head>
- <!-- The 'X-UA-Compatible' tag must be first, otherwise IE will not respect it. See http://stackoverflow.com/questions/25557299/internet-explorer-11-disable-display-intranet-sites-in-compatibility-view-via -->
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
- <meta name="description" content="{% block page_description %}This page has not yet been configured.{% endblock %}">
- <meta name="author" content="{% block page_author %}{{ site.author }}{% endblock %}">
-
- <title>{{ site.title }} | {% block page_title %}New Page{% endblock %}</title>
-
- {% 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 %}
- <!-- Include main CSS asset bundle -->
- {{ 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 %}
- <link href="{% block page_author_link %}{{ site.uri.author }}{% endblock %}" rel="author" />
- {% endif %}
-
- {# Site publisher link #}
- {% if site.uri.publisher %}
- <link href="{% block page_publisher_link %}{{ site.uri.publisher }}{% endblock %}" rel="publisher" />
- {% endif %}
-
- {# Canonical page link #}
- {% if block('page_canonical') %}
- <link href="{{site.uri.base.scheme}}://{% block page_canonical %}{% endblock %}" rel="canonical" />
- {% endif %}
-
- <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
- <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
- <!--[if lt IE 9]>
- <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
- <script src="//oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
- <![endif]-->
-
- {% include "pages/partials/analytics.html.twig" %}
- </head>
- {% endblock %}
-
- {% block body %}
- <body {% block body_attributes %}{% endblock %}>
- {# Page Content #}
- {% block content %}{% endblock %}
-
- <!-- Javascript configuration -->
- <script>
- {% include "pages/partials/config.js.twig" %}
- </script>
-
- {% 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 %}
-
- </body>
- {% endblock %}
- </html>
-{% endblock %}
+{# This is the base layout template for all pages. #} + +{% block page %} + <!DOCTYPE html> + <html lang="en-US"> + {% block head %} + <head> + <!-- The 'X-UA-Compatible' tag must be first, otherwise IE will not respect it. See http://stackoverflow.com/questions/25557299/internet-explorer-11-disable-display-intranet-sites-in-compatibility-view-via --> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> + <meta name="description" content="{% block page_description %}This page has not yet been configured.{% endblock %}"> + <meta name="author" content="{% block page_author %}{{ site.author }}{% endblock %}"> + + <title>{{ site.title }} | {% block page_title %}New Page{% endblock %}</title> + + {% 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 %} + <!-- Include main CSS asset bundle --> + {{ 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. #} + {% 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 %} + <link href="{% block page_author_link %}{{ site.uri.author }}{% endblock %}" rel="author" /> + {% endif %} + + {# Site publisher link #} + {% if site.uri.publisher %} + <link href="{% block page_publisher_link %}{{ site.uri.publisher }}{% endblock %}" rel="publisher" /> + {% endif %} + + {# Canonical page link #} + {% if block('page_canonical') %} + <link href="{{site.uri.base.scheme}}://{% block page_canonical %}{% endblock %}" rel="canonical" /> + {% endif %} + + <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> + <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> + <!--[if lt IE 9]> + <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> + <script src="//oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script> + <![endif]--> + + {% include "pages/partials/analytics.html.twig" %} + </head> + {% endblock %} + + {% block body %} + <body {% block body_attributes %}{% endblock %}> + {# Page Content #} + {% block content %} + <div class="wrapper"> + + <header class="main-header"> + {% include "navigation/main-nav.html.twig" %} + </header> + + <!-- Full Width Column --> + <div class="content-wrapper"> + <div class="container"> + <!-- Content Header (Page header) --> + {% block content_header %} + <section class="content-header"> + <h1>{% block header_title %}{{ block('page_title') }}{% endblock %}</h1> + {% if block('page_description') is not empty %}<h1><small>{% block header_description %}{{ block('page_description') }}{% endblock %}</small></h1>{% endif %} + {% block breadcrumb %} + {% include 'navigation/breadcrumb.html.twig' with {page_title: block('page_title')} %} + {% endblock %} + <div id="alerts-page"></div> + </section> + {% endblock %} + <section class="content"> + {% block body_matter %}{% endblock %} + </section> + </div> + </div> + <!-- /.content-wrapper --> + + {% block footer %} + {% include "pages/partials/footer.html.twig" %} + {% endblock %} + </div> + <!-- ./wrapper --> + {% endblock %} + + <!-- Javascript configuration --> + <script> + {% include "pages/partials/config.js.twig" %} + </script> + + {% 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 %} + + </body> + {% endblock %} + </html> +{% 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 index 3570df8..3570df8 100755..100644 --- a/main/app/sprinkles/core/templates/pages/error/400.html.twig +++ b/main/app/sprinkles/core/templates/pages/error/400.html.twig diff --git a/main/app/sprinkles/core/templates/pages/error/404.html.twig b/main/app/sprinkles/core/templates/pages/error/404.html.twig index 6630e1b..6630e1b 100755..100644 --- a/main/app/sprinkles/core/templates/pages/error/404.html.twig +++ b/main/app/sprinkles/core/templates/pages/error/404.html.twig diff --git a/main/app/sprinkles/core/templates/pages/error/config-errors.html.twig b/main/app/sprinkles/core/templates/pages/error/config-errors.html.twig index 314b3b8..314b3b8 100755..100644 --- a/main/app/sprinkles/core/templates/pages/error/config-errors.html.twig +++ b/main/app/sprinkles/core/templates/pages/error/config-errors.html.twig diff --git a/main/app/sprinkles/core/templates/pages/index.html.twig b/main/app/sprinkles/core/templates/pages/index.html.twig index 5de2d30..26b0188 100755..100644 --- a/main/app/sprinkles/core/templates/pages/index.html.twig +++ b/main/app/sprinkles/core/templates/pages/index.html.twig @@ -3,13 +3,14 @@ {% 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 %} <div class="main"> <div class="MainTabWindows"> + <div class="carousel-cell FeedTab"> <div class="headerWrap"> <div class="header"> @@ -21,6 +22,7 @@ <hr> </div> </div> + <div class="carousel-cell ExploreTab"> <div class="headerWrap"> <div class="header"> @@ -32,27 +34,29 @@ <hr> </div> </div> - <div class="carousel-cell"> + + <div class="carousel-cell ChatTab"> <div class="headerWrap"> <div class="header"> - <span class="LeftButtonHeader"><img draggable="false" ondragstart="return false;" + <span class="LeftButtonHeader"><img class="svg" draggable="false" ondragstart="return false;" src="{{ assets.url('assets://SiteAssets/icons/BurgerMenuShort.svg') }}"></span> <span class="HeaderCaption">{{ translate("TAB_CAPTIONS.CHAT") }}</span> <span class="RightButtonHeader"><i class="fas fa-bell"></i></span> </div> <hr> </div> - <div class="MainInTab"> - <div class="ChatWindow"> - <div id="ChatMessages" class="ChatMessages"> - <!-- Messages --> - </div> - <input title="Type your message..." id="ChatTextInput" class="ChatInput" type="text"/> - <input title="Join a group..." id="SubscribeTextInput" class="ChatInput" type="text"/> + <div class="MainInTab ChatWindow"> + <div id="ChatMessages" class="ChatMessages"> + <!-- Messages --> </div> + <input title="Join a group..." placeholder="{{ translate("CHAT_MESSAGES.JOIN_GROUP_PH") }}" + id="SubscribeTextInput" class="ChatInput" type="text"/> + <input title="Type your message..." placeholder="{{ translate("CHAT_MESSAGES.WRITE_MESSAGE_PH") }}" + id="ChatTextInput" class="ChatInput" type="text"/> </div> </div> - <div class="carousel-cell"> + + <div class="carousel-cell FriendsTab"> <div class="headerWrap"> <div class="header"> <span class="LeftButtonHeader"><img draggable="false" ondragstart="return false;" @@ -63,7 +67,8 @@ <hr> </div> </div> - <div class="carousel-cell"> + + <div class="carousel-cell PersonalTab"> <div class="headerWrap"> <div class="header"> <span class="LeftButtonHeader"><img draggable="false" ondragstart="return false;" @@ -73,24 +78,44 @@ </div> <hr> </div> + <div class="MainInTab PersonalTabWindow"> + <div class="PersonalOverviewHeader"> + <div class="GenderFab Female">♀</div> + <img class="AvatarImage" src="{{ current_user.avatar }}"/> + <div class="GenderFab Male">♂</div> + </div> + <br> + <div class="DisplayNames"> + <span class="FullName">{{ current_user.first_name }} {{ current_user.last_name }}</span> + <br> + <small class="Username">{{ current_user.user_name }}</small> + </div> + <br> + <hr class="ShorterLine" align="center"> + </div> </div> </div> <div class="Navbar"> <span id="0" class="NavbarIconWrap"> - <img draggable="false" ondragstart="return false;" src="{{ assets.url('assets://SiteAssets/icons/FriendFeedOutline.svg') }}"> + <img draggable="false" ondragstart="return false;" + src="{{ assets.url('assets://SiteAssets/icons/FriendFeedOutline.svg') }}"> </span> <span id="1" class="NavbarIconWrap"> - <img draggable="false" ondragstart="return false;" src="{{ assets.url('assets://SiteAssets/icons/ExploreGlobeOutline.svg') }}"> + <img draggable="false" ondragstart="return false;" + src="{{ assets.url('assets://SiteAssets/icons/ExploreGlobeOutline.svg') }}"> </span> <span id="2" class="NavbarIconWrap ActiveTab"> - <img draggable="false" ondragstart="return false;" src="{{ assets.url('assets://SiteAssets/icons/MessageBubbleOutline.svg') }}"> + <img draggable="false" ondragstart="return false;" + src="{{ assets.url('assets://SiteAssets/icons/MessageBubbleOutlineActivated.svg') }}"> </span> <span id="3" class="NavbarIconWrap"> - <img draggable="false" ondragstart="return false;" src="{{ assets.url('assets://SiteAssets/icons/UserGroupOutline.svg') }}"> + <img draggable="false" ondragstart="return false;" + src="{{ assets.url('assets://SiteAssets/icons/UserGroupOutline.svg') }}"> </span> <span id="4" class="NavbarIconWrap"> - <img draggable="false" ondragstart="return false;" src="{{ assets.url('assets://SiteAssets/icons/UserOutline.svg') }}"> + <img draggable="false" ondragstart="return false;" + src="{{ assets.url('assets://SiteAssets/icons/UserOutline.svg') }}"> </span> </div> <span class='NavbarLine'></span> diff --git a/main/app/sprinkles/core/templates/pages/legal.html.twig b/main/app/sprinkles/core/templates/pages/legal.html.twig index c1eac19..c1eac19 100755..100644 --- a/main/app/sprinkles/core/templates/pages/legal.html.twig +++ b/main/app/sprinkles/core/templates/pages/legal.html.twig diff --git a/main/app/sprinkles/core/templates/pages/partials/alerts.html.twig b/main/app/sprinkles/core/templates/pages/partials/alerts.html.twig index a7f9c08..a7f9c08 100755..100644 --- a/main/app/sprinkles/core/templates/pages/partials/alerts.html.twig +++ b/main/app/sprinkles/core/templates/pages/partials/alerts.html.twig diff --git a/main/app/sprinkles/core/templates/pages/partials/analytics.html.twig b/main/app/sprinkles/core/templates/pages/partials/analytics.html.twig index 3fbeeed..3fbeeed 100755..100644 --- a/main/app/sprinkles/core/templates/pages/partials/analytics.html.twig +++ b/main/app/sprinkles/core/templates/pages/partials/analytics.html.twig 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..da9d9f5 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,130 @@ -{% 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("<div class='ChatMessage MessageSent AloneMessage'>" + MessageObject.Message + "</div><br><br>");
- } 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("<div class='ChatMessage MessageSent BottomMessage'>" + MessageObject.Message + "</div><br><br>");
- }
- $('.MessageSent').linkify({
- target: "_blank"
- });
- } else if (MessageObject.WasHimself === false) {
- if (!LastMessage.hasClass("MessageReceived")) {
- ChatMessages.append("<div class='ChatMessage MessageReceived AloneMessage'>" + MessageObject.Message + "</div><br><br>");
- } 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("<div class='ChatMessage MessageReceived BottomMessage'>" + MessageObject.Message + "</div><br><br>");
- }
- $('.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("<div class='ServerChatMessage'>" + GeneratedJoinMessage + ".</div><br><br>");
- } else if (MessageObject.WasHimself === true) {
- ChatMessages.empty();
- ChatMessages.append("<div class='ServerChatMessage'>{{ translate("CHAT_MESSAGES.YOU_GROUP_JOIN") }} " + MessageObject.GroupName + "</span>.</div><br><br>");
- }
- } else if (MessageObject.ServerMessageType === "UserDisconnect") {
- var TempDisconnectMessage = "{{ translate("CHAT_MESSAGES.USER_DISCONNECT", {user: "ConvertTranslatedMessageWithUsername"}) }}";
- var GeneratedDisconnectMessage = TempDisconnectMessage.replace("ConvertTranslatedMessageWithUsername", MessageObject.Username);
- ChatMessages.append("<div class='ServerChatMessage'>" + GeneratedDisconnectMessage + ".</div><br><br>");
- }
- }
-};
-
-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 + ******/ +function InitializeChatServer() { + var ChatTextInput = $("#ChatTextInput"); + var SubscribeTextInput = $("#SubscribeTextInput"); + var ChatMessages = $("#ChatMessages"); + + 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("<div class='ChatMessage MessageSent AloneMessage'>" + MessageObject.Message + "</div><br><br>"); + } 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("<div class='ChatMessage MessageSent BottomMessage'>" + MessageObject.Message + "</div><br><br>"); + } + $('.MessageSent').linkify({ + target: "_blank" + }); + } else if (MessageObject.WasHimself === false) { + if (!LastMessage.hasClass("MessageReceived")) { + ChatMessages.append("<div class='ChatMessage MessageReceived AloneMessage'>" + MessageObject.Message + "</div><br><br>"); + } 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("<div class='ChatMessage MessageReceived BottomMessage'>" + MessageObject.Message + "</div><br><br>"); + } + $('.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("<div class='ServerChatMessage'>" + TranslatedUserJoinMessage + ".</div><br><br>"); + } else if (MessageObject.WasHimself === true) { + ChatMessages.empty(); + var TranslatedYouJoinMessage = "{{ translate("CHAT_MESSAGES.YOU_GROUP_JOIN", {group: "ConvertTranslatedMessageWithGroupName"}) }}".replace("ConvertTranslatedMessageWithGroupName", '"' + MessageObject.GroupName + '"'); + ChatMessages.append("<div class='ServerChatMessage'>" + TranslatedYouJoinMessage + "</span>.</div><br><br>"); + } + } else if (MessageObject.ServerMessageType === "UserDisconnect") { + var TranslatedDisconnectMessage = "{{ translate("CHAT_MESSAGES.USER_DISCONNECT", {user: "ConvertTranslatedMessageWithUsername"}) }}".replace("ConvertTranslatedMessageWithUsername", MessageObject.Username); + ChatMessages.append("<div class='ServerChatMessage'>" + TranslatedDisconnectMessage + ".</div><br><br>"); + } + } + }; + + 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) { + ChatSocket.send(JSON.stringify({ClientMessageType: "Subscribe", Channel: channel})); + SubscribeTextInput.hide(); + ChatTextInput.show(); + } + + function sendMessage(msg) { + ChatSocket.send(JSON.stringify({ClientMessageType: "Message", Message: msg})); + ChatTextInput.val(""); + } + }; +} + +InitializeChatServer(); + {% 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 index a7a60f0..a7a60f0 100755..100644 --- a/main/app/sprinkles/core/templates/pages/partials/config.js.twig +++ b/main/app/sprinkles/core/templates/pages/partials/config.js.twig 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 100755..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) #} -<meta name="msapplication-TileColor" content="#603cba"> +<meta name="msapplication-TileColor" content="#0c1d34"> <meta name="msapplication-TileImage" content="{{ assets.url('assets://userfrosting/favicons/mstile-144x144.png') }}"> {# IE 11 Tile for Windows 8.1 Start Screen #} -<meta name="application-name" content="UserFrosting"> -<meta name="msapplication-tooltip" content="A secure, modern user management system for PHP."> +<meta name="application-name" content="BEAM-Messenger"> +<meta name="msapplication-tooltip" content="A secure, fast and simple messenger."> <meta name="msapplication-config" content="{{ assets.url('assets://userfrosting/favicons/ieconfig.xml') }}"> {# Apple touch icons #} @@ -33,7 +33,7 @@ {# Chrome icons and manifest #} <link rel="icon" type="image/png" sizes="192x192" href="{{ assets.url('assets://userfrosting/favicons/android-chrome-192x192.png') }}"> <link rel="manifest" href="{{ assets.url('assets://userfrosting/favicons/manifest.json') }}"> -<meta name="theme-color" content="#f3f2e4"> +<meta name="theme-color" content="#0c1d34"> {# Safari pinned sites icons #} <link rel="mask-icon" href="{{ assets.url('assets://userfrosting/favicons/safari-pinned-tab.svg') }}" color="#f39ca1"> diff --git a/main/app/sprinkles/core/templates/pages/partials/footer.html.twig b/main/app/sprinkles/core/templates/pages/partials/footer.html.twig index e7a93c3..e7a93c3 100755..100644 --- a/main/app/sprinkles/core/templates/pages/partials/footer.html.twig +++ b/main/app/sprinkles/core/templates/pages/partials/footer.html.twig diff --git a/main/app/sprinkles/core/templates/pages/partials/legal.html.twig b/main/app/sprinkles/core/templates/pages/partials/legal.html.twig index 65fe61c..65fe61c 100755..100644 --- a/main/app/sprinkles/core/templates/pages/partials/legal.html.twig +++ b/main/app/sprinkles/core/templates/pages/partials/legal.html.twig diff --git a/main/app/sprinkles/core/templates/pages/partials/page.js.twig b/main/app/sprinkles/core/templates/pages/partials/page.js.twig index 51a1703..51a1703 100755..100644 --- a/main/app/sprinkles/core/templates/pages/partials/page.js.twig +++ b/main/app/sprinkles/core/templates/pages/partials/page.js.twig diff --git a/main/app/sprinkles/core/templates/pages/partials/privacy.html.twig b/main/app/sprinkles/core/templates/pages/partials/privacy.html.twig index 6a6cafc..6a6cafc 100755..100644 --- a/main/app/sprinkles/core/templates/pages/partials/privacy.html.twig +++ b/main/app/sprinkles/core/templates/pages/partials/privacy.html.twig diff --git a/main/app/sprinkles/core/templates/pages/privacy.html.twig b/main/app/sprinkles/core/templates/pages/privacy.html.twig index 75db423..75db423 100755..100644 --- a/main/app/sprinkles/core/templates/pages/privacy.html.twig +++ b/main/app/sprinkles/core/templates/pages/privacy.html.twig diff --git a/main/app/sprinkles/core/templates/tables/table-paginated.html.twig b/main/app/sprinkles/core/templates/tables/table-paginated.html.twig index 5b94120..5b94120 100755..100644 --- a/main/app/sprinkles/core/templates/tables/table-paginated.html.twig +++ b/main/app/sprinkles/core/templates/tables/table-paginated.html.twig 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 index 0c4dfed..0c4dfed 100755..100644 --- a/main/app/sprinkles/core/templates/tables/table-tool-menu.html.twig +++ b/main/app/sprinkles/core/templates/tables/table-tool-menu.html.twig |