IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small view updates [skip ci]

Browse Source
This commit is contained in:
James Cole 2016-12-27 09:56:30 +01:00
parent 6ab52e282f
commit b9d142c2b7
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,6 +99,8 @@ return [
'cannot_change_demo' => 'You cannot change the password of the demonstration account.',
'cannot_delete_demo' => 'You cannot remove the demonstration account.',
'cannot_reset_demo_user' => 'You cannot reset the password of the demonstration account',
'per_period' => 'Per period',
'all_periods' => 'All periods',
// repeat frequencies:
'repeat_freq_yearly' => 'yearly',

6
resources/views/accounts/show.twig
View File

@ -37,7 +37,7 @@
</div>
<div class="box-body">
<div style="width:60%;margin:0 auto;">
<canvas id="account-cat-out" style="margin:0 auto;" height="150" width="150"></canvas>
<canvas id="account-cat-out" style="margin:0 auto;"></canvas>
</div>
</div>
</div>
@ -49,7 +49,7 @@
</div>
<div class="box-body">
<div style="width:60%;margin:0 auto;">
<canvas id="account-budget-out" style="margin:0 auto;" height="150" width="150"></canvas>
<canvas id="account-budget-out" style="margin:0 auto;"></canvas>
</div>
</div>
</div>
@ -61,7 +61,7 @@
</div>
<div class="box-body">
<div style="width:60%;margin:0 auto;">
<canvas id="account-cat-in" style="margin:0 auto;" height="150" width="150"></canvas>
<canvas id="account-cat-in" style="margin:0 auto;"></canvas>
</div>
</div>
</div>

8
resources/views/categories/show.twig
View File

@ -9,7 +9,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'overview'|_ }} ({{ 'month'|_ }})</h3>
<h3 class="box-title">{{ 'overview'|_ }} ({{ 'per_period'|_|lower }})</h3>
</div>
<div class="box-body">
<canvas id="period" style="width:100%" height="350"></canvas>
@ -19,7 +19,7 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'overview'|_ }} ({{ 'all'|_ }})</h3>
<h3 class="box-title">{{ 'overview'|_ }} ({{ 'all_periods'|_|lower }})</h3>
</div>
<div class="box-body">
<canvas id="all" style="width:100%;" height="350"></canvas>
@ -28,7 +28,7 @@
</div>
</div>
<div class="row">
<div class="col-lg-8 col-md-8 col-sm-12 col-xs-12">
<div class="col-lg-10 col-md-8 col-sm-12 col-xs-12">
<div class="box">
<div class="box-header with-border">
@ -39,7 +39,7 @@
</div>
</div>
</div>
<div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
<div class="col-lg-2 col-md-4 col-sm-12 col-xs-12">
{% for entry in entries %}
{% if entry[2] != 0 or entry[3] != 0 %}
<div class="box">