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

Use relative urls see what breaks.

Browse Source
This commit is contained in:
James Cole
2023-08-31 18:45:11 +02:00
parent 2636a6557a
commit 4cc5128b4c
4 changed files with 183 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
resources/views/index.twig
View File

@@ -10,13 +10,14 @@
{# ACCOUNTS #}
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title"><a href="{{ route('accounts.index',['asset']) }}" title="{{ 'yourAccounts'|_ }}">{{ 'yourAccounts'|_ }}</a></h3>
<h3 class="box-title"><a href="{{ route('accounts.index',['asset'], false) }}"
title="{{ 'yourAccounts'|_ }}">{{ 'yourAccounts'|_ }}</a></h3>
</div>
<div class="box-body">
<canvas id="accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div>
<div class="box-footer">
<a href="{{ route('accounts.index','asset') }}" class="btn btn-default button-sm"><span
<a href="{{ route('accounts.index',['asset'], false) }}" class="btn btn-default button-sm"><span
class="fa fa-money"></span> {{ 'go_to_asset_accounts'|_ }}</a>
</div>
</div>
@@ -24,13 +25,14 @@
{# BUDGETS #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title"><a href="{{ route('budgets.index') }}" title="{{ 'budgetsAndSpending'|_ }}">{{ 'budgetsAndSpending'|_ }}</a></h3>
<h3 class="box-title"><a href="{{ route('budgets.index',null, false) }}"
title="{{ 'budgetsAndSpending'|_ }}">{{ 'budgetsAndSpending'|_ }}</a></h3>
</div>
<div class="box-body">
<canvas id="budgets-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div>
<div class="box-footer">
<a href="{{ route('budgets.index') }}" class="btn btn-default button-sm">
<a href="{{ route('budgets.index', null,false) }}" class="btn btn-default button-sm">
<span class="fa fa-pie-chart"></span>
<span>{{ 'go_to_budgets'|_ }}</span>
</a>
@@ -39,14 +41,15 @@
{# CATEGORIES #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title"><a href="{{ route('categories.index') }}" title="{{ 'categories'|_ }}">{{ 'categories'|_ }}</a></h3>
<h3 class="box-title"><a href="{{ route('categories.index', null,false) }}"
title="{{ 'categories'|_ }}">{{ 'categories'|_ }}</a></h3>
</div>
<div class="box-body">
<canvas id="categories-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
</div>
<div class="box-footer">
<a href="{{ route('categories.index') }}" class="btn btn-default button-sm">
<a href="{{ route('categories.index',null, false) }}" class="btn btn-default button-sm">
<span class="fa fa-bookmark"></span>
<span>{{ 'go_to_categories'|_ }}</span>
</a>
@@ -60,7 +63,9 @@
{% for data in transactions %}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title"><a href="{{ route('accounts.show', data.account.id) }}">{{ data.account.name }}</a></h3>
<h3 class="box-title"><a
href="{{ route('accounts.show', [data.account.id], false) }}">{{ data.account.name }}</a>
</h3>
</div>
{% if data.transactions|length > 0 %}
@@ -81,25 +86,41 @@
<div class="box-footer clearfix">
<!-- Single button -->
<div class="btn-group">
<a type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
{{ 'sidebar_frontpage_create'|_ }} <span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li><a href="{{ route('transactions.create', ['withdrawal']) }}?source={{ data.account.id }}">{{ 'create_new_withdrawal'|_ }}</a></li>
<li><a href="{{ route('transactions.create', ['deposit']) }}?destination={{ data.account.id }}">{{ 'create_new_deposit'|_ }}</a></li>
<li><a href="{{ route('transactions.create', ['transfer']) }}?source={{ data.account.id }}">{{ 'create_new_transfer'|_ }}</a></li>
<li>
<a href="{{ route('transactions.create', ['withdrawal'], false) }}?source={{ data.account.id }}">{{ 'create_new_withdrawal'|_ }}</a>
</li>
<li>
<a href="{{ route('transactions.create', ['deposit'], false) }}?destination={{ data.account.id }}">{{ 'create_new_deposit'|_ }}</a>
</li>
<li>
<a href="{{ route('transactions.create', ['transfer'], false) }}?source={{ data.account.id }}">{{ 'create_new_transfer'|_ }}</a>
</li>
</ul>
</div>
<div class="btn-group">
<a type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
href="{{ route('accounts.show', [data.account.id]) }}">{{ formatAmountByAccount(data.account, data.account|balance, false) }}
<a type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"
href="{{ route('accounts.show', [data.account.id], false) }}">{{ formatAmountByAccount(data.account, data.account|balance, false) }}
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li><a href="{{ route('accounts.show', [data.account.id]) }}">{{ 'show'|_ }}</a></li>
<li><a href="{{ route('accounts.reconcile', [data.account.id]) }}">{{ 'reconcile'|_ }}</a></li>
<li><a href="{{ route('accounts.edit', [data.account.id]) }}">{{ 'edit'|_ }}</a></li>
<li><a href="{{ route('accounts.delete', [data.account.id]) }}">{{ 'delete'|_ }}</a></li>
<li>
<a href="{{ route('accounts.show', [data.account.id], false) }}">{{ 'show'|_ }}</a>
</li>
<li>
<a href="{{ route('accounts.reconcile', [data.account.id], false) }}">{{ 'reconcile'|_ }}</a>
</li>
<li>
<a href="{{ route('accounts.edit', [data.account.id], false) }}">{{ 'edit'|_ }}</a>
</li>
<li>
<a href="{{ route('accounts.delete', [data.account.id], false) }}">{{ 'delete'|_ }}</a>
</li>
</ul>
</div>
</div>
@@ -111,7 +132,8 @@
{# BILLS #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title"><a href="{{ route('bills.index') }}" title="{{ 'bills'|_ }}">{{ 'bills'|_ }}</a></h3>
<h3 class="box-title"><a href="{{ route('bills.index', null, false) }}"
title="{{ 'bills'|_ }}">{{ 'bills'|_ }}</a></h3>
</div>
<div class="box-body">
@@ -120,7 +142,7 @@
</div>
</div>
<div class="box-footer">
<a href="{{ route('bills.index') }}" class="btn btn-default button-sm"><span
<a href="{{ route('bills.index',null, false) }}" class="btn btn-default button-sm"><span
class="fa fa-calendar"></span> {{ 'go_to_bills'|_ }}</a>
</div>
</div>
@@ -137,30 +159,32 @@
{# EXPENSE ACCOUNTS #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title"><a href="{{ route('accounts.index',['expense']) }}"
<h3 class="box-title"><a href="{{ route('accounts.index',['expense'], false) }}"
title="{{ 'expense_accounts'|_ }}">{{ 'expense_accounts'|_ }}</a>
</h3>
</div>
<div class="box-body">
<canvas id="expense-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
<canvas id="expense-accounts-chart" style="width:100%;height:400px;" height="400"
width="100%"></canvas>
</div>
<div class="box-footer">
<a href="{{ route('accounts.index', ['expense']) }}" class="btn btn-default button-sm"><span
<a href="{{ route('accounts.index', ['expense'], false) }}" class="btn btn-default button-sm"><span
class="fa fa-shopping-cart"></span> {{ 'go_to_expense_accounts'|_ }}</a>
</div>
</div>
{# OPTIONAL REVENUE ACCOUNTS #}
<div class="box">
<div class="box-header with-border">
<h3 class="box-title"><a href="{{ route('accounts.index',['revenue']) }}"
<h3 class="box-title"><a href="{{ route('accounts.index',['revenue'], false) }}"
title="{{ 'revenue_accounts'|_ }}">{{ 'revenue_accounts'|_ }}</a></h3>
</div>
<div class="box-body">
<canvas id="revenue-accounts-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
<canvas id="revenue-accounts-chart" style="width:100%;height:400px;" height="400"
width="100%"></canvas>
</div>
<div class="box-footer">
<a href="{{ route('accounts.index', ['revenue']) }}" class="btn btn-default button-sm"><span
<a href="{{ route('accounts.index', ['revenue'], false) }}" class="btn btn-default button-sm"><span
class="fa fa-download"></span> {{ 'go_to_revenue_accounts'|_ }}</a>
</div>
</div>
@@ -176,9 +200,9 @@
lineTextColor = '#bec5cb';
}
var billCount = {{ billCount }};
var accountFrontpageUrl = '{{ route('chart.account.frontpage') }}';
var accountRevenueUrl = '{{ route('chart.account.revenue') }}';
var accountExpenseUrl = '{{ route('chart.account.expense') }}';
var accountFrontpageUrl = '{{ route('chart.account.frontpage', null, false) }}';
var accountRevenueUrl = '{{ route('chart.account.revenue', null, false) }}';
var accountExpenseUrl = '{{ route('chart.account.expense',null, false) }}';
var piggyInfoUrl = '{{ route('json.fp.piggy-banks') }}';
var drawVerticalLine = '';
{# render vertical line with text "today" #}
@@ -187,11 +211,14 @@
{% endif %}
</script>
<script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="/v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"
nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="/v1/js/lib/chartjs-plugin-annotation.min.js?v={{ FF_VERSION }}"
nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="/v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}"
nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="/v1/js/ff/charts.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="/v1/js/ff/index.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% endblock %}
{% block styles %}
{% endblock %}

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

@@ -1,7 +1,11 @@
<!DOCTYPE html>
<html lang="{{ trans('config.html_language') }}">
<head>
<base href="{{ route('index') }}/">
<!--
If the base href URL begins with "http://" but you are sure it should start with "https://",
please visit the following page: https://bit.ly/FF3-base-href
-->
<base href="{{ route('index', null, true) }}/">
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="csrf-token" content="{{ csrf_token() }}">
@@ -22,12 +26,15 @@
</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
{# CSS things #}
<link href="v1/lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
<link href="v1/lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
<link href="/v1/lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
nonce="{{ JS_NONCE }}">
<link href="/v1/lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
nonce="{{ JS_NONCE }}">
{# the theme #}
<link href="v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
<link href="/v1/lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
nonce="{{ JS_NONCE }}">
{% if 'browser' == darkMode %}
<script nonce="{{ JS_NONCE }}">
// If `prefers-color-scheme` is not supported, fall back to light mode.
@@ -36,35 +43,43 @@
document.documentElement.style.display = 'none';
document.head.insertAdjacentHTML(
'beforeend',
'<link rel="stylesheet" href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}" onload="document.documentElement.style.display = \'\'">',
'<link rel="stylesheet" href="/v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}" onload="document.documentElement.style.display = \'\'">',
);
}
</script>
<link href="v1/css/daterangepicker-default.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
<link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: dark)">
<link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: light)">
<link href="/v1/css/daterangepicker-default.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
nonce="{{ JS_NONCE }}">
<link href="/v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: dark)">
<link href="/v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
nonce="{{ JS_NONCE }}" media="(prefers-color-scheme: light)">
{% endif %}
{% if 'dark' == darkMode %}
<link href="v1/css/daterangepicker-dark.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
<link href="v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
<link href="/v1/css/daterangepicker-dark.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
nonce="{{ JS_NONCE }}">
<link href="/v1/lib/adminlte/css/skins/skin-dark.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
nonce="{{ JS_NONCE }}">
{% endif %}
{% if 'light' == darkMode %}
<link href="v1/css/daterangepicker-light.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
<link href="v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
<link href="/v1/css/daterangepicker-light.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
nonce="{{ JS_NONCE }}">
<link href="/v1/lib/adminlte/css/skins/skin-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
nonce="{{ JS_NONCE }}">
{% endif %}
{# Firefly III customisations #}
<link href="v1/css/firefly.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
<link href="/v1/css/firefly.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
{# Extra CSS for the demo: #}
{% if not shownDemo %}
<link href="v1/lib/intro/introjs.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css" nonce="{{ JS_NONCE }}">
<link href="/v1/lib/intro/introjs.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"
nonce="{{ JS_NONCE }}">
{% endif %}
{# Any local custom CSS. #}
{% block styles %}{% endblock %}
<!--[if lt IE 9]>
<script src="v1/js/lib/html5shiv.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script src="v1/js/lib/respond.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script src="/v1/js/lib/html5shiv.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script src="/v1/js/lib/respond.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<![endif]-->
{# this entry is in the header so it's loaded early #}
@@ -80,7 +95,7 @@
<header class="main-header">
{# Logo #}
<a href="{{ route('index') }}" class="logo">
<a href="{{ route('index', null, false) }}" class="logo">
{# mini logo for sidebar mini 50x50 pixels #}
<span class="logo-mini">FF</span>
{# logo for regular state and mobile devices #}
@@ -95,8 +110,10 @@
<ul class="nav navbar-nav">
<li class="hidden-sm hidden-xs">
<a href="#" id="help" data-route="{{ original_route_name }}" data-extra="{{ objectType|default("") }}">
<span class="fa fa-question-circle" data-route="{{ original_route_name }}" data-extra="{{ objectType|default("") }}"></span>
<a href="#" id="help" data-route="{{ original_route_name }}"
data-extra="{{ objectType|default("") }}">
<span class="fa fa-question-circle" data-route="{{ original_route_name }}"
data-extra="{{ objectType|default("") }}"></span>
</a>
</li>
@@ -121,9 +138,10 @@
</header>
<aside class="main-sidebar">
<section class="sidebar">
<form action="{{ route('search.index') }}" method="get" class="sidebar-form">
<form action="{{ route('search.index', null, false) }}" method="get" class="sidebar-form">
<div class="input-group">
<input autocomplete="off" type="text" name="search" class="form-control" placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}" spellcheck="false"/>
<input autocomplete="off" type="text" name="search" class="form-control"
placeholder="{{ 'searchPlaceholder'|_ }}" value="{{ query }}" spellcheck="false"/>
<span class="input-group-btn">
<button type='submit' name='go' id='search-btn' class="btn btn-flat"><span class="fa fa-search"></span></button>
</span>
@@ -157,7 +175,8 @@
</div>
<footer class="main-footer">
<div class="pull-right">
<b class="hidden-xs">{{ 'version'|_ }}</b> <a href="{{ route('debug') }}">{{ Config.get('firefly.version') }}</a>
<b class="hidden-xs">{{ 'version'|_ }}</b> <a
href="{{ route('debug', null, false) }}">{{ Config.get('firefly.version') }}</a>
</div>
<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>
@@ -197,37 +216,42 @@
{% block definitions %}{% endblock %}
{# Moment JS #}
<script src="v1/js/lib/moment.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
<script src="v1/js/lib/moment/{{ language }}.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
<script src="/v1/js/lib/moment.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
<script src="/v1/js/lib/moment/{{ language }}.js?v={{ FF_VERSION }}" type="text/javascript"
nonce="{{ JS_NONCE }}"></script>
{# All kinds of variables. #}
<script src="{{ route('javascript.variables') }}?ext=.js&amp;v={{ FF_VERSION }}{% if account %}&amp;account={{ account.id }}{% endif %}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
<script
src="{{ route('javascript.variables', null, false) }}?ext=.js&amp;v={{ FF_VERSION }}{% if account %}&amp;account={{ account.id }}{% endif %}"
type="text/javascript" nonce="{{ JS_NONCE }}"></script>
{# Base script: jquery and bootstrap #}
<script src="v1/js/app.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
<script src="/v1/js/app.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
{# Vue scripts and components. Only loaded when needed #}
{% if VUE_SCRIPT_NAME %}
<script src="v1/js/app_vue.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
<script src="v1/js/{{ VUE_SCRIPT_NAME }}.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
<script src="/v1/js/app_vue.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
<script src="/v1/js/{{ VUE_SCRIPT_NAME }}.js?v={{ FF_VERSION }}" type="text/javascript"
nonce="{{ JS_NONCE }}"></script>
{% endif %}
{# date range picker, current template, etc.#}
<script src="v1/js/lib/daterangepicker.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
<script src="v1/lib/adminlte/js/adminlte.min.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/lib/accounting.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{# date range picker, current template, etc. #}
<script src="/v1/js/lib/daterangepicker.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
<script src="/v1/lib/adminlte/js/adminlte.min.js?v={{ FF_VERSION }}" type="text/javascript"
nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="/v1/js/lib/accounting.min.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{# Firefly III code#}
<script type="text/javascript" src="v1/js/ff/firefly.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="v1/js/ff/help.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{# Firefly III code #}
<script type="text/javascript" src="/v1/js/ff/firefly.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
<script type="text/javascript" src="/v1/js/ff/help.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
{% if not shownDemo %}
<script type="text/javascript" nonce="{{ JS_NONCE }}">
var routeForTour = "{{ current_route_name }}";
var routeStepsUrl = "{{ route('json.intro', [current_route_name, objectType|default("")]) }}";
var routeForFinishedTour = "{{ route('json.intro.finished', [current_route_name, objectType|default("")]) }}";
var routeStepsUrl = "{{ route('json.intro', [current_route_name, objectType|default("")], false) }}";
var routeForFinishedTour = "{{ route('json.intro.finished', [current_route_name, objectType|default("")], false) }}";
</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/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>
{% endif %}
{% block scripts %}{% endblock %}
@@ -239,19 +263,25 @@
var _paq = window._paq || [];
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//{{ config('firefly.tracker_url') }}/";
_paq.push(['setTrackerUrl', u+'matomo.php']);
(function () {
var u = "//{{ config('firefly.tracker_url') }}/";
_paq.push(['setTrackerUrl', u + 'matomo.php']);
_paq.push(['setSiteId', '{{ config('firefly.tracker_site_id') }}']);
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);
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);
})();
</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 %}
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<form id="logout-form" action="{{ route('logout', null, false) }}" method="POST" style="display: none;">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
</form>
</body>

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="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="manifest" href="manifest.webmanifest?v=3e8AboOwbd">
<link rel="mask-icon" href="safari-pinned-tab.svg" color="#3c8dbc">
<link rel="shortcut icon" href="favicon.ico?v=3e8AboOwbd">
<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="16x16" href="/favicon-16x16.png?v=3e8AboOwbd">
<link rel="manifest" href="/manifest.webmanifest?v=3e8AboOwbd">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#3c8dbc">
<link rel="shortcut icon" href="/favicon.ico?v=3e8AboOwbd">
<meta name="apple-mobile-web-app-title" content="Firefly III">
<meta name="application-name" content="Firefly III">
<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">

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

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