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

Boxes will try to remember their state and auto-collapse.

Browse Source
This commit is contained in:
James Cole
2016-04-29 09:47:47 +02:00
parent 14b94a5bd2
commit b714eaac06
6 changed files with 90 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/accounts/index.twig
View File

@@ -15,7 +15,7 @@
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
<div class="box" id="account-index-{{ what }}">
<div class="box-header with-border">
<h3 class="box-title">{{ subTitle }}</h3>

1
resources/views/layout/default.twig
View File

@@ -195,6 +195,7 @@
</script>
<script type="text/javascript" src="js/ff/firefly.js"></script>
<script type="text/javascript" src="js/ff/boxes.js"></script>
<script type="text/javascript" src="js/ff/help.js"></script>
{% block scripts %}{% endblock %}

48
resources/views/reports/default/year.twig
View File

@@ -8,7 +8,7 @@
<div class="row">
<div class="col-lg-8 col-md-8 col-sm-12">
<div class="box">
<div class="box" id="year-inc-exp">
<div class="box-header with-border">
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
@@ -18,7 +18,7 @@
</div>
</div>
<div class="col-lg-4 col-md-4 col-sm-12">
<div class="box">
<div class="box" id="year-inc-exp-sum">
<div class="box-header with-border">
<h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
@@ -61,42 +61,17 @@
</div>
</div>
<!--
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'categories_spent_in_year'|_ }}</h3>
</div>
<div class="box-body">
<canvas height="400" id="categories-spent-in-period" style="width:100%;height:400px;"></canvas>
</div>
</div>
</div>
</div>
-->
<!--
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'categories_earned_in_year'|_ }}</h3>
</div>
<div class="box-body">
<canvas height="400" id="categories-earned-in-period" style="width:100%;height:400px;"></canvas>
</div>
</div>
</div>
</div>
-->
{% for category in categories %}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
<div class="box" id="year-cat-{{ category.id }}">
<div class="box-header with-border">
<h3 class="box-title">{{ 'category'|_ }} {{ category.name }}</h3>
<!-- ACTIONS MENU -->
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
</div>
</div>
<div class="box-body">
<canvas height="400" id="categories_{{ category.id }}" class="category_year_chart" data-category="{{ category.id }}"
@@ -110,9 +85,14 @@
{% for budget in budgets %}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
<div class="box" id="year-budget-{{ budget.id }}">
<div class="box-header with-border">
<h3 class="box-title">{{ 'budget'|_ }} {{ budget.name }}</h3>
<!-- ACTIONS MENU -->
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
</div>
</div>
<div class="box-body">
<canvas height="400" id="budgets_{{ budget.id }}" class="budget_year_chart" data-budget="{{ budget.id }}"