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

Fix issues with relative urls

Browse Source
This commit is contained in:
James Cole
2023-09-05 19:34:46 +02:00
parent 5ee80dd046
commit dd794e409f
43 changed files with 509 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/views/admin/link/show.twig
View File

@@ -61,6 +61,7 @@
<script nonce="{{ JS_NONCE }}"> <script nonce="{{ JS_NONCE }}">
$('.switch-link').on('click', switchLink); $('.switch-link').on('click', switchLink);
var switchLinkUrl = '{{ route('transactions.link.switch') }}'; var switchLinkUrl = '{{ route('transactions.link.switch') }}';
function switchLink(e) { function switchLink(e) {
e.preventDefault(); e.preventDefault();
var obj = $(e.currentTarget); var obj = $(e.currentTarget);

6
resources/views/bills/index.twig
View File

@@ -8,7 +8,7 @@
{% if total == 0 %} {% if total == 0 %}
{% include 'partials.empty' with {objectType: 'default', type: 'bills',route: route('bills.create')} %} {% include 'partials.empty' with {objectType: 'default', type: 'bills',route: route('bills.create')} %}
{% else %} {% else %}
<div class="row"> <div class="row">
<div class="col-lg-12 col-sm-12 col-md-12"> <div class="col-lg-12 col-sm-12 col-md-12">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
@@ -33,8 +33,8 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block styles %} {% block styles %}

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

@@ -99,7 +99,7 @@
<form action="{{ route('bills.rescan',object.data.id) }}" method="post"> <form action="{{ route('bills.rescan',object.data.id) }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/> <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<p> <p>
<input type="submit" name="submit" value="{{ 'rescan_old'|_ }}" class="btn btn-default" /> <input type="submit" name="submit" value="{{ 'rescan_old'|_ }}" class="btn btn-default"/>
</p> </p>
</form> </form>

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 auto-budget#} {# panel for auto-budget #}
<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>

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

@@ -20,7 +20,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 optional fields#} {# panel for 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>

6
resources/views/categories/index.twig
View File

@@ -6,7 +6,7 @@
{% block content %} {% block content %}
{% if categories.count() > 0 %} {% if categories.count() > 0 %}
<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">
@@ -33,8 +33,8 @@
</div> </div>
</div> </div>
</div> </div>
{% else %} {% else %}
{% include 'partials.empty' with {objectType: 'default', type: 'categories',route: route('categories.create')} %} {% include 'partials.empty' with {objectType: 'default', type: 'categories',route: route('categories.create')} %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}

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

@@ -7,7 +7,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<div class="checkbox"> <div class="checkbox">
<label> <label>
{{ Html.checkbox('create_another', false).id(name ~ '_return_to_form') }} {{ Html.checkbox('create_another').id(name ~ '_return_to_form') }}
{{ trans('form.returnHereExplanation') }} {{ trans('form.returnHereExplanation') }}
</label> </label>

44
resources/views/index.twig
View File

@@ -10,14 +10,14 @@
{# ACCOUNTS #} {# ACCOUNTS #}
<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"><a href="{{ route('accounts.index',['asset'], false) }}" <h3 class="box-title"><a href="{{ route('accounts.index',['asset']) }}"
title="{{ 'yourAccounts'|_ }}">{{ 'yourAccounts'|_ }}</a></h3> title="{{ 'yourAccounts'|_ }}">{{ 'yourAccounts'|_ }}</a></h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<canvas id="accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas> <canvas id="accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('accounts.index',['asset'], false) }}" class="btn btn-default button-sm"><span <a href="{{ route('accounts.index',['asset']) }}" class="btn btn-default button-sm"><span
class="fa fa-money"></span> {{ 'go_to_asset_accounts'|_ }}</a> class="fa fa-money"></span> {{ 'go_to_asset_accounts'|_ }}</a>
</div> </div>
</div> </div>
@@ -25,7 +25,7 @@
{# BUDGETS #} {# BUDGETS #}
<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.index',null, false) }}" <h3 class="box-title"><a href="{{ route('budgets.index') }}"
title="{{ 'budgetsAndSpending'|_ }}">{{ 'budgetsAndSpending'|_ }}</a></h3> title="{{ 'budgetsAndSpending'|_ }}">{{ 'budgetsAndSpending'|_ }}</a></h3>
</div> </div>
<div class="box-body"> <div class="box-body">
@@ -49,7 +49,7 @@
<canvas id="categories-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas> <canvas id="categories-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('categories.index',null, false) }}" class="btn btn-default button-sm"> <a href="{{ route('categories.index') }}" class="btn btn-default button-sm">
<span class="fa fa-bookmark"></span> <span class="fa fa-bookmark"></span>
<span>{{ 'go_to_categories'|_ }}</span> <span>{{ 'go_to_categories'|_ }}</span>
</a> </a>
@@ -64,7 +64,7 @@
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"><a <h3 class="box-title"><a
href="{{ route('accounts.show', [data.account.id], false) }}">{{ data.account.name }}</a> href="{{ route('accounts.show', [data.account.id]) }}">{{ data.account.name }}</a>
</h3> </h3>
</div> </div>
@@ -92,34 +92,34 @@
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<a href="{{ route('transactions.create', ['withdrawal'], false) }}?source={{ data.account.id }}">{{ 'create_new_withdrawal'|_ }}</a> <a href="{{ route('transactions.create', ['withdrawal']) }}?source={{ data.account.id }}">{{ 'create_new_withdrawal'|_ }}</a>
</li> </li>
<li> <li>
<a href="{{ route('transactions.create', ['deposit'], false) }}?destination={{ data.account.id }}">{{ 'create_new_deposit'|_ }}</a> <a href="{{ route('transactions.create', ['deposit']) }}?destination={{ data.account.id }}">{{ 'create_new_deposit'|_ }}</a>
</li> </li>
<li> <li>
<a href="{{ route('transactions.create', ['transfer'], false) }}?source={{ data.account.id }}">{{ 'create_new_transfer'|_ }}</a> <a href="{{ route('transactions.create', ['transfer']) }}?source={{ data.account.id }}">{{ 'create_new_transfer'|_ }}</a>
</li> </li>
</ul> </ul>
</div> </div>
<div class="btn-group"> <div class="btn-group">
<a type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" <a type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false" aria-haspopup="true" aria-expanded="false"
href="{{ route('accounts.show', [data.account.id], false) }}">{{ formatAmountByAccount(data.account, data.account|balance, false) }} href="{{ route('accounts.show', [data.account.id]) }}">{{ formatAmountByAccount(data.account, data.account|balance, false) }}
<span class="caret"></span> <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<a href="{{ route('accounts.show', [data.account.id], false) }}">{{ 'show'|_ }}</a> <a href="{{ route('accounts.show', [data.account.id]) }}">{{ 'show'|_ }}</a>
</li> </li>
<li> <li>
<a href="{{ route('accounts.reconcile', [data.account.id], false) }}">{{ 'reconcile'|_ }}</a> <a href="{{ route('accounts.reconcile', [data.account.id]) }}">{{ 'reconcile'|_ }}</a>
</li> </li>
<li> <li>
<a href="{{ route('accounts.edit', [data.account.id], false) }}">{{ 'edit'|_ }}</a> <a href="{{ route('accounts.edit', [data.account.id]) }}">{{ 'edit'|_ }}</a>
</li> </li>
<li> <li>
<a href="{{ route('accounts.delete', [data.account.id], false) }}">{{ 'delete'|_ }}</a> <a href="{{ route('accounts.delete', [data.account.id]) }}">{{ 'delete'|_ }}</a>
</li> </li>
</ul> </ul>
</div> </div>
@@ -132,7 +132,7 @@
{# BILLS #} {# BILLS #}
<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('bills.index', null, false) }}" <h3 class="box-title"><a href="{{ route('bills.index') }}"
title="{{ 'bills'|_ }}">{{ 'bills'|_ }}</a></h3> title="{{ 'bills'|_ }}">{{ 'bills'|_ }}</a></h3>
</div> </div>
@@ -142,7 +142,7 @@
</div> </div>
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('bills.index',null, false) }}" class="btn btn-default button-sm"><span <a href="{{ route('bills.index') }}" class="btn btn-default button-sm"><span
class="fa fa-calendar"></span> {{ 'go_to_bills'|_ }}</a> class="fa fa-calendar"></span> {{ 'go_to_bills'|_ }}</a>
</div> </div>
</div> </div>
@@ -159,7 +159,7 @@
{# EXPENSE ACCOUNTS #} {# EXPENSE ACCOUNTS #}
<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('accounts.index',['expense'], false) }}" <h3 class="box-title"><a href="{{ route('accounts.index',['expense']) }}"
title="{{ 'expense_accounts'|_ }}">{{ 'expense_accounts'|_ }}</a> title="{{ 'expense_accounts'|_ }}">{{ 'expense_accounts'|_ }}</a>
</h3> </h3>
</div> </div>
@@ -168,14 +168,14 @@
width="100%"></canvas> width="100%"></canvas>
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('accounts.index', ['expense'], false) }}" class="btn btn-default button-sm"><span <a href="{{ route('accounts.index', ['expense']) }}" class="btn btn-default button-sm"><span
class="fa fa-shopping-cart"></span> {{ 'go_to_expense_accounts'|_ }}</a> class="fa fa-shopping-cart"></span> {{ 'go_to_expense_accounts'|_ }}</a>
</div> </div>
</div> </div>
{# OPTIONAL REVENUE ACCOUNTS #} {# OPTIONAL REVENUE ACCOUNTS #}
<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('accounts.index',['revenue'], false) }}" <h3 class="box-title"><a href="{{ route('accounts.index',['revenue']) }}"
title="{{ 'revenue_accounts'|_ }}">{{ 'revenue_accounts'|_ }}</a></h3> title="{{ 'revenue_accounts'|_ }}">{{ 'revenue_accounts'|_ }}</a></h3>
</div> </div>
@@ -184,7 +184,7 @@
width="100%"></canvas> width="100%"></canvas>
</div> </div>
<div class="box-footer"> <div class="box-footer">
<a href="{{ route('accounts.index', ['revenue'], false) }}" class="btn btn-default button-sm"><span <a href="{{ route('accounts.index', ['revenue']) }}" class="btn btn-default button-sm"><span
class="fa fa-download"></span> {{ 'go_to_revenue_accounts'|_ }}</a> class="fa fa-download"></span> {{ 'go_to_revenue_accounts'|_ }}</a>
</div> </div>
</div> </div>
@@ -200,9 +200,9 @@
lineTextColor = '#bec5cb'; lineTextColor = '#bec5cb';
} }
var billCount = {{ billCount }}; var billCount = {{ billCount }};
var accountFrontpageUrl = '{{ route('chart.account.frontpage', null, false) }}'; var accountFrontpageUrl = '{{ route('chart.account.frontpage') }}';
var accountRevenueUrl = '{{ route('chart.account.revenue', null, false) }}'; var accountRevenueUrl = '{{ route('chart.account.revenue') }}';
var accountExpenseUrl = '{{ route('chart.account.expense',null, false) }}'; var accountExpenseUrl = '{{ route('chart.account.expense') }}';
var piggyInfoUrl = '{{ route('json.fp.piggy-banks') }}'; var piggyInfoUrl = '{{ route('json.fp.piggy-banks') }}';
var drawVerticalLine = ''; var drawVerticalLine = '';
{# render vertical line with text "today" #} {# render vertical line with text "today" #}

6
resources/views/javascript/variables.twig
View File

@@ -54,9 +54,9 @@ var edit_selected_txt = "{{ trans('firefly.mass_edit')|escape('js') }}";
var edit_bulk_selected_txt = "{{ trans('firefly.bulk_edit')|escape('js') }}"; var edit_bulk_selected_txt = "{{ trans('firefly.bulk_edit')|escape('js') }}";
var delete_selected_txt = "{{ trans('firefly.mass_delete')|escape('js') }}"; var delete_selected_txt = "{{ trans('firefly.mass_delete')|escape('js') }}";
var mass_edit_url = '{{ route('transactions.mass.edit', [''], false) }}'; var mass_edit_url = '{{ route('transactions.mass.edit', ['']) }}';
var bulk_edit_url = '{{ route('transactions.bulk.edit', [''], false) }}'; var bulk_edit_url = '{{ route('transactions.bulk.edit', ['']) }}';
var mass_delete_url = '{{ route('transactions.mass.delete', [''], false) }}'; var mass_delete_url = '{{ route('transactions.mass.delete', ['']) }}';
// for demo: // for demo:
var nextLabel = "{{ trans('firefly.intro_next_label')|escape('js') }}"; var nextLabel = "{{ trans('firefly.intro_next_label')|escape('js') }}";

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

@@ -95,7 +95,7 @@
<header class="main-header"> <header class="main-header">
{# Logo #} {# Logo #}
<a href="{{ route('index', null, false) }}" 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 #}
@@ -138,7 +138,7 @@
</header> </header>
<aside class="main-sidebar"> <aside class="main-sidebar">
<section class="sidebar"> <section class="sidebar">
<form action="{{ route('search.index', null, false) }}" method="get" class="sidebar-form"> <form action="{{ route('search.index') }}" method="get" class="sidebar-form">
<div class="input-group"> <div class="input-group">
<input autocomplete="off" type="text" name="search" class="form-control" <input autocomplete="off" type="text" name="search" class="form-control"
placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}" spellcheck="false"/> placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}" spellcheck="false"/>
@@ -176,7 +176,7 @@
<footer class="main-footer"> <footer class="main-footer">
<div class="pull-right"> <div class="pull-right">
<b class="hidden-xs">{{ 'version'|_ }}</b> <a <b class="hidden-xs">{{ 'version'|_ }}</b> <a
href="{{ route('debug', null, false) }}">{{ Config.get('firefly.version') }}</a> href="{{ route('debug') }}">{{ Config.get('firefly.version') }}</a>
</div> </div>
<strong><a href="https://github.com/firefly-iii/firefly-iii">Firefly III</a></strong> <strong><a href="https://github.com/firefly-iii/firefly-iii">Firefly III</a></strong>
<small class="text-muted">&copy; James Cole, <a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL-3.0-or-later</a>.</small> <small class="text-muted">&copy; James Cole, <a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL-3.0-or-later</a>.</small>
@@ -222,7 +222,7 @@
{# All kinds of variables. #} {# All kinds of variables. #}
<script <script
src="{{ route('javascript.variables', null, false) }}?ext=.js&amp;v={{ FF_VERSION }}{% if account %}&amp;account={{ account.id }}{% endif %}" src="{{ route('javascript.variables') }}?ext=.js&amp;v={{ FF_VERSION }}{% if account %}&amp;account={{ account.id }}{% endif %}"
type="text/javascript" nonce="{{ JS_NONCE }}"></script> type="text/javascript" nonce="{{ JS_NONCE }}"></script>
{# Base script: jquery and bootstrap #} {# Base script: jquery and bootstrap #}
@@ -247,8 +247,8 @@
{% if not shownDemo %} {% if not shownDemo %}
<script type="text/javascript" nonce="{{ JS_NONCE }}"> <script type="text/javascript" nonce="{{ JS_NONCE }}">
var routeForTour = "{{ current_route_name }}"; var routeForTour = "{{ current_route_name }}";
var routeStepsUrl = "{{ route('json.intro', [current_route_name, objectType|default("")], false) }}"; var routeStepsUrl = "{{ route('json.intro', [current_route_name, objectType|default("")]) }}";
var routeForFinishedTour = "{{ route('json.intro.finished', [current_route_name, objectType|default("")], false) }}"; var routeForFinishedTour = "{{ route('json.intro.finished', [current_route_name, objectType|default("")]) }}";
</script> </script>
<script type="text/javascript" src="v1/lib/intro/intro.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script> <script type="text/javascript" src="v1/lib/intro/intro.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/intro/intro.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script> <script type="text/javascript" src="v1/js/ff/intro/intro.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
@@ -280,7 +280,7 @@
style="border:0;" alt=""/></p></noscript> style="border:0;" alt=""/></p></noscript>
{% endif %} {% endif %}
<form id="logout-form" action="{{ route('logout', null, false) }}" method="POST" style="display: none;"> <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/> <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
</form> </form>

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

@@ -70,15 +70,19 @@
var _paq = window._paq || []; var _paq = window._paq || [];
_paq.push(['trackPageView']); _paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']); _paq.push(['enableLinkTracking']);
(function() { (function () {
var u="//{{ config('firefly.tracker_url') }}/"; var u = "//{{ config('firefly.tracker_url') }}/";
_paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setTrackerUrl', u + 'matomo.php']);
_paq.push(['setSiteId', '{{ config('firefly.tracker_site_id') }}']); _paq.push(['setSiteId', '{{ config('firefly.tracker_site_id') }}']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); g.type = 'text/javascript';
g.async = true;
g.defer = true;
g.src = u + 'matomo.js';
s.parentNode.insertBefore(g, s);
})(); })();
</script> </script>
<noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" style="border:0;" alt="" /></p></noscript> <noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" style="border:0;" alt=""/></p></noscript>
{% endif %} {% endif %}
</body> </body>

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

@@ -85,15 +85,19 @@
var _paq = window._paq || []; var _paq = window._paq || [];
_paq.push(['trackPageView']); _paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']); _paq.push(['enableLinkTracking']);
(function() { (function () {
var u="//{{ config('firefly.tracker_url') }}/"; var u = "//{{ config('firefly.tracker_url') }}/";
_paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setTrackerUrl', u + 'matomo.php']);
_paq.push(['setSiteId', '{{ config('firefly.tracker_site_id') }}']); _paq.push(['setSiteId', '{{ config('firefly.tracker_site_id') }}']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); g.type = 'text/javascript';
g.async = true;
g.defer = true;
g.src = u + 'matomo.js';
s.parentNode.insertBefore(g, s);
})(); })();
</script> </script>
<noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" style="border:0;" alt="" /></p></noscript> <noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" style="border:0;" alt=""/></p></noscript>
{% endif %} {% endif %}
</body> </body>

18
resources/views/layout/install.twig
View File

@@ -25,7 +25,7 @@
<body class="hold-transition login-page dark-mode"> <body class="hold-transition login-page dark-mode">
<div class="login-box"> <div class="login-box">
<div class="login-logo"> <div class="login-logo">
<strong>Firefly</strong>III<br /> <strong>Firefly</strong>III<br/>
<span style="font-family: monospace;font-size:16pt;">installation and upgrade</span> <span style="font-family: monospace;font-size:16pt;">installation and upgrade</span>
</div> </div>
{% block content %}{% endblock %} {% block content %}{% endblock %}
@@ -45,15 +45,19 @@
var _paq = window._paq || []; var _paq = window._paq || [];
_paq.push(['trackPageView']); _paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']); _paq.push(['enableLinkTracking']);
(function() { (function () {
var u="//{{ config('firefly.tracker_url') }}/"; var u = "//{{ config('firefly.tracker_url') }}/";
_paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setTrackerUrl', u + 'matomo.php']);
_paq.push(['setSiteId', '{{ config('firefly.tracker_site_id') }}']); _paq.push(['setSiteId', '{{ config('firefly.tracker_site_id') }}']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); g.type = 'text/javascript';
g.async = true;
g.defer = true;
g.src = u + 'matomo.js';
s.parentNode.insertBefore(g, s);
})(); })();
</script> </script>
<noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" style="border:0;" alt="" /></p></noscript> <noscript><p><img src="//{{ config('firefly.tracker_url') }}/matomo.php?idsite={{ config('firefly.tracker_site_id') }}&amp;rec=1" style="border:0;" alt=""/></p></noscript>
{% endif %} {% endif %}
</body> </body>

24
resources/views/list/groups.twig
View File

@@ -52,7 +52,7 @@
<tr style="border-top:1px #aaa solid;" class="unsortable"> <tr style="border-top:1px #aaa solid;" class="unsortable">
<td colspan="2" style="border-top:1px #aaa solid;"> <td colspan="2" style="border-top:1px #aaa solid;">
<small><strong> <small><strong>
<a href="{{ route('transactions.show', [group.id], false) }}" <a href="{{ route('transactions.show', [group.id]) }}"
title="{{ group.title }}">{{ group.title }}</a> title="{{ group.title }}">{{ group.title }}</a>
</strong></small> </strong></small>
</td> </td>
@@ -81,9 +81,9 @@
aria-haspopup="true" aria-expanded="false"> aria-haspopup="true" aria-expanded="false">
{{ 'actions'|_ }} <span class="caret"></span></button> {{ 'actions'|_ }} <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu"> <ul class="dropdown-menu dropdown-menu-right" role="menu">
<li><a href="{{ route('transactions.edit', [group.id], false) }}"><span <li><a href="{{ route('transactions.edit', [group.id]) }}"><span
class="fa fa-fw fa-pencil"></span> {{ 'edit'|_ }}</a></li> class="fa fa-fw fa-pencil"></span> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('transactions.delete', [group.id], false) }}"><span <li><a href="{{ route('transactions.delete', [group.id]) }}"><span
class="fa fa-fw fa-trash"></span> {{ 'delete'|_ }}</a></li> class="fa fa-fw fa-trash"></span> {{ 'delete'|_ }}</a></li>
<li><a href="#" data-id="{{ group.id }}" class="clone-transaction"><span <li><a href="#" data-id="{{ group.id }}" class="clone-transaction"><span
class="fa fa-copy fa-fw"></span> {{ 'clone'|_ }}</a></li> class="fa fa-copy fa-fw"></span> {{ 'clone'|_ }}</a></li>
@@ -137,7 +137,7 @@
<span class="fa fa-paperclip"></span> <span class="fa fa-paperclip"></span>
{% endif %} {% endif %}
{% if group.count == 1 %} {% if group.count == 1 %}
<a href="{{ route('transactions.show', [group.id], false) }}" title="{{ transaction.description }}"> <a href="{{ route('transactions.show', [group.id]) }}" title="{{ transaction.description }}">
{% endif %} {% endif %}
{{ transaction.description }} {{ transaction.description }}
{% if group.count == 1 %} {% if group.count == 1 %}
@@ -215,7 +215,7 @@
{% if 'Cash account' == transaction.source_account_type %} {% if 'Cash account' == transaction.source_account_type %}
<span class="text-success">({{ 'cash'|_ }})</span> <span class="text-success">({{ 'cash'|_ }})</span>
{% else %} {% else %}
<a href="{{ route('accounts.show', [transaction.source_account_id|default(1)], false) }}" <a href="{{ route('accounts.show', [transaction.source_account_id|default(1)]) }}"
title="{{ transaction.source_account_iban|default(transaction.source_account_name) }}">{{ transaction.source_account_name }}</a> title="{{ transaction.source_account_iban|default(transaction.source_account_name) }}">{{ transaction.source_account_name }}</a>
{% endif %} {% endif %}
</td> </td>
@@ -223,14 +223,14 @@
{% if 'Cash account' == transaction.destination_account_type %} {% if 'Cash account' == transaction.destination_account_type %}
<span class="text-success">({{ 'cash'|_ }})</span> <span class="text-success">({{ 'cash'|_ }})</span>
{% else %} {% else %}
<a href="{{ route('accounts.show', [transaction.destination_account_id|default(1)], false) }}" <a href="{{ route('accounts.show', [transaction.destination_account_id|default(1)]) }}"
title="{{ transaction.destination_account_iban|default(transaction.destination_account_name) }}">{{ transaction.destination_account_name }}</a> title="{{ transaction.destination_account_iban|default(transaction.destination_account_name) }}">{{ transaction.destination_account_name }}</a>
{% endif %} {% endif %}
</td> </td>
{% if showCategory %} {% if showCategory %}
<td style=" {{ style|raw }}" class="hidden-xs"> <td style=" {{ style|raw }}" class="hidden-xs">
{% if transaction.category_id %} {% if transaction.category_id %}
<a href="{{ route('categories.show', [transaction.category_id], false) }}" <a href="{{ route('categories.show', [transaction.category_id]) }}"
title="{{ transaction.category_name }}">{{ transaction.category_name }}</a> title="{{ transaction.category_name }}">{{ transaction.category_name }}</a>
{% endif %} {% endif %}
</td> </td>
@@ -238,7 +238,7 @@
{% if showBudget %} {% if showBudget %}
<td style=" {{ style|raw }}" class="hidden-xs"> <td style=" {{ style|raw }}" class="hidden-xs">
{% if transaction.budget_id %} {% if transaction.budget_id %}
<a href="{{ route('budgets.show', [transaction.budget_id], false) }}" <a href="{{ route('budgets.show', [transaction.budget_id]) }}"
title="{{ transaction.budget_name }}">{{ transaction.budget_name }}</a> title="{{ transaction.budget_name }}">{{ transaction.budget_name }}</a>
{% endif %} {% endif %}
</td> </td>
@@ -251,14 +251,14 @@
aria-haspopup="true" aria-expanded="false"> aria-haspopup="true" aria-expanded="false">
{{ 'actions'|_ }} <span class="caret"></span></button> {{ 'actions'|_ }} <span class="caret"></span></button>
<ul class="dropdown-menu dropdown-menu-right" role="menu"> <ul class="dropdown-menu dropdown-menu-right" role="menu">
<li><a href="{{ route('transactions.edit', [group.id], false) }}"><span <li><a href="{{ route('transactions.edit', [group.id]) }}"><span
class="fa fa-fw fa-pencil"></span> {{ 'edit'|_ }}</a></li> class="fa fa-fw fa-pencil"></span> {{ 'edit'|_ }}</a></li>
<li><a href="{{ route('transactions.delete', [group.id], false) }}"><span <li><a href="{{ route('transactions.delete', [group.id]) }}"><span
class="fa fa-fw fa-trash"></span> {{ 'delete'|_ }}</a></li> class="fa fa-fw fa-trash"></span> {{ 'delete'|_ }}</a></li>
<li><a href="#" data-id="{{ group.id }}" class="clone-transaction"><span <li><a href="#" data-id="{{ group.id }}" class="clone-transaction"><span
class="fa fa-copy fa-fw"></span> {{ 'clone'|_ }}</a></li> class="fa fa-copy fa-fw"></span> {{ 'clone'|_ }}</a></li>
<li> <li>
<a href="{{ route('rules.create-from-journal', [transaction.transaction_journal_id], false) }}"><span <a href="{{ route('rules.create-from-journal', [transaction.transaction_journal_id]) }}"><span
class="fa fa-fw fa-random"></span> {{ 'create_rule_from_transaction'|_ }} class="fa fa-fw fa-random"></span> {{ 'create_rule_from_transaction'|_ }}
</a></li> </a></li>
</ul> </ul>
@@ -316,5 +316,5 @@
</tfoot> </tfoot>
</table> </table>
<script type="text/javascript" nonce="{{ JS_NONCE }}"> <script type="text/javascript" nonce="{{ JS_NONCE }}">
var cloneGroupUrl = '{{ route('transactions.clone',null, false) }}'; var cloneGroupUrl = '{{ route('transactions.clone') }}';
</script> </script>

2
resources/views/object-groups/index.twig
View File

@@ -40,7 +40,7 @@
<tr class="group-sortable" data-id="{{ objectGroup.id }}" data-name="{{ objectGroup.title|escape('html') }}" data-order="{{ objectGroup.order }}"> <tr class="group-sortable" data-id="{{ objectGroup.id }}" data-name="{{ objectGroup.title|escape('html') }}" data-order="{{ objectGroup.order }}">
<td><span class="fa fa-fw fa-bars group-handle"></span></td> <td><span class="fa fa-fw fa-bars group-handle"></span></td>
<td> <td>
<strong>{{ objectGroup.title }}</strong><br /> <strong>{{ objectGroup.title }}</strong><br/>
{% for piggyBank in objectGroup.piggyBanks %} {% for piggyBank in objectGroup.piggyBanks %}
- {{ 'piggy_bank'|_ }}: <a href="{{ route('piggy-banks.show', [piggyBank.id]) }}">{{ piggyBank.name }}</a><br> - {{ 'piggy_bank'|_ }}: <a href="{{ route('piggy-banks.show', [piggyBank.id]) }}">{{ piggyBank.name }}</a><br>

14
resources/views/partials/favicons.twig
View File

@@ -1,11 +1,11 @@
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"> <link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?v=3e8AboOwbd"> <link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png?v=3e8AboOwbd">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?v=3e8AboOwbd"> <link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png?v=3e8AboOwbd">
<link rel="manifest" href="/manifest.webmanifest?v=3e8AboOwbd"> <link rel="manifest" href="manifest.webmanifest?v=3e8AboOwbd">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#3c8dbc"> <link rel="mask-icon" href="safari-pinned-tab.svg" color="#3c8dbc">
<link rel="shortcut icon" href="/favicon.ico?v=3e8AboOwbd"> <link rel="shortcut icon" href="favicon.ico?v=3e8AboOwbd">
<meta name="apple-mobile-web-app-title" content="Firefly III"> <meta name="apple-mobile-web-app-title" content="Firefly III">
<meta name="application-name" content="Firefly III"> <meta name="application-name" content="Firefly III">
<meta name="msapplication-TileColor" content="#3c8dbc"> <meta name="msapplication-TileColor" content="#3c8dbc">
<meta name="msapplication-TileImage" content="/mstile-144x144.png?v=3e8AboOwbd"> <meta name="msapplication-TileImage" content="mstile-144x144.png?v=3e8AboOwbd">
<meta name="theme-color" content="#3c8dbc"> <meta name="theme-color" content="#3c8dbc">

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

@@ -1,6 +1,6 @@
<ul class="sidebar-menu" data-widget="tree"> <ul class="sidebar-menu" data-widget="tree">
<li class="{{ activeRouteStrict('index') }}"> <li class="{{ activeRouteStrict('index') }}">
<a href="{{ route('index', null, false) }}"> <a href="{{ route('index') }}">
<em class="fa fa-dashboard fa-fw"></em> <em class="fa fa-dashboard fa-fw"></em>
<span>{{ 'dashboard'|_ }}</span> <span>{{ 'dashboard'|_ }}</span>
</a> </a>
@@ -9,7 +9,7 @@
<li class="header text-uppercase">{{ 'financial_control'|_ }}</li> <li class="header text-uppercase">{{ 'financial_control'|_ }}</li>
<li class="{{ activeRoutePartial('budgets') }}" id="budget-menu"> <li class="{{ activeRoutePartial('budgets') }}" id="budget-menu">
<a href="{{ route('budgets.index', null, false) }}"> <a href="{{ route('budgets.index') }}">
<em class="fa fa-pie-chart fa-fw"></em> <em class="fa fa-pie-chart fa-fw"></em>
<span>{{ 'budgets'|_ }}</span> <span>{{ 'budgets'|_ }}</span>
</a> </a>
@@ -23,7 +23,7 @@
</li> </li>
<li class="{{ activeRoutePartial('piggy-banks') }}"> <li class="{{ activeRoutePartial('piggy-banks') }}">
<a href="{{ route('piggy-banks.index', null, false) }}"> <a href="{{ route('piggy-banks.index') }}">
<em class="fa fa-bullseye fa-fw"></em> <em class="fa fa-bullseye fa-fw"></em>
<span>{{ 'piggyBanks'|_ }}</span> <span>{{ 'piggyBanks'|_ }}</span>
</a> </a>
@@ -42,19 +42,19 @@
<ul class="treeview-menu"> <ul class="treeview-menu">
<li class="{{ activeRoutePartialObjectType('transactions', 'withdrawal') }}"> <li class="{{ activeRoutePartialObjectType('transactions', 'withdrawal') }}">
<a href="{{ route('transactions.index', ['withdrawal'], false) }}"> <a href="{{ route('transactions.index', ['withdrawal']) }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'expenses'|_ }}</span> <span>{{ 'expenses'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartialObjectType('transactions', 'deposit') }}"> <li class="{{ activeRoutePartialObjectType('transactions', 'deposit') }}">
<a href="{{ route('transactions.index', ['deposit'], false) }}"> <a href="{{ route('transactions.index', ['deposit']) }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'income'|_ }}</span> <span>{{ 'income'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartialObjectType('transactions', 'transfers') }}"> <li class="{{ activeRoutePartialObjectType('transactions', 'transfers') }}">
<a href="{{ route('transactions.index', ['transfers'], false) }}"> <a href="{{ route('transactions.index', ['transfers']) }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'transfers'|_ }}</span> <span>{{ 'transfers'|_ }}</span>
</a> </a>
@@ -73,19 +73,19 @@
<ul class="treeview-menu"> <ul class="treeview-menu">
<li class="{{ activeRoutePartial('rules') }}"> <li class="{{ activeRoutePartial('rules') }}">
<a href="{{ route('rules.index', null, false) }}"> <a href="{{ route('rules.index') }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'rules'|_ }}</span> <span>{{ 'rules'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartial('recurring') }}"> <li class="{{ activeRoutePartial('recurring') }}">
<a href="{{ route('recurring.index', null, false) }}"> <a href="{{ route('recurring.index') }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'recurrences'|_ }}</span> <span>{{ 'recurrences'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartial('webhooks') }}"> <li class="{{ activeRoutePartial('webhooks') }}">
<a href="{{ route('webhooks.index', null, false) }}"> <a href="{{ route('webhooks.index') }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'webhooks'|_ }}</span> <span>{{ 'webhooks'|_ }}</span>
</a> </a>
@@ -106,25 +106,25 @@
<ul class="treeview-menu"> <ul class="treeview-menu">
<li class="{{ activeRoutePartialObjectType('accounts', 'asset') }}"> <li class="{{ activeRoutePartialObjectType('accounts', 'asset') }}">
<a href="{{ route('accounts.index', ['asset'], false) }}"> <a href="{{ route('accounts.index', ['asset']) }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'asset_accounts'|_ }}</span> <span>{{ 'asset_accounts'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartialObjectType('accounts', 'expense') }}"> <li class="{{ activeRoutePartialObjectType('accounts', 'expense') }}">
<a href="{{ route('accounts.index', ['expense'], false) }}"> <a href="{{ route('accounts.index', ['expense']) }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'expense_accounts'|_ }}</span> <span>{{ 'expense_accounts'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartialObjectType('accounts', 'revenue') }}"> <li class="{{ activeRoutePartialObjectType('accounts', 'revenue') }}">
<a href="{{ route('accounts.index', ['revenue'], false) }}"> <a href="{{ route('accounts.index', ['revenue']) }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'revenue_accounts'|_ }}</span> <span>{{ 'revenue_accounts'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartialObjectType('accounts', 'liabilities') }}"> <li class="{{ activeRoutePartialObjectType('accounts', 'liabilities') }}">
<a href="{{ route('accounts.index', ['liabilities'], false) }}"> <a href="{{ route('accounts.index', ['liabilities']) }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'liabilities_accounts'|_ }}</span> <span>{{ 'liabilities_accounts'|_ }}</span>
</a> </a>
@@ -143,19 +143,19 @@
<ul class="treeview-menu"> <ul class="treeview-menu">
<li class="{{ activeRoutePartial('categories') }}"> <li class="{{ activeRoutePartial('categories') }}">
<a href="{{ route('categories.index', null, false) }}"> <a href="{{ route('categories.index') }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'categories'|_ }}</span> <span>{{ 'categories'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartial('tags') }}"> <li class="{{ activeRoutePartial('tags') }}">
<a href="{{ route('tags.index', null, false) }}"> <a href="{{ route('tags.index') }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'tags'|_ }}</span> <span>{{ 'tags'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartial('object-groups') }}"> <li class="{{ activeRoutePartial('object-groups') }}">
<a href="{{ route('object-groups.index', null, false) }}"> <a href="{{ route('object-groups.index') }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'object_groups_menu_bar'|_ }}</span> <span>{{ 'object_groups_menu_bar'|_ }}</span>
</a> </a>
@@ -164,7 +164,7 @@
</li> </li>
<li class="{{ activeRoutePartial('reports') }}" id="report-menu"> <li class="{{ activeRoutePartial('reports') }}" id="report-menu">
<a href="{{ route('reports.index', null, false) }}"> {# relative route! #} <a href="{{ route('reports.index') }}"> {# relative route! #}
<em class="fa fa-bar-chart fa-fw"></em> <em class="fa fa-bar-chart fa-fw"></em>
<span>{{ 'reports'|_ }}</span> <span>{{ 'reports'|_ }}</span>
</a> </a>
@@ -173,7 +173,7 @@
{% if config('firefly.feature_flags.export') %} {% if config('firefly.feature_flags.export') %}
<li class="{{ activeRoutePartial('export') }}" id="report-menu"> <li class="{{ activeRoutePartial('export') }}" id="report-menu">
<a href="{{ route('export.index', null, false) }}"> <a href="{{ route('export.index') }}">
<em class="fa fa-upload fa-fw"></em> <em class="fa fa-upload fa-fw"></em>
<span>{{ 'export_data_menu'|_ }}</span> <span>{{ 'export_data_menu'|_ }}</span>
</a> </a>
@@ -192,27 +192,27 @@
<ul class="treeview-menu"> <ul class="treeview-menu">
<li class="{{ activeRoutePartial('profile') }}"> <li class="{{ activeRoutePartial('profile') }}">
<a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index', null, false) }}"> <a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'profile'|_ }}</span> <span>{{ 'profile'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartial('preferences') }}"> <li class="{{ activeRoutePartial('preferences') }}">
<a class="{{ activeRouteStrict('preferences.index') }}" <a class="{{ activeRouteStrict('preferences.index') }}"
href="{{ route('preferences.index', null, false) }}"> href="{{ route('preferences.index') }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'preferences'|_ }}</span> <span>{{ 'preferences'|_ }}</span>
</a> </a>
</li> </li>
<li class="{{ activeRoutePartial('currencies') }}"> <li class="{{ activeRoutePartial('currencies') }}">
<a class="{{ activeRoutePartial('currencies') }}" href="{{ route('currencies.index', null, false) }}"> <a class="{{ activeRoutePartial('currencies') }}" href="{{ route('currencies.index') }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'currencies'|_ }}</span> <span>{{ 'currencies'|_ }}</span>
</a> </a>
</li> </li>
{% if true == featuringWebhooks %} {% if true == featuringWebhooks %}
<li class="{{ activeRoutePartial('webhooks') }}"> <li class="{{ activeRoutePartial('webhooks') }}">
<a class="{{ activeRoutePartial('webhooks') }}" href="{{ route('webhooks.index', null, false) }}"> <a class="{{ activeRoutePartial('webhooks') }}" href="{{ route('webhooks.index') }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'webhooks'|_ }}</span> <span>{{ 'webhooks'|_ }}</span>
</a> </a>
@@ -220,7 +220,7 @@
{% endif %} {% endif %}
{% if hasRole('owner') %} {% if hasRole('owner') %}
<li class="{{ activeRoutePartial('admin') }}"> <li class="{{ activeRoutePartial('admin') }}">
<a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index', null, false) }}"> <a class="{{ activeRoutePartial('admin') }}" href="{{ route('admin.index') }}">
<span class="fa fa-angle-right fa-fw"></span> <span class="fa fa-angle-right fa-fw"></span>
<span>{{ 'administration'|_ }}</span> <span>{{ 'administration'|_ }}</span>
</a> </a>
@@ -232,7 +232,7 @@
{% if 'remote_user_guard' != authGuard or '' != logoutUri %} {% if 'remote_user_guard' != authGuard or '' != logoutUri %}
<li> <li>
<a href="{{ route('logout', null, false) }}" class="logout-link"> <a href="{{ route('logout') }}" class="logout-link">
<em class="fa fa-sign-out fa-fw"></em> <em class="fa fa-sign-out fa-fw"></em>
<span>{{ 'logout'|_ }}</span> <span>{{ 'logout'|_ }}</span>
</a> </a>

10
resources/views/piggy-banks/index.twig
View File

@@ -8,7 +8,7 @@
{% if piggyBanks|length == 0 %} {% if piggyBanks|length == 0 %}
{% include 'partials.empty' with {objectType: 'default', type: 'piggies',route: route('piggy-banks.create')} %} {% include 'partials.empty' with {objectType: 'default', type: 'piggies',route: route('piggy-banks.create')} %}
{% else %} {% else %}
<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">
@@ -25,9 +25,9 @@
</div> </div>
</div> </div>
</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">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
@@ -71,8 +71,8 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script> <script src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>

2
resources/views/recurring/index.twig
View File

@@ -73,7 +73,7 @@
<ol> <ol>
{% for rtt in rt.transactions %} {% for rtt in rt.transactions %}
<li> <li>
{# normal amount + comma#} {# normal amount + comma #}
{{ formatAmountBySymbol(rtt['amount'],rtt['currency_symbol'],rtt['currency_decimal_places']) }}{% if rtt['foreign_amount'] == null %},{% endif %} {{ formatAmountBySymbol(rtt['amount'],rtt['currency_symbol'],rtt['currency_decimal_places']) }}{% if rtt['foreign_amount'] == null %},{% endif %}
{# foreign amount + comma #} {# foreign amount + comma #}

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

@@ -6,7 +6,7 @@
{% block content %} {% block content %}
<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">
<div class="box-header with-border"> <div class="box-header with-border">
@@ -25,11 +25,11 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% for account in accounts %} {% for account in accounts %}
<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">
@@ -77,8 +77,8 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
{% endblock %} {% endblock %}
{% block styles %} {% block styles %}

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

@@ -125,7 +125,7 @@
{% endif %} {% endif %}
><br/>{{ rule.description|default('')|markdown }}</small> ><br/>{{ rule.description|default('')|markdown }}</small>
{% endif %} {% endif %}
<small><br />{% if rule.strict %}<span class="text-danger">{{ 'rule_is_strict'|_ }}</span>{% else %}<span class="text-success">{{ 'rule_is_not_strict'|_ }}</span>{% endif %}</small> <small><br/>{% if rule.strict %}<span class="text-danger">{{ 'rule_is_strict'|_ }}</span>{% else %}<span class="text-success">{{ 'rule_is_not_strict'|_ }}</span>{% endif %}</small>
</td> </td>
<td class="hidden-xs"> <td class="hidden-xs">
{% if rule.ruleTriggers.count() > 0 %} {% if rule.ruleTriggers.count() > 0 %}

6
resources/views/transactions/bulk/edit.twig
View File

@@ -141,19 +141,19 @@
<td> <td>
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" name="tags_action" id="tags_action_do_nothing" value="no_nothing" checked /> <input type="radio" name="tags_action" id="tags_action_do_nothing" value="no_nothing" checked/>
{{ 'no_bulk_tags'|_ }} {{ 'no_bulk_tags'|_ }}
</label> </label>
</div> </div>
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" name="tags_action" id="tags_action_do_replace" value="do_replace" /> <input type="radio" name="tags_action" id="tags_action_do_replace" value="do_replace"/>
{{ 'replace_with_these_tags'|_ }} {{ 'replace_with_these_tags'|_ }}
</label> </label>
</div> </div>
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" name="tags_action" id="tags_action_do_append" value="do_append" /> <input type="radio" name="tags_action" id="tags_action_do_append" value="do_append"/>
{{ 'append_these_tags'|_ }} {{ 'append_these_tags'|_ }}
</label> </label>
</div> </div>