kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Extra buttons

Browse Source
This commit is contained in:
James Cole
2018-01-12 20:37:56 +01:00
parent e34e43173c
commit 517731cb59
5 changed files with 63 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,13 @@ return [
'create_new_stuff' => 'Create new stuff', 'create_new_stuff' => 'Create new stuff',
'new_withdrawal' => 'New withdrawal', 'new_withdrawal' => 'New withdrawal',
'create_new_transaction' => 'Create new transaction', '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_deposit' => 'New deposit',
'new_transfer' => 'New transfer', 'new_transfer' => 'New transfer',
'new_asset_account' => 'New asset account', 'new_asset_account' => 'New asset account',

2
resources/lang/en_US/import.php
View File

@@ -178,7 +178,7 @@ return [
'spectre_extra_key_open_date' => 'Open date', 'spectre_extra_key_open_date' => 'Open date',
'spectre_extra_key_current_time' => 'Current time', 'spectre_extra_key_current_time' => 'Current time',
'spectre_extra_key_current_date' => 'Current date', '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_units' => 'Units',
'spectre_extra_key_unit_price' => 'Unit price', 'spectre_extra_key_unit_price' => 'Unit price',
'spectre_extra_key_transactions_count' => 'Transactions count', 'spectre_extra_key_transactions_count' => 'Transactions count',

88
resources/views/index.twig
View File

@@ -16,6 +16,10 @@
<div class="box-body"> <div class="box-body">
<canvas id="accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas> <canvas id="accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div> </div>
<div class="box-footer">
<a href="{{ route('accounts.index','asset') }}" class="btn btn-default button-sm"><i
class="fa fa-money"></i> {{ 'go_to_asset_accounts'|_ }}</a>
</div>
</div> </div>
{# BUDGETS #} {# BUDGETS #}
@@ -26,6 +30,10 @@
<div class="box-body"> <div class="box-body">
<canvas id="budgets-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas> <canvas id="budgets-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div> </div>
<div class="box-footer">
<a href="{{ route('budgets.index') }}" class="btn btn-default button-sm"><i
class="fa fa-tasks"></i> {{ 'go_to_budgets'|_ }}</a>
</div>
</div> </div>
{# CATEGORIES #} {# CATEGORIES #}
<div class="box"> <div class="box">
@@ -36,6 +44,10 @@
<div class="box-body"> <div class="box-body">
<canvas id="categories-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas> <canvas id="categories-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div> </div>
<div class="box-footer">
<a href="{{ route('categories.index') }}" class="btn btn-default button-sm"><i
class="fa fa-bar-chart"></i> {{ 'go_to_categories'|_ }}</a>
</div>
</div> </div>
</div> </div>
<div class="col-lg-4 col-md-6 col-sm-12"> <div class="col-lg-4 col-md-6 col-sm-12">
@@ -63,44 +75,10 @@
{% if data[0].count > 0 %} {% if data[0].count > 0 %}
<div class="box-body no-padding"> <div class="box-body no-padding">
<div class="btn-group" style="padding:8px;">
<a href="{{ route('transactions.create','withdrawal') }}" class="btn btn-success"><i
class="fa fa-money fa-fw"></i> {{ 'create_new_transaction'|_ }}</a>
<button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="false">
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu">
<li><a href="{{ route('transactions.create','withdrawal') }}"><i
class="fa fa-long-arrow-left fa-fw"></i> {{ 'newWithdrawal'|_ }}</a></li>
<li><a href="{{ route('transactions.create','deposit') }}"><i
class="fa fa-long-arrow-right fa-fw"></i> {{ 'newDeposit'|_ }}</a></li>
<li><a href="{{ route('transactions.create','transfer') }}"><i class="fa fa-fw fa-exchange"></i> {{ 'newTransfer'|_ }}
</a></li>
</ul>
</div>
{% include 'list.journals-tiny' with {'transactions': data[0],'account': data[1]} %} {% include 'list.journals-tiny' with {'transactions': data[0],'account': data[1]} %}
</div> </div>
{% else %} {% else %}
<div class="box-body"> <div class="box-body">
<div class="btn-group">
<a href="{{ route('transactions.create','withdrawal') }}" class="btn btn-success"><i
class="fa fa-money fa-fw"></i> {{ 'create_new_transaction'|_ }}</a>
<button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="false">
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu">
<li><a href="{{ route('transactions.create','withdrawal') }}"><i
class="fa fa-long-arrow-left fa-fw"></i> {{ 'newWithdrawal'|_ }}</a></li>
<li><a href="{{ route('transactions.create','deposit') }}"><i
class="fa fa-long-arrow-right fa-fw"></i> {{ 'newDeposit'|_ }}</a></li>
<li><a href="{{ route('transactions.create','transfer') }}"><i class="fa fa-fw fa-exchange"></i> {{ 'newTransfer'|_ }}
</a></li>
</ul>
</div>
<p> <p>
<em> <em>
{{ trans('firefly.no_transactions_account', {name: data[1].name}) }} {{ trans('firefly.no_transactions_account', {name: data[1].name}) }}
@@ -111,8 +89,32 @@
{% endif %} {% endif %}
<div class="box-footer clearfix"> <div class="box-footer clearfix">
<a class="btn btn-sm btn-default btn-flat pull-right" <div class="btn-group" role="group">
href="{{ route('accounts.show',data[1].id) }}">{{ formatAmountByAccount(data[1], data[1]|balance, false) }}</a>
</div>
<div class="btn-group" role="group" aria-label="...">
<div class="btn-group" role="group">
<a href="{{ route('transactions.create','withdrawal') }}" class="btn btn-success"><i
class="fa fa-check-circle-o fa-fw"></i> {{ 'create_new_transaction'|_ }}</a>
<button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="false">
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu">
<li><a href="{{ route('transactions.create','withdrawal') }}"><i
class="fa fa-long-arrow-left fa-fw"></i> {{ 'newWithdrawal'|_ }}</a></li>
<li><a href="{{ route('transactions.create','deposit') }}"><i
class="fa fa-long-arrow-right fa-fw"></i> {{ 'newDeposit'|_ }}</a></li>
<li><a href="{{ route('transactions.create','transfer') }}"><i class="fa fa-fw fa-exchange"></i> {{ 'newTransfer'|_ }}
</a></li>
</ul>
</div>
<a class="btn btn-default" href="{{ route('accounts.show',data[1].id) }}">{{ formatAmountByAccount(data[1], data[1]|balance, false) }}</a>
</div>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
@@ -129,7 +131,10 @@
<div style="width:100%;margin:0 auto;"> <div style="width:100%;margin:0 auto;">
<canvas id="bills-chart" style="width:100%;height:200px;" height="200"></canvas> <canvas id="bills-chart" style="width:100%;height:200px;" height="200"></canvas>
</div> </div>
</div>
<div class="box-footer">
<a href="{{ route('bills.index') }}" class="btn btn-default button-sm"><i
class="fa fa-calendar"></i> {{ 'go_to_bills'|_ }}</a>
</div> </div>
</div> </div>
{% endif %} {% endif %}
@@ -147,11 +152,14 @@
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"><a href="{{ route('accounts.index',['expense']) }}" title="{{ 'expense_accounts'|_ }}">{{ 'expense_accounts'|_ }}</a> <h3 class="box-title"><a href="{{ route('accounts.index',['expense']) }}" title="{{ 'expense_accounts'|_ }}">{{ 'expense_accounts'|_ }}</a>
</h3> </h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<canvas id="expense-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas> <canvas id="expense-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div> </div>
<div class="box-footer">
<a href="{{ route('accounts.index', ['expense']) }}" class="btn btn-default button-sm"><i
class="fa fa-shopping-cart"></i> {{ 'go_to_expense_accounts'|_ }}</a>
</div>
</div> </div>
{# OPTIONAL REVENUE ACCOUNTS #} {# OPTIONAL REVENUE ACCOUNTS #}
{% if showDeps %} {% if showDeps %}
@@ -164,6 +172,10 @@
<div class="box-body"> <div class="box-body">
<canvas id="revenue-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas> <canvas id="revenue-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div> </div>
<div class="box-footer">
<a href="{{ route('accounts.index', ['revenue']) }}" class="btn btn-default button-sm"><i
class="fa fa-download"></i> {{ 'go_to_revenue_accounts'|_ }}</a>
</div>
</div> </div>
{% endif %} {% endif %}
</div> </div>

4
resources/views/json/piggy-banks.twig
View File

@@ -15,4 +15,8 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
<div class="box-footer">
<a href="{{ route('piggy-banks.index') }}" class="btn btn-default button-sm"><i
class="fa fa-download"></i> {{ 'go_to_piggies'|_ }}</a>
</div>
</div> </div>

3
resources/views/piggy-banks/show.twig
View File

@@ -99,8 +99,7 @@
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ trans('form.notes') }}</h3> <h3 class="box-title">{{ trans('form.notes') }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body markdown">{{ note.text|markdown }}
{{ note.text|markdown }}
</div> </div>
</div> </div>