mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Some code reformatting.
This commit is contained in:
parent
3670053a58
commit
148956a60d
@ -26,7 +26,7 @@
|
|||||||
<input type="hidden" name="_token" value="{{ csrf_token() }}">
|
<input type="hidden" name="_token" value="{{ csrf_token() }}">
|
||||||
|
|
||||||
<div class="form-group has-feedback">
|
<div class="form-group has-feedback">
|
||||||
<input type="email" name="email" value="{{ email }}"class="form-control" placeholder="Email"/>
|
<input type="email" name="email" value="{{ email }}" class="form-control" placeholder="Email"/>
|
||||||
{% if showDemoWarning %}
|
{% if showDemoWarning %}
|
||||||
<p class="help-block">You will receive an email from Firefly III. If your email address
|
<p class="help-block">You will receive an email from Firefly III. If your email address
|
||||||
is incorrect, your account may not work.</p>
|
is incorrect, your account may not work.</p>
|
||||||
|
@ -59,8 +59,8 @@
|
|||||||
{% else %}
|
{% else %}
|
||||||
{{ transaction.description }}
|
{{ transaction.description }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</a>
|
</a>
|
||||||
{{ splitJournalIndicator(transaction.journal_id) }}
|
{{ splitJournalIndicator(transaction.journal_id) }}
|
||||||
|
|
||||||
{% if transaction.transactionJournal.attachments|length > 0 %}
|
{% if transaction.transactionJournal.attachments|length > 0 %}
|
||||||
<i class="fa fa-paperclip"
|
<i class="fa fa-paperclip"
|
||||||
|
@ -15,10 +15,10 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
<span class="pull-right small">
|
<span class="pull-right small">
|
||||||
<!-- format amount of transaction -->
|
<!-- format amount of transaction -->
|
||||||
{{ formatAmountWithCode(transaction.transaction_amount, transaction.transaction_currency_code) }}
|
{{ formatAmountWithCode(transaction.transaction_amount, transaction.transaction_currency_code) }}
|
||||||
<!-- and then amount of journal itself. -->
|
<!-- and then amount of journal itself. -->
|
||||||
{{ optionalJournalAmount(transaction.journal_id, transaction.transaction_amount,
|
{{ optionalJournalAmount(transaction.journal_id, transaction.transaction_amount,
|
||||||
transaction.transaction_currency_code, transaction.transaction_type_type) }}
|
transaction.transaction_currency_code, transaction.transaction_type_type) }}
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
@ -130,7 +130,8 @@
|
|||||||
</li>
|
</li>
|
||||||
|
|
||||||
<!-- options and preferences -->
|
<!-- options and preferences -->
|
||||||
<li id="option-menu" class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currency') }} treeview">
|
<li id="option-menu"
|
||||||
|
class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currency') }} treeview">
|
||||||
<a href="#">
|
<a href="#">
|
||||||
<i class="fa fa-gears fa-fw"></i>
|
<i class="fa fa-gears fa-fw"></i>
|
||||||
<span>{{ 'options'|_ }}</span>
|
<span>{{ 'options'|_ }}</span>
|
||||||
@ -149,9 +150,10 @@
|
|||||||
</li>
|
</li>
|
||||||
<!-- admin (if user admin) -->
|
<!-- admin (if user admin) -->
|
||||||
{% if Auth.user.hasRole('owner') %}
|
{% if Auth.user.hasRole('owner') %}
|
||||||
<li class="{{ activeRoutePartial('admin') }}">
|
<li class="{{ activeRoutePartial('admin') }}">
|
||||||
<a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index') }}"><i class="fa fa-hand-spock-o fa-fw"></i> {{ 'administration'|_ }}</a>
|
<a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index') }}"><i
|
||||||
</li>
|
class="fa fa-hand-spock-o fa-fw"></i> {{ 'administration'|_ }}</a>
|
||||||
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
@ -73,14 +73,10 @@
|
|||||||
{{ ExpandedForm.checkbox('tj[attachments]','1', tjOptionalFields.attachments,{ 'label' : 'pref_optional_tj_attachments'|_ }) }}
|
{{ ExpandedForm.checkbox('tj[attachments]','1', tjOptionalFields.attachments,{ 'label' : 'pref_optional_tj_attachments'|_ }) }}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-6 col-md-6 col-sm-6">
|
<div class="col-lg-6 col-md-6 col-sm-6">
|
||||||
<div class="box">
|
<div class="box">
|
||||||
|
@ -43,7 +43,8 @@
|
|||||||
<td class="hide-buttons">
|
<td class="hide-buttons">
|
||||||
<div class="btn-group btn-group-xs">
|
<div class="btn-group btn-group-xs">
|
||||||
<a href="{{ route('transactions.edit',transaction.journal_id) }}" class="btn btn-xs btn-default"><i class="fa fa-fw fa-pencil"></i></a>
|
<a href="{{ route('transactions.edit',transaction.journal_id) }}" class="btn btn-xs btn-default"><i class="fa fa-fw fa-pencil"></i></a>
|
||||||
<a href="{{ route('transactions.delete',transaction.journal_id) }}" class="btn btn-xs btn-danger"><i class="fa fa-fw fa-trash-o"></i></a></div>
|
<a href="{{ route('transactions.delete',transaction.journal_id) }}" class="btn btn-xs btn-danger"><i class="fa fa-fw fa-trash-o"></i></a>
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td class="hide-icon">{{ transaction|typeIconTransaction }}</td>
|
<td class="hide-icon">{{ transaction|typeIconTransaction }}</td>
|
||||||
|
|
||||||
@ -141,7 +142,7 @@
|
|||||||
{% if transaction.transactionJournal.hasMeta('notes') %}
|
{% if transaction.transactionJournal.hasMeta('notes') %}
|
||||||
{{ transaction.transactionJournal.getMeta('notes')|nl2br }}
|
{{ transaction.transactionJournal.getMeta('notes')|nl2br }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td class="hide-create_date">
|
<td class="hide-create_date">
|
||||||
|
@ -104,10 +104,10 @@
|
|||||||
class="btn btn-danger"><span
|
class="btn btn-danger"><span
|
||||||
class="fa fa-fw fa-trash"></span></a>
|
class="fa fa-fw fa-trash"></span></a>
|
||||||
</div>
|
</div>
|
||||||
<br />
|
<br/>
|
||||||
<div class="btn-group btn-group-xs">
|
<div class="btn-group btn-group-xs">
|
||||||
<a href="{{ route('rules.rule-group.select_transactions',ruleGroup.id) }}" class="btn btn-default"
|
<a href="{{ route('rules.rule-group.select_transactions',ruleGroup.id) }}" class="btn btn-default"
|
||||||
title=" {{ 'execute_on_existing_transactions_short'|_ }}">
|
title=" {{ 'execute_on_existing_transactions_short'|_ }}">
|
||||||
<i class="fa fa-fw fa-check-circle"></i></a>
|
<i class="fa fa-fw fa-check-circle"></i></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -93,16 +93,15 @@
|
|||||||
not optionalFields.invoice_date or
|
not optionalFields.invoice_date or
|
||||||
not optionalFields.internal_reference or
|
not optionalFields.internal_reference or
|
||||||
not optionalFields.notes or
|
not optionalFields.notes or
|
||||||
not optionalFields.attachments
|
not optionalFields.attachments %}
|
||||||
%}
|
<p class="text-center text-success"><i class="fa fa-info-circle" aria-hidden="true"></i>
|
||||||
<p class="text-center text-success"><i class="fa fa-info-circle" aria-hidden="true"></i> <em>{{ trans('firefly.hidden_fields_preferences', {link: route('preferences')})|raw }}</em></p>
|
<em>{{ trans('firefly.hidden_fields_preferences', {link: route('preferences')})|raw }}</em></p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<!-- box for dates -->
|
<!-- box for dates -->
|
||||||
{% if
|
{% if
|
||||||
optionalFields.interest_date or optionalFields.book_date or optionalFields.process_date
|
optionalFields.interest_date or optionalFields.book_date or optionalFields.process_date
|
||||||
or optionalFields.due_date or optionalFields.payment_date
|
or optionalFields.due_date or optionalFields.payment_date
|
||||||
or optionalFields.invoice_date
|
or optionalFields.invoice_date %}
|
||||||
%}
|
|
||||||
<div class="box">
|
<div class="box">
|
||||||
<div class="box-header with-border">
|
<div class="box-header with-border">
|
||||||
<h3 class="box-title">{{ 'optional_field_meta_dates'|_ }}</h3>
|
<h3 class="box-title">{{ 'optional_field_meta_dates'|_ }}</h3>
|
||||||
|
@ -110,18 +110,17 @@
|
|||||||
|
|
||||||
<!-- box for dates -->
|
<!-- box for dates -->
|
||||||
{% if
|
{% if
|
||||||
optionalFields.interest_date or
|
optionalFields.interest_date or
|
||||||
optionalFields.book_date or
|
optionalFields.book_date or
|
||||||
optionalFields.process_date or
|
optionalFields.process_date or
|
||||||
optionalFields.due_date or
|
optionalFields.due_date or
|
||||||
optionalFields.payment_date or
|
optionalFields.payment_date or
|
||||||
optionalFields.invoice_date or
|
optionalFields.invoice_date or
|
||||||
data.interest_date or
|
data.interest_date or
|
||||||
data.book_date or
|
data.book_date or
|
||||||
data.process_date or
|
data.process_date or
|
||||||
data.due_date or
|
data.due_date or
|
||||||
data.payment_date
|
data.payment_date %}
|
||||||
%}
|
|
||||||
<div class="box">
|
<div class="box">
|
||||||
<div class="box-header with-border">
|
<div class="box-header with-border">
|
||||||
<h3 class="box-title">{{ 'optional_field_meta_dates'|_ }}</h3>
|
<h3 class="box-title">{{ 'optional_field_meta_dates'|_ }}</h3>
|
||||||
@ -163,15 +162,12 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- box for business fields -->
|
<!-- box for business fields -->
|
||||||
{% if
|
{% if
|
||||||
optionalFields.internal_reference or
|
optionalFields.internal_reference or
|
||||||
optionalFields.notes or
|
optionalFields.notes or
|
||||||
data['interal_reference'] or
|
data['interal_reference'] or
|
||||||
data['notes']
|
data['notes'] %}
|
||||||
|
|
||||||
%}
|
|
||||||
<div class="box">
|
<div class="box">
|
||||||
<div class="box-header with-border">
|
<div class="box-header with-border">
|
||||||
<h3 class="box-title">{{ 'optional_field_meta_business'|_ }}</h3>
|
<h3 class="box-title">{{ 'optional_field_meta_business'|_ }}</h3>
|
||||||
|
Loading…
Reference in New Issue
Block a user