From 4627ea1dec7ef05b2a977f3f15c2aea46f6ad917 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 29 Mar 2016 11:54:26 +0200 Subject: [PATCH] Updated views for user activation. --- resources/views/auth/confirmation/error.twig | 43 +++++++++++++++++++ .../views/auth/confirmation/no-resent.twig | 43 +++++++++++++++++++ resources/views/auth/confirmation/resent.twig | 43 +++++++++++++++++++ resources/views/auth/password.twig | 4 +- 4 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 resources/views/auth/confirmation/error.twig create mode 100644 resources/views/auth/confirmation/no-resent.twig create mode 100644 resources/views/auth/confirmation/resent.twig diff --git a/resources/views/auth/confirmation/error.twig b/resources/views/auth/confirmation/error.twig new file mode 100644 index 0000000000..02c38dab51 --- /dev/null +++ b/resources/views/auth/confirmation/error.twig @@ -0,0 +1,43 @@ + + + + + + Firefly III + + + + + + + + + + {% include('partials/favicons.twig') %} + + + +
+ + +
+
+

{{ 'confirm_account_header'|_ }}

+
+
+ +
+
+

+ {{ 'confirm_account_intro'|_ }} +

+

+ {{ 'confirm_account_resend_email'|_ }} +

+
+
+
+ + diff --git a/resources/views/auth/confirmation/no-resent.twig b/resources/views/auth/confirmation/no-resent.twig new file mode 100644 index 0000000000..8ac79ec1bf --- /dev/null +++ b/resources/views/auth/confirmation/no-resent.twig @@ -0,0 +1,43 @@ + + + + + + Firefly III + + + + + + + + + + {% include('partials/favicons.twig') %} + + + +
+ + +
+
+

{{ 'confirm_account_not_resent_header'|_ }}

+
+
+ +
+
+

+ {{ trans('firefly.confirm_account_not_resent_intro', {owner:owner})|raw }} +

+

+ {{ 'confirm_account_not_resent_go_home'|_ }} +

+
+
+
+ + diff --git a/resources/views/auth/confirmation/resent.twig b/resources/views/auth/confirmation/resent.twig new file mode 100644 index 0000000000..35d6468f95 --- /dev/null +++ b/resources/views/auth/confirmation/resent.twig @@ -0,0 +1,43 @@ + + + + + + Firefly III + + + + + + + + + + {% include('partials/favicons.twig') %} + + + +
+ + +
+
+

{{ 'confirm_account_is_resent_header'|_ }}

+
+
+ +
+
+

+ {{ trans('firefly.confirm_account_is_resent_text', {owner:owner})|raw }} +

+

+ {{ 'confirm_account_is_resent_go_home'|_ }} +

+
+
+
+ + diff --git a/resources/views/auth/password.twig b/resources/views/auth/password.twig index 20323c501f..3f9a286116 100644 --- a/resources/views/auth/password.twig +++ b/resources/views/auth/password.twig @@ -50,7 +50,9 @@ {% endif %} I want to login
- I forgot my password + {% if Config.get('auth.allow_register') %} + Register a new account
+ {% endif %}