mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-12-12 01:42:32 +00:00
Update files for new release
This commit is contained in:
James Cole
@@ -159,7 +159,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# bar to visualise spending in budget .#}
|
||||
{# bar to visualise spending in budget . #}
|
||||
<div class="row">
|
||||
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
|
||||
<div class="progress spent_bar" data-id="{{ budget.id }}" data-budgeted="{{ budget.budgeted }}"
|
||||
@@ -223,7 +223,7 @@
|
||||
{% if 1 == budget.budgeted|length %}
|
||||
{% for budgetLimit in budget.budgeted %}
|
||||
<a href="{{ route('budgets.show.limit', [budget.id, budgetLimit.id]) }}" data-id="{{ budget.id }}">{{ budget.name }}</a>
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
{% if budget.budgeted|length > 1 %}
|
||||
@@ -233,15 +233,15 @@
|
||||
{% endif %}
|
||||
|
||||
{% if budget.auto_budget %}
|
||||
{% if 1 == budget.auto_budget.auto_budget_type %}
|
||||
<span class="fa fa-fw fa-calendar-check-o" title="{{ 'auto_budget_reset_icon'|_ }}"></span>
|
||||
{% endif %}
|
||||
{% if 2 == budget.auto_budget.auto_budget_type %}
|
||||
<span class="fa fa-fw fa-calendar-plus-o" title="{{ 'auto_budget_rollover_icon'|_ }}"></span>
|
||||
{% endif %}
|
||||
{% if 3 == budget.auto_budget.auto_budget_type %}
|
||||
<span class="fa fa-fw fa-calendar-plus-o" title="{{ 'auto_budget_adjusted_icon'|_ }}"></span>
|
||||
{% endif %}
|
||||
{% if 1 == budget.auto_budget.auto_budget_type %}
|
||||
<span class="fa fa-fw fa-calendar-check-o" title="{{ 'auto_budget_reset_icon'|_ }}"></span>
|
||||
{% endif %}
|
||||
{% if 2 == budget.auto_budget.auto_budget_type %}
|
||||
<span class="fa fa-fw fa-calendar-plus-o" title="{{ 'auto_budget_rollover_icon'|_ }}"></span>
|
||||
{% endif %}
|
||||
{% if 3 == budget.auto_budget.auto_budget_type %}
|
||||
<span class="fa fa-fw fa-calendar-plus-o" title="{{ 'auto_budget_adjusted_icon'|_ }}"></span>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if budget.attachments.count() > 0 %}
|
||||
<span class="fa fa-paperclip"></span>
|
||||
@@ -253,11 +253,11 @@
|
||||
<div class="input-group-addon">{{ defaultCurrency.symbol }}</div>
|
||||
<input type="hidden" name="balance_currency_id" value="{{ defaultCurrency.id }}"/>
|
||||
<input class="form-control budget_amount" data-original="0" data-id="{{ budget.id }}"
|
||||
data-currency="{{ defaultCurrency.id }}" data-limit="0" value="0" autocomplete="off" min="0" name="amount"
|
||||
type="number">
|
||||
data-currency="{{ defaultCurrency.id }}" data-limit="0" value="0" autocomplete="off" min="0" name="amount"
|
||||
type="number">
|
||||
</div>
|
||||
<span class="text-danger budget_warning" data-id="{{ budget.id }}" data-budgetLimit="{{ budgetLimit.id }}"
|
||||
style="display:none;"></span>
|
||||
style="display:none;"></span>
|
||||
{% endif %}
|
||||
{% if budget.budgeted|length > 0 %}
|
||||
{% for budgetLimit in budget.budgeted %}
|
||||
@@ -270,9 +270,9 @@
|
||||
<div class="input-group bl_entry" data-budget-limit-id="{{ budgetLimit.id }}">
|
||||
<div class="input-group-addon">{{ budgetLimit.currency_symbol }}</div>
|
||||
<input class="form-control budget_amount" data-original="{{ budgetLimit.amount }}"
|
||||
data-id="{{ budget.id }}" data-limit="{{ budgetLimit.id }}" value="{{ budgetLimit.amount }}"
|
||||
autocomplete="off"
|
||||
min="0" name="amount" type="number">
|
||||
data-id="{{ budget.id }}" data-limit="{{ budgetLimit.id }}" value="{{ budgetLimit.amount }}"
|
||||
autocomplete="off"
|
||||
min="0" name="amount" type="number">
|
||||
<div class="input-group-btn">
|
||||
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
|
||||
aria-expanded="false"><span class="caret"></span></button>
|
||||
@@ -284,7 +284,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<span class="text-danger budget_warning" data-id="{{ budget.id }}" data-budgetLimit="{{ budgetLimit.id }}"
|
||||
style="display:none;"></span>
|
||||
style="display:none;"></span>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% if budget.budgeted|length < currencies.count() %}
|
||||
@@ -305,14 +305,18 @@
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</td>
|
||||
{# this cell displays the amount left in the budget, per budget limit. #}
|
||||
<td class="left" data-id="{{ budget.id }}" style="text-align: right;">
|
||||
{% for spentInfo in budget.spent %}
|
||||
{% set countLimit = 0 %}
|
||||
{% for budgetLimit in budget.budgeted %}
|
||||
{# now looping a single budget limit. #}
|
||||
{% if spentInfo.currency_id == budgetLimit.currency_id and budgetLimit.in_range %}
|
||||
{# the code below is used for budget limits INSIDE the current view range. #}
|
||||
{% set countLimit = countLimit + 1 %}
|
||||
<span class="left_span" data-currency="{{ spentInfo.currency_id }}" data-limit="{{ budgetLimit.id }}"
|
||||
data-value="{{ spentInfo.spent + budgetLimit.amount }}" class="amount_left">
|
||||
data-value="{{ spentInfo.spent + budgetLimit.amount }}" class="amount_left">
|
||||
{# the amount left is automatically calculated. #}
|
||||
{{ formatAmountBySymbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
|
||||
{% if spentInfo.spent + budgetLimit.amount > 0 %}
|
||||
({{ formatAmountBySymbol((spentInfo.spent + budgetLimit.amount) / activeDaysLeft, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
|
||||
@@ -324,8 +328,9 @@
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% if countLimit == 0 %}
|
||||
{# this code is used for budget limits OUTSIDE the current view range. #}
|
||||
<span class="left_span" data-id="{{ budget.id }}" data-currency="{{ spentInfo.currency_id }}" data-limit="0"
|
||||
class="amount_left" data-value="{{ spentInfo.spent }}">
|
||||
class="amount_left" data-value="{{ spentInfo.spent }}">
|
||||
{{ formatAmountBySymbol(spentInfo.spent, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
|
||||
</span>
|
||||
<br/>
|
||||
@@ -333,14 +338,14 @@
|
||||
{% endfor %}
|
||||
{% for budgetLimit in budget.budgeted %}
|
||||
{% if null == budget.spent[budgetLimit.currency_id] %}
|
||||
<span class="left_span" data-currency="{{ spentInfo.currency_id }}" data-limit="{{ budgetLimit.id }}"
|
||||
data-value="{{ spentInfo.spent + budgetLimit.amount }}" class="amount_left">
|
||||
<span class="left_span" data-currency="{{ spentInfo.currency_id }}" data-limit="{{ budgetLimit.id }}"
|
||||
data-value="{{ spentInfo.spent + budgetLimit.amount }}" class="amount_left">
|
||||
{{ formatAmountBySymbol(budgetLimit.amount, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}
|
||||
{% if budgetLimit.in_range %}
|
||||
({{ formatAmountBySymbol(budgetLimit.amount / activeDaysLeft, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
|
||||
{% endif %}
|
||||
{% if budgetLimit.in_range %}
|
||||
({{ formatAmountBySymbol(budgetLimit.amount / activeDaysLeft, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
|
||||
{% endif %}
|
||||
</span>
|
||||
<br/>
|
||||
<br/>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</td>
|
||||
@@ -433,7 +438,7 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block styles %}
|
||||
<link href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
|
||||
<link href="v1/css/bootstrap-sortable.css?v={{ FF_VERSION }}" type="text/css" rel="stylesheet" media="all" nonce="{{ JS_NONCE }}">
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}
|
||||
|
||||
@@ -11,58 +11,11 @@
|
||||
<p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;">
|
||||
<strong>{{ trans('firefly.debug_pretty_table') }}</strong>
|
||||
</p>
|
||||
<textarea rows="30" cols="100" name="debug_info" id="debug_info" style="font-family:Menlo, Monaco, Consolas, monospace;font-size:8pt;">
|
||||
Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION }}**.
|
||||
<textarea rows="30" cols="100" name="debug_info" id="debug_info"
|
||||
style="font-family:Menlo, Monaco, Consolas, monospace;font-size:8pt;">
|
||||
Debug information generated at {{ now }} for Firefly III version **v{{ FF_VERSION }}**.
|
||||
|
||||
| Scope | Version |
|
||||
| --- | --- |
|
||||
| Firefly III | {{ FF_VERSION }} |
|
||||
| Firefly III API | {{ config('firefly.api_version') }} |
|
||||
{% if isDocker %}| Build | {{ buildNr }}, {{ buildDate }} |
|
||||
| Base Build | {{ baseBuildNr }}, {{ baseBuildDate }} |
|
||||
{% endif %}
|
||||
| DB version | {{ foundDBversion }} (exp. {{ expectedDBversion}}) |
|
||||
{% if not isDocker %}| Docker | No |
|
||||
{% endif %}
|
||||
| PHP | `{{ phpVersion }}` |
|
||||
| Host | `{{ phpOs }}` |
|
||||
|
||||
|
||||
| System info | Value |
|
||||
| --- | --- |
|
||||
| System TZ | {{ tz }} |
|
||||
| Browser TZ | [BrowserTZ] |
|
||||
| App environment | {{ appEnv }} |
|
||||
| App debug mode | {{ appDebug }} |
|
||||
| App cache driver | {{ cacheDriver }} |
|
||||
| App logging | {{ appLogLevel }}, {{ logChannel }} |
|
||||
| Display errors | {{ displayErrors }} |
|
||||
| Error reporting | {{ errorReporting }} |
|
||||
| Max upload | {{ uploadSize }} ({{ uploadSize|filesize }}) |
|
||||
| Interface | {{ interface }} |
|
||||
| Default language | {{ defaultLanguage }} |
|
||||
| Default locale | {{ defaultLocale }} |
|
||||
| BCscale | {{ bcscale }} |
|
||||
| DB drivers | {{ drivers }} |
|
||||
| Current driver | {{ currentDriver }} |
|
||||
| Trusted proxies (.env) | `{{ trustedProxies }}` |
|
||||
|
||||
| User info | Value |
|
||||
| --- | --- |
|
||||
| Login provider | {{ loginProvider }} |
|
||||
| User guard | {{ userGuard }} |
|
||||
| Headers | {{ remoteHeader }}, {{ remoteMailHeader }} |
|
||||
| Stateful domains | {{ stateful }} |
|
||||
| Session start | {{ session('start') }} |
|
||||
| Session end | {{ session('end') }} |
|
||||
| Session first | {{ session('first') }} |
|
||||
| User ID | {{ Auth.user.id }} |
|
||||
| User language | {{ userLanguage }} |
|
||||
| User locale | {{ userLocale }} |
|
||||
{% for code,result in localeAttempts %}
|
||||
| Attempt at "{{ code }}" | {{ result }} |
|
||||
{% endfor %}
|
||||
| User agent | {{ userAgent }} |
|
||||
{{ table|escape('html') }}
|
||||
</textarea>
|
||||
<script type="text/javascript" nonce="{{ JS_NONCE }}">
|
||||
var textArea = document.getElementById('debug_info');
|
||||
|
||||
157
resources/views/partials/debug-table.twig
Normal file
157
resources/views/partials/debug-table.twig
Normal file
@@ -0,0 +1,157 @@
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th colspan="2">System information</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Item</th>
|
||||
<th>Value</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{# Firefly III version #}
|
||||
<tr>
|
||||
<td>Firefly III</td>
|
||||
<td>v{{ FF_VERSION }} / v{{ config('firefly.api_version') }} / {{ system.db_version }}
|
||||
(exp. {{ config('firefly.db_version') }})
|
||||
</td>
|
||||
</tr>
|
||||
{# PHP version + settings #}
|
||||
<tr>
|
||||
<td>PHP version</td>
|
||||
<td>{{ system.php_version|escape }} / {{ system.interface }} / {{ system.php_os }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>BCscale</td>
|
||||
<td>{{ system.bcscale }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Error reporting</td>
|
||||
<td>Display: {{ system.display_errors }}, reporting: {{ system.error_reporting }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Max upload</td>
|
||||
<td>{{ system.upload_size }} ({{ system.upload_size|filesize }})</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Database drivers</td>
|
||||
<td>
|
||||
{% for driver in system.all_drivers %}{% if system.current_driver == driver %}<strong>*{{ driver }}*</strong>{% else %}{{ driver }}{% endif %}, {% endfor %}
|
||||
</td>
|
||||
</tr>
|
||||
{# Docker information #}
|
||||
{% if docker.is_docker %}
|
||||
<tr>
|
||||
<td>
|
||||
Docker build
|
||||
</td>
|
||||
<td>
|
||||
#{{ docker.build }}, base #{{ docker.base_build }}
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
</tbody>
|
||||
</table>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th colspan="2">Firefly III information</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Item</th>
|
||||
<th>Value</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Timezone</td>
|
||||
<td>{{ app.tz }} + [BrowserTZ]</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>App environment</td>
|
||||
<td>{{ config('app.env') }}, debug: {{ app.debug }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Logging</td>
|
||||
<td>{{ config('logging.level') }}, {{ app.log_channel }} / {{ app.audit_log_channel }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Cache driver</td>
|
||||
<td>{{ config('cache.default') }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Default language and locale</td>
|
||||
<td>{{ app.default_language }} + {{ app.default_locale }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Trusted proxies</td>
|
||||
<td>{{ config('firefly.trusted_proxies')|escape }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Login provider & user guard</td>
|
||||
<td>{{ config('auth.providers.users.driver') }} / {{ config('auth.defaults.guard') }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Login headers</td>
|
||||
<td>{{ app.remote_header }} + {{ app.remote_mail_header }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Stateful domains</td>
|
||||
<td>{{ app.stateful_domains }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th colspan="2">User-specific information</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Item</th>
|
||||
<th>Value</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>User</td>
|
||||
<td><span>#</span>{{ user.user_id }} of {{ user.user_count }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>User flags</td>
|
||||
<td>{{ user.user_flags }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Session start</td>
|
||||
<td>{{ session('start') }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Session end</td>
|
||||
<td>{{ session('end') }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>View range</td>
|
||||
<td>{{ user.view_range }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>User language</td>
|
||||
<td>{{ user.language }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>User locale</td>
|
||||
<td>{{ user.locale }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Locale(s) supported</td>
|
||||
<td>
|
||||
{% for key, attempt in user.locale_attempts %}
|
||||
{{ key }}: {% if attempt %}:white_check_mark:{% else %}:x:{% endif %}<br>
|
||||
{% endfor %}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>User agent</td>
|
||||
<td>{{ user.user_agent }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
Reference in New Issue
Block a user