kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-25 05:03:13 +00:00
Code Issues Projects Releases Wiki Activity

Some cleanup.

Browse Source
This commit is contained in:
James Cole
2015-06-03 17:32:50 +02:00
parent d1d6c48d9b
commit 4b0b79199d
16 changed files with 172 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
<div class="{{ classes }}">
<div class="{{ classes }}" id="{{ name}}_holder">
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">
<div class="input-group">

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

@@ -1,4 +1,4 @@
<div class="{{ classes }}">
<div class="{{ classes }}" id="{{ name}}_holder">
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">
<div class="input-group">

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

@@ -1,4 +1,4 @@
<div class="{{ classes }}">
<div class="{{ classes }}" id="{{ name}}_holder">
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">
<div class="checkbox">

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

@@ -1,4 +1,4 @@
<div class="{{ classes }}">
<div class="{{ classes }}" id="{{ name}}_holder">
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">
{{ Form.input('date', name, value, options) }}

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

@@ -1,4 +1,4 @@
<div class="{{ classes }}">
<div class="{{ classes }}" id="{{ name}}_holder">
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">
<div class="input-group">

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

@@ -1,4 +1,4 @@
<div class="{{ classes }}">
<div class="{{ classes }}" id="{{ name}}_holder">
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">
<div id="map-canvas" style="width:100%;height:300px;"></div>

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

@@ -1,4 +1,4 @@
<div class="{{ classes }}">
<div class="{{ classes }}" id="{{ name}}_holder">
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">
{% for value,description in list %}

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

@@ -1,4 +1,4 @@
<div class="{{ classes }}">
<div class="{{ classes }}" id="{{ name}}_holder">
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">
{{ Form.select(name, list, selected , options ) }}

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

@@ -1,4 +1,4 @@
<div class="{{ classes }}">
<div class="{{ classes }}" id="{{ name}}_holder">
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">
{{ Form.input('text', name, value, options) }}

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

@@ -1,4 +1,4 @@
<div class="{{ classes }}">
<div class="{{ classes }}" id="{{ name}}_holder">
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">
{{ Form.input('text', name, value, options) }}

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

@@ -1,4 +1,4 @@
<div class="{{ classes }}">
<div class="{{ classes }}" id="{{ name}}_holder">
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">
{{ Form.textarea(name, value, options) }}

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

@@ -66,7 +66,7 @@
{{ title }}
{% if subTitle %}
<small>
<small id="subTitle">
{% if subTitleIcon %}
<i class="hidden-xs fa {{ subTitleIcon }}"></i>
{% endif %}

62
resources/twig/transactions/create.twig
View File

@@ -11,29 +11,35 @@
<i class="fa fa-exclamation-circle"></i> {{ 'mandatoryFields'|_ }}
</div>
<div class="panel-body">
<div class="form-group">
<label class="col-sm-4 control-label">Quickswitch</label>
<div class="col-sm-8">
<div class="btn-group btn-group-justified">
<a href="#" data-what="withdrawal" class="switch btn btn-default"> {{ 'withdrawal'|_ }}</a>
<a href="#" data-what="deposit" class="switch btn btn-default"> {{ 'deposit'|_ }}</a>
<a href="#" data-what="transfer" class="switch btn btn-default">{{ 'transfer'|_ }}</a>
</div>
</div>
</div>
<!-- DESCRIPTION ALWAYS AVAILABLE -->
{{ ExpandedForm.text('description') }}
{% if what == 'deposit' or what == 'withdrawal' %}
{{ ExpandedForm.select('account_id',accounts) }}
{% endif %}
<!-- ACCOUNT ONLY FOR DEPOSITS AND WITHDRAWALS -->
{{ ExpandedForm.select('account_id',accounts) }}
<!-- SHOW EXPENSE ACCOUNT ONLY FOR WITHDRAWALS -->
{% if what == 'withdrawal' %}
{{ ExpandedForm.text('expense_account') }}
{% endif %}
{{ ExpandedForm.text('expense_account') }}
<!-- SHOW REVENUE ACCOUNT ONLY FOR DEPOSITS -->
{% if what == 'deposit' %}
{{ ExpandedForm.text('revenue_account') }}
{% endif %}
{{ ExpandedForm.text('revenue_account') }}
<!-- ONLY SHOW FROM/TO ACCOUNT WHEN CREATING TRANSFER -->
{% if what == 'transfer' %}
{{ ExpandedForm.select('account_from_id',accounts) }}
{{ ExpandedForm.select('account_to_id',accounts) }}
{% endif %}
{{ ExpandedForm.select('account_from_id',accounts) }}
{{ ExpandedForm.select('account_to_id',accounts) }}
<!-- ALWAYS SHOW AMOUNT -->
@@ -51,9 +57,7 @@
</div>
<div class="panel-body">
<!-- BUDGET ONLY WHEN CREATING A WITHDRAWAL -->
{% if what == 'withdrawal' %}
{{ ExpandedForm.select('budget_id',budgets,0) }}
{% endif %}
{{ ExpandedForm.select('budget_id',budgets,0) }}
<!-- CATEGORY ALWAYS -->
{{ ExpandedForm.text('category') }}
@@ -62,9 +66,7 @@
<!-- RELATE THIS TRANSFER TO A PIGGY BANK -->
{% if what == 'withdrawal' and piggies|length > 0 %}
{{ ExpandedForm.select('piggy_bank_id',piggies) }}
{% endif %}
{{ ExpandedForm.select('piggy_bank_id',piggies) }}
</div>
</div>
@@ -82,7 +84,7 @@
<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">
<button type="submit" id="transaction-btn" class="btn btn-lg btn-success">
<i class="fa fa-plus-circle"></i> {{ trans('form.store_new_'~what) }}
</button>
</p>
@@ -94,6 +96,26 @@
{% block scripts %}
<script type="text/javascript">
var what = "{{ what }}";
var piggiesLength = {{ piggies|length }};
var doSwitch = true;
// some titles and names:
var txt = [];
var title = [];
var breadcrumbs = [];
var middleCrumbName = [];
var middleCrumbUrl = [];
var button = [];
{% for type in {0:'withdrawal',1:'deposit',2:'transfer'} %}
txt['{{ type }}'] = '{{ type|_ }}';
title['{{ type }}'] = '{{ trans('form.add_new_' ~ type) }}';
breadcrumbs['{{ type }}'] = '{{ trans('breadcrumbs.create_' ~ type) }}';
middleCrumbName['{{ type }}'] = '{{ trans('breadcrumbs.' ~ type ~ '_list') }}';
middleCrumbUrl['{{ type }}'] = '{{ route('transactions.index', type) }}';
button['{{ type }}'] = '{{ trans('form.store_new_' ~ type) }}';
{% endfor %}
</script>
<script type="text/javascript" src="js/bootstrap3-typeahead.min.js"></script>
<script type="text/javascript" src="js/bootstrap-tagsinput.min.js"></script>