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

Fixed some html errors [skip ci]

Browse Source
This commit is contained in:
James Cole 2015-06-22 18:50:54 +02:00
parent 1ddaacbef5
commit e94bb9b549
8 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Support/ExpandedForm.php
View File

@ -38,6 +38,8 @@ class ExpandedForm
$options['min'] = '0.01';
$defaultCurrency = isset($options['currency']) ? $options['currency'] : Amt::getDefaultCurrency();
$currencies = Amt::getAllCurrencies();
unset($options['currency']);
unset($options['placeholder']);
$html = View::make('form.amount', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
return $html;
@ -140,6 +142,8 @@ class ExpandedForm
$options['step'] = 'any';
$defaultCurrency = isset($options['currency']) ? $options['currency'] : Amt::getDefaultCurrency();
$currencies = Amt::getAllCurrencies();
unset($options['currency']);
unset($options['placeholder']);
$html = View::make('form.balance', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
return $html;
@ -181,6 +185,7 @@ class ExpandedForm
$options = $this->expandOptionArray($name, $label, $options);
$classes = $this->getHolderClasses($name);
$value = $this->fillFieldValue($name, $value);
unset($options['placeholder']);
$html = View::make('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render();
return $html;
@ -316,6 +321,8 @@ class ExpandedForm
$options = $this->expandOptionArray($name, $label, $options);
$classes = $this->getHolderClasses($name);
$selected = $this->fillFieldValue($name, $selected);
unset($options['autocomplete']);
unset($options['placeholder']);
$html = View::make('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
return $html;

1
resources/twig/accounts/show.twig
View File

@ -42,6 +42,7 @@
</div>
</div>
</div>
</div>

7
resources/twig/bills/create.twig
View File

@ -55,13 +55,6 @@
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<p>
</p>
</div>
</div>
{{ Form.close|raw }}

2
resources/twig/form/amount.twig
View File

@ -4,7 +4,7 @@
<div class="input-group">
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle amountCurrencyDropdown" data-toggle="dropdown" aria-expanded="false">
<span id="amountCurrentSymbol">{{ defaultCurrency.symbol|raw }}</span> <span class="caret"></span>
<span>{{ defaultCurrency.symbol|raw }}</span> <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
{% for currency in currencies %}

2
resources/twig/form/balance.twig
View File

@ -4,7 +4,7 @@
<div class="input-group">
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle balanceCurrencyDropdown" data-toggle="dropdown" aria-expanded="false">
<span id="balanceCurrentSymbol">{{ defaultCurrency.symbol|raw }}</span> <span class="caret"></span>
<span>{{ defaultCurrency.symbol|raw }}</span> <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
{% for currency in currencies %}

4
resources/twig/form/options.twig
View File

@ -6,7 +6,7 @@
<div class="col-sm-8">
<div class="radio">
<label>
{{ Form.checkbox('create_another', '1') }}
{{ Form.checkbox('create_another', '1', false, {'id': name ~ '_return_to_form'}) }}
{{ trans('form.returnHereExplanation') }}
</label>
@ -22,7 +22,7 @@
</label>
<div class="col-sm-8">
<div class="radio"><label>
{{ Form.checkbox('return_to_edit', '1', Input.old('return_to_edit') == '1') }}
{{ Form.checkbox(name ~ '_return_to_edit', '1', Input.old('return_to_edit') == '1', {'id': name ~ '_return_to_edit'}) }}
{{ trans('form.returnHereUpdateExplanation') }}
</label>
</div>

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

@ -131,7 +131,7 @@
<!-- Modal -->
<div class="modal fade" id="defaultModal" tabindex="-1" role="dialog" aria-labelledby="defaultModalLabel">
<div class="modal fade" id="defaultModal" tabindex="-1" role="dialog">
</div>

1
resources/twig/layout/guest.twig
View File

@ -44,7 +44,6 @@
{% block content %}{% endblock %}
</div>
<!-- /.login-box -->
</body>
<script type="text/javascript" src="js/jquery-2.1.3.min.js"></script>
<script type="text/javascript" src="bootstrap/js/bootstrap.min.js"></script>