From cf14306c2b3f82a81f8d56669a71633b4d4b5fce Mon Sep 17 00:00:00 2001
From: marvin-borner@live.com
Date: Mon, 16 Apr 2018 21:09:05 +0200
Subject: Main merge to user management system - files are now at /main/public/
---
.../templates/forms/settings-account.html.twig | 37 ++++++++
.../templates/forms/settings-profile.html.twig | 40 ++++++++
.../templates/mail/password-reset.html.twig | 22 +++++
.../templates/mail/resend-verification.html.twig | 17 ++++
.../templates/mail/verify-account.html.twig | 21 +++++
.../account/templates/modals/tos.html.twig | 16 ++++
.../templates/navigation/main-nav.html.twig | 13 +++
.../templates/navigation/user-card.html.twig | 33 +++++++
.../templates/pages/account-settings.html.twig | 45 +++++++++
.../templates/pages/error/compromised.html.twig | 11 +++
.../templates/pages/forgot-password.html.twig | 46 +++++++++
.../account/templates/pages/register.html.twig | 105 +++++++++++++++++++++
.../templates/pages/resend-verification.html.twig | 46 +++++++++
.../templates/pages/reset-password.html.twig | 56 +++++++++++
.../account/templates/pages/set-password.html.twig | 55 +++++++++++
.../account/templates/pages/sign-in.html.twig | 84 +++++++++++++++++
16 files changed, 647 insertions(+)
create mode 100755 main/app/sprinkles/account/templates/forms/settings-account.html.twig
create mode 100755 main/app/sprinkles/account/templates/forms/settings-profile.html.twig
create mode 100755 main/app/sprinkles/account/templates/mail/password-reset.html.twig
create mode 100755 main/app/sprinkles/account/templates/mail/resend-verification.html.twig
create mode 100755 main/app/sprinkles/account/templates/mail/verify-account.html.twig
create mode 100755 main/app/sprinkles/account/templates/modals/tos.html.twig
create mode 100755 main/app/sprinkles/account/templates/navigation/main-nav.html.twig
create mode 100755 main/app/sprinkles/account/templates/navigation/user-card.html.twig
create mode 100755 main/app/sprinkles/account/templates/pages/account-settings.html.twig
create mode 100755 main/app/sprinkles/account/templates/pages/error/compromised.html.twig
create mode 100755 main/app/sprinkles/account/templates/pages/forgot-password.html.twig
create mode 100755 main/app/sprinkles/account/templates/pages/register.html.twig
create mode 100755 main/app/sprinkles/account/templates/pages/resend-verification.html.twig
create mode 100755 main/app/sprinkles/account/templates/pages/reset-password.html.twig
create mode 100755 main/app/sprinkles/account/templates/pages/set-password.html.twig
create mode 100755 main/app/sprinkles/account/templates/pages/sign-in.html.twig
(limited to 'main/app/sprinkles/account/templates')
diff --git a/main/app/sprinkles/account/templates/forms/settings-account.html.twig b/main/app/sprinkles/account/templates/forms/settings-account.html.twig
new file mode 100755
index 0000000..996b27b
--- /dev/null
+++ b/main/app/sprinkles/account/templates/forms/settings-account.html.twig
@@ -0,0 +1,37 @@
+
\ No newline at end of file
diff --git a/main/app/sprinkles/account/templates/forms/settings-profile.html.twig b/main/app/sprinkles/account/templates/forms/settings-profile.html.twig
new file mode 100755
index 0000000..0b0a788
--- /dev/null
+++ b/main/app/sprinkles/account/templates/forms/settings-profile.html.twig
@@ -0,0 +1,40 @@
+
diff --git a/main/app/sprinkles/account/templates/mail/password-reset.html.twig b/main/app/sprinkles/account/templates/mail/password-reset.html.twig
new file mode 100755
index 0000000..37096ce
--- /dev/null
+++ b/main/app/sprinkles/account/templates/mail/password-reset.html.twig
@@ -0,0 +1,22 @@
+{% block subject %}
+ {{site.title}} - your password reset request
+{% endblock %}
+
+{% block body %}
+Dear {{user.first_name}},
+
+
+A lost password request has been submitted for your account with {{site.title}} ({{site.uri.public}}) on {{request_date | date('m/d/Y g:i A')}}.
+
+
+If you or someone you trust sent this request, and you wish to set a new password, please click this link: {{site.uri.public}}/account/set-password/confirm?token={{token}}
+
+
+
+If you did not expect this email, you may click this link to cancel the request: {{site.uri.public}}/account/set-password/deny?token={{token}} , or simply do nothing and the request will expire on its own.
+
+
+With regards,
+The {{site.title}} Team
+
+{% endblock %}
\ No newline at end of file
diff --git a/main/app/sprinkles/account/templates/mail/resend-verification.html.twig b/main/app/sprinkles/account/templates/mail/resend-verification.html.twig
new file mode 100755
index 0000000..ba1c243
--- /dev/null
+++ b/main/app/sprinkles/account/templates/mail/resend-verification.html.twig
@@ -0,0 +1,17 @@
+{% block subject %}
+ {{site.title}} - verify your account
+{% endblock %}
+
+{% block body %}
+Dear {{user.first_name}},
+
+
+We have received a new verification request for your account with {{site.title}} ({{site.uri.public}}). Please follow the link below to verify your account. If your account is already active, please disregard this message.
+
+{{site.uri.public}}/account/verify?token={{token}}
+
+
+With regards,
+The {{site.title}} Team
+
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/mail/verify-account.html.twig b/main/app/sprinkles/account/templates/mail/verify-account.html.twig
new file mode 100755
index 0000000..aa342c7
--- /dev/null
+++ b/main/app/sprinkles/account/templates/mail/verify-account.html.twig
@@ -0,0 +1,21 @@
+{% block subject %}
+ Welcome to {{site.title}} - please verify your account
+{% endblock %}
+
+{% block body %}
+Dear {{user.first_name}},
+
+
+You are receiving this email because you registered with {{site.title}} ({{site.uri.public}}).
+
+
+You will need to verify your account before you can login. Please follow the link below to verify your account.
+
+
+{{site.uri.public}}/account/verify?token={{token}}
+
+
+With regards,
+The {{site.title}} Team
+
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/modals/tos.html.twig b/main/app/sprinkles/account/templates/modals/tos.html.twig
new file mode 100755
index 0000000..d51d897
--- /dev/null
+++ b/main/app/sprinkles/account/templates/modals/tos.html.twig
@@ -0,0 +1,16 @@
+{% extends 'modals/modal.html.twig' %}
+
+{% block modal_title %}
+ {{translate("TOS_FOR", {title: site.title})}}
+{% endblock %}
+
+{% block modal_body %}
+
+ {% include 'pages/partials/legal.html.twig' %}
+ {% include 'pages/partials/privacy.html.twig' %}
+
+{% endblock %}
+
+{% block modal_footer %}
+ Got it!
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/navigation/main-nav.html.twig b/main/app/sprinkles/account/templates/navigation/main-nav.html.twig
new file mode 100755
index 0000000..e44c9c8
--- /dev/null
+++ b/main/app/sprinkles/account/templates/navigation/main-nav.html.twig
@@ -0,0 +1,13 @@
+{# This extend the same file from core to add a sign-up/sign-in or "my account" link to the "home page" nav menu. #}
+{% extends "@core/navigation/main-nav.html.twig" %}
+
+{% block secondary_nav %}
+ {{parent()}}
+ {% if not checkAuthenticated() %}
+
+ {{translate("SIGNIN")}}
+
+ {% else %}
+ {% include "navigation/user-card.html.twig" %}
+ {% endif %}
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/navigation/user-card.html.twig b/main/app/sprinkles/account/templates/navigation/user-card.html.twig
new file mode 100755
index 0000000..47e18f1
--- /dev/null
+++ b/main/app/sprinkles/account/templates/navigation/user-card.html.twig
@@ -0,0 +1,33 @@
+{% block userCard %}
+
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/pages/account-settings.html.twig b/main/app/sprinkles/account/templates/pages/account-settings.html.twig
new file mode 100755
index 0000000..61cd3d0
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/account-settings.html.twig
@@ -0,0 +1,45 @@
+{% extends forcedLayout ? forcedLayout : "pages/abstract/default.html.twig" %}
+
+{% set page_active = "account-settings" %}
+
+{% block stylesheets_page %}
+
+ {{ assets.css('css/form-widgets') | raw }}
+{% endblock %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{translate("ACCOUNT.SETTINGS")}}{% endblock %}
+
+{% block page_description %}{{translate("ACCOUNT.SETTINGS.DESCRIPTION")}}{% endblock %}
+
+{% block body_matter %}
+
+
+
+ {% block settings_profile_box %}
+
+ {% include "forms/settings-profile.html.twig" %}
+
+ {% endblock %}
+
+
+ {% block settings_account_box %}
+
+ {% include "forms/settings-account.html.twig" %}
+
+ {% endblock %}
+
+
+{% endblock %}
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/form-widgets') | raw }}
+
+
+ {{ assets.js('js/pages/account-settings') | raw }}
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/pages/error/compromised.html.twig b/main/app/sprinkles/account/templates/pages/error/compromised.html.twig
new file mode 100755
index 0000000..6048619
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/error/compromised.html.twig
@@ -0,0 +1,11 @@
+{% extends "pages/abstract/error.html.twig" %}
+
+{% block page_title %}{{ translate('ACCOUNT.SESSION_COMPROMISED.TITLE') }}{% endblock %}
+
+{% block page_description %}{{ translate('ACCOUNT.SESSION_COMPROMISED.TITLE') }}{% endblock %}
+
+{% block heading %}
+ {{ translate('ACCOUNT.SESSION_COMPROMISED.TEXT', {
+ 'url' : site.uri.public ~ '/account/sign-in'
+ }) | raw }}
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/pages/forgot-password.html.twig b/main/app/sprinkles/account/templates/pages/forgot-password.html.twig
new file mode 100755
index 0000000..72b1a2a
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/forgot-password.html.twig
@@ -0,0 +1,46 @@
+{% extends "pages/abstract/base.html.twig" %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{translate("PASSWORD.FORGOTTEN")}}{% endblock %}
+
+{% block page_description %}{{translate("PASSWORD.FORGET.PAGE")}}{% endblock %}
+
+{% block body_attributes %}
+ class="hold-transition login-page"
+{% endblock %}
+
+{% block content %}
+
+
+
+
+
+
{{translate("PASSWORD.FORGOTTEN")}}
+
{{translate("PASSWORD.FORGET.EMAIL")}}
+
+
+
+
+
+
+{% endblock %}
+
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/pages/forgot-password') | raw }}
+
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/pages/register.html.twig b/main/app/sprinkles/account/templates/pages/register.html.twig
new file mode 100755
index 0000000..bd155ba
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/register.html.twig
@@ -0,0 +1,105 @@
+{% extends "pages/abstract/base.html.twig" %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{translate('REGISTER')}}{% endblock %}
+
+{% block page_description %}{{translate('PAGE.LOGIN.DESCRIPTION', {'site_name': site.title })}}{% endblock %}
+
+{% block body_attributes %}
+ class="hold-transition login-page"
+{% endblock %}
+
+{% block content %}
+
+
+
+
+
+
{{translate('REGISTER')}}
+
+
+
+
+
+
+
+
+{% endblock %}
+
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/pages/register') | raw }}
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/pages/resend-verification.html.twig b/main/app/sprinkles/account/templates/pages/resend-verification.html.twig
new file mode 100755
index 0000000..627dce0
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/resend-verification.html.twig
@@ -0,0 +1,46 @@
+{% extends "pages/abstract/base.html.twig" %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{translate("ACCOUNT.VERIFICATION.RESEND")}}{% endblock %}
+
+{% block page_description %}{{translate("ACCOUNT.VERIFICATION.PAGE")}}{% endblock %}
+
+{% block body_attributes %}
+ class="hold-transition login-page"
+{% endblock %}
+
+{% block content %}
+
+
+
+
+
+
{{translate("ACCOUNT.VERIFICATION.RESEND")}}
+
{{translate("ACCOUNT.VERIFICATION.EMAIL")}}
+
+
+
+
+
+
+{% endblock %}
+
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/pages/resend-verification') | raw }}
+
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/pages/reset-password.html.twig b/main/app/sprinkles/account/templates/pages/reset-password.html.twig
new file mode 100755
index 0000000..8e3a24a
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/reset-password.html.twig
@@ -0,0 +1,56 @@
+{% extends "pages/abstract/base.html.twig" %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{translate("PASSWORD.RESET")}}{% endblock %}
+
+{% block page_description %}{{translate("PASSWORD.RESET.PAGE")}}{% endblock %}
+
+{% block body_attributes %}
+ class="hold-transition login-page"
+{% endblock %}
+
+{% block content %}
+
+
+
+
+
+
{{translate("PASSWORD.RESET")}}
+
{{translate("PASSWORD.RESET.CHOOSE")}}
+
+
+
+
+
+
+{% endblock %}
+
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/pages/set-or-reset-password') | raw }}
+
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/pages/set-password.html.twig b/main/app/sprinkles/account/templates/pages/set-password.html.twig
new file mode 100755
index 0000000..3c4fe2b
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/set-password.html.twig
@@ -0,0 +1,55 @@
+{% extends "pages/abstract/base.html.twig" %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{translate("PASSWORD.CREATE")}}{% endblock %}
+
+{% block page_description %}{{translate("PASSWORD.CREATE.PAGE")}}{% endblock %}
+
+{% block body_attributes %}
+ class="hold-transition login-page"
+{% endblock %}
+
+{% block content %}
+
+
+
+
+
+
{{translate("PASSWORD.CREATE")}}
+
{{translate("WELCOME_TO", {'title': site.title})}} {{translate("PASSWORD.CREATE.PAGE")}}
+
+
+
+
+
+
+{% endblock %}
+
+{% block scripts_page %}
+
+
+
+
+ {{ assets.js('js/pages/set-or-reset-password') | raw }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/main/app/sprinkles/account/templates/pages/sign-in.html.twig b/main/app/sprinkles/account/templates/pages/sign-in.html.twig
new file mode 100755
index 0000000..2fb6e1c
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/sign-in.html.twig
@@ -0,0 +1,84 @@
+{% extends "pages/abstract/base.html.twig" %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{translate('SIGNIN')}}{% endblock %}
+
+{% block page_description %}{{translate('PAGE.LOGIN.DESCRIPTION', {'site_name': site.title })}}{% endblock %}
+
+{% block body_attributes %}
+ class="hold-transition login-page"
+{% endblock %}
+
+{% block content %}
+
+
+{% endblock %}
+
+{% block scripts_page %}
+
+
+
+
+
+
+ {{ assets.js('js/pages/sign-in') | raw }}
+{% endblock %}
--
cgit v1.2.3