From ad18b9b81b3566711b3d06ba9339c3b34cb0fd66 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 9 Mar 2018 05:44:35 +0100 Subject: [PATCH] Remove optional chart (always enabled) --- app/Http/Controllers/HomeController.php | 3 +- resources/views/index.twig | 296 +++++++++--------- .../views/{preferences => profile}/code.twig | 0 3 files changed, 148 insertions(+), 151 deletions(-) rename resources/views/{preferences => profile}/code.twig (100%) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index d1587d0824..70b27913b9 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -165,7 +165,6 @@ class HomeController extends Controller /** @var Carbon $end */ $end = session('end', Carbon::now()->endOfMonth()); $accounts = $repository->getAccountsById($frontPage->data); - $showDeps = Preferences::get('showDepositsFrontpage', false)->data; $today = new Carbon; // zero bills? Hide some elements from view. @@ -185,7 +184,7 @@ class HomeController extends Controller return view( 'index', - compact('count', 'subTitle', 'transactions', 'showDeps', 'billCount', 'start', 'end', 'today') + compact('count', 'subTitle', 'transactions', 'billCount', 'start', 'end', 'today') ); } diff --git a/resources/views/index.twig b/resources/views/index.twig index 89ee1e0094..32abc8fa8b 100644 --- a/resources/views/index.twig +++ b/resources/views/index.twig @@ -5,183 +5,181 @@ {% endblock %} {% block content %} {% include 'partials.boxes' %} -
-
- {# ACCOUNTS #} -
-
-

{{ 'yourAccounts'|_ }}

-
-
- -
-
- {{ 'go_to_asset_accounts'|_ }} -
+
+
+ {# ACCOUNTS #} +
+
+

{{ 'yourAccounts'|_ }}

- - {# BUDGETS #} -
-
-

{{ 'budgetsAndSpending'|_ }}

-
-
- -
-
- {{ 'go_to_budgets'|_ }} -
+
+
- {# CATEGORIES #} -
-
-

{{ 'categories'|_ }}

- -
-
- -
-
- {{ 'go_to_categories'|_ }} -
+
+ {{ 'go_to_asset_accounts'|_ }}
-
- {# TRANSACTIONS #} -
- {% for data in transactions %} -
-
-

{{ data[1].name }}

-
-
- - -
+ {# BUDGETS #} +
+
+

{{ 'budgetsAndSpending'|_ }}

+
+
+ +
+
+ {{ 'go_to_budgets'|_ }} +
+
+ {# CATEGORIES #} +
+
+

{{ 'categories'|_ }}

+ +
+
+ +
+
+ {{ 'go_to_categories'|_ }} +
+
+
+
+ {# TRANSACTIONS #} +
+ {% for data in transactions %} +
+
+

{{ data[1].name }}

+ +
+
+ +
+
- {% if data[0].count > 0 %} -
- {% include 'list.journals-tiny' with {'transactions': data[0],'account': data[1]} %} -
- {% else %} -
-

- - {{ trans('firefly.no_transactions_account', {name: data[1].name}) }} - -

+ {% if data[0].count > 0 %} +
+ {% include 'list.journals-tiny' with {'transactions': data[0],'account': data[1]} %} +
+ {% else %} +
+

+ + {{ trans('firefly.no_transactions_account', {name: data[1].name}) }} + +

-
- {% endif %} +
+ {% endif %} + +
+
+ +
+ +
-
- + {{ 'create_new_transaction'|_ }} + +
- -
- -
- {{ 'create_new_transaction'|_ }} - - -
- {{ formatAmountByAccount(data[1], data[1]|balance, false) }} -
- + {{ formatAmountByAccount(data[1], data[1]|balance, false) }}
-
- {% endfor %} -
- {% if billCount > 0 %} - {# BILLS #} -
-
-

{{ 'bills'|_ }}

- -
-
-
- -
-
-
- {{ 'go_to_bills'|_ }}
- {% endif %} - - {# box for piggy bank data (JSON) #} -
- -
+ {% endfor %}
-
-
-
- {# EXPENSE ACCOUNTS #} + + {% if billCount > 0 %} + {# BILLS #}
-

{{ 'expense_accounts'|_ }} -

+

{{ 'bills'|_ }}

+
- +
+ +
- {{ 'go_to_expense_accounts'|_ }} + {{ 'go_to_bills'|_ }}
- {# OPTIONAL REVENUE ACCOUNTS #} - {% if showDeps %} -
-
-

{{ 'revenue_accounts'|_ }}

+ {% endif %} + + {# box for piggy bank data (JSON) #} +
-
-
- -
-
- {{ 'go_to_revenue_accounts'|_ }} -
-
- {% endif %}
+
+
+
+ {# EXPENSE ACCOUNTS #} +
+
+

{{ 'expense_accounts'|_ }} +

+
+
+ +
+
+ {{ 'go_to_expense_accounts'|_ }} +
+
+ {# OPTIONAL REVENUE ACCOUNTS #} +
+
+

{{ 'revenue_accounts'|_ }}

+ +
+
+ +
+
+ {{ 'go_to_revenue_accounts'|_ }} +
+
+
+
{% endblock %} {% block scripts %}