From 81d9d4dbc76fdc619530bce1037760ae95ce2661 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 2 May 2015 13:20:49 +0200 Subject: [PATCH] Various files updated to twig [skip ci] --- app/Providers/ConfigServiceProvider.php | 2 + resources/twig/auth/password.twig | 45 ++++++++++++++++ resources/twig/auth/register.twig | 58 +++++++++++++++++++++ resources/twig/list/reminders.twig | 45 ++++++++++++++++ resources/twig/profile/change-password.twig | 55 +++++++++++++++++++ resources/twig/profile/delete-account.twig | 49 +++++++++++++++++ resources/twig/profile/index.twig | 19 +++++++ resources/twig/reminders/index.twig | 37 +++++++++++++ resources/twig/reminders/show.twig | 40 ++++++++++++++ 9 files changed, 350 insertions(+) create mode 100644 resources/twig/auth/password.twig create mode 100644 resources/twig/auth/register.twig create mode 100644 resources/twig/list/reminders.twig create mode 100644 resources/twig/profile/change-password.twig create mode 100644 resources/twig/profile/delete-account.twig create mode 100644 resources/twig/profile/index.twig create mode 100644 resources/twig/reminders/index.twig create mode 100644 resources/twig/reminders/show.twig diff --git a/app/Providers/ConfigServiceProvider.php b/app/Providers/ConfigServiceProvider.php index cc915d0f6f..1f55469074 100644 --- a/app/Providers/ConfigServiceProvider.php +++ b/app/Providers/ConfigServiceProvider.php @@ -162,6 +162,7 @@ class ConfigServiceProvider extends ServiceProvider ], 'Session', 'Route', + 'Auth', 'URL', 'Config', 'ExpandedForm' => [ @@ -208,6 +209,7 @@ class ConfigServiceProvider extends ServiceProvider 'elixir', 'head', 'last', + 'old' ], /* diff --git a/resources/twig/auth/password.twig b/resources/twig/auth/password.twig new file mode 100644 index 0000000000..720bce9a88 --- /dev/null +++ b/resources/twig/auth/password.twig @@ -0,0 +1,45 @@ +{% extends "./layout/guest.twig" %} + +{% block content %} +
+
+ +
+
+ +{% endblock %} \ No newline at end of file diff --git a/resources/twig/auth/register.twig b/resources/twig/auth/register.twig new file mode 100644 index 0000000000..d564378099 --- /dev/null +++ b/resources/twig/auth/register.twig @@ -0,0 +1,58 @@ +{% extends "./layout/guest.twig" %} + +{% block content %} +
+
+ +
+
+{% endblock %} diff --git a/resources/twig/list/reminders.twig b/resources/twig/list/reminders.twig new file mode 100644 index 0000000000..991b8b37ee --- /dev/null +++ b/resources/twig/list/reminders.twig @@ -0,0 +1,45 @@ +
+ {% if reminders|length > 0 %} + {% for reminder in reminders %} +
+
+
+ + {% if reminder.notnow %} + Dismissed reminder + {% else %} + Reminder + {% endif %} + for piggy bank "{{reminder.remindersable.name}}" + +
+
+

+ This reminder is active between {{reminder.startdate.format('jS F Y')}} + and {{reminder.enddate.format('jS F Y')}}. +

+ {% if reminder.description %} +

{{ reminder.description|raw }}

+ {% endif %} +
+
+
+ {% if not reminder.notnow %} + Dismiss + {% endif %} + {% if reminder.active %} + Act + {% endif %} +
+
+
+
+ {% endfor %} + {% else %} +
+

+ (No reminders) +

+
+ {% endif %} +
diff --git a/resources/twig/profile/change-password.twig b/resources/twig/profile/change-password.twig new file mode 100644 index 0000000000..16900564f3 --- /dev/null +++ b/resources/twig/profile/change-password.twig @@ -0,0 +1,55 @@ +{% extends "./layout/default.twig" %} +{% block content %} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }} +
+
+
+
+ Change your password +
+
+ + {% if errors|length > 0 %} +
    +
      + {% for error in errors.all %} +
    • {{ error }}
      • + {% endfor %} +
    +
+ + {% endif %} + + + {{ Form.open({'class' : 'form-horizontal','id' : 'change-password'}) }} +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+
+ +
+
+ +
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/resources/twig/profile/delete-account.twig b/resources/twig/profile/delete-account.twig new file mode 100644 index 0000000000..f3e5f94e1c --- /dev/null +++ b/resources/twig/profile/delete-account.twig @@ -0,0 +1,49 @@ +{% extends "./layout/default.twig" %} +{% block content %} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }} +
+
+
+
+ Delete your account +
+
+ +

+ Deleting your account will also delete any accounts, transactions, anything + you might have saved into Firefly III. It'll be GONE. +

+

+ Enter your password to continue. +

+ + {% if errors|length > 0 %} +
    +
      + {% for error in errors.all %} +
    • {{ error }}
      • + {% endfor %} +
    +
+ + {% endif %} + + {{ Form.open({'class' : 'form-horizontal','id' : 'change-password'}) }} +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/resources/twig/profile/index.twig b/resources/twig/profile/index.twig new file mode 100644 index 0000000000..244a1a6e35 --- /dev/null +++ b/resources/twig/profile/index.twig @@ -0,0 +1,19 @@ +{% extends "./layout/default.twig" %} +{% block content %} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }} +
+
+
+
+ Options +
+
+ +
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/resources/twig/reminders/index.twig b/resources/twig/reminders/index.twig new file mode 100644 index 0000000000..d2fbedf270 --- /dev/null +++ b/resources/twig/reminders/index.twig @@ -0,0 +1,37 @@ +{% extends "./layout/default.twig" %} +{% block content %} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }} + +
+
+

Active reminders

+
+
+ + {% include 'list/reminders.twig' with {'reminders': active} %} + +
+
+

Dismissed reminders

+
+
+ + {% include 'list/reminders.twig' with {'reminders': dismissed} %} + +
+
+

Expired reminders

+
+
+ + {% include 'list/reminders.twig' with {'reminders': expired} %} + +
+
+

Inactive reminders

+
+
+ + {% include 'list/reminders.twig' with {'reminders': inactive} %} + +{% endblock %} diff --git a/resources/twig/reminders/show.twig b/resources/twig/reminders/show.twig new file mode 100644 index 0000000000..b78eb138a0 --- /dev/null +++ b/resources/twig/reminders/show.twig @@ -0,0 +1,40 @@ +{% extends "./layout/default.twig" %} +{% block content %} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, reminder) }} +
+
+
+
+ + {% if reminder.notnow %} + Dismissed reminder + {% else %} + Reminder + {% endif %} + for piggy bank "{{reminder.remindersable.name}}" + +
+
+

+ Active between {{reminder.startdate.format('jS F Y')}} + and {{reminder.enddate.format('jS F Y')}}. +

+ + {% if reminder.description %} +

{!! reminder.description !!}

+ {% endif %} +
+
+
+ {% if not reminder.notnow %} + Dismiss + {% endif %} + {% if reminder.active %} + Act + {% endif %} +
+
+
+
+
+{% endblock %} \ No newline at end of file