diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index 5b2088beab..ff7851dd66 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -31,6 +31,11 @@ class General extends Twig_Extension return App::make('amount')->format($string); }, ['is_safe' => ['html']] ); + $filters[] = new Twig_SimpleFilter( + 'formatAmountPlain', function ($string) { + return App::make('amount')->format($string, false); + } + ); $filters[] = new Twig_SimpleFilter( 'formatJournal', function ($journal) { diff --git a/resources/twig/emails/password.twig b/resources/twig/emails/password.twig new file mode 100644 index 0000000000..2aba25c1fc --- /dev/null +++ b/resources/twig/emails/password.twig @@ -0,0 +1 @@ +Click here to reset your password: {{ url('password/reset/' . token) }} diff --git a/resources/twig/emails/registered.twig b/resources/twig/emails/registered.twig new file mode 100644 index 0000000000..4550f79f9d --- /dev/null +++ b/resources/twig/emails/registered.twig @@ -0,0 +1,5 @@ +Hey there! + +Welkome to Firefly III. Your registration has made it, and this email is here to confirm it. + +Thanks for using Firefly! diff --git a/resources/twig/errors/503.twig b/resources/twig/errors/503.twig new file mode 100644 index 0000000000..0847a1c967 --- /dev/null +++ b/resources/twig/errors/503.twig @@ -0,0 +1,41 @@ + + + + + + + +
+
+
Be right back.
+
+
+ + diff --git a/resources/twig/list/piggy-banks.twig b/resources/twig/list/piggy-banks.twig new file mode 100644 index 0000000000..ef6cf6be63 --- /dev/null +++ b/resources/twig/list/piggy-banks.twig @@ -0,0 +1,56 @@ + + + {% for piggyBank in piggyBanks %} + + + + + + + + + + + + + +{% endfor %} + +
+ + + +
+ + +
+ 		+ {{ piggyBank.name }} + + {{piggyBank.savedSoFar|formatAmountPlain }} + + {% if piggyBank.savedSoFar > 0 %} + + {% endif %} + +
+
+ {{ piggyBank.percentage }}% +
+
+ 		+ {% if piggyBank.leftToSave > 0 %} + + {% endif %} + + {{ piggyBank.targetamount|formatAmount }} + {% if piggyBank.leftToSave > 0 %} + ({{ piggyBank.leftToSave|formatAmount }}) + {% endif %} +
\ No newline at end of file diff --git a/resources/twig/piggy-banks/index.twig b/resources/twig/piggy-banks/index.twig new file mode 100644 index 0000000000..62c3e1254f --- /dev/null +++ b/resources/twig/piggy-banks/index.twig @@ -0,0 +1,62 @@ +{% extends "./layout/default.twig" %} +{% block content %} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }} +
+
+

+ Create new piggy bank +

+
+
+ +
+
+
+
Piggy banks
+ {% include 'list/piggy-banks.twig' %} +
+
+
+ +
+
+
+
+ Account status +
+ + + + + + + + + + {% for id,info in accounts %} + + + + + + + + + {% endfor %} +
AccountBalanceLeft for piggy banksSum of piggy banksSaved so farLeft to save
{{ info.name }}{{ info.balance|formatAmount }}{{ info.leftForPiggyBanks|formatAmount }}{{ info.sumOfTargets|formatAmount }}{{ info.sumOfSaved|formatAmount }}{{ info.leftToSave|formatAmount }}
+
+
+
+ + + + +{% endblock %} +{% block scripts %} + + +{% endblock %} \ No newline at end of file