From ec70fde5575270dbd91a268a814e6dd526e6d96a Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 25 Apr 2016 09:49:34 +0200
Subject: [PATCH] Start of some changes in budget overview related to #256 and
 #246

---
 resources/views/budgets/index.twig | 40 +++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig
index b2b1b704da..bc06065233 100644
--- a/resources/views/budgets/index.twig
+++ b/resources/views/budgets/index.twig
@@ -99,10 +99,10 @@
 
         </div>
     </div>
-
+    <p>Bla bla bla</p>
     <div class="row">
         {% for budget in budgets %}
-            <div class="col-lg-3 col-sm-4 col-md-6" style="height:180px;">
+            <div class="col-lg-4 col-sm-6 col-md-6">
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">
@@ -130,7 +130,12 @@
                     <div class="box-body">
                         <table class="table">
                             <tr>
-                                <td style="width:40%;">{{ 'budgeted'|_ }}</td>
+                                <td style="width:40%;">
+                                    {{ 'budgeted'|_ }}
+                                    <span class="small"><br />
+                                        {{ session('start').formatLocalized(monthAndDayFormat) }} -
+                                        {{ session('start').formatLocalized(monthAndDayFormat) }}</span>
+                                </td>
                                 <td>
                                     <div class="form-group" style="margin-bottom:0;">
                                         <div class="input-group">
@@ -140,13 +145,40 @@
                                                    data-id="{{ budget.id }}" value="{{ budget.currentRep.amount|number_format(0,'','') }}" autocomplete="off"
                                                    step="1" min="0" max="{{ budgetMaximum }}" name="amount" type="number">
                                         </div>
+                                        <div class="small">
+                                                <ul class="list-inline">
+                                                    <li>Previously budgeted:</li>
+                                                    <li><a href="#">{{ 123|formatAmountPlain }}</a></li>
+                                                    <li><a href="#">{{ 456|formatAmountPlain }}</a></li>
+                                                </ul>
+
+                                            </div>
                                     </div>
                                 </td>
                             </tr>
                             <tr>
-                                <td style="width:50%;">{{ 'spent'|_ }}</td>
+                                <td style="width:40%;">
+                                    {{ 'spent'|_ }}
+                                    <span class="small"><br />
+                                        {{ session('start').formatLocalized(monthAndDayFormat) }} -
+                                        {{ session('start').formatLocalized(monthAndDayFormat) }}
+                                    </span>
+                                </td>
                                 <td>{{ budget.spent|formatAmount }}</a></td>
                             </tr>
+                            <tr>
+                                <td style="width:40%">
+                                    <span class="text-danger">
+                                        Conflicts
+                                    </span>
+                                </td>
+                                <td>
+                                    <ul class="list-unstyled">
+                                        <li>Also budgeted {{ 123|formatAmount }} between x and y.</li>
+                                        <li>Also budgeted {{ 123|formatAmount }} between x and y.</li>  
+                                    </ul>
+                                </td>
+                            </tr>
                         </table>
                     </div>
                 </div>