kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-02 10:22:09 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup.

Browse Source 
Signed-off-by: James Cole <thegrumpydictator@gmail.com>
This commit is contained in:
James Cole
2016-08-27 03:50:35 +02:00
parent a9444ac702
commit a0ea3882e1
43 changed files with 385 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
resources/views/admin/index.twig
View File

@@ -4,21 +4,21 @@
{{ Breadcrumbs.renderIfExists }} {{ Breadcrumbs.renderIfExists }}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
<div class="box box-primary"> <div class="box box-primary">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'user_administration'|_ }}</h3> <h3 class="box-title">{{ 'user_administration'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<ul> <ul>
<li><a href="{{ route('admin.users') }}">{{ 'list_all_users'|_ }}</a></li> <li><a href="{{ route('admin.users') }}">{{ 'list_all_users'|_ }}</a></li>
<li><a href="{{ route('admin.users.domains') }}">{{ 'blocked_domains'|_ }}</a></li> <li><a href="{{ route('admin.users.domains') }}">{{ 'blocked_domains'|_ }}</a></li>
<!-- <li><a href="#">{{ 'user_related_settings'|_ }}</a></li> --> <!-- <li><a href="#">{{ 'user_related_settings'|_ }}</a></li> -->
</ul> </ul>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}

3
resources/views/budgets/show.twig
View File

@@ -48,7 +48,8 @@
{% for limit in limits %} {% for limit in limits %}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"><a href="{{ route('budgets.showWithRepetition',[budget.id,limit.id]) }}">{{ limit.startdate.formatLocalized(monthFormat) }}</a> <h3 class="box-title"><a
href="{{ route('budgets.showWithRepetition',[budget.id,limit.id]) }}">{{ limit.startdate.formatLocalized(monthFormat) }}</a>
</h3> </h3>
</div> </div>
<div class="box-body"> <div class="box-body">

3
resources/views/currency/index.twig
View File

@@ -37,7 +37,8 @@
{% if currency.id == defaultCurrency.id %} {% if currency.id == defaultCurrency.id %}
<span class="label label-success">{{ 'default_currency'|_ }}</span> <span class="label label-success">{{ 'default_currency'|_ }}</span>
{% else %} {% else %}
<a class="btn btn-info btn-xs" href="{{ route('currency.default',currency.id) }}">{{ 'make_default_currency'|_ }}</a> <a class="btn btn-info btn-xs"
href="{{ route('currency.default',currency.id) }}">{{ 'make_default_currency'|_ }}</a>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

6
resources/views/emails/blocked-login-html.twig
View File

@@ -10,14 +10,14 @@
Hey there, Hey there,
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
Firefly III has just blocked a login from user #{{ user_id }} ({{ user_address }}). Firefly III has just blocked a login from user #{{ user_id }} ({{ user_address }}).
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The blocked code was "{{ code }}". The blocked code was "{{ code }}".
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:11px;color:#aaa;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:11px;color:#aaa;">
The login attempt came from IP {{ ip }}. The login attempt came from IP {{ ip }}.
</p> </p>
</body> </body>

6
resources/views/emails/blocked-registration-html.twig
View File

@@ -10,14 +10,14 @@
Hey there, Hey there,
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
Firefly III has just blocked a registration for an email addres at domain {{ blocked_domain }}. Firefly III has just blocked a registration for an email addres at domain {{ blocked_domain }}.
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The blocked email address was "{{ email_address }}". The blocked email address was "{{ email_address }}".
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:11px;color:#aaa;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:11px;color:#aaa;">
The login attempt came from IP {{ ip }}. The login attempt came from IP {{ ip }}.
</p> </p>
</body> </body>

3
resources/views/emails/confirm-account-html.twig
View File

@@ -11,7 +11,8 @@
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is! To start using your brand new Firefly III account, you need to activate it. Activating your account allows the website to verify that this email address is
valid. Unfortunately, not even the most complex routines can work this out, without actually sending an email message. And here it is!
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">

10
resources/views/emails/error-html.blade.php
View File

@@ -10,11 +10,11 @@
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The error was of type "{{ class }}". The error was of type "{{ class }}".
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The error occured on/at: {{ time }}. The error occured on/at: {{ time }}.
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
@@ -23,14 +23,14 @@ The error occured on/at: {{ time }}.
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
{% if loggedIn %} {% if loggedIn %}
The error was encountered by user #{{ user.id }}, <a href="mailto:{{ user.email }}">{{ user.email }}</a>. The error was encountered by user #{{ user.id }}, <a href="mailto:{{ user.email }}">{{ user.email }}</a>.
{% else %} {% else %}
There was no user logged in for this error or no user was detected. There was no user logged in for this error or no user was detected.
{% endif %} {% endif %}
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The IP address related to this error is: {{ ip }} The IP address related to this error is: {{ ip }}
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">

6
resources/views/emails/error-html.twig
View File

@@ -10,11 +10,11 @@
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The error was of type "{{ class }}". The error was of type "{{ class }}".
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The error occured on/at: {{ time }}. The error occured on/at: {{ time }}.
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
@@ -30,7 +30,7 @@ The error occured on/at: {{ time }}.
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The IP address related to this error is: {{ ip }} The IP address related to this error is: {{ ip }}
</p> </p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;"> <p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">

4
resources/views/emails/error.twig
View File

@@ -7,9 +7,9 @@ The error occured on/at: {{ time }}.
This error occured in file "{{ file }}" on line {{ line }} with code {{ code }}. This error occured in file "{{ file }}" on line {{ line }} with code {{ code }}.
{% if loggedIn %} {% if loggedIn %}
The error was encountered by user #{{ user.id }}, {{ user.email }}. The error was encountered by user #{{ user.id }}, {{ user.email }}.
{% else %} {% else %}
There was no user logged in for this error or no user was detected. There was no user logged in for this error or no user was detected.
{% endif %} {% endif %}
The IP address related to this error is: {{ ip }} The IP address related to this error is: {{ ip }}

5
resources/views/errors/503.twig
View File

@@ -12,9 +12,10 @@
display: table; display: table;
font-family: 'Roboto', sans-serif; font-family: 'Roboto', sans-serif;
} }
p { p {
color:#575e62; color: #575e62;
font-size:1.5em; font-size: 1.5em;
} }
.container { .container {

3
resources/views/export/index.twig
View File

@@ -33,7 +33,8 @@
</div> </div>
<div id="export-download" style="display:none;"> <div id="export-download" style="display:none;">
<p class="text-center text-info" id="download-holder"> <p class="text-center text-info" id="download-holder">
<a id="download-link" class="btn btn-lg btn-success" href="{{ route('export.download', job.key) }}"><i class="fa fa-fw fa-download"></i> Download</a> <a id="download-link" class="btn btn-lg btn-success" href="{{ route('export.download', job.key) }}"><i
class="fa fa-fw fa-download"></i> Download</a>
</p> </p>
</div> </div>
<div id="export-error" style="display:none;"> <div id="export-error" style="display:none;">

2
resources/views/form/multiCheckbox.twig
View File

@@ -4,7 +4,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
{% for value,description in list %} {% for value,description in list %}
{% set options = options|merge({'id': 'ffInput_'~name~'_'~value}) %} {% set options = options|merge({'id': 'ffInput_'~name~'_'~value}) %}
<div class="checkbox"> <div class="checkbox">
<label> <label>
{% if value in selected %} {% if value in selected %}
{{ Form.checkbox(name~'[]', value, true, options) }} {{ Form.checkbox(name~'[]', value, true, options) }}

20
resources/views/form/options.twig
View File

@@ -32,17 +32,17 @@
</div> </div>
{% endif %} {% endif %}
{% if type == 'create' and name == 'transaction' %} {% if type == 'create' and name == 'transaction' %}
<div class="form-group"> <div class="form-group">
<label for="{{ name }}_split" class="col-sm-4 control-label"> <label for="{{ name }}_split" class="col-sm-4 control-label">
{{ trans('form.split_journal') }} {{ trans('form.split_journal') }}
</label> </label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="radio"><label> <div class="radio"><label>
{{ Form.checkbox('split_journal', '1', Input.old('split_journal') == '1', {'id': name ~ 'split'}) }} {{ Form.checkbox('split_journal', '1', Input.old('split_journal') == '1', {'id': name ~ 'split'}) }}
{{ trans('form.split_journal_explanation') }} {{ trans('form.split_journal_explanation') }}
</label> </label>
</div>
</div> </div>
</div> </div>
</div>
{% endif %} {% endif %}

6
resources/views/import/complete.twig
View File

@@ -19,10 +19,12 @@
</p> </p>
<div class="row"> <div class="row">
<div class="col-lg-4"> <div class="col-lg-4">
<a href="{{ route('import.download', [job.key]) }}" class="btn btn-default"><i class="fa fa-fw fa-download"></i> {{ 'import_download_config'|_ }}</a> <a href="{{ route('import.download', [job.key]) }}" class="btn btn-default"><i
class="fa fa-fw fa-download"></i> {{ 'import_download_config'|_ }}</a>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<a href="{{ route('import.status', [job.key]) }}" class="btn btn-success"><i class="fa fa-fw fa-gears"></i> {{ 'import_start_import'|_ }}</a> <a href="{{ route('import.status', [job.key]) }}" class="btn btn-success"><i
class="fa fa-fw fa-gears"></i> {{ 'import_start_import'|_ }}</a>
</div> </div>
</div> </div>
</div> </div>

4
resources/views/import/csv/roles.twig
View File

@@ -49,14 +49,14 @@
<em>{{ trans('csv.no_example_data') }}</em> <em>{{ trans('csv.no_example_data') }}</em>
{% else %} {% else %}
{% for example in data.columns[i] %} {% for example in data.columns[i] %}
<code>{{ example }}</code><br /> <code>{{ example }}</code><br/>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
<td> <td>
{{ Form.select(('role['~loop.index0~']'), {{ Form.select(('role['~loop.index0~']'),
data.available_roles, data.available_roles,
job.configuration['column-roles'][loop.index0], job.configuration['column-roles'][loop.index0],
{class: 'form-control'}) }} {class: 'form-control'}) }}
</td> </td>
<td> <td>

14
resources/views/import/status.twig
View File

@@ -11,13 +11,13 @@
<h3 class="box-title">{{ 'import_status_header'|_ }}</h3> <h3 class="box-title">{{ 'import_status_header'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<div class="progress" id="import-status-holder"> <div class="progress" id="import-status-holder">
<div id="import-status-bar" class="progress-bar progress-bar-info active progress-bar-striped" role="progressbar" <div id="import-status-bar" class="progress-bar progress-bar-info active progress-bar-striped" role="progressbar"
aria-valuenow="100" aria-valuemin="0" aria-valuenow="100" aria-valuemin="0"
aria-valuemax="100" style="width: 100%"> aria-valuemax="100" style="width: 100%">
</div> </div>
</div> </div>
<p id="import-status-txt">{{ 'import_status_settings_complete'|_ }}</p> <p id="import-status-txt">{{ 'import_status_settings_complete'|_ }}</p>
</div> </div>
</div> </div>
</div> </div>

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

@@ -92,7 +92,7 @@
<form action="{{ route('search') }}" method="get" class="sidebar-form"> <form action="{{ route('search') }}" method="get" class="sidebar-form">
<div class="input-group"> <div class="input-group">
<input type="text" name="q" class="form-control" placeholder="Search..." value="{{ query }}"/> <input type="text" name="q" class="form-control" placeholder="Search..." value="{{ query }}"/>
<span class="input-group-btn"> <span class="input-group-btn">
<button type='submit' name='search' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i></button> <button type='submit' name='search' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i></button>
</span> </span>
</div> </div>

6
resources/views/list/journals-tiny.twig
View File

@@ -7,9 +7,9 @@
href="{{ route('transactions.show',journal.id) }}" href="{{ route('transactions.show',journal.id) }}"
{% endif %} {% endif %}
> >
{{ journal|typeIcon }} {{ journal|typeIcon }}
{{ journal.description }} {{ journal.description }}
<span class="pull-right small"> <span class="pull-right small">
{{ journal|formatJournal }} {{ journal|formatJournal }}
</span> </span>
</a> </a>

8
resources/views/partials/menu-sidebar.twig
View File

@@ -130,7 +130,7 @@
</li> </li>
<!-- options and preferences --> <!-- options and preferences -->
<li id="option-menu" class="{{ 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>
@@ -147,6 +147,12 @@
<li class="{{ activeRoutePartial('currency') }}"> <li class="{{ activeRoutePartial('currency') }}">
<a class="{{ activeRoutePartial('currency') }}" href="{{ route('currency.index') }}"><i class="fa fa-usd fa-fw"></i> {{ 'currencies'|_ }}</a> <a class="{{ activeRoutePartial('currency') }}" href="{{ route('currency.index') }}"><i class="fa fa-usd fa-fw"></i> {{ 'currencies'|_ }}</a>
</li> </li>
<!-- admin (if user admin) -->
{% if Auth.user.hasRole('owner') %}
<li class="{{ activeRoutePartial('admin') }}">
<a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index') }}"><i class="fa fa-hand-spock-o fa-fw"></i> {{ 'administration'|_ }}</a>
</li>
{% endif %}
</ul> </ul>

2
resources/views/popup/report/budget-spent-amount.twig
View File

@@ -4,7 +4,7 @@
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="budgetSpentAmountLabel"> <h4 class="modal-title" id="budgetSpentAmountLabel">
{{ trans('firefly.budget_spent_amount', {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat), budget: budget.name})}} {{ trans('firefly.budget_spent_amount', {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat), budget: budget.name}) }}
</h4> </h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">

3
resources/views/popup/report/category-entry.twig
View File

@@ -3,7 +3,8 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="expenseEntryTitle">{{ trans('firefly.category_entry', {name: category.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4> <h4 class="modal-title"
id="expenseEntryTitle">{{ trans('firefly.category_entry', {name: category.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
{% set hideCategory = true %} {% set hideCategory = true %}

3
resources/views/popup/report/expense-entry.twig
View File

@@ -3,7 +3,8 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="expenseEntryTitle">{{ trans('firefly.expense_entry', {name: account.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4> <h4 class="modal-title"
id="expenseEntryTitle">{{ trans('firefly.expense_entry', {name: account.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
{% set hideDestination = true %} {% set hideDestination = true %}

3
resources/views/popup/report/income-entry.twig
View File

@@ -3,7 +3,8 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'close'|_ }}"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="incomeEntryTitle">{{ trans('firefly.income_entry', {name: account.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4> <h4 class="modal-title"
id="incomeEntryTitle">{{ trans('firefly.income_entry', {name: account.name, start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }}</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
{% set hideBudget = true %} {% set hideBudget = true %}

4
resources/views/preferences/code.twig
View File

@@ -18,8 +18,8 @@
</p> </p>
<div class="form group"> <div class="form group">
<div class="col-sm-8 col-md-offset-4"> <div class="col-sm-8 col-md-offset-4">
<img src="{{ image }}" alt="" title="" /> <img src="{{ image }}" alt="" title=""/>
<br /><br /> <br/><br/>
</div> </div>
</div> </div>

29
resources/views/preferences/index.twig
View File

@@ -160,7 +160,7 @@
</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">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'pref_two_factor_auth'|_ }}</h3> <h3 class="box-title">{{ 'pref_two_factor_auth'|_ }}</h3>
@@ -172,26 +172,26 @@
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="twoFactorAuthEnabled" value="1" <input type="checkbox" name="twoFactorAuthEnabled" value="1"
{% if is2faEnabled == '1' %} checked {% endif %}> {{ 'pref_enable_two_factor_auth'|_ }} {% if is2faEnabled == '1' %} checked {% endif %}> {{ 'pref_enable_two_factor_auth'|_ }}
</label> </label>
</div> </div>
</div> </div>
{% if is2faEnabled == 1 and has2faSecret == true %} {% if is2faEnabled == 1 and has2faSecret == true %}
<div class="col-sm-10"> <div class="col-sm-10">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<a href="{{ route('preferences.code') }}">{{ 'pref_two_factor_auth_reset_code'|_ }}</a> <a href="{{ route('preferences.code') }}">{{ 'pref_two_factor_auth_reset_code'|_ }}</a>
</label> </label>
</div>
<div class="checkbox">
<label>
<a href="{{ route('preferences.delete-code') }}">{{ 'pref_two_factor_auth_remove_code'|_ }}</a>
{{ 'pref_two_factor_auth_remove_will_disable'|_ }}
</label>
</div>
</div> </div>
<div class="checkbox">
<label>
<a href="{{ route('preferences.delete-code') }}">{{ 'pref_two_factor_auth_remove_code'|_ }}</a>
{{ 'pref_two_factor_auth_remove_will_disable'|_ }}
</label>
</div>
</div>
{% endif %} {% endif %}
</div> </div>
@@ -200,7 +200,6 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">

22
resources/views/reports/audit/report.twig
View File

@@ -18,7 +18,8 @@
{% for hide in hideable %} {% for hide in hideable %}
<li><input <li><input
{% if hide in defaultShow %}checked{% endif %} {% if hide in defaultShow %}checked{% endif %}
type="checkbox" class="audit-option-checkbox" name="option[]" value="{{ hide }}" id="option_{{ hide }}" /> <label for="option_{{ hide }}" style="font-weight:normal;">{{ trans('list.'~hide) }}</label></li> type="checkbox" class="audit-option-checkbox" name="option[]" value="{{ hide }}" id="option_{{ hide }}"/> <label
for="option_{{ hide }}" style="font-weight:normal;">{{ trans('list.'~hide) }}</label></li>
{% endfor %} {% endfor %}
</ul> </ul>
@@ -41,13 +42,12 @@
<em> <em>
{{ trans('firefly.no_audit_activity', {{ trans('firefly.no_audit_activity',
{ {
account_name: account.name, account_name: account.name,
url: url, url: url,
start: start.formatLocalized(monthAndDayFormat), start: start.formatLocalized(monthAndDayFormat),
end: end.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat),
})|raw })|raw }}
}}
</em> </em>
</div> </div>
{% else %} {% else %}
@@ -60,8 +60,7 @@
url: url, url: url,
end: auditData[account.id].end, end: auditData[account.id].end,
balance: auditData[account.id].endBalance|formatAmount balance: auditData[account.id].endBalance|formatAmount
})|raw })|raw }}
}}
</p> </p>
{% include 'reports/partials/journals-audit.twig' with {'journals': auditData[account.id].journals,'account':account} %} {% include 'reports/partials/journals-audit.twig' with {'journals': auditData[account.id].journals,'account':account} %}
<p style="padding:10px;"> <p style="padding:10px;">
@@ -71,8 +70,7 @@
url: url, url: url,
end: auditData[account.id].dayBefore, end: auditData[account.id].dayBefore,
balance: auditData[account.id].dayBeforeBalance|formatAmount balance: auditData[account.id].dayBeforeBalance|formatAmount
})|raw })|raw }}
}}
</p> </p>
</div> </div>
{% endif %} {% endif %}

3
resources/views/reports/default/multi-year.twig
View File

@@ -62,7 +62,8 @@
<h3 class="box-title">{{ 'Asset account'|_ }}: {{ account.name }}</h3> <h3 class="box-title">{{ 'Asset account'|_ }}: {{ account.name }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<canvas id="account-chart-{{ account.id }}" class="account-chart" data-id="{{ account.id }}" style="width:100%;height:400px;" height="400"></canvas> <canvas id="account-chart-{{ account.id }}" class="account-chart" data-id="{{ account.id }}" style="width:100%;height:400px;"
height="400"></canvas>
</div> </div>
</div> </div>
</div> </div>

28
resources/views/reports/default/year.twig
View File

@@ -70,25 +70,25 @@
<div class="box-body"> <div class="box-body">
<table class="table table-condensed table-hover"> <table class="table table-condensed table-hover">
<thead> <thead>
<tr> <tr>
<th>&nbsp;</th> <th>&nbsp;</th>
{% for date, header in budgets.get('headers') %} {% for date, header in budgets.get('headers') %}
<th>{{ header }}</th> <th>{{ header }}</th>
{% endfor %} {% endfor %}
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% set spentData = budgets.get('spent') %} {% set spentData = budgets.get('spent') %}
{% for budgetId, budgetName in budgets.get('budgets') %} {% for budgetId, budgetName in budgets.get('budgets') %}
<tr> <tr>
<th> <th>
<a title="{{ budgetName }}" href="#" data-budget="{{ budgetId }}" class="budget-chart-activate">{{ budgetName }}</a> <a title="{{ budgetName }}" href="#" data-budget="{{ budgetId }}" class="budget-chart-activate">{{ budgetName }}</a>
</th> </th>
{% for date, header in budgets.get('headers') %} {% for date, header in budgets.get('headers') %}
<td>{{ spentData[budgetId][date]|formatAmount }}</td> <td>{{ spentData[budgetId][date]|formatAmount }}</td>
{% endfor %} {% endfor %}
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>

8
resources/views/reports/partials/balance.twig
View File

@@ -26,10 +26,10 @@
<td> <td>
<a href="{{ route('budgets.show',balanceLine.getBudget.id) }}">{{ balanceLine.getTitle }}</a> <a href="{{ route('budgets.show',balanceLine.getBudget.id) }}">{{ balanceLine.getTitle }}</a>
{% if balanceLine.getStartdate and balanceLine.getEnddate %} {% if balanceLine.getStartdate and balanceLine.getEnddate %}
<span class="small"><br> <span class="small"><br>
{{ balanceLine.getStartdate.formatLocalized(monthAndDayFormat) }} {{ balanceLine.getStartdate.formatLocalized(monthAndDayFormat) }}
&mdash; &mdash;
{{ balanceLine.getEnddate.formatLocalized(monthAndDayFormat) }} {{ balanceLine.getEnddate.formatLocalized(monthAndDayFormat) }}
</span> </span>
{% endif %} {% endif %}
</td> </td>

3
resources/views/reports/partials/expenses.twig
View File

@@ -17,7 +17,8 @@
<br/> <br/>
<small> <small>
{{ expense.count }} {{ 'transactions'|_|lower }} {{ expense.count }} {{ 'transactions'|_|lower }}
<i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="expense-entry" data-account-id="{{ expense.id }}"></i> <i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="expense-entry"
data-account-id="{{ expense.id }}"></i>
</small> </small>
{% endif %} {% endif %}
</td> </td>

3
resources/views/reports/partials/income.twig
View File

@@ -17,7 +17,8 @@
<br/> <br/>
<small> <small>
{{ income.count }} {{ 'transactions'|_|lower }} {{ income.count }} {{ 'transactions'|_|lower }}
<i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="income-entry" data-account-id="{{ income.id }}"></i> <i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="income-entry"
data-account-id="{{ income.id }}"></i>
</small> </small>
{% endif %} {% endif %}

8
resources/views/reports/partials/journals-audit.twig
View File

@@ -33,11 +33,13 @@
<tr data-date="{{ journal.date.format('Y-m-d') }}" data-id="{{ journal.id }}"> <tr data-date="{{ journal.date.format('Y-m-d') }}" data-id="{{ journal.id }}">
<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',journal.id) }}" class="btn btn-xs btn-default"><i class="fa fa-fw fa-pencil"></i></a> <a href="{{ route('transactions.edit',journal.id) }}" class="btn btn-xs btn-default"><i class="fa fa-fw fa-pencil"></i></a>
<a href="{{ route('transactions.delete',journal.id) }}" class="btn btn-xs btn-danger"><i class="fa fa-fw fa-trash-o"></i></a></div></td> <a href="{{ route('transactions.delete',journal.id) }}" class="btn btn-xs btn-danger"><i class="fa fa-fw fa-trash-o"></i></a></div>
</td>
<td class="hide-icon">{{ journal|typeIcon }}</td> <td class="hide-icon">{{ journal|typeIcon }}</td>
<td class="hide-description"><a href="{{ route('transactions.show',journal.id) }}" title="{{ journal.description }}">{{ journal.description }}</a></td> <td class="hide-description"><a href="{{ route('transactions.show',journal.id) }}" title="{{ journal.description }}">{{ journal.description }}</a>
</td>
<td class="hide-balance_before">{{ journal.before|formatAmount }}</td> <td class="hide-balance_before">{{ journal.before|formatAmount }}</td>
<td class="hide-amount">{{ journal|formatJournal }}</td> <td class="hide-amount">{{ journal|formatJournal }}</td>
<td class="hide-balance_after">{{ journal.after|formatAmount }}</td> <td class="hide-balance_after">{{ journal.after|formatAmount }}</td>

18
resources/views/rules/index.twig
View File

@@ -44,15 +44,15 @@
class="fa fa-fw fa-trash"></i> {{ 'delete'|_ }}</a></li> class="fa fa-fw fa-trash"></i> {{ 'delete'|_ }}</a></li>
<li><a href="{{ route('rules.rule-group.select_transactions',ruleGroup.id) }}"><i <li><a href="{{ route('rules.rule-group.select_transactions',ruleGroup.id) }}"><i
class="fa fa-fw fa-anchor"></i> {{ 'execute_on_existing_transactions_short'|_ }}</a></li> class="fa fa-fw fa-anchor"></i> {{ 'execute_on_existing_transactions_short'|_ }}</a></li>
{% if ruleGroup.order > 1 %} {% if ruleGroup.order > 1 %}
<li><a href="{{ route('rules.rule-group.up',ruleGroup.id) }}"><i <li><a href="{{ route('rules.rule-group.up',ruleGroup.id) }}"><i
class="fa fa-fw fa-arrow-up"></i> {{ 'move_rule_group_up'|_ }}</a></li> class="fa fa-fw fa-arrow-up"></i> {{ 'move_rule_group_up'|_ }}</a></li>
{% endif %} {% endif %}
{% if ruleGroup.order < ruleGroups|length %} {% if ruleGroup.order < ruleGroups|length %}
<li><a href="{{ route('rules.rule-group.down',ruleGroup.id) }}"><i <li><a href="{{ route('rules.rule-group.down',ruleGroup.id) }}"><i
class="fa fa-fw fa-arrow-down"></i> {{ 'move_rule_group_down'|_ }} class="fa fa-fw fa-arrow-down"></i> {{ 'move_rule_group_down'|_ }}
</a></li> </a></li>
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
</div> </div>

44
resources/views/rules/partials/test-trigger-modal.twig
View File

@@ -1,22 +1,22 @@
<!-- Modal dialog to show transactions matching these triggers --> <!-- Modal dialog to show transactions matching these triggers -->
<div class="modal fade" id="testTriggerModal" tabindex="-1" role="dialog" aria-labelledby="testTriggerLabel"> <div class="modal fade" id="testTriggerModal" tabindex="-1" role="dialog" aria-labelledby="testTriggerLabel">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button> <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="testTriggerLabel">{{ 'test_rule_triggers'|_ }}</h4> <h4 class="modal-title" id="testTriggerLabel">{{ 'test_rule_triggers'|_ }}</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="transaction-warning alert alert-warning"> <div class="transaction-warning alert alert-warning">
<h4><i class="icon fa fa-warning"></i> {{ 'flash_warning'|_ }}</h4> <h4><i class="icon fa fa-warning"></i> {{ 'flash_warning'|_ }}</h4>
<span class="warning-contents"></span> <span class="warning-contents"></span>
</div> </div>
<div class="transactions-list"> <div class="transactions-list">
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ 'close'|_ }}</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

2
resources/views/rules/rule/create.twig
View File

@@ -68,7 +68,7 @@
</div> </div>
</div> </div>
{% include '/rules/partials/test-trigger-modal.twig' %} {% include '/rules/partials/test-trigger-modal.twig' %}
<!-- RULE ACTIONS --> <!-- RULE ACTIONS -->
<div class="row"> <div class="row">

2
resources/views/rules/rule/edit.twig
View File

@@ -69,7 +69,7 @@
</div> </div>
</div> </div>
{% include '/rules/partials/test-trigger-modal.twig' %} {% include '/rules/partials/test-trigger-modal.twig' %}
<!-- RULE ACTIONS --> <!-- RULE ACTIONS -->
<div class="row"> <div class="row">

3
resources/views/split/journals/create.twig
View File

@@ -143,7 +143,8 @@
<!-- deposit has several source names --> <!-- deposit has several source names -->
{% if preFilled.what == 'deposit' %} {% if preFilled.what == 'deposit' %}
<td> <td>
<input type="text" name="source_account_name[]" value="{{ preFilled.source_account_name[index] }}" class="form-control"/> <input type="text" name="source_account_name[]" value="{{ preFilled.source_account_name[index] }}"
class="form-control"/>
</td> </td>
{% endif %} {% endif %}

309
resources/views/split/journals/edit.twig
View File

@@ -7,196 +7,197 @@
<form method="POST" action="{{ route('split.journal.update',journal.id) }}" accept-charset="UTF-8" class="form-horizontal" id="update" <form method="POST" action="{{ route('split.journal.update',journal.id) }}" accept-charset="UTF-8" class="form-horizontal" id="update"
enctype="multipart/form-data"> enctype="multipart/form-data">
<input name="_token" type="hidden" value="{{ csrf_token() }}"> <input name="_token" type="hidden" value="{{ csrf_token() }}">
<input type="hidden" name="id" value="{{ journal.id }}"/> <input type="hidden" name="id" value="{{ journal.id }}"/>
<input type="hidden" name="what" value="{{ preFilled.what }}"/> <input type="hidden" name="what" value="{{ preFilled.what }}"/>
{% if errors.all()|length > 0 %} {% if errors.all()|length > 0 %}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box box-danger">
<div class="box-header with-border">
<h3 class="box-title">{{ 'errors'|_ }}</h3>
</div>
<div class="box-body">
<ul>
{% for key, err in errors.all() %}
<li class="text-danger">{{ err }}</li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
{% endif %}
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-6 col-md-6 col-sm-6">
<div class="box box-danger"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'errors'|_ }}</h3> <h3 class="box-title">{{ 'transaction_meta_data'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<ul> {{ ExpandedForm.text('journal_description', journal.description) }}
{% for key, err in errors.all() %} {{ ExpandedForm.select('journal_currency_id', currencies, preFilled.transaction_currency_id) }}
<li class="text-danger">{{ err }}</li> {{ ExpandedForm.staticText('journal_amount', preFilled.journal_amount|formatAmount ) }}
{% endfor %} <input type="hidden" name="journal_amount" value="{{ preFilled.journal_amount }}"/>
</ul>
<!-- show source if withdrawal or transfer -->
{% if preFilled.what == 'withdrawal' or preFilled.what == 'transfer' %}
{{ ExpandedForm.select('journal_source_account_id', assetAccounts, preFilled.journal_source_account_id) }}
{% endif %}
<!-- show destination account id, if deposit (is asset): -->
{% if preFilled.what == 'deposit' %}
{{ ExpandedForm.select('journal_destination_account_id', assetAccounts, preFilled.journal_destination_account_id) }}
{% endif %}
<!-- show static destination if transfer -->
{% if preFilled.what == 'transfer' %}
{{ ExpandedForm.select('journal_destination_account_id', assetAccounts, preFilled.journal_destination_account_id) }}
{% endif %}
</div> </div>
</div> </div>
</div> </div>
</div> <div class="col-lg-6 col-md-6 col-sm-6">
{% endif %} <div class="box">
<div class="row"> <div class="box-header with-border">
<div class="col-lg-6 col-md-6 col-sm-6"> <h3 class="box-title">{{ 'transaction_dates'|_ }}</h3>
<div class="box"> </div>
<div class="box-header with-border"> <div class="box-body">
<h3 class="box-title">{{ 'transaction_meta_data'|_ }}</h3> {{ ExpandedForm.date('date', journal.date) }}
{{ ExpandedForm.date('interest_date', journal.interest_date) }}
{{ ExpandedForm.date('book_date', journal.book_date) }}
{{ ExpandedForm.date('process_date', journal.process_date) }}
</div>
</div> </div>
<div class="box-body">
{{ ExpandedForm.text('journal_description', journal.description) }}
{{ ExpandedForm.select('journal_currency_id', currencies, preFilled.transaction_currency_id) }}
{{ ExpandedForm.staticText('journal_amount', preFilled.journal_amount|formatAmount ) }}
<input type="hidden" name="journal_amount" value="{{ preFilled.journal_amount }}"/>
<!-- show source if withdrawal or transfer -->
{% if preFilled.what == 'withdrawal' or preFilled.what == 'transfer' %}
{{ ExpandedForm.select('journal_source_account_id', assetAccounts, preFilled.journal_source_account_id) }}
{% endif %}
<!-- show destination account id, if deposit (is asset): -->
{% if preFilled.what == 'deposit' %}
{{ ExpandedForm.select('journal_destination_account_id', assetAccounts, preFilled.journal_destination_account_id) }}
{% endif %}
<!-- show static destination if transfer -->
{% if preFilled.what == 'transfer' %}
{{ ExpandedForm.select('journal_destination_account_id', assetAccounts, preFilled.journal_destination_account_id) }}
{% endif %}
</div>
</div> </div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="row">
<div class="box"> <div class="col-lg-12 col-md-12 col-sm-12">
<div class="box-header with-border"> <div class="box">
<h3 class="box-title">{{ 'transaction_dates'|_ }}</h3> <div class="box-header with-border">
</div> <h3 class="box-title">{{ 'splits'|_ }}</h3>
<div class="box-body"> </div>
{{ ExpandedForm.date('date', journal.date) }} <div class="box-body">
<table class="table table-bordered table-condensed table-striped split-table">
<thead>
<tr>
<th>{{ trans('list.split_number') }}</th>
<th>{{ trans('list.description') }}</th>
{{ ExpandedForm.date('interest_date', journal.interest_date) }} <!-- withdrawal and deposit have a destination. -->
{{ ExpandedForm.date('book_date', journal.book_date) }}
{{ ExpandedForm.date('process_date', journal.process_date) }}
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'splits'|_ }}</h3>
</div>
<div class="box-body">
<table class="table table-bordered table-condensed table-striped split-table">
<thead>
<tr>
<th>{{ trans('list.split_number') }}</th>
<th>{{ trans('list.description') }}</th>
<!-- withdrawal and deposit have a destination. -->
{% if preFilled.what == 'withdrawal' %}
<th>{{ trans('list.destination') }}</th>
{% endif %}
{% if preFilled.what == 'deposit' %}
<th>{{ trans('list.source') }}</th>
{% endif %}
<th>{{ trans('list.amount') }}</th>
<!-- only withdrawal has budget -->
{% if preFilled.what == 'withdrawal' %}
<th>{{ trans('list.budget') }}</th>
{% endif %}
<th>{{ trans('list.category') }}</th>
</tr>
</thead>
<tbody>
{% for index, descr in preFilled.description %}
<tr class="{% if loop.index == 1 %}initial-row{% else %}not-initial-row{% endif %}">
<td class="count">#{{ loop.index }}</td>
<td>
<input type="text" name="description[]" value="{{ descr }}" class="form-control"/>
</td>
<!-- withdrawal has several destination names. -->
{% if preFilled.what == 'withdrawal' %} {% if preFilled.what == 'withdrawal' %}
<td> <th>{{ trans('list.destination') }}</th>
<input type="text" name="destination_account_name[]" value="{{ preFilled.destination_account_name[index] }}"
class="form-control"/>
</td>
{% endif %} {% endif %}
<!-- deposit has several source names -->
{% if preFilled.what == 'deposit' %} {% if preFilled.what == 'deposit' %}
<td> <th>{{ trans('list.source') }}</th>
<input type="text" name="source_account_name[]" value="{{ preFilled.source_account_name[index] }}" class="form-control"/>
</td>
{% endif %} {% endif %}
<th>{{ trans('list.amount') }}</th>
<td style="width:10%;"> <!-- only withdrawal has budget -->
<input type="number" name="amount[]" value="{{ preFilled.amount[index] }}"
class="form-control" autocomplete="off" step="any" min="0.01">
</td>
{% if preFilled.what == 'withdrawal' %} {% if preFilled.what == 'withdrawal' %}
<td> <th>{{ trans('list.budget') }}</th>
<select class="form-control" name="budget_id[]">
{% for key, budget in budgets %}
<option label="{{ budget }}" value="{{ key }}"
{% if preFilled.budget_id[index] == key %}
selected="selected"
{% endif %}
>{{ budget }}</option>
{% endfor %}
</select>
</td>
{% endif %} {% endif %}
<td> <th>{{ trans('list.category') }}</th>
<input type="text" name="category[]" value="{{ preFilled.category[index] }}" class="form-control"/>
</td>
</tr> </tr>
{% endfor %} </thead>
</tbody> <tbody>
</table> {% for index, descr in preFilled.description %}
<p> <tr class="{% if loop.index == 1 %}initial-row{% else %}not-initial-row{% endif %}">
<br/> <td class="count">#{{ loop.index }}</td>
<a href="#" class="btn btn-default btn-do-split"><i class="fa fa-plus-circle"></i> {{ 'add_another_split'|_ }}</a> <td>
</p> <input type="text" name="description[]" value="{{ descr }}" class="form-control"/>
<!--<p class="pull-right"> </td>
<!-- withdrawal has several destination names. -->
{% if preFilled.what == 'withdrawal' %}
<td>
<input type="text" name="destination_account_name[]" value="{{ preFilled.destination_account_name[index] }}"
class="form-control"/>
</td>
{% endif %}
<!-- deposit has several source names -->
{% if preFilled.what == 'deposit' %}
<td>
<input type="text" name="source_account_name[]" value="{{ preFilled.source_account_name[index] }}"
class="form-control"/>
</td>
{% endif %}
<td style="width:10%;">
<input type="number" name="amount[]" value="{{ preFilled.amount[index] }}"
class="form-control" autocomplete="off" step="any" min="0.01">
</td>
{% if preFilled.what == 'withdrawal' %}
<td>
<select class="form-control" name="budget_id[]">
{% for key, budget in budgets %}
<option label="{{ budget }}" value="{{ key }}"
{% if preFilled.budget_id[index] == key %}
selected="selected"
{% endif %}
>{{ budget }}</option>
{% endfor %}
</select>
</td>
{% endif %}
<td>
<input type="text" name="category[]" value="{{ preFilled.category[index] }}" class="form-control"/>
</td>
</tr>
{% endfor %}
</tbody>
</table>
<p>
<br/>
<a href="#" class="btn btn-default btn-do-split"><i class="fa fa-plus-circle"></i> {{ 'add_another_split'|_ }}</a>
</p>
<!--<p class="pull-right">
<button type="submit" id="transaction-btn" class="btn btn-success pull-right"> <button type="submit" id="transaction-btn" class="btn btn-success pull-right">
{{ ('update_splitted_'~preFilled.what)|_ }} {{ ('update_splitted_'~preFilled.what)|_ }}
</button> </button>
</p> </p>
--> -->
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'optionalFields'|_ }}</h3> <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="box-body">
<!-- ATTACHMENTS -->
{{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
</div>
</div> </div>
<div class="box-body"> </div>
<!-- ATTACHMENTS --> <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} <!-- 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','split-transaction') }}
</div>
<div class="box-footer">
<button type="submit" class="pull-right btn btn-success">{{ ('update_' ~ preFilled.what)|_ }}</button>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-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','split-transaction') }}
</div>
<div class="box-footer">
<button type="submit" class="pull-right btn btn-success">{{ ('update_' ~ preFilled.what)|_ }}</button>
</div>
</div>
</div>
</div>
</form> </form>
{% endblock %} {% endblock %}

2
resources/views/tags/show.twig
View File

@@ -39,7 +39,7 @@
{% endif %} {% endif %}
<p> <p>
{{ 'sum'|_ }}: {{ sum|formatAmount }}<br /> {{ 'sum'|_ }}: {{ sum|formatAmount }}<br/>
</p> </p>
</div> </div>

1
resources/views/transactions/create.twig
View File

@@ -67,7 +67,6 @@
{% endif %} {% endif %}
<!-- CATEGORY ALWAYS --> <!-- CATEGORY ALWAYS -->
{{ ExpandedForm.text('category') }} {{ ExpandedForm.text('category') }}

19
resources/views/transactions/edit.twig
View File

@@ -13,16 +13,16 @@
<input type="hidden" name="what" value="{{ what }}"/> <input type="hidden" name="what" value="{{ what }}"/>
{% if errors.all|length > 0 %} {% if errors.all|length > 0 %}
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<h3 class="text-danger">{{ 'errors'|_ }}</h3> <h3 class="text-danger">{{ 'errors'|_ }}</h3>
<ul> <ul>
{% for err in errors.all %} {% for err in errors.all %}
<li class="text-danger">{{ err }}</li> <li class="text-danger">{{ err }}</li>
{% endfor %} {% endfor %}
</ul> </ul>
</div>
</div> </div>
</div>
{% endif %} {% endif %}
@@ -88,7 +88,6 @@
{{ ExpandedForm.date('process_date',data['process_date']) }} {{ ExpandedForm.date('process_date',data['process_date']) }}
<!-- TAGS --> <!-- TAGS -->
{{ ExpandedForm.text('tags') }} {{ ExpandedForm.text('tags') }}

2
resources/views/transactions/mass-delete.twig
View File

@@ -36,7 +36,7 @@
{% for journal in journals %} {% for journal in journals %}
<tr> <tr>
<td> <td>
<input type="checkbox" name="confirm_mass_delete[]" value="{{ journal.id }}" checked /> <input type="checkbox" name="confirm_mass_delete[]" value="{{ journal.id }}" checked/>
</td> </td>
<td> <td>
<a href="{{ route('transactions.show',journal.id) }}" title="{{ journal.description }}">{{ journal.description }}</a> <a href="{{ route('transactions.show',journal.id) }}" title="{{ journal.description }}">{{ journal.description }}</a>

78
resources/views/transactions/show.twig
View File

@@ -158,46 +158,46 @@
{% endif %} {% endif %}
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-12"> <div class="col-lg-6 col-md-6 col-sm-12">
{% for t in transactions %} {% for t in transactions %}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ t.account.name }}</h3> <h3 class="box-title">{{ t.account.name }}</h3>
</div>
<table class="table table-bordered table-striped">
<tr>
<td style="width:30%;">{{ 'account'|_ }}</td>
<td><a href="{{ route('accounts.show',t.account.id) }}">{{ t.account.name }}</a></td>
</tr>
<tr>
<td>{{ 'account_type'|_ }}</td>
<td>{{ t.account.accounttype.type|_ }}</td>
</tr>
<tr>
<td>{{ 'balance'|_ }}</td>
<td>{{ t.before|formatAmount }} &rarr; {{ (t.before+t.amount)|formatAmount }}</td>
</tr>
{% if t.description %}
<tr>
<td>{{ trans('form.description') }}</td>
<td>{{ t.description }}</td>
</tr>
{% endif %}
<tr>
<td>{{ 'category'|_ }}</td>
<td>
{{ transactionCategories(t)|raw }}
</td>
</tr>
<tr>
<td>{{ 'budget'|_ }}</td>
<td>
{{ transactionBudgets(t)|raw }}
</td>
</tr>
</table>
</div> </div>
{% endfor %} <table class="table table-bordered table-striped">
<tr>
<td style="width:30%;">{{ 'account'|_ }}</td>
<td><a href="{{ route('accounts.show',t.account.id) }}">{{ t.account.name }}</a></td>
</tr>
<tr>
<td>{{ 'account_type'|_ }}</td>
<td>{{ t.account.accounttype.type|_ }}</td>
</tr>
<tr>
<td>{{ 'balance'|_ }}</td>
<td>{{ t.before|formatAmount }} &rarr; {{ (t.before+t.amount)|formatAmount }}</td>
</tr>
{% if t.description %}
<tr>
<td>{{ trans('form.description') }}</td>
<td>{{ t.description }}</td>
</tr>
{% endif %}
<tr>
<td>{{ 'category'|_ }}</td>
<td>
{{ transactionCategories(t)|raw }}
</td>
</tr>
<tr>
<td>{{ 'budget'|_ }}</td>
<td>
{{ transactionBudgets(t)|raw }}
</td>
</tr>
</table>
</div>
{% endfor %}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}