kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix #2694

Browse Source
This commit is contained in:
James Cole
2019-10-19 19:17:14 +02:00
parent 2d720f72bd
commit 6efe5cfd4d
7 changed files with 138 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/lang/en_US/firefly.php
View File

@@ -759,6 +759,9 @@ return [
'list_inactive_rule' => 'inactive rule',
// accounts:
'inactive_account_link' => 'You have :count inactive (archived) accounts, which you can view on this separate page.',
'all_accounts_inactive' => 'These are your inactive accounts.',
'active_account_link' => 'This link goes back to your active accounts.',
'account_missing_transaction' => 'Account #:id (":name") cannot be viewed directly, but Firefly is missing redirect information.',
'details_for_asset' => 'Details for asset account ":name"',
'details_for_expense' => 'Details for expense account ":name"',
@@ -786,7 +789,9 @@ return [
'make_new_revenue_account' => 'Create a new revenue account',
'make_new_liabilities_account' => 'Create a new liability',
'asset_accounts' => 'Asset accounts',
'asset_accounts_inactive' => 'Asset accounts (inactive)',
'expense_accounts' => 'Expense accounts',
'expense_accounts_inactive' => 'Expense accounts (inactive)',
'revenue_accounts' => 'Revenue accounts',
'cash_accounts' => 'Cash accounts',
'Cash account' => 'Cash account',

26
resources/views/v1/accounts/index.twig
View File

@@ -35,7 +35,31 @@
{% include 'list.accounts' %}
</div>
<div class="box-footer">
<a href="{{ route('accounts.create', objectType) }}" class="btn btn-success"><i class="fa fa-plus fa-fw"></i> {{ ('make_new_' ~ objectType ~ '_account')|_ }}</a>
<p>
<a href="{{ route('accounts.create', objectType) }}" class="btn btn-success"><i
class="fa fa-plus fa-fw"></i> {{ ('make_new_' ~ objectType ~ '_account')|_ }}</a>
</p>
{% if inactiveCount > 0 %}
<p><small>
<em>
<a href="{{ route('accounts.inactive.index', objectType) }}" class="text-muted">
{{ trans('firefly.inactive_account_link', {count: inactiveCount}) }}
</a>
</em>
</small>
</p>
{% endif %}
{% if inactivePage %}
<p><small class="text-muted">
<em>
{{ 'all_accounts_inactive'|_ }}
<a href="{{ route('accounts.index', objectType) }}">
{{ trans('firefly.active_account_link', {count: inactiveCount}) }}
</a>
</em>
</small>
</p>
{% endif %}
</div>
</div>
</div>