From 4ae24225a558b9cfa5e57018a0b033945c013b27 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 31 May 2015 20:23:49 +0200
Subject: [PATCH] Cleanup some modals.

---
 public/js/budgets.js                  |  6 +++---
 public/js/piggy-banks.js              |  4 ++--
 resources/lang/en/firefly.php         |  1 +
 resources/lang/nl/firefly.php         |  1 +
 resources/twig/budgets/income.twig    | 10 ++++++----
 resources/twig/budgets/index.twig     |  7 -------
 resources/twig/layout/default.twig    |  4 ----
 resources/twig/piggy-banks/add.twig   |  2 +-
 resources/twig/piggy-banks/index.twig |  8 --------
 9 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/public/js/budgets.js b/public/js/budgets.js
index 67a7d325a1..52e80dff01 100644
--- a/public/js/budgets.js
+++ b/public/js/budgets.js
@@ -188,10 +188,10 @@ $(function () {
 //
 //}
 //
-function updateIncome() {
+function updateIncome(e) {
     "use strict";
-    $('#monthlyBudgetModal').empty().load('budgets/income', function () {
-        $('#monthlyBudgetModal').modal('show');
+    $('#defaultModal').empty().load('budgets/income', function () {
+        $('#defaultModal').modal('show');
     });
 
     return false;
diff --git a/public/js/piggy-banks.js b/public/js/piggy-banks.js
index d108c41ef2..36fb5d27ff 100644
--- a/public/js/piggy-banks.js
+++ b/public/js/piggy-banks.js
@@ -50,8 +50,8 @@ $(function () {
 function addMoney(e) {
     "use strict";
     var pigID = parseInt($(e.target).data('id'));
-    $('#moneyManagementModal').empty().load('piggy-banks/add/' + pigID, function () {
-        $('#moneyManagementModal').modal('show');
+    $('#defaultModal').empty().load('piggy-banks/add/' + pigID, function () {
+        $('#defaultModal').modal('show');
     });
 
     return false;
diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php
index 8f89543fa2..9f99552a15 100644
--- a/resources/lang/en/firefly.php
+++ b/resources/lang/en/firefly.php
@@ -35,6 +35,7 @@ return [
     'without_budget_between'        => 'Transactions without a budget between :start and :end',
     'budget_in_month'               => ':name in :month',
     'delete_budget'                 => 'Delete budget ":name"',
+    'update_amount'                 => 'Update amount',
 
     // bills:
     'delete_bill'                   => 'Delete bill ":name"',
diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php
index baeed28302..28f289d678 100644
--- a/resources/lang/nl/firefly.php
+++ b/resources/lang/nl/firefly.php
@@ -35,6 +35,7 @@ return [
     'without_budget_between'        => 'Transacties zonder budget tussen :start en :end',
     'budget_in_month'               => ':name in :month',
     'delete_budget'                 => 'Verwijder budget ":name"',
+    'update_amount'                 => 'Bedrag bijwerken',
 
     // bills:
     'delete_bill'                   => 'Verwijder rekening ":name"',
diff --git a/resources/twig/budgets/income.twig b/resources/twig/budgets/income.twig
index 12cc983ae0..632d63b742 100644
--- a/resources/twig/budgets/income.twig
+++ b/resources/twig/budgets/income.twig
@@ -4,18 +4,20 @@
             <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span></button>
             <h4 class="modal-title" id="myModalLabel">Update (expected) available amount for {{Session.get('start').format('F Y')}}</h4>
         </div>
+
         <form style="display: inline;" id="income" action="{{route('budgets.postIncome')}}" method="POST">
             <div class="modal-body">
-                <input type="hidden" name="_token" value="{{ csrf_token() }}"
+                <input type="hidden" name="_token" value="{{ csrf_token() }}" />
                 <div class="input-group">
-                    <div class="input-group-addon">{{ getCurrencySymbol() }}</div>
-                    <input step="any" class="form-control" id="amount" value="{{ amount.data }}" autocomplete="off" name="amount" type="number">
+                    <div class="input-group-addon">{{ getCurrencySymbol()|raw }}</div>
+                    <input step="any" class="form-control" id="amount" value="{{ amount.data }}" autocomplete="off" name="amount" type="number" />
                 </div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
-                <button type="submit" class="btn btn-primary">Update</button>
+                <button type="submit" class="btn btn-primary">{{ 'update_amount'|_ }}</button>
             </div>
         </form>
     </div>
 </div>
+
diff --git a/resources/twig/budgets/index.twig b/resources/twig/budgets/index.twig
index 5601d04dc3..23cdba38d3 100644
--- a/resources/twig/budgets/index.twig
+++ b/resources/twig/budgets/index.twig
@@ -145,13 +145,6 @@
             </div>
         {% endif %}
     </div>
-
-    <!-- DIALOG -->
-    <div class="modal fade" id="monthlyBudgetModal">
-
-        
-    </div><!-- /.modal -->
-
 {% endblock %}
 {% block scripts %}
     <script type="text/javascript">
diff --git a/resources/twig/layout/default.twig b/resources/twig/layout/default.twig
index 6f88f5131a..7247597006 100644
--- a/resources/twig/layout/default.twig
+++ b/resources/twig/layout/default.twig
@@ -107,10 +107,6 @@
     </div>
 </div>
 
-<!-- modal to relate transactions to each other -->
-<div class="modal fade" id="relationModal">
-</div>
-
 <!-- default modal -->
 <div class="modal fade" id="defaultModal">
 </div>
diff --git a/resources/twig/piggy-banks/add.twig b/resources/twig/piggy-banks/add.twig
index 1a3f3f0f49..14148bc581 100644
--- a/resources/twig/piggy-banks/add.twig
+++ b/resources/twig/piggy-banks/add.twig
@@ -6,12 +6,12 @@
         </div>
         <form style="display: inline;" id="add" action="{{ route('piggy-banks.add', piggyBank.id) }}" method="POST">
             <div class="modal-body">
+                <input type="hidden" name="_token" value="{{ csrf_token() }}" />
                 <p>
                     {{ 'max_amount_add'|_ }}: {{ maxAmount|formatAmount }}.
                 </p>
                 <div class="input-group">
                     <div class="input-group-addon">{{ getCurrencySymbol()|raw }}</div>
-                    <input type="hidden" name="_token" value="{{ csrf_token() }}" />
                     <input step="any" class="form-control" id="amount" autocomplete="off" name="amount" max="{{ maxAmount|round(2) }}" type="number" />
                 </div>
             </div>
diff --git a/resources/twig/piggy-banks/index.twig b/resources/twig/piggy-banks/index.twig
index d1fe305dd5..582f1c0b80 100644
--- a/resources/twig/piggy-banks/index.twig
+++ b/resources/twig/piggy-banks/index.twig
@@ -47,14 +47,6 @@
             </div>
         </div>
     </div>
-
-    <!-- this is the modal for the add/remove money routine: -->
-    <div class="modal fade" id="moneyManagementModal">
-
-
-
-    </div><!-- /.modal -->
-
 {% endblock %}
 {% block scripts %}
     <script src="js/jquery-ui.min.js" type="text/javascript"></script>