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

Clean up view HTML

Browse Source
This commit is contained in:
James Cole
2018-01-12 18:42:48 +01:00
parent 89e0791e2f
commit 4984eda320
61 changed files with 78 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/accounts/edit.twig
View File

@@ -53,7 +53,7 @@
</div> </div>
</div> </div>
<!-- panel for credit card options --> {# panel for credit card options #}
{% if preFilled.accountRole == 'ccAsset' %} {% if preFilled.accountRole == 'ccAsset' %}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
@@ -66,7 +66,7 @@
</div> </div>
{% endif %} {% endif %}
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

10
resources/views/accounts/reconcile/edit.twig
View File

@@ -50,15 +50,15 @@
<h3 class="box-title">{{ 'optionalFields'|_ }}</h3> <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<!-- CATEGORY ALWAYS --> {# category always #}
{{ ExpandedForm.text('category',data['category']) }} {{ ExpandedForm.text('category',data['category']) }}
<!-- TAGS --> {# tags #}
{{ ExpandedForm.text('tags') }} {{ ExpandedForm.text('tags') }}
</div> </div>
</div> </div>
<!-- box for attachments --> {# box for attachments #}
{% if optionalFields.attachments %} {% if optionalFields.attachments %}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
@@ -66,14 +66,14 @@
</div> </div>
<div class="box-body"> <div class="box-body">
{% if optionalFields.attachments %} {% if optionalFields.attachments %}
<!-- ATTACHMENTS --> {# attachments #}
{{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% endif %} {% endif %}
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

6
resources/views/admin/configuration/index.twig
View File

@@ -40,8 +40,8 @@
</div> </div>
</div> </div>
<!-- configuration setting block --> {# block for config setting #}
<!-- {#
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12"> <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
<div class="box box-default"> <div class="box box-default">
<div class="box-header with-border"> <div class="box-header with-border">
@@ -54,7 +54,7 @@
</div> </div>
</div> </div>
</div> </div>
--> #}
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12"> <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">

2
resources/views/admin/link/create.twig
View File

@@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<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">
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

2
resources/views/admin/link/edit.twig
View File

@@ -24,7 +24,7 @@
</div> </div>
<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">
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

2
resources/views/admin/users/edit.twig
View File

@@ -27,7 +27,7 @@
</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 --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

6
resources/views/admin/users/show.twig
View File

@@ -99,13 +99,11 @@
</tr> </tr>
<tr> <tr>
<td>{{ trans('list.export_jobs_count') }}</td> <td>{{ trans('list.export_jobs_count') }}</td>
<td>{{ information.export_jobs }}, {{ trans('firefly.successful_count', {count: information.export_jobs_success}) }} <td>{{ information.export_jobs }}, {{ trans('firefly.successful_count', {count: information.export_jobs_success}) }}</td>
<!-- of which x successful --></td>
</tr> </tr>
<tr> <tr>
<td>{{ trans('list.import_jobs_count') }}</td> <td>{{ trans('list.import_jobs_count') }}</td>
<td>{{ information.import_jobs }}, {{ trans('firefly.successful_count', {count: information.import_jobs_success}) }} <td>{{ information.import_jobs }}, {{ trans('firefly.successful_count', {count: information.import_jobs_success}) }}</td>
<!-- of which x successful --></td>
</tr> </tr>
<tr> <tr>
<td>{{ trans('list.budget_count') }}</td> <td>{{ trans('list.budget_count') }}</td>

2
resources/views/attachments/edit.twig
View File

@@ -37,7 +37,7 @@
</div> </div>
</div> </div>
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

3
resources/views/auth/login.twig
View File

@@ -67,11 +67,9 @@
</label> </label>
</div> </div>
</div> </div>
<!-- /.col -->
<div class="col-xs-4"> <div class="col-xs-4">
<button type="submit" class="btn btn-primary btn-block btn-flat">{{ 'sign_in'|_ }}</button> <button type="submit" class="btn btn-primary btn-block btn-flat">{{ 'sign_in'|_ }}</button>
</div> </div>
<!-- /.col -->
</div> </div>
</form> </form>
{% if allowRegistration %} {% if allowRegistration %}
@@ -79,6 +77,5 @@
{% endif %} {% endif %}
<a href="{{ URL.to('/password/reset') }}">{{ 'forgot_my_password'|_ }}</a> <a href="{{ URL.to('/password/reset') }}">{{ 'forgot_my_password'|_ }}</a>
</div> </div>
<!-- /.login-box-body -->
{% endblock %} {% endblock %}

4
resources/views/auth/passwords/email.twig
View File

@@ -38,11 +38,9 @@
</div> </div>
<div class="row"> <div class="row">
<!-- /.col -->
<div class="col-xs-12"> <div class="col-xs-12">
<button type="submit" class="btn btn-primary btn-flat pull-right">{{ 'reset_button'|_ }}</button> <button type="submit" class="btn btn-primary btn-flat pull-right">{{ 'reset_button'|_ }}</button>
</div> </div>
<!-- /.col -->
</div> </div>
</form> </form>
@@ -53,6 +51,6 @@
<a href="{{ route('register') }}" class="text-center">{{ 'register_new_account'|_ }}</a><br> <a href="{{ route('register') }}" class="text-center">{{ 'register_new_account'|_ }}</a><br>
{% endif %} {% endif %}
</div><!-- /.login-box-body --> </div>
{% endblock %} {% endblock %}

3
resources/views/auth/passwords/reset.twig
View File

@@ -36,7 +36,6 @@
<div class="col-xs-12"> <div class="col-xs-12">
<button type="submit" class="btn btn-primary pull-right btn-flat">{{ 'button_reset_password'|_ }}</button> <button type="submit" class="btn btn-primary pull-right btn-flat">{{ 'button_reset_password'|_ }}</button>
</div> </div>
<!-- /.col -->
</div> </div>
</form> </form>
@@ -45,6 +44,6 @@
{% if allowRegistration %} {% if allowRegistration %}
<a href="{{ route('register') }}" class="text-center">{{ 'register_new_account'|_ }}</a><br> <a href="{{ route('register') }}" class="text-center">{{ 'register_new_account'|_ }}</a><br>
{% endif %} {% endif %}
</div><!-- /.form-box --> </div>
{% endblock %} {% endblock %}

3
resources/views/auth/register.twig
View File

@@ -42,13 +42,12 @@
<div class="col-xs-4"> <div class="col-xs-4">
<button class="btn btn-primary pull-right btn-flat">{{ 'button_register'|_ }}</button> <button class="btn btn-primary pull-right btn-flat">{{ 'button_register'|_ }}</button>
</div> </div>
<!-- /.col -->
</div> </div>
</form> </form>
<a href="{{ URL.to('/login') }}">{{ 'want_to_login'|_ }}</a><br> <a href="{{ URL.to('/login') }}">{{ 'want_to_login'|_ }}</a><br>
<a href="{{ URL.to('/password/reset') }}">{{ 'forgot_my_password'|_ }}</a> <a href="{{ URL.to('/password/reset') }}">{{ 'forgot_my_password'|_ }}</a>
</div><!-- /.form-box --> </div>
{% include 'partials.password-modal' %} {% include 'partials.password-modal' %}

3
resources/views/auth/two-factor.twig
View File

@@ -26,15 +26,12 @@
</div> </div>
<div class="row"> <div class="row">
<!-- /.col -->
<div class="col-xs-6 col-xs-offset-6"> <div class="col-xs-6 col-xs-offset-6">
<button type="submit" class="btn btn-primary btn-block btn-flat">{{ 'authenticate'|_ }}</button> <button type="submit" class="btn btn-primary btn-block btn-flat">{{ 'authenticate'|_ }}</button>
</div> </div>
<!-- /.col -->
</div> </div>
</form> </form>
<a href="{{ route('two-factor.lost') }}">{{ 'two_factor_forgot'|_ }}</a> <a href="{{ route('two-factor.lost') }}">{{ 'two_factor_forgot'|_ }}</a>
</div> </div>
<!-- /.login-box-body -->
{% endblock %} {% endblock %}

2
resources/views/bills/create.twig
View File

@@ -41,7 +41,7 @@
</div> </div>
</div> </div>
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

2
resources/views/budgets/create.twig
View File

@@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<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">
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

2
resources/views/budgets/edit.twig
View File

@@ -21,7 +21,7 @@
</div> </div>
<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">
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

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

@@ -127,7 +127,7 @@
{% set overspent = limit.amount + limit.spent < 0 %} {% set overspent = limit.amount + limit.spent < 0 %}
{% if overspent %} {% if overspent %}
{% set pct = (limit.spent != 0 ? (limit.amount / (limit.spent*-1))*100 : 0) %} <!-- must have -1 here --> {% set pct = (limit.spent != 0 ? (limit.amount / (limit.spent*-1))*100 : 0) %} {# must have -1 here #}
<div class="progress progress-striped"> <div class="progress progress-striped">
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="{{ pct|round }}" <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="{{ pct|round }}"
aria-valuemin="0" aria-valuemin="0"
@@ -136,7 +136,7 @@
aria-valuemin="0" aria-valuemax="100" style="width: {{ (100-pct)|round }}%;"></div> aria-valuemin="0" aria-valuemax="100" style="width: {{ (100-pct)|round }}%;"></div>
</div> </div>
{% else %} {% else %}
{% set pct = (limit.amount != 0 ? (((limit.spent*-1) / limit.amount)*100) : 0) %} <!-- must have -1 here --> {% set pct = (limit.amount != 0 ? (((limit.spent*-1) / limit.amount)*100) : 0) %} {# must have -1 here #}
<div class="progress progress-striped"> <div class="progress progress-striped">
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{{ pct|round }}" <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{{ pct|round }}"
aria-valuemin="0" aria-valuemin="0"

2
resources/views/categories/create.twig
View File

@@ -22,7 +22,7 @@
<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">
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

2
resources/views/categories/edit.twig
View File

@@ -22,7 +22,7 @@
<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 --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

2
resources/views/currencies/create.twig
View File

@@ -25,7 +25,7 @@
<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">
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

2
resources/views/currencies/edit.twig
View File

@@ -25,7 +25,7 @@
<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">
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

4
resources/views/debug.twig
View File

@@ -6,7 +6,7 @@
<p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;"> <p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;">
If you are running into problems, you can use the information in this box as debug information. Please copy-and-paste into a new If you are running into problems, you can use the information in this box as debug information. Please copy-and-paste into a new
or existing <a href="https://github.com/firefly-iii/firefly-iii/issues">Github issue</a>. It will generate a beautiful table that can or existing <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub issue</a>. It will generate a beautiful table that can
be used to quickly diagnose your problem. be used to quickly diagnose your problem.
</p> </p>
<textarea rows="30" cols="100" name="debug_info" style="font-family:Menlo, Monaco, Consolas, monospace;font-size:8pt;"> <textarea rows="30" cols="100" name="debug_info" style="font-family:Menlo, Monaco, Consolas, monospace;font-size:8pt;">
@@ -43,7 +43,7 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
<p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;"> <p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;">
You may also share the content of the box below. You can also copy-and-paste this into a new You may also share the content of the box below. You can also copy-and-paste this into a new
or existing <a href="https://github.com/firefly-iii/firefly-iii/issues">Github issue</a>. However, the content of this or existing <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub issue</a>. However, the content of this
box may contain private information such as account names, transaction details or email addresses. box may contain private information such as account names, transaction details or email addresses.
</p> </p>

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

@@ -34,7 +34,7 @@
This can help fix the bug you just encountered. This can help fix the bug you just encountered.
</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;">
If you prefer, you can also open a new issue on <a href="https://github.com/firefly-iii/firefly-iii/issues">Github</a>. If you prefer, you can also open a new issue on <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>.
</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;">

2
resources/views/error.twig
View File

@@ -18,7 +18,7 @@
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">
<p> <p>
If you do not know how to handle this error, please open an issue on If you do not know how to handle this error, please open an issue on
<a href="https://github.com/firefly-iii/firefly-iii/issues">Github</a> <a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a>
or <a href="mailto:thegrumpydictator@gmail.com">send me a message</a>. or <a href="mailto:thegrumpydictator@gmail.com">send me a message</a>.
</p> </p>
</div> </div>

4
resources/views/errors/404.twig
View File

@@ -30,8 +30,6 @@
<p class="text-danger"> <p class="text-danger">
The page you have requested does not exist. Please check that you have not entered The page you have requested does not exist. Please check that you have not entered
the wrong URL. Did you make a typo perhaps? the wrong URL. Did you make a typo perhaps?
<!-- {{ Request.url() }} -->
</p> </p>
</div> </div>
</div> </div>
@@ -39,7 +37,7 @@
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">
<p> <p>
If you are sure this page should exist, please open a ticket on If you are sure this page should exist, please open a ticket on
<strong><a href="https://github.com/firefly-iii/firefly-iii/issues">Github</a></strong>. <strong><a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a></strong>.
</p> </p>
</div> </div>
</div> </div>

2
resources/views/errors/FireflyException.twig
View File

@@ -47,7 +47,7 @@
</p> </p>
<p> <p>
If you cannot find the cause of this error or when you need some help, please open a ticket on If you cannot find the cause of this error or when you need some help, please open a ticket on
<strong><a href="https://github.com/firefly-iii/firefly-iii/issues">Github</a></strong>. <strong><a href="https://github.com/firefly-iii/firefly-iii/issues">GitHub</a></strong>.
</p> </p>
</div> </div>
</div> </div>

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

@@ -49,7 +49,7 @@
{{ ExpandedForm.date('export_end_range', today) }} {{ ExpandedForm.date('export_end_range', today) }}
<!-- EXPORT FORMATS --> {# EXPORT FORMATS #}
<div class="form-group"> <div class="form-group">
<label for="exportFormat" class="col-sm-4 control-label">{{ 'export_format'|_ }}</label> <label for="exportFormat" class="col-sm-4 control-label">{{ 'export_format'|_ }}</label>
@@ -73,7 +73,7 @@
</div> </div>
<!-- ACCOUNTS --> {# ACCOUNTS #}
{{ ExpandedForm.multiCheckbox('accounts',accountList, checked, {' class': 'account-checkbox'}) }} {{ ExpandedForm.multiCheckbox('accounts',accountList, checked, {' class': 'account-checkbox'}) }}
{{ ExpandedForm.checkbox('include_attachments','1', true) }} {{ ExpandedForm.checkbox('include_attachments','1', true) }}

4
resources/views/import/spectre/accounts.twig
View File

@@ -39,10 +39,10 @@
{{ account.nature|capitalize }} "<strong>{{ account.name }}</strong>" ({{ formatAmountBySymbol(account.balance, account.currency_code~' ') }})<br /> {{ account.nature|capitalize }} "<strong>{{ account.name }}</strong>" ({{ formatAmountBySymbol(account.balance, account.currency_code~' ') }})<br />
{% for name, value in account.extra %} {% for name, value in account.extra %}
{% if not value is iterable and name != 'sort_code' and name !='current_date' and name != 'available_amount' and name !='current_time' and name != 'last_posted_transaction_id' %} {% if not value is iterable and name != 'sort_code' and name !='current_date' and name != 'available_amount' and name !='current_time' and name != 'last_posted_transaction_id' %}
{{ name|capitalize }}: {{ value }}<br /> {{ trans('import.spectre_extra_key_'~name) }}: {{ value }}<br />
{% endif %} {% endif %}
{% if name == 'available_amount' %} {% if name == 'available_amount' %}
Available amount: {{ formatAmountBySymbol(value, account.currency_code~' ') }} {{ trans('import.spectre_extra_key_'~name) }}: {{ formatAmountBySymbol(value, account.currency_code~' ') }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</td> </td>

1
resources/views/import/spectre/redirect.twig
View File

@@ -9,7 +9,6 @@
<title>Page Redirection</title> <title>Page Redirection</title>
</head> </head>
<body> <body>
<!-- Note: don't tell people to `click` the link, just tell them that it is a link. -->
If you are not redirected automatically, follow this <a href='{{ data['token-url'] }}'>link to Spectre.</a>. If you are not redirected automatically, follow this <a href='{{ data['token-url'] }}'>link to Spectre.</a>.
</body> </body>
</html>#} </html>#}

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

@@ -48,19 +48,16 @@
{# Logo #} {# Logo #}
<a href="{{ route('index') }}" class="logo"> <a href="{{ route('index') }}" class="logo">
<!-- mini logo for sidebar mini 50x50 pixels --> {# mini logo for sidebar mini 50x50 pixels #}
<span class="logo-mini">FF</span> <span class="logo-mini">FF</span>
<!-- logo for regular state and mobile devices --> {# logo for regular state and mobile devices #}
<span class="logo-lg"><b>Firefly</b>III</span> <span class="logo-lg"><b>Firefly</b>III</span>
</a> </a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation"> <nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->
<a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button"> <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
<span class="sr-only">{{ 'toggleNavigation'|_ }}</span> <span class="sr-only">{{ 'toggleNavigation'|_ }}</span>
</a> </a>
<!-- Navbar Right Menu -->
<div class="navbar-custom-menu"> <div class="navbar-custom-menu">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
@@ -70,7 +67,6 @@
</a> </a>
</li> </li>
<!-- Messages: style can be found in dropdown.less-->
<li> <li>
<span style="color:#fff;padding: 15px;display: block;line-height: 20px;"> <span style="color:#fff;padding: 15px;display: block;line-height: 20px;">
<span id="daterange"></span> <span id="daterange"></span>
@@ -92,11 +88,8 @@
</nav> </nav>
</header> </header>
<!-- Left side column. contains the logo and sidebar -->
<aside class="main-sidebar"> <aside class="main-sidebar">
<!-- sidebar: style can be found in sidebar.less -->
<section class="sidebar"> <section class="sidebar">
<!-- search form -->
<form action="{{ route('search.index') }}" method="get" class="sidebar-form"> <form action="{{ route('search.index') }}" method="get" class="sidebar-form">
<div class="input-group"> <div class="input-group">
<input type="text" name="q" class="form-control" placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}"/> <input type="text" name="q" class="form-control" placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}"/>
@@ -105,22 +98,16 @@
</span> </span>
</div> </div>
</form> </form>
<!-- /.search form -->
<!-- sidebar menu: : style can be found in sidebar.less -->
{% include('partials.menu-sidebar') %} {% include('partials.menu-sidebar') %}
</section> </section>
<!-- /.sidebar -->
</aside> </aside>
<!-- Content Wrapper. Contains page content -->
<div class="content-wrapper"> <div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header"> <section class="content-header">
{% include('partials.page-header') %} {% include('partials.page-header') %}
{% block breadcrumbs %}{% endblock %} {% block breadcrumbs %}{% endblock %}
</section> </section>
<!-- Main content -->
<section class="content"> <section class="content">
{% if IS_DEMO_SITE %} {% if IS_DEMO_SITE %}
<div class="row no-print"> <div class="row no-print">
@@ -134,13 +121,9 @@
{% include('partials.flashes') %} {% include('partials.flashes') %}
<!-- actual content -->
{% block content %}{% endblock %} {% block content %}{% endblock %}
</section> </section>
<!-- /.content -->
</div> </div>
<!-- /.content-wrapper -->
<footer class="main-footer"> <footer class="main-footer">
<div class="pull-right hidden-xs"> <div class="pull-right hidden-xs">
<b>{{ 'version'|_ }}</b> <a href="{{ route('debug') }}">{{ Config.get('firefly.version') }}</a> <b>{{ 'version'|_ }}</b> <a href="{{ route('debug') }}">{{ Config.get('firefly.version') }}</a>
@@ -151,10 +134,6 @@
{% include('partials.control-bar') %} {% include('partials.control-bar') %}
</div> </div>
<!-- ./wrapper -->
<!-- Modal -->
<div class="modal fade" id="defaultModal" tabindex="-1" role="dialog"> <div class="modal fade" id="defaultModal" tabindex="-1" role="dialog">
</div> </div>

1
resources/views/layout/empty.twig
View File

@@ -27,7 +27,6 @@
</div> </div>
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
<!-- /.login-box -->
<script type="text/javascript" src="js/lib/jquery-3.2.1.min.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="js/lib/jquery-3.2.1.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js?v={{ FF_VERSION }}"></script>

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

@@ -37,7 +37,6 @@
</div> </div>
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
<!-- /.login-box -->
<script type="text/javascript" src="js/lib/jquery-3.2.1.min.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="js/lib/jquery-3.2.1.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/guest.js?v={{ FF_VERSION }}"></script> <script type="text/javascript" src="js/ff/guest.js?v={{ FF_VERSION }}"></script>

8
resources/views/list/bills.twig
View File

@@ -47,14 +47,6 @@
</span> </span>
</td> </td>
<!--
Some debug data:
entry.paidDates.count(): {{ entry.paidDates.count() }}
entry.paidDates set:
entry.payDates.count(): {{ entry.payDates.count() }}
active: {% if entry.active %}true{% else %}false{% endif %}
-->
{# {#
paidDates = 0 (bill not paid in period) paidDates = 0 (bill not paid in period)
payDates = 0 (bill not expected to be paid in this period) payDates = 0 (bill not expected to be paid in this period)

9
resources/views/partials/control-bar.twig
View File

@@ -1,8 +1,5 @@
<!-- Control Sidebar -->
<aside class="control-sidebar control-sidebar-dark"> <aside class="control-sidebar control-sidebar-dark">
<!-- Tab panes -->
<div class="tab-content"> <div class="tab-content">
<!-- Home tab content -->
<div class="tab-panel active" id="control-sidebar-home-tab"> <div class="tab-panel active" id="control-sidebar-home-tab">
<h3 class="control-sidebar-heading">{{ 'create_new_stuff'|_ }}</h3> <h3 class="control-sidebar-heading">{{ 'create_new_stuff'|_ }}</h3>
<ul class='control-sidebar-menu'> <ul class='control-sidebar-menu'>
@@ -101,12 +98,8 @@
</li> </li>
</ul> </ul>
<!-- /.control-sidebar-menu -->
</div> </div>
<!-- /.tab-pane -->
</div> </div>
</aside><!-- /.control-sidebar --> </aside>
<!-- Add the sidebar's background. This div must be placed
immediately after the control sidebar -->
<div class='control-sidebar-bg'></div> <div class='control-sidebar-bg'></div>

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

@@ -1,10 +1,8 @@
<ul class="sidebar-menu"> <ul class="sidebar-menu">
<!-- home / dashboard -->
<li class="{{ activeRouteStrict('index') }} treeview"> <li class="{{ activeRouteStrict('index') }} treeview">
<a href="{{ route('index') }}"><i class="fa fa-dashboard fa-fw"></i> <a href="{{ route('index') }}"><i class="fa fa-dashboard fa-fw"></i>
<span>{{ 'dashboard'|_ }}</span></a> <span>{{ 'dashboard'|_ }}</span></a>
</li> </li>
<!-- accounts -->
<li class="{{ activeRoutePartial('accounts') }} treeview" id="account-menu"> <li class="{{ activeRoutePartial('accounts') }} treeview" id="account-menu">
<a href="#"> <a href="#">
<i class="fa fa-credit-card fa-fw"></i> <i class="fa fa-credit-card fa-fw"></i>
@@ -13,7 +11,6 @@
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</span> </span>
</a> </a>
<!-- submenu for accounts -->
<ul class="treeview-menu"> <ul class="treeview-menu">
<li class="{{ activeRoutePartialWhat('accounts', 'asset') }}"> <li class="{{ activeRoutePartialWhat('accounts', 'asset') }}">
<a href="{{ route('accounts.index','asset') }}"> <a href="{{ route('accounts.index','asset') }}">
@@ -32,37 +29,30 @@
</li> </li>
</ul> </ul>
</li> </li>
<!-- budgets-->
<li class="{{ activeRoutePartial('budgets') }}" id="budget-menu"> <li class="{{ activeRoutePartial('budgets') }}" id="budget-menu">
<a href="{{ route('budgets.index') }}"> <a href="{{ route('budgets.index') }}">
<i class="fa fa-tasks fa-fw"></i> <i class="fa fa-tasks fa-fw"></i>
<span>{{ 'budgets'|_ }}</span> <span>{{ 'budgets'|_ }}</span>
</a> </a>
</li> </li>
<!-- categories -->
<li class="{{ activeRoutePartial('categories') }}"> <li class="{{ activeRoutePartial('categories') }}">
<a href="{{ route('categories.index') }}"> <a href="{{ route('categories.index') }}">
<i class="fa fa-bar-chart fa-fw"></i> <i class="fa fa-bar-chart fa-fw"></i>
<span>{{ 'categories'|_ }}</span> <span>{{ 'categories'|_ }}</span>
</a> </a>
</li> </li>
<!-- tags -->
<li class="{{ activeRoutePartial('tags') }}"> <li class="{{ activeRoutePartial('tags') }}">
<a href="{{ route('tags.index') }}"> <a href="{{ route('tags.index') }}">
<i class="fa fa-tags fa-fw"></i> <i class="fa fa-tags fa-fw"></i>
<span>{{ 'tags'|_ }}</span> <span>{{ 'tags'|_ }}</span>
</a> </a>
</li> </li>
<!-- reports -->
<li class="{{ activeRoutePartial('reports') }}" id="report-menu"> <li class="{{ activeRoutePartial('reports') }}" id="report-menu">
<a href="{{ route('reports.index') }}"> <a href="{{ route('reports.index') }}">
<i class="fa fa-line-chart fa-fw"></i> <i class="fa fa-line-chart fa-fw"></i>
<span>{{ 'reports'|_ }}</span> <span>{{ 'reports'|_ }}</span>
</a> </a>
</li> </li>
<!-- transactions -->
<li class="{{ activeRoutePartial('transactions') }} treeview" id="transaction-menu"> <li class="{{ activeRoutePartial('transactions') }} treeview" id="transaction-menu">
<a href="#"> <a href="#">
<i class="fa fa-repeat"></i> <i class="fa fa-repeat"></i>
@@ -87,7 +77,6 @@
</ul> </ul>
</li> </li>
<!-- money management -->
<li class="{{ activeRoutePartial('bills') }} {{ activeRoutePartial('piggy-banks') }} {{ activeRoutePartial('rules') }} treeview"> <li class="{{ activeRoutePartial('bills') }} {{ activeRoutePartial('piggy-banks') }} {{ activeRoutePartial('rules') }} treeview">
<a href="#"> <a href="#">
<i class="fa fa-euro fa-fw"></i> <i class="fa fa-euro fa-fw"></i>
@@ -112,8 +101,6 @@
</ul> </ul>
</li> </li>
<!-- import and export -->
<li class="{{ activeRoutePartial('export') }} {{ activeRoutePartial('import') }} treeview"> <li class="{{ activeRoutePartial('export') }} {{ activeRoutePartial('import') }} treeview">
<a href="#"> <a href="#">
<i class="fa fa-arrows-alt fa-fw"></i> <i class="fa fa-arrows-alt fa-fw"></i>
@@ -134,9 +121,6 @@
</ul> </ul>
</li> </li>
<!-- options and preferences -->
<li id="option-menu" <li id="option-menu"
class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currencies') }} treeview"> class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currencies') }} treeview">
<a href="#"> <a href="#">
@@ -162,7 +146,6 @@
<a class="{{ activeRoutePartial('currencies') }}" href="{{ route('currencies.index') }}"><i class="fa fa-usd fa-fw"></i> {{ 'currencies'|_ }} <a class="{{ activeRoutePartial('currencies') }}" href="{{ route('currencies.index') }}"><i class="fa fa-usd fa-fw"></i> {{ 'currencies'|_ }}
</a> </a>
</li> </li>
<!-- 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 <a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index') }}"><i
@@ -173,9 +156,6 @@
</li> </li>
<!-- other options -->
{% if not SANDSTORM %} {% if not SANDSTORM %}
<li> <li>
<a href="{{ route('logout') }}"> <a href="{{ route('logout') }}">

1
resources/views/partials/password-modal.twig
View File

@@ -1,4 +1,3 @@
<!-- Modal -->
<div class="modal fade" id="passwordModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> <div class="modal fade" id="passwordModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">

2
resources/views/piggy-banks/create.twig
View File

@@ -35,7 +35,7 @@
</div> </div>
</div> </div>
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

2
resources/views/piggy-banks/edit.twig
View File

@@ -38,7 +38,7 @@
</div> </div>
</div> </div>
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

3
resources/views/popup/list/journals.twig
View File

@@ -26,9 +26,8 @@
{# Make sum: #} {# Make sum: #}
{% set sum = 0 %} {% set sum = 0 %}
{% for transaction in journals %} {% for transaction in journals %}
<!-- add to sum {# add to sum #}
{% set sum = (sum + transaction.transaction_amount) %} {% set sum = (sum + transaction.transaction_amount) %}
-->
<tr class="drag" data-date="{{ transaction.date.format('Y-m-d') }}" data-id="{{ transaction.journal_id }}"> <tr class="drag" data-date="{{ transaction.date.format('Y-m-d') }}" data-id="{{ transaction.journal_id }}">
<td class="hidden-xs"> <td class="hidden-xs">
{{ transaction|transactionIcon }} {{ transaction|transactionIcon }}

1
resources/views/popup/report/balance-amount.twig
View File

@@ -1,4 +1,3 @@
<!-- Modal dialog to show balance amount -->
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

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

@@ -1,4 +1,3 @@
<!-- Modal dialog to show budget expenses -->
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

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

@@ -1,4 +1,3 @@
<!-- Modal dialog to show category expenses -->
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

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

@@ -1,4 +1,3 @@
<!-- Modal dialog to show expenses to an account -->
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

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

@@ -1,4 +1,3 @@
<!-- Modal dialog to show incomes to an account -->
<div class="modal-dialog modal-lg" role="document"> <div class="modal-dialog modal-lg" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">

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

@@ -10,7 +10,7 @@
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<!-- start of preferences tabs --> {# start of preferences tabs #}
<div class="nav-tabs-custom"> <div class="nav-tabs-custom">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#general" data-toggle="tab" aria-expanded="true">{{ 'preferences_general'|_ }}</a></li> <li class="active"><a href="#general" data-toggle="tab" aria-expanded="true">{{ 'preferences_general'|_ }}</a></li>
@@ -20,9 +20,9 @@
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane active" id="general"> <div class="tab-pane active" id="general">
<!-- general settings here --> {# general settings here #}
<div class="row"> <div class="row">
<!-- general settings column A --> {# general settings column A #}
<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">
{# language #} {# language #}
<div class="preferences-box"> <div class="preferences-box">
@@ -47,7 +47,7 @@
</p> </p>
</div> </div>
<!-- fiscal year --> {# fiscal year #}
<div class="preferences-box"> <div class="preferences-box">
<h3>{{ 'pref_custom_fiscal_year'|_ }}</h3> <h3>{{ 'pref_custom_fiscal_year'|_ }}</h3>
<p class="text-info"> <p class="text-info">
@@ -59,10 +59,10 @@
</div> </div>
</div> </div>
<!-- general settings column B --> {# general settings column B #}
<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">
<!-- transaction preferences --> {# transaction preferences #}
<div class="preferences-box"> <div class="preferences-box">
<h3>{{ 'pref_optional_fields_transaction'|_ }}</h3> <h3>{{ 'pref_optional_fields_transaction'|_ }}</h3>
<p class="text-info"> <p class="text-info">
@@ -87,9 +87,9 @@
</div> </div>
</div> </div>
<div class="tab-pane" id="frontpage"> <div class="tab-pane" id="frontpage">
<!-- frontpage settings here --> {# frontpage settings here #}
<div class="row"> <div class="row">
<!-- frontpage settings column a --> {# frontpage settings column a #}
<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="preferences-box"> <div class="preferences-box">
<h3>{{ 'pref_home_screen_accounts'|_ }}</h3> <h3>{{ 'pref_home_screen_accounts'|_ }}</h3>
@@ -113,9 +113,9 @@
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
<!-- frontpage settings column b --> {# frontpage settings column b #}
<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">
<!-- show deposit chart --> {# show deposit chart #}
<div class="preferences-box"> <div class="preferences-box">
<h3>{{ 'pref_home_show_deposits'|_ }}</h3> <h3>{{ 'pref_home_show_deposits'|_ }}</h3>
<p class="text-info">{{ 'pref_home_show_deposits_info'|_ }}</p> <p class="text-info">{{ 'pref_home_show_deposits_info'|_ }}</p>
@@ -137,12 +137,12 @@
</div> </div>
</div> </div>
<div class="tab-pane" id="security"> <div class="tab-pane" id="security">
<!-- security settings here --> {# security settings here #}
<div class="row"> <div class="row">
<!-- security settings column A --> {# security settings column A #}
<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">
<!-- 2fa --> {# 2fa #}
<div class="preferences-box"> <div class="preferences-box">
<h3>{{ 'pref_two_factor_auth'|_ }}</h3> <h3>{{ 'pref_two_factor_auth'|_ }}</h3>
<p class="text-info">{{ 'pref_two_factor_auth_help'|_ }}</p> <p class="text-info">{{ 'pref_two_factor_auth_help'|_ }}</p>
@@ -177,17 +177,17 @@
</div> </div>
</div> </div>
<!-- security settings column B --> {# security settings column B #}
<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> </div>
</div> </div>
</div> </div>
<div class="tab-pane" id="layout"> <div class="tab-pane" id="layout">
<!-- layout settings here --> {# layout settings here #}
<div class="row"> <div class="row">
<!-- layout settings column A --> {# layout settings column A #}
<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">
<!-- view range --> {# view range #}
<div class="preferences-box"> <div class="preferences-box">
<h3>{{ 'pref_view_range'|_ }}</h3> <h3>{{ 'pref_view_range'|_ }}</h3>
<p class="text-info">{{ 'pref_view_range_help'|_ }}</p> <p class="text-info">{{ 'pref_view_range_help'|_ }}</p>
@@ -239,10 +239,9 @@
</label> </label>
</div> </div>
</div> </div>
<!-- end -->
</div> </div>
<!-- layout settings column B --> {# layout settings column B #}
<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="preferences-box"> <div class="preferences-box">
<h3>{{ 'list_page_size_title'|_ }}</h3> <h3>{{ 'list_page_size_title'|_ }}</h3>

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

@@ -6,7 +6,6 @@
{% block content %} {% block content %}
<!-- options block -->
<div class="row no-print"> <div class="row no-print">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="box" id="optionsBox"> <div class="box" id="optionsBox">

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

@@ -1,5 +1,4 @@
<table class="table table-hover"> <table class="table table-hover">
<!-- build balance report header -->
<thead> <thead>
<tr> <tr>
<th colspan="2">{{ 'budgets'|_ }}</th> <th colspan="2">{{ 'budgets'|_ }}</th>
@@ -13,7 +12,6 @@
</thead> </thead>
<tbody> <tbody>
<!-- make rows -->
{% for balanceLine in balance.getBalanceLines %} {% for balanceLine in balance.getBalanceLines %}
<tr> <tr>

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

@@ -16,7 +16,7 @@
<th class="hide-process_date">{{ trans('list.process_date') }}</th> <th class="hide-process_date">{{ trans('list.process_date') }}</th>
<th class="hide-interest_date">{{ trans('list.interest_date') }}</th> <th class="hide-interest_date">{{ trans('list.interest_date') }}</th>
<!-- new optional fields (3x) --> {# new optional fields (3x) #}
<th class="hide-interest_date">{{ trans('list.due_date') }}</th> <th class="hide-interest_date">{{ trans('list.due_date') }}</th>
<th class="hide-payment_date">{{ trans('list.payment_date') }}</th> <th class="hide-payment_date">{{ trans('list.payment_date') }}</th>
<th class="hide-invoice_date">{{ trans('list.invoice_date') }}</th> <th class="hide-invoice_date">{{ trans('list.invoice_date') }}</th>
@@ -28,7 +28,7 @@
<th class="hide-category"><i class="fa fa-bar-chart fa-fw" title="{{ trans('list.category') }}"></i></th> <th class="hide-category"><i class="fa fa-bar-chart fa-fw" title="{{ trans('list.category') }}"></i></th>
<th class="hide-bill">{{ trans('list.bill') }}</th> <th class="hide-bill">{{ trans('list.bill') }}</th>
<!-- more optional fields (2x) --> {# more optional fields (2x) #}
<th class="hide-internal_reference">{{ trans('list.internal_reference') }}</th> <th class="hide-internal_reference">{{ trans('list.internal_reference') }}</th>
<th class="hide-notes">{{ trans('list.notes') }}</th> <th class="hide-notes">{{ trans('list.notes') }}</th>
@@ -82,7 +82,7 @@
</td> </td>
<!-- new optional fields (3x) --> {# new optional fields (3x) #}
<td class="hide-due_date"> <td class="hide-due_date">
{% if transaction.transactionJournal.hasMeta('due_date') %} {% if transaction.transactionJournal.hasMeta('due_date') %}
{{ transaction.transactionJournal.getMeta('due_date').formatLocalized(monthAndDayFormat) }} {{ transaction.transactionJournal.getMeta('due_date').formatLocalized(monthAndDayFormat) }}
@@ -125,7 +125,7 @@
<td class="hide-bill">&nbsp;</td> <td class="hide-bill">&nbsp;</td>
{% endif %} {% endif %}
<!-- new optional fields (2x) --> {# new optional fields (2x) #}
<td class="hide-internal_reference"> <td class="hide-internal_reference">
{% if transaction.transactionJournal.hasMeta('internal_reference') %} {% if transaction.transactionJournal.hasMeta('internal_reference') %}

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

@@ -1,4 +1,3 @@
<!-- 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">

4
resources/views/rules/rule-group/create.twig
View File

@@ -20,7 +20,7 @@
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-12"> <div class="col-lg-6 col-md-6 col-sm-12">
<!-- optional fields --> {# optional fields #}
<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>
@@ -30,7 +30,7 @@
</div> </div>
</div> </div>
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

4
resources/views/rules/rule-group/edit.twig
View File

@@ -22,7 +22,7 @@
</div> </div>
<div class="col-lg-6 col-md-12 col-sm-6"> <div class="col-lg-6 col-md-12 col-sm-6">
<!-- optional fields --> {# optional fields #}
<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>
@@ -32,7 +32,7 @@
</div> </div>
</div> </div>
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

2
resources/views/rules/rule-group/select-transactions.twig
View File

@@ -28,8 +28,6 @@
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12"> <div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
{{ ExpandedForm.date('start_date', first) }} {{ ExpandedForm.date('start_date', first) }}
{{ ExpandedForm.date('end_date', today) }} {{ ExpandedForm.date('end_date', today) }}
<!-- ACCOUNTS -->
{{ ExpandedForm.multiCheckbox('accounts',accountList, checkedAccounts, {' class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }} {{ ExpandedForm.multiCheckbox('accounts',accountList, checkedAccounts, {' class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
</div> </div>
</div> </div>

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

@@ -25,7 +25,7 @@
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-12"> <div class="col-lg-6 col-md-6 col-sm-12">
<!-- optional fields --> {# optional fields #}
<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>
@@ -37,14 +37,12 @@
</div> </div>
</div> </div>
<!-- RULE TRIGGERS -->
<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">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'rule_triggers'|_ }}</h3> <h3 class="box-title">{{ 'rule_triggers'|_ }}</h3>
</div> </div>
<!-- display any error -->
<div class="box-body rule-trigger-box"> <div class="box-body rule-trigger-box">
<table class="table table-condensed table-bordered table-striped"> <table class="table table-condensed table-bordered table-striped">
<thead> <thead>
@@ -73,7 +71,6 @@
{% include '/rules/partials/test-trigger-modal' %} {% include '/rules/partials/test-trigger-modal' %}
<!-- RULE ACTIONS -->
<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">
<div class="box"> <div class="box">
@@ -107,7 +104,7 @@
<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">
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

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

@@ -24,7 +24,7 @@
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-12"> <div class="col-lg-6 col-md-6 col-sm-12">
<!-- optional fields --> {# optional fields #}
<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>
@@ -36,14 +36,12 @@
</div> </div>
</div> </div>
<!-- RULE TRIGGERS -->
<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">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'rule_triggers'|_ }}</h3> <h3 class="box-title">{{ 'rule_triggers'|_ }}</h3>
</div> </div>
<!-- display any error -->
<div class="box-body rule-trigger-box"> <div class="box-body rule-trigger-box">
<table class="table table-condensed table-bordered table-striped"> <table class="table table-condensed table-bordered table-striped">
<thead> <thead>
@@ -72,7 +70,6 @@
{% include '/rules/partials/test-trigger-modal' %} {% include '/rules/partials/test-trigger-modal' %}
<!-- RULE ACTIONS -->
<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">
<div class="box"> <div class="box">
@@ -106,7 +103,7 @@
<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">
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

2
resources/views/rules/rule/select-transactions.twig
View File

@@ -28,8 +28,6 @@
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12"> <div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
{{ ExpandedForm.date('start_date', first) }} {{ ExpandedForm.date('start_date', first) }}
{{ ExpandedForm.date('end_date', today) }} {{ ExpandedForm.date('end_date', today) }}
<!-- ACCOUNTS -->
{{ ExpandedForm.multiCheckbox('accounts',accountList, checkedAccounts, {' class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }} {{ ExpandedForm.multiCheckbox('accounts',accountList, checkedAccounts, {' class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
</div> </div>
</div> </div>

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

@@ -32,7 +32,7 @@
</div> </div>
</div> </div>
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

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

@@ -34,7 +34,7 @@
</div> </div>
</div> </div>
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

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

@@ -5,8 +5,6 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<!-- show this block only when the tag has some meta-data -->
<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">

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

@@ -74,18 +74,14 @@
<td>{{ trans('list.description') }}</td> <td>{{ trans('list.description') }}</td>
<td>{{ journal.description }}</td> <td>{{ journal.description }}</td>
</tr> </tr>
<!-- source(s) -->
<tr> <tr>
<td>{{ 'source_accounts'|_ }}</td> <td>{{ 'source_accounts'|_ }}</td>
<td>{{ sourceAccount(journal)|raw }}</td> <td>{{ sourceAccount(journal)|raw }}</td>
</tr> </tr>
<!-- destination(s) -->
<tr> <tr>
<td>{{ 'destination_accounts'|_ }}</td> <td>{{ 'destination_accounts'|_ }}</td>
<td>{{ destinationAccount(journal)|raw }}</td> <td>{{ destinationAccount(journal)|raw }}</td>
</tr> </tr>
<!-- total amount -->
<tr> <tr>
<td>{{ 'total_amount'|_ }}</td> <td>{{ 'total_amount'|_ }}</td>
<td> <td>
@@ -163,7 +159,6 @@
</div> </div>
</div> </div>
<!-- events, if present -->
{% if journal.piggyBankEvents|length > 0 %} {% if journal.piggyBankEvents|length > 0 %}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">

23
resources/views/transactions/single/edit.twig
View File

@@ -80,23 +80,16 @@
<h3 class="box-title">{{ 'optionalFields'|_ }}</h3> <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<!-- BUDGET ONLY WHEN CREATING A WITHDRAWAL -->
{% if what == 'withdrawal' %} {% if what == 'withdrawal' %}
{{ ExpandedForm.select('budget_id',budgetList,data['budget_id']) }} {{ ExpandedForm.select('budget_id',budgetList,data['budget_id']) }}
{% endif %} {% endif %}
<!-- CATEGORY ALWAYS -->
{{ ExpandedForm.text('category',data['category']) }} {{ ExpandedForm.text('category',data['category']) }}
<!-- TAGS -->
{{ ExpandedForm.text('tags') }} {{ ExpandedForm.text('tags') }}
{# NO PIGGY BANK #} {# NO PIGGY BANK #}
</div> </div>
</div> </div>
<!-- explain if necessary -->
{% if {% if
not optionalFields.interest_date or not optionalFields.interest_date or
not optionalFields.book_date or not optionalFields.book_date or
@@ -110,9 +103,6 @@
<p class="text-center text-success"><i class="fa fa-info-circle"></i> <p class="text-center text-success"><i class="fa fa-info-circle"></i>
<em>{{ trans('firefly.hidden_fields_preferences', {link: route('preferences.index')})|raw }}</em></p> <em>{{ trans('firefly.hidden_fields_preferences', {link: route('preferences.index')})|raw }}</em></p>
{% endif %} {% endif %}
<!-- box for dates -->
{% if {% if
optionalFields.interest_date or optionalFields.interest_date or
optionalFields.book_date or optionalFields.book_date or
@@ -132,32 +122,26 @@
<div class="box-body"> <div class="box-body">
{% if optionalFields.interest_date or data['interest_date'] %} {% if optionalFields.interest_date or data['interest_date'] %}
<!-- INTEREST DATE -->
{{ ExpandedForm.date('interest_date',data['interest_date']) }} {{ ExpandedForm.date('interest_date',data['interest_date']) }}
{% endif %} {% endif %}
{% if optionalFields.book_date or data['book_date'] %} {% if optionalFields.book_date or data['book_date'] %}
<!-- BOOK DATE -->
{{ ExpandedForm.date('book_date',data['book_date']) }} {{ ExpandedForm.date('book_date',data['book_date']) }}
{% endif %} {% endif %}
{% if optionalFields.process_date or data['process_date'] %} {% if optionalFields.process_date or data['process_date'] %}
<!-- PROCESSING DATE -->
{{ ExpandedForm.date('process_date',data['process_date']) }} {{ ExpandedForm.date('process_date',data['process_date']) }}
{% endif %} {% endif %}
{% if optionalFields.due_date or data['due_date'] %} {% if optionalFields.due_date or data['due_date'] %}
<!-- DUE DATE -->
{{ ExpandedForm.date('due_date',data['due_date']) }} {{ ExpandedForm.date('due_date',data['due_date']) }}
{% endif %} {% endif %}
{% if optionalFields.payment_date or data['payment_date'] %} {% if optionalFields.payment_date or data['payment_date'] %}
<!-- PAYMENT DATE -->
{{ ExpandedForm.date('payment_date',data['payment_date']) }} {{ ExpandedForm.date('payment_date',data['payment_date']) }}
{% endif %} {% endif %}
{% if optionalFields.invoice_date or data['invoice_date'] %} {% if optionalFields.invoice_date or data['invoice_date'] %}
<!-- INVOICE DATE -->
{{ ExpandedForm.date('invoice_date',data['invoice_date']) }} {{ ExpandedForm.date('invoice_date',data['invoice_date']) }}
{% endif %} {% endif %}
@@ -166,7 +150,6 @@
{% endif %} {% endif %}
<!-- box for business fields -->
{% if {% if
optionalFields.internal_reference or optionalFields.internal_reference or
optionalFields.notes or optionalFields.notes or
@@ -178,12 +161,10 @@
</div> </div>
<div class="box-body"> <div class="box-body">
{% if optionalFields.internal_reference or data['interal_reference'] %} {% if optionalFields.internal_reference or data['interal_reference'] %}
<!-- REFERENCE -->
{{ ExpandedForm.text('internal_reference', data['interal_reference']) }} {{ ExpandedForm.text('internal_reference', data['interal_reference']) }}
{% endif %} {% endif %}
{% if optionalFields.notes or data['notes'] %} {% if optionalFields.notes or data['notes'] %}
<!-- NOTES -->
{{ ExpandedForm.textarea('notes', data['notes'], {helpText: trans('firefly.field_supports_markdown')}) }} {{ ExpandedForm.textarea('notes', data['notes'], {helpText: trans('firefly.field_supports_markdown')}) }}
{% endif %} {% endif %}
@@ -191,7 +172,6 @@
</div> </div>
{% endif %} {% endif %}
<!-- box for attachments -->
{% if optionalFields.attachments %} {% if optionalFields.attachments %}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
@@ -199,14 +179,13 @@
</div> </div>
<div class="box-body"> <div class="box-body">
{% if optionalFields.attachments %} {% if optionalFields.attachments %}
<!-- ATTACHMENTS -->
{{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% endif %} {% endif %}
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>

2
resources/views/transactions/split/edit.twig
View File

@@ -311,7 +311,7 @@
</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">
<!-- panel for options --> {# panel for options #}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'options'|_ }}</h3> <h3 class="box-title">{{ 'options'|_ }}</h3>