From 7182909e289313fbe725973583ca1d70f74c64c0 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 26 Oct 2016 16:54:52 +0200
Subject: [PATCH] Keep the box [skip ci]

---
 resources/views/reports/default/month.twig    | 19 ++++-
 .../views/reports/default/multi-year.twig     |  9 +-
 resources/views/reports/default/year.twig     |  9 +-
 .../views/reports/partials/categories.twig    | 85 +++++++++----------
 resources/views/reports/partials/income.twig  | 83 +++++++++---------
 5 files changed, 109 insertions(+), 96 deletions(-)

diff --git a/resources/views/reports/default/month.twig b/resources/views/reports/default/month.twig
index 2f67fd62f7..ccc14c3877 100644
--- a/resources/views/reports/default/month.twig
+++ b/resources/views/reports/default/month.twig
@@ -22,7 +22,14 @@
     <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-6 loading" id="accountReport">
         </div>
-        <div class="col-lg-3 col-md-3 col-sm-3 loading" id="incomeReport">
+        <div class="col-lg-3 col-md-3 col-sm-3">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'income'|_ }}</h3>
+                </div>
+                <div class="box-body table-responsive no-padding loading" id="incomeReport">
+                </div>
+            </div>
         </div>
         <div class="col-lg-3 col-md-3 col-sm-3 loading" id="expenseReport">
         </div>
@@ -39,8 +46,14 @@
             <!-- budgets -->
             {% include 'reports/partials/budgets.twig' %}
         </div>
-        <div class="col-lg-4 col-md-4 col-sm-12 loading" id="categoryReport">
-            {# {% include 'reports/partials/categories.twig' %} #}
+        <div class="col-lg-4 col-md-4 col-sm-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'categories'|_ }}</h3>
+                </div>
+                <div class="box-body table-responsive no-padding loading" id="categoryReport">
+                </div>
+            </div>
         </div>
     </div>
     <div class="row">
diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig
index d77e17636d..5ce435fbf8 100644
--- a/resources/views/reports/default/multi-year.twig
+++ b/resources/views/reports/default/multi-year.twig
@@ -33,7 +33,14 @@
     <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-6 loading" id="accountReport">
         </div>
-        <div class="col-lg-3 col-md-3 col-sm-3 loading" id="incomeReport">
+        <div class="col-lg-3 col-md-3 col-sm-3">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'income'|_ }}</h3>
+                </div>
+                <div class="box-body table-responsive no-padding loading"  id="incomeReport">
+                </div>
+            </div>
         </div>
         <div class="col-lg-3 col-md-3 col-sm-3 loading" id="expenseReport">
         </div>
diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig
index c65d56d98a..bbd280301b 100644
--- a/resources/views/reports/default/year.twig
+++ b/resources/views/reports/default/year.twig
@@ -36,7 +36,14 @@
             <div class="loading" id="incomeVsExpenseReport">
         </div>
         </div>
-        <div class="col-lg-3 col-md-3 col-sm-3 loading" id="incomeReport">
+        <div class="col-lg-3 col-md-3 col-sm-3">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">{{ 'income'|_ }}</h3>
+                </div>
+                <div class="box-body table-responsive no-padding loading"  id="incomeReport">
+                </div>
+            </div>
         </div>
         <div class="col-lg-3 col-md-3 col-sm-3 loading" id="expenseReport">
         </div>
diff --git a/resources/views/reports/partials/categories.twig b/resources/views/reports/partials/categories.twig
index ddbe1648f2..a09cbe2c7c 100644
--- a/resources/views/reports/partials/categories.twig
+++ b/resources/views/reports/partials/categories.twig
@@ -1,48 +1,41 @@
-<div class="box">
-    <div class="box-header with-border">
-        <h3 class="box-title">{{ 'categories'|_ }}</h3>
-    </div>
-    <div class="box-body table-responsive no-padding">
-        <table class="table table-hover">
-            <thead>
+<table class="table table-hover">
+    <thead>
+    <tr>
+        <th>{{ 'category'|_ }}</th>
+        <th colspan="2">{{ 'spent'|_ }}</th>
+    </tr>
+    </thead>
+    <tbody>
+    {% for cat in categories.getCategories %}
+        {% if loop.index > listLength %}
+            <tr class="overListLength">
+        {% else %}
             <tr>
-                <th>{{ 'categories'|_ }}</th>
-                <th colspan="2">{{ 'spent'|_ }}</th>
-            </tr>
-            </thead>
-            <tbody>
-            {% for cat in categories.getCategories %}
-                {% if loop.index > listLength %}
-                    <tr class="overListLength">
-                {% else %}
-                    <tr>
-                {% endif %}
-                    <td>
-                        <a href="{{ route('categories.show',cat.id) }}">{{ cat.name }}</a>
-                    </td>
-                    <td>{{ cat.spent|formatAmount }}</td>
-                    <td style="width:20px;">
-                        <i class="fa fa-fw fa-info-circle text-muted firefly-info-button"
-                           data-location="category-entry" data-category-id="{{ cat.id }}"
-                        ></i>
-                    </td>
-                </tr>
-            {% endfor %}
-            </tbody>
-            <tfoot>
-            {% if categories.getCategories.count > expenseTopLength %}
-                <tr>
-                    <td colspan="2" class="active">
-                        <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
-                    </td>
-                </tr>
-            {% endif %}
+        {% endif %}
+        <td>
+            <a href="{{ route('categories.show',cat.id) }}">{{ cat.name }}</a>
+        </td>
+        <td>{{ cat.spent|formatAmount }}</td>
+        <td style="width:20px;">
+            <i class="fa fa-fw fa-info-circle text-muted firefly-info-button"
+               data-location="category-entry" data-category-id="{{ cat.id }}"
+            ></i>
+        </td>
+        </tr>
+    {% endfor %}
+    </tbody>
+    <tfoot>
+    {% if categories.getCategories.count > expenseTopLength %}
+        <tr>
+            <td colspan="2" class="active">
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+            </td>
+        </tr>
+    {% endif %}
 
-            <tr>
-                <td><em>{{ 'sum'|_ }}</em></td>
-                <td>{{ categories.getTotal|formatAmount }}</td>
-            </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
+    <tr>
+        <td><em>{{ 'sum'|_ }}</em></td>
+        <td>{{ categories.getTotal|formatAmount }}</td>
+    </tr>
+    </tfoot>
+</table>
diff --git a/resources/views/reports/partials/income.twig b/resources/views/reports/partials/income.twig
index 6d47763b9f..3428b0a33a 100644
--- a/resources/views/reports/partials/income.twig
+++ b/resources/views/reports/partials/income.twig
@@ -1,46 +1,39 @@
-<div class="box">
-    <div class="box-header with-border">
-        <h3 class="box-title">{{ 'income'|_ }}</h3>
-    </div>
-    <div class="box-body table-responsive no-padding">
-        <table class="table table-hover">
-            <tbody>
-            {% for income in incomes.getIncomes %}
-                {% if loop.index > listLength %}
-                    <tr class="overListLength">
-                {% else %}
-                    <tr>
-                {% endif %}
-                <td>
-                    <a href="{{ route('accounts.show',income.id) }}" title="{{ income.name }}">{{ income.name }}</a>
-                    {% if income.count > 1 %}
-                        <br/>
-                        <small>
-                            {{ income.count }} {{ 'transactions'|_|lower }}
-                            <i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="income-entry"
-                               data-account-id="{{ income.id }}"></i>
-                        </small>
-
-                    {% endif %}
-                </td>
-
-                <td>{{ income.amount|formatAmount }}</td>
-                </tr>
-            {% endfor %}
-            </tbody>
-            <tfoot>
-            {% if incomes.getIncomes|length > listLength %}
-                <tr>
-                    <td colspan="2" class="active">
-                        <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{ number:listLength } ) }}</a>
-                    </td>
-                </tr>
-            {% endif %}
+<table class="table table-hover">
+    <tbody>
+    {% for income in incomes.getIncomes %}
+        {% if loop.index > listLength %}
+            <tr class="overListLength">
+        {% else %}
             <tr>
-                <td><em>{{ 'sum'|_ }}</em></td>
-                <td>{{ incomes.getTotal|formatAmount }}</td>
-            </tr>
-            </tfoot>
-        </table>
-    </div>
-</div>
+        {% endif %}
+        <td>
+            <a href="{{ route('accounts.show',income.id) }}" title="{{ income.name }}">{{ income.name }}</a>
+            {% if income.count > 1 %}
+                <br/>
+                <small>
+                    {{ income.count }} {{ 'transactions'|_|lower }}
+                    <i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="income-entry"
+                       data-account-id="{{ income.id }}"></i>
+                </small>
+
+            {% endif %}
+        </td>
+
+        <td>{{ income.amount|formatAmount }}</td>
+        </tr>
+    {% endfor %}
+    </tbody>
+    <tfoot>
+    {% if incomes.getIncomes|length > listLength %}
+        <tr>
+            <td colspan="2" class="active">
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{ number:listLength } ) }}</a>
+            </td>
+        </tr>
+    {% endif %}
+    <tr>
+        <td><em>{{ 'sum'|_ }}</em></td>
+        <td>{{ incomes.getTotal|formatAmount }}</td>
+    </tr>
+    </tfoot>
+</table>