mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-12-12 01:42:32 +00:00
Fix issues with relative urls
This commit is contained in:
James Cole
@@ -6,79 +6,79 @@
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="row no-print">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
|
||||
<div class="box" id="optionsBox">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'options'|_ }}</h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<ul class="list-inline">
|
||||
{% for hide in hideable %}
|
||||
<li><input
|
||||
<div class="row no-print">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
|
||||
<div class="box" id="optionsBox">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'options'|_ }}</h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<ul class="list-inline">
|
||||
{% for hide in hideable %}
|
||||
<li><input
|
||||
{% if hide in defaultShow %}checked{% endif %}
|
||||
type="checkbox" class="audit-option-checkbox" name="option[]" value="{{ hide }}" id="option_{{ hide }}"/> <label
|
||||
for="option_{{ hide }}" style="font-weight:normal;">{{ trans('list.'~hide) }}</label></li>
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
|
||||
</ul>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
{% for account in accounts %}
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12">
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ account.name }}</h3>
|
||||
{% for account in accounts %}
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12">
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ account.name }}</h3>
|
||||
</div>
|
||||
{% set url = route('accounts.show',account.id) %}
|
||||
{% if not auditData[account.id].exists %}
|
||||
<div class="box-body">
|
||||
|
||||
<em>
|
||||
{{ trans('firefly.no_audit_activity',
|
||||
{
|
||||
account_name: account.name|escape,
|
||||
url: url,
|
||||
start: start.isoFormat(monthAndDayFormat),
|
||||
end: end.isoFormat(monthAndDayFormat),
|
||||
})|raw }}
|
||||
|
||||
</em>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="box-body no-padding">
|
||||
<p style="padding:10px;">
|
||||
{{ trans('firefly.audit_end_balance',
|
||||
{
|
||||
account_name: account.name|escape,
|
||||
url: url,
|
||||
end: auditData[account.id].dayBefore,
|
||||
balance: formatAmountByAccount(account, auditData[account.id].dayBeforeBalance)
|
||||
})|raw }}
|
||||
</p>
|
||||
{% include 'reports.partials.journals-audit' with {'journals': auditData[account.id].journals,'account':account} %}
|
||||
|
||||
<p style="padding:10px;">
|
||||
|
||||
{{ trans('firefly.audit_end_balance',
|
||||
{
|
||||
account_name: account.name|escape,
|
||||
url: url,
|
||||
end: auditData[account.id].end,
|
||||
balance: formatAmountByAccount(account,auditData[account.id].endBalance)
|
||||
})|raw }}
|
||||
</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% set url = route('accounts.show',account.id) %}
|
||||
{% if not auditData[account.id].exists %}
|
||||
<div class="box-body">
|
||||
|
||||
<em>
|
||||
{{ trans('firefly.no_audit_activity',
|
||||
{
|
||||
account_name: account.name|escape,
|
||||
url: url,
|
||||
start: start.isoFormat(monthAndDayFormat),
|
||||
end: end.isoFormat(monthAndDayFormat),
|
||||
})|raw }}
|
||||
|
||||
</em>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="box-body no-padding">
|
||||
<p style="padding:10px;">
|
||||
{{ trans('firefly.audit_end_balance',
|
||||
{
|
||||
account_name: account.name|escape,
|
||||
url: url,
|
||||
end: auditData[account.id].dayBefore,
|
||||
balance: formatAmountByAccount(account, auditData[account.id].dayBeforeBalance)
|
||||
})|raw }}
|
||||
</p>
|
||||
{% include 'reports.partials.journals-audit' with {'journals': auditData[account.id].journals,'account':account} %}
|
||||
|
||||
<p style="padding:10px;">
|
||||
|
||||
{{ trans('firefly.audit_end_balance',
|
||||
{
|
||||
account_name: account.name|escape,
|
||||
url: url,
|
||||
end: auditData[account.id].end,
|
||||
balance: formatAmountByAccount(account,auditData[account.id].endBalance)
|
||||
})|raw }}
|
||||
</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
|
||||
{% endblock %}
|
||||
{% block styles %}
|
||||
|
||||
@@ -103,18 +103,18 @@
|
||||
</div>
|
||||
|
||||
{% for budget in budgets %}
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="box main_budget_chart">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'expenses'|_ }} ({{ budget.name }})</h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<canvas class="main_budget_canvas" data-url="{{ route('chart.budget.main', [accountIds, budget.id, start.format('Ymd'), end.format('Ymd')]) }}" id="in-out-chart-{{ budget.id }}" style="width:100%;height:400px;" height="400" width="100%"></canvas>
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="box main_budget_chart">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'expenses'|_ }} ({{ budget.name }})</h3>
|
||||
</div>
|
||||
<div class="box-body">
|
||||
<canvas class="main_budget_canvas" data-url="{{ route('chart.budget.main', [accountIds, budget.id, start.format('Ymd'), end.format('Ymd')]) }}" id="in-out-chart-{{ budget.id }}" style="width:100%;height:400px;" height="400" width="100%"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
<div class="row">
|
||||
<div class="col-lg-6">
|
||||
|
||||
@@ -38,15 +38,15 @@
|
||||
|
||||
<div class="col-sm-9" id="inputAccountsSelect">
|
||||
<select id="inputAccounts" name="accounts[]" multiple class="form-control">
|
||||
{% for role, accountList in groupedAccounts %}
|
||||
{% for role, accountList in groupedAccounts %}
|
||||
<optgroup label="{{ role }}">
|
||||
{% for account in accountList %}
|
||||
<option
|
||||
value="{{ account.id }}"
|
||||
label="{{ account.name }}{% if accountGetMetaField(account, 'accountRole') == 'sharedAsset' %} ({{ 'shared'|_|lower }}){% endif %}">
|
||||
{{ account.name }}{% if accountGetMetaField(account, 'accountRole') == 'sharedAsset' %} ({{ 'shared'|_|lower }}){% endif %}
|
||||
</option>
|
||||
{% endfor %}
|
||||
{% for account in accountList %}
|
||||
<option
|
||||
value="{{ account.id }}"
|
||||
label="{{ account.name }}{% if accountGetMetaField(account, 'accountRole') == 'sharedAsset' %} ({{ 'shared'|_|lower }}){% endif %}">
|
||||
{{ account.name }}{% if accountGetMetaField(account, 'accountRole') == 'sharedAsset' %} ({{ 'shared'|_|lower }}){% endif %}
|
||||
</option>
|
||||
{% endfor %}
|
||||
</optgroup>
|
||||
{% endfor %}
|
||||
</select>
|
||||
@@ -186,7 +186,7 @@
|
||||
var selectAllText = "{{ trans('firefly.multi_select_select_all')|escape('js') }}";
|
||||
var nonSelectedText = "{{ trans('firefly.multi_select_no_selection')|escape('js') }}";
|
||||
var nSelectedText = "{{ trans('firefly.multi_select_n_selected')|escape('js') }}";
|
||||
var allSelectedText = "{{ trans('firefly.multi_select_all_selected')|escape('js') }}";
|
||||
var allSelectedText = "{{ trans('firefly.multi_select_all_selected')|escape('js') }}";
|
||||
var filterPlaceholder = "{{ trans('firefly.multi_select_filter_placeholder')|escape('js') }}";
|
||||
</script>
|
||||
<script type="text/javascript" src="v1/js/lib/bootstrap-multiselect.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
|
||||
|
||||
Reference in New Issue
Block a user