Fixed some views. [skip ci]

This commit is contained in:
James Cole
2015-06-21 15:09:10 +02:00
parent 9d6ea6b2f6
commit ad8a9717d1
9 changed files with 205 additions and 134 deletions

View File

@@ -6,43 +6,39 @@
{% block content %}
{{ Form.open({'class' : 'form-horizontal','id' : 'store','route' : 'currency.store'}) }}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary">
<div class="box-header with-border">
<i class="fa {{ subTitleIcon }}"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="box-body">
{{ ExpandedForm.text('name',null,{'maxlength' : 48}) }}
{{ ExpandedForm.text('symbol',null,{'maxlength': 8}) }}
{{ ExpandedForm.text('code',null,{'maxlength' : 3}) }}
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.text('name',null,{'maxlength' : 48}) }}
{{ ExpandedForm.text('symbol',null,{'maxlength': 8}) }}
{{ ExpandedForm.text('code',null,{'maxlength' : 3}) }}
</div>
</div>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="col-lg-6 col-md-6 col-sm-12">
<!-- panel for options -->
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.optionsList('create','currency') }}
</div>
<div class="box-footer">
<button type="submit" class="btn pull-right btn-success">
Store new currency
</button>
</div>
</div>
<!-- panel for options -->
<div class="box">
<div class="box-header with-border">
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="box-body">
{{ ExpandedForm.optionsList('create','currency') }}
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<p>
<button type="submit" class="btn btn-lg btn-success">
<i class="fa fa-plus-circle"></i> Store new currency
</button>
</p>
</div>
</div>
</form>
{{ Form.close|raw }}
{% endblock %}

View File

@@ -11,8 +11,7 @@
<div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">
<div class="box box-danger">
<div class="box-header with-border">
<i class="fa fa-exclamation-circle"></i>
{{ trans('form.delete_currency', {'name': currency.name}) }}
<h3 class="box-title">{{ trans('form.delete_currency', {'name': currency.name}) }}</h3>
</div>
<div class="box-body">
<p class="text-danger">
@@ -21,15 +20,15 @@
<p>
{{ trans('form.currency_areYouSure', {'name': currency.name}) }}
</p>
<p>
<input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger" />
<a href="{{ URL.previous }}" class="btn-default btn">{{ trans('form.cancel') }}</a >
</p>
</div>
<div class="box-footer">
<input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right" />
<a href="{{ URL.previous }}" class="btn-default btn">{{ trans('form.cancel') }}</a >
</div>
</div>
</div>
</div>
</form>
{{ Form.close|raw }}
{% endblock %}

View File

@@ -7,43 +7,39 @@
{% block content %}
{{ Form.model(currency, {'class' : 'form-horizontal','id' : 'update','url' : route('currency.update',currency.id)}) }}
<input type="hidden" name="id" value="{{currency.id}}" />
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary">
<div class="box-header with-border">
<i class="fa {{ subTitleIcon }}"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="box-body">
{{ ExpandedForm.text('name',null,{'maxlength' : 48}) }}
{{ ExpandedForm.text('symbol',null,{'maxlength' : 8}) }}
{{ ExpandedForm.text('code',null,{'maxlength' : 3}) }}
</div>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
<!-- panel for options -->
<div class="box">
<div class="box-header with-border">
<i class="fa fa-bolt"></i> {{ 'options'|_ }}
</div>
<div class="box-body">
{{ ExpandedForm.optionsList('update','currency') }}
<input type="hidden" name="id" value="{{ currency.id }}"/>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.text('name',null,{'maxlength' : 48}) }}
{{ ExpandedForm.text('symbol',null,{'maxlength' : 8}) }}
{{ ExpandedForm.text('code',null,{'maxlength' : 3}) }}
</div>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
<!-- panel for options -->
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.optionsList('update','currency') }}
</div>
<div class="box-footer">
<button type="submit" class="btn btn-success pull-right">
Update currency
</button>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<p>
<button type="submit" class="btn btn-lg btn-success">
<i class="fa fa-plus-circle"></i> Update currency
</button>
</p>
</div>
</div>
</form>
{{ Form.close|raw }}
{% endblock %}

View File

@@ -9,42 +9,45 @@
<div class="col-lg-12 col-sm-12 col-md-12">
<div class="box">
<div class="box-header with-border">
Currencies
<h3 class="box-title">Currencies</h3>
</div>
<div class="box-body">
<p class="text-info">
Firefly III supports various currencies which you can set and enable here.
</p>
<ul>
{% if currencies|length > 0 %}
<table class="table table-striped table-bordered">
{% if currencies|length > 0 %}
<table class="table table-hover">
<thead>
<tr>
<th>&nbsp;</th>
<th colspan="2">Currency</th>
</tr>
</thead>
<tbody>
{% for currency in currencies %}
<tr>
<th>&nbsp;</th>
<th colspan="2">Currency</th>
</tr>
{% for currency in currencies %}
<tr>
<td>
<div class="btn-group btn-group-xs">
<a class="btn btn-default" href="{{route('currency.edit',currency.id)}}"><i class="fa fa-fw fa-pencil"></i></a>
<a class="btn btn-default" href="{{route('currency.delete',currency.id)}}"><i class="fa fa-fw fa-trash"></i></a>
</div>
</td>
<td>{{ currency.name }} ({{ currency.code }}) ({{ currency.symbol|raw }})</td>
<td>
<td>
<div class="btn-group btn-group-xs">
<a class="btn btn-default" href="{{ route('currency.edit',currency.id) }}"><i class="fa fa-fw fa-pencil"></i></a>
<a class="btn btn-danger" href="{{ route('currency.delete',currency.id) }}"><i class="fa fa-fw fa-trash"></i></a>
</div>
</td>
<td>{{ currency.name }} ({{ currency.code }}) ({{ currency.symbol|raw }})</td>
<td>
{% if currency.id == defaultCurrency.id %}
<span class="label label-success">default</span>
{% else %}
<a class="btn btn-info btn-xs" href="{{route('currency.default',currency.id)}}">make default</a>
<a class="btn btn-info btn-xs" href="{{ route('currency.default',currency.id) }}">make default</a>
{% endif %}
</td>
</tr>
</td>
</tr>
{% endfor %}
</table>
{% endif %}
<p><a class="btn btn-success" href="{{route('currency.create')}}"><i class="fa fa-fw fa-plus-circle"></i> Add another currency</a></p>
</tbody>
</table>
{% endif %}
</div>
<div class="box-footer">
<a class="btn btn-success pull-right" href="{{ route('currency.create') }}">Add another currency</a>
</div>
</div>
</div>