From 517731cb59b13d17d5c81b17a9e2563060881fc4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 12 Jan 2018 20:37:56 +0100 Subject: [PATCH] Extra buttons --- resources/lang/en_US/firefly.php | 7 +++ resources/lang/en_US/import.php | 2 +- resources/views/index.twig | 88 +++++++++++++++------------ resources/views/json/piggy-banks.twig | 4 ++ resources/views/piggy-banks/show.twig | 3 +- 5 files changed, 63 insertions(+), 41 deletions(-) diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index dd6b9218a5..eec7f13268 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -45,6 +45,13 @@ return [ 'create_new_stuff' => 'Create new stuff', 'new_withdrawal' => 'New withdrawal', 'create_new_transaction' => 'Create new transaction', + 'go_to_asset_accounts' => 'View your asset accounts', + 'go_to_budgets' => 'Go to your budgets', + 'go_to_categories' => 'Go to your categories', + 'go_to_bills' => 'Go to your bills', + 'go_to_expense_accounts' => 'See your asset accounts', + 'go_to_revenue_accounts' => 'See your revenue accounts', + 'go_to_piggies' => 'Go to piggy banks', 'new_deposit' => 'New deposit', 'new_transfer' => 'New transfer', 'new_asset_account' => 'New asset account', diff --git a/resources/lang/en_US/import.php b/resources/lang/en_US/import.php index 3ccbed97ca..838111a03d 100644 --- a/resources/lang/en_US/import.php +++ b/resources/lang/en_US/import.php @@ -178,7 +178,7 @@ return [ 'spectre_extra_key_open_date' => 'Open date', 'spectre_extra_key_current_time' => 'Current time', 'spectre_extra_key_current_date' => 'Current date', - 'spectre_extra_key_cards' => 'Car', + 'spectre_extra_key_cards' => 'Cards', 'spectre_extra_key_units' => 'Units', 'spectre_extra_key_unit_price' => 'Unit price', 'spectre_extra_key_transactions_count' => 'Transactions count', diff --git a/resources/views/index.twig b/resources/views/index.twig index eaa6aa540b..a774663a41 100644 --- a/resources/views/index.twig +++ b/resources/views/index.twig @@ -16,6 +16,10 @@
+
+ {{ 'go_to_asset_accounts'|_ }} +
{# BUDGETS #} @@ -26,6 +30,10 @@
+
+ {{ 'go_to_budgets'|_ }} +
{# CATEGORIES #}
@@ -36,6 +44,10 @@
+
+ {{ 'go_to_categories'|_ }} +
@@ -63,44 +75,10 @@ {% if data[0].count > 0 %}
-
- {{ 'create_new_transaction'|_ }} - - -
{% include 'list.journals-tiny' with {'transactions': data[0],'account': data[1]} %}
{% else %}
-
- {{ 'create_new_transaction'|_ }} - - -

{{ trans('firefly.no_transactions_account', {name: data[1].name}) }} @@ -111,8 +89,32 @@ {% endif %}

- {{ formatAmountByAccount(data[1], data[1]|balance, false) }} +
+ +
+ +
+ +
+ {{ 'create_new_transaction'|_ }} + + +
+ {{ formatAmountByAccount(data[1], data[1]|balance, false) }} +
+
{% endfor %} @@ -129,7 +131,10 @@
- +
+
+ {{ 'go_to_bills'|_ }}
{% endif %} @@ -147,11 +152,14 @@

{{ 'expense_accounts'|_ }}

-
+
+ {{ 'go_to_expense_accounts'|_ }} +
{# OPTIONAL REVENUE ACCOUNTS #} {% if showDeps %} @@ -164,6 +172,10 @@
+
+ {{ 'go_to_revenue_accounts'|_ }} +
{% endif %} diff --git a/resources/views/json/piggy-banks.twig b/resources/views/json/piggy-banks.twig index 478ba1d95b..fecfcaf517 100644 --- a/resources/views/json/piggy-banks.twig +++ b/resources/views/json/piggy-banks.twig @@ -15,4 +15,8 @@ {% endfor %} +
+ {{ 'go_to_piggies'|_ }} +
diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig index ab138b1c1c..e6c9666f7c 100644 --- a/resources/views/piggy-banks/show.twig +++ b/resources/views/piggy-banks/show.twig @@ -99,8 +99,7 @@

{{ trans('form.notes') }}

-
- {{ note.text|markdown }} +
{{ note.text|markdown }}