kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-17 01:42:19 +00:00
Code Issues Projects Releases Wiki Activity

Added empty box for bills as well.

Browse Source
This commit is contained in:
James Cole
2017-02-23 07:30:08 +01:00
parent 563c668e3f
commit fc36f9cd8c
3 changed files with 72 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1006,6 +1006,14 @@ return [
'no_transactions_intro_transfers' => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.', 'no_transactions_intro_transfers' => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.',
'no_transactions_imperative_transfers' => 'Have you moved some money around? Then you should write it down:', 'no_transactions_imperative_transfers' => 'Have you moved some money around? Then you should write it down:',
'no_transactions_create_transfers' => 'Create a new transfer', 'no_transactions_create_transfers' => 'Create a new transfer',
'no_piggies_title_default' => 'Let\'s create a piggy bank',
'no_piggies_intro_default' => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.',
'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:',
'no_piggies_create_default' => 'Create a new piggy bank',
'no_bills_title_default' => 'Let\'s create a bill',
'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.',
'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:',
'no_bills_create_default' => 'Create a new bill',
]; ];

45
resources/views/bills/index.twig
View File

@@ -5,33 +5,30 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="row"> {% if bills.count == 0 %}
<div class="col-lg-12 col-sm-12 col-md-12"> {% include 'partials.empty' with {what: 'default', type: 'bills',route: route('bills.create')} %}
<div class="box"> {% else %}
<div class="box-header with-border"> <div class="row">
<h3 class="box-title">{{ title }}</h3> <div class="col-lg-12 col-sm-12 col-md-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ title }}</h3>
<!-- ACTIONS MENU --> <!-- ACTIONS MENU -->
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button> <button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v"></i></button>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a href="{{ route('bills.create') }}"><i class="fa fa-plus fa-fw"></i> New bill</a></li> <li><a href="{{ route('bills.create') }}"><i class="fa fa-plus fa-fw"></i> New bill</a></li>
</ul> </ul>
</div>
</div> </div>
</div> </div>
</div> <div class="box-body table-responsive no-padding">
<div class="box-body table-responsive no-padding"> {% include 'list/bills' %}
{% include 'list/bills' %} </div>
</div> </div>
</div> </div>
</div> </div>
</div> {% endif %}
{% endblock %} {% endblock %}
{% block styles %}
<link rel="stylesheet" href="css/bootstrap-sortable.css" type="text/css" media="all"/>
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
{% endblock %}

82
resources/views/piggy-banks/index.twig
View File

@@ -5,54 +5,58 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="row"> {% if piggyBanks.count == 0 %}
<div class="col-lg-12 col-md-12 col-sm-12"> {% include 'partials.empty' with {what: 'default', type: 'piggies',route: route('piggy-banks.create')} %}
<div class="box"> {% else %}
<div class="box-header with-border"> <div class="row">
<h3 class="box-title">{{ 'piggyBanks'|_ }}</h3> <div class="col-lg-12 col-md-12 col-sm-12">
</div> <div class="box">
<div class="box-body no-padding"> <div class="box-header with-border">
{% include 'list/piggy-banks' %} <h3 class="box-title">{{ 'piggyBanks'|_ }}</h3>
</div>
<div class="box-body no-padding">
{% include 'list/piggy-banks' %}
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'account_status'|_ }}</h3> <h3 class="box-title">{{ 'account_status'|_ }}</h3>
</div> </div>
<div class="box-body table-responsive no-padding"> <div class="box-body table-responsive no-padding">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr>
<th>{{ 'account'|_ }}</th>
<th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'balance'|_ }}</th>
<th style="text-align:right;">{{ 'left_for_piggy_banks'|_ }}</th>
<th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'sum_of_piggy_banks'|_ }}</th>
<th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'saved_so_far'|_ }}</th>
<th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'left_to_save'|_ }}</th>
</tr>
</thead>
<tbody>
{% for id,info in accounts %}
<tr> <tr>
<td><a href="{{ route('accounts.show',id) }}" title="{{ info.name }}">{{ info.name }}</a></td> <th>{{ 'account'|_ }}</th>
<td style="text-align:right;" class="hidden-sm hidden-xs">{{ info.balance|formatAmount }}</td> <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'balance'|_ }}</th>
<td style="text-align:right;">{{ info.leftForPiggyBanks|formatAmount }}</td> <th style="text-align:right;">{{ 'left_for_piggy_banks'|_ }}</th>
<td style="text-align:right;" class="hidden-sm hidden-xs">{{ info.sumOfTargets|formatAmount }}</td> <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'sum_of_piggy_banks'|_ }}</th>
<td style="text-align:right;" class="hidden-sm hidden-xs">{{ info.sumOfSaved|formatAmount }}</td> <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'saved_so_far'|_ }}</th>
<td style="text-align:right;" class="hidden-sm hidden-xs">{{ info.leftToSave|formatAmount }}</td> <th style="text-align:right;" class="hidden-sm hidden-xs">{{ 'left_to_save'|_ }}</th>
</tr> </tr>
{% endfor %} </thead>
</tbody> <tbody>
</table> {% for id,info in accounts %}
<tr>
<td><a href="{{ route('accounts.show',id) }}" title="{{ info.name }}">{{ info.name }}</a></td>
<td style="text-align:right;" class="hidden-sm hidden-xs">{{ info.balance|formatAmount }}</td>
<td style="text-align:right;">{{ info.leftForPiggyBanks|formatAmount }}</td>
<td style="text-align:right;" class="hidden-sm hidden-xs">{{ info.sumOfTargets|formatAmount }}</td>
<td style="text-align:right;" class="hidden-sm hidden-xs">{{ info.sumOfSaved|formatAmount }}</td>
<td style="text-align:right;" class="hidden-sm hidden-xs">{{ info.leftToSave|formatAmount }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> {% endif %}
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script src="js/lib/jquery-ui.min.js" type="text/javascript"></script> <script src="js/lib/jquery-ui.min.js" type="text/javascript"></script>