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

Cleanup some modals.

Browse Source
This commit is contained in:
James Cole 2015-05-31 20:23:49 +02:00
parent 67d9154563
commit 4ae24225a5
9 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/js/budgets.js
View File

@ -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;

4
public/js/piggy-banks.js
View File

@ -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;

1
resources/lang/en/firefly.php
View File

@ -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"',

1
resources/lang/nl/firefly.php
View File

@ -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"',

10
resources/twig/budgets/income.twig
View File

@ -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>

7
resources/twig/budgets/index.twig
View File

@ -145,13 +145,6 @@
</div>
{% endif %}
</div>
<!-- DIALOG -->
<div class="modal fade" id="monthlyBudgetModal">
</div><!-- /.modal -->
{% endblock %}
{% block scripts %}
<script type="text/javascript">

4
resources/twig/layout/default.twig
View File

@ -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>

2
resources/twig/piggy-banks/add.twig
View File

@ -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>

8
resources/twig/piggy-banks/index.twig
View File

@ -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>