mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Clean up code, fixes #392
This commit is contained in:
parent
5b8583dd2b
commit
49cc8a97a3
@ -14,47 +14,47 @@
|
|||||||
<table class="table table-condensed sortable">
|
<table class="table table-condensed sortable">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th colspan="2"> </th>
|
<th class="hidden-xs" colspan="2"> </th>
|
||||||
<th>{{ trans('list.email') }}</th>
|
<th>{{ trans('list.email') }}</th>
|
||||||
<th>{{ trans('list.registered_at') }}</th>
|
<th class="hidden-xs">{{ trans('list.registered_at') }}</th>
|
||||||
<th>{{ trans('list.registered_from') }}</th>
|
<th class="hidden-xs">{{ trans('list.registered_from') }}</th>
|
||||||
<th>{{ trans('list.confirmed_from') }}</th>
|
<th class="hidden-xs">{{ trans('list.confirmed_from') }}</th>
|
||||||
<th>{{ trans('list.is_admin') }}</th>
|
<th class="hidden-xs">{{ trans('list.is_admin') }}</th>
|
||||||
<th>{{ trans('list.has_two_factor') }}</th>
|
<th class="hidden-xs">{{ trans('list.has_two_factor') }}</th>
|
||||||
<th>{{ trans('list.is_activated') }}</th>
|
<th>{{ trans('list.is_activated') }}</th>
|
||||||
<th>{{ trans('list.is_blocked') }}</th>
|
<th>{{ trans('list.is_blocked') }}</th>
|
||||||
<th>{{ trans('list.blocked_code') }}</th>
|
<th class="hidden-xs">{{ trans('list.blocked_code') }}</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for user in users %}
|
{% for user in users %}
|
||||||
<tr>
|
<tr>
|
||||||
<td data-value="{{ user.id }}">
|
<td class="hidden-xs" data-value="{{ user.id }}">
|
||||||
<div class="btn-group btn-group-xs">
|
<div class="btn-group btn-group-xs">
|
||||||
<a class="btn btn-default" href="{{ route('admin.users.edit',user.id) }}"><i class="fa fa-pencil"></i></a>
|
<a class="btn btn-default" href="{{ route('admin.users.edit',user.id) }}"><i class="fa fa-pencil"></i></a>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td data-value="{{ user.id }}">#{{ user.id }}</td>
|
<td class="hidden-xs" data-value="{{ user.id }}">#{{ user.id }}</td>
|
||||||
<td data-value="{{ user.email }}">
|
<td data-value="{{ user.email }}">
|
||||||
<a href="{{ route('admin.users.show',user.id) }}">{{ user.email }}</a></td>
|
<a href="{{ route('admin.users.show',user.id) }}">{{ user.email }}</a></td>
|
||||||
<td data-value="{{ user.created_at.format('Y-m-d-H-i-s') }}">
|
<td class="hidden-xs" data-value="{{ user.created_at.format('Y-m-d-H-i-s') }}">
|
||||||
{{ user.created_at.formatLocalized(monthAndDayFormat) }}
|
{{ user.created_at.formatLocalized(monthAndDayFormat) }}
|
||||||
{{ user.created_at.format('H:i') }}
|
{{ user.created_at.format('H:i') }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td class="hidden-xs">
|
||||||
{{ Preferences.getForUser(user,"registration_ip_address").data }}
|
{{ Preferences.getForUser(user,"registration_ip_address").data }}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td class="hidden-xs">
|
||||||
{{ Preferences.getForUser(user,"confirmation_ip_address").data }}
|
{{ Preferences.getForUser(user,"confirmation_ip_address").data }}
|
||||||
</td>
|
</td>
|
||||||
<td data-value="{% if user.isAdmin %}1{% else %}0{% endif %}">
|
<td class="hidden-xs" data-value="{% if user.isAdmin %}1{% else %}0{% endif %}">
|
||||||
{% if user.isAdmin %}
|
{% if user.isAdmin %}
|
||||||
<small class="text-success"><i class="fa fa-fw fa-check"></i></small>
|
<small class="text-success"><i class="fa fa-fw fa-check"></i></small>
|
||||||
{% else %}
|
{% else %}
|
||||||
<small class="text-danger"><i class="fa fa-fw fa-times"></i></small>
|
<small class="text-danger"><i class="fa fa-fw fa-times"></i></small>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td data-value="{% if user.has2FA %}1{% else %}0{% endif %}">
|
<td class="hidden-xs" data-value="{% if user.has2FA %}1{% else %}0{% endif %}">
|
||||||
{% if user.has2FA %}
|
{% if user.has2FA %}
|
||||||
<small class="text-success"><i class="fa fa-fw fa-check"></i></small>
|
<small class="text-success"><i class="fa fa-fw fa-check"></i></small>
|
||||||
{% else %}
|
{% else %}
|
||||||
@ -75,7 +75,7 @@
|
|||||||
<small class="text-success"><i class="fa fa-fw fa-times" title="{{ 'no'|_ }}"></i></small>
|
<small class="text-success"><i class="fa fa-fw fa-times" title="{{ 'no'|_ }}"></i></small>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td class="hidden-xs">
|
||||||
<small>
|
<small>
|
||||||
{% if user.blocked == 1 %}
|
{% if user.blocked == 1 %}
|
||||||
{% if user.blocked_code == "" %}
|
{% if user.blocked_code == "" %}
|
||||||
|
@ -105,7 +105,7 @@
|
|||||||
<div class="box-header with-border">
|
<div class="box-header with-border">
|
||||||
<h3 class="box-title">{{ 'connected_journals'|_ }}</h3>
|
<h3 class="box-title">{{ 'connected_journals'|_ }}</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="box-body table-responsive no-padding">
|
<div class="box-body">
|
||||||
{% include 'list.journals-tasker' %}
|
{% include 'list.journals-tasker' %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -113,14 +113,14 @@
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<div class="row mass_edit_all" style="display: none;">
|
<div class="row mass_edit_all hidden-xs" style="display: none;">
|
||||||
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
|
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
|
||||||
<div class="mass_button_options btn-group btn-group" style="display:none;">
|
<div class="mass_button_options btn-group btn-group" style="display:none;">
|
||||||
<a href="#" class="btn btn-default mass_edit"><i class="fa fa-fw fa-pencil"></i> <span>{{ 'edit_selected'|_ }}</span></a>
|
<a href="#" class="btn btn-default mass_edit"><i class="fa fa-fw fa-pencil"></i> <span>{{ 'edit_selected'|_ }}</span></a>
|
||||||
<a href="#" class="btn btn-danger mass_delete"><i class="fa fa-fw fa-trash"></i> <span>{{ 'delete_selected'|_ }}</span></a>
|
<a href="#" class="btn btn-danger mass_delete"><i class="fa fa-fw fa-trash"></i> <span>{{ 'delete_selected'|_ }}</span></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
|
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12 hidden-xs">
|
||||||
|
|
||||||
<div class="mass_buttons btn-group btn-group pull-right">
|
<div class="mass_buttons btn-group btn-group pull-right">
|
||||||
<a href="#" class="btn btn-default mass_select"><i class="fa fa-fw fa-check-square-o"></i> {{ 'select_transactions'|_ }}</a>
|
<a href="#" class="btn btn-default mass_select"><i class="fa fa-fw fa-check-square-o"></i> {{ 'select_transactions'|_ }}</a>
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<form class="form-horizontal" id="report-form" action="{{ route('reports.index') }}" method="post">
|
<form class="form-horizontal" id="report-form" action="{{ route('reports.index') }}" method="post">
|
||||||
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
|
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
|
||||||
<div class="box">
|
<div class="box">
|
||||||
<div class="box-header with-border">
|
<div class="box-header with-border">
|
||||||
<h3 class="box-title">{{ 'reports'|_ }}</h3>
|
<h3 class="box-title">{{ 'reports'|_ }}</h3>
|
||||||
@ -109,7 +109,7 @@
|
|||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
|
||||||
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
|
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
|
||||||
<div class="box">
|
<div class="box">
|
||||||
<div class="box-header with-border">
|
<div class="box-header with-border">
|
||||||
<h3 class="box-title">{{ 'quick_link_reports'|_ }}</h3>
|
<h3 class="box-title">{{ 'quick_link_reports'|_ }}</h3>
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>{{ 'name'|_ }}</th>
|
<th>{{ 'name'|_ }}</th>
|
||||||
<th>{{ 'balanceStart'|_ }}</th>
|
<th class="hidden-xs">{{ 'balanceStart'|_ }}</th>
|
||||||
<th>{{ 'balanceEnd'|_ }}</th>
|
<th class="hidden-xs">{{ 'balanceEnd'|_ }}</th>
|
||||||
<th>{{ 'difference'|_ }}</th>
|
<th>{{ 'difference'|_ }}</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
@ -13,8 +13,8 @@
|
|||||||
<td>
|
<td>
|
||||||
<a href="{{ route('accounts.show',account.id) }}" title="{{ account.name }}">{{ account.name }}</a>
|
<a href="{{ route('accounts.show',account.id) }}" title="{{ account.name }}">{{ account.name }}</a>
|
||||||
</td>
|
</td>
|
||||||
<td data-value="{{ account.startBalance }}">{{ account.startBalance|formatAmount }}</td>
|
<td class="hidden-xs" data-value="{{ account.startBalance }}">{{ account.startBalance|formatAmount }}</td>
|
||||||
<td data-value="{{ account.endBalance }}">{{ account.endBalance|formatAmount }}</td>
|
<td class="hidden-xs" data-value="{{ account.endBalance }}">{{ account.endBalance|formatAmount }}</td>
|
||||||
<td data-value="{{ (account.endBalance - account.startBalance) }}">{{ (account.endBalance - account.startBalance)|formatAmount }}</td>
|
<td data-value="{{ (account.endBalance - account.startBalance) }}">{{ (account.endBalance - account.startBalance)|formatAmount }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@ -22,8 +22,8 @@
|
|||||||
<tfoot>
|
<tfoot>
|
||||||
<tr>
|
<tr>
|
||||||
<td><em>{{ 'sumOfSums'|_ }}</em></td>
|
<td><em>{{ 'sumOfSums'|_ }}</em></td>
|
||||||
<td>{{ accountReport.getStart|formatAmount }}</td>
|
<td class="hidden-xs">{{ accountReport.getStart|formatAmount }}</td>
|
||||||
<td>{{ accountReport.getEnd|formatAmount }}</td>
|
<td class="hidden-xs">{{ accountReport.getEnd|formatAmount }}</td>
|
||||||
<td>{{ accountReport.getDifference|formatAmount }}</td>
|
<td>{{ accountReport.getDifference|formatAmount }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tfoot>
|
</tfoot>
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<th colspan="2">{{ 'budgets'|_ }}</th>
|
<th colspan="2">{{ 'budgets'|_ }}</th>
|
||||||
{% for account in balance.getBalanceHeader.getAccounts %}
|
{% for account in balance.getBalanceHeader.getAccounts %}
|
||||||
<th><a href="{{ route('accounts.show',account.id) }}">{{ account.name }}</a></th>
|
<th class="hidden-xs"><a href="{{ route('accounts.show',account.id) }}">{{ account.name }}</a></th>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
<th>
|
<th>
|
||||||
{{ 'leftInBudget'|_ }}
|
{{ 'leftInBudget'|_ }}
|
||||||
@ -21,7 +21,7 @@
|
|||||||
<td>
|
<td>
|
||||||
<a href="{{ route('budgets.show',balanceLine.getBudget.id) }}">{{ balanceLine.getTitle }}</a>
|
<a href="{{ route('budgets.show',balanceLine.getBudget.id) }}">{{ balanceLine.getTitle }}</a>
|
||||||
{% if balanceLine.getStartdate and balanceLine.getEnddate %}
|
{% if balanceLine.getStartdate and balanceLine.getEnddate %}
|
||||||
<span class="small"><br>
|
<span class="small" class="hidden-xs"><br>
|
||||||
{{ balanceLine.getStartdate.formatLocalized(monthAndDayFormat) }}
|
{{ balanceLine.getStartdate.formatLocalized(monthAndDayFormat) }}
|
||||||
—
|
—
|
||||||
{{ balanceLine.getEnddate.formatLocalized(monthAndDayFormat) }}
|
{{ balanceLine.getEnddate.formatLocalized(monthAndDayFormat) }}
|
||||||
@ -40,7 +40,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% for balanceEntry in balanceLine.getBalanceEntries %}
|
{% for balanceEntry in balanceLine.getBalanceEntries %}
|
||||||
<td>
|
<td class="hidden-xs">
|
||||||
{% if balanceEntry.getSpent != 0 %}
|
{% if balanceEntry.getSpent != 0 %}
|
||||||
<span class="text-danger">{{ (balanceEntry.getSpent)|formatAmountPlain }}</span>
|
<span class="text-danger">{{ (balanceEntry.getSpent)|formatAmountPlain }}</span>
|
||||||
<i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="balance-amount"
|
<i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="balance-amount"
|
||||||
|
@ -7,8 +7,8 @@
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>{{ trans('form.name') }}</th>
|
<th>{{ trans('form.name') }}</th>
|
||||||
<th>{{ trans('form.amount_min') }}</th>
|
<th class="hidden-xs">{{ trans('form.amount_min') }}</th>
|
||||||
<th>{{ trans('form.amount_max') }}</th>
|
<th class="hidden-xs">{{ trans('form.amount_max') }}</th>
|
||||||
<th>{{ trans('form.amount') }}</th>
|
<th>{{ trans('form.amount') }}</th>
|
||||||
<th>{{ trans('form.under') }}</th>
|
<th>{{ trans('form.under') }}</th>
|
||||||
</tr>
|
</tr>
|
||||||
@ -19,8 +19,8 @@
|
|||||||
<td data-value="{{ line.getBill.name }}">
|
<td data-value="{{ line.getBill.name }}">
|
||||||
<a href="{{ route('bills.show',line.getBill.id) }}">{{ line.getBill.name }}</a>
|
<a href="{{ route('bills.show',line.getBill.id) }}">{{ line.getBill.name }}</a>
|
||||||
</td>
|
</td>
|
||||||
<td data-value="{{ line.getMin }}">{{ line.getMin|formatAmount }}</td>
|
<td class="hidden-xs" data-value="{{ line.getMin }}">{{ line.getMin|formatAmount }}</td>
|
||||||
<td data-value="{{ line.getMax }}">{{ line.getMax|formatAmount }}</td>
|
<td class="hidden-xs" data-value="{{ line.getMax }}">{{ line.getMax|formatAmount }}</td>
|
||||||
{% if line.isHit %}
|
{% if line.isHit %}
|
||||||
<td data-value="{{ line.getAmount }}">
|
<td data-value="{{ line.getAmount }}">
|
||||||
<a href="{{ route('transactions.show', line.getTransactionJournalId) }}">
|
<a href="{{ route('transactions.show', line.getTransactionJournalId) }}">
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>{{ 'budget'|_ }}</th>
|
<th>{{ 'budget'|_ }}</th>
|
||||||
<th>{{ 'date'|_ }}</th>
|
<th class="hidden-xs">{{ 'date'|_ }}</th>
|
||||||
<th>{{ 'budgeted'|_ }}</th>
|
<th>{{ 'budgeted'|_ }}</th>
|
||||||
<th>{{ 'spent'|_ }}</th>
|
<th>{{ 'spent'|_ }}</th>
|
||||||
<th>{{ 'left'|_ }}</th>
|
<th>{{ 'left'|_ }}</th>
|
||||||
@ -19,7 +19,7 @@
|
|||||||
<em>{{ 'no_budget'|_ }}</em>
|
<em>{{ 'no_budget'|_ }}</em>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td class="hidden-xs">
|
||||||
{% if budgetLine.getRepetition.id %}
|
{% if budgetLine.getRepetition.id %}
|
||||||
<a href="{{ route('budgets.showWithRepetition', [budgetLine.getBudget.id, budgetLine.getRepetition.id]) }}">
|
<a href="{{ route('budgets.showWithRepetition', [budgetLine.getBudget.id, budgetLine.getRepetition.id]) }}">
|
||||||
{{ budgetLine.getRepetition.startdate.formatLocalized(monthAndDayFormat) }}
|
{{ budgetLine.getRepetition.startdate.formatLocalized(monthAndDayFormat) }}
|
||||||
@ -62,7 +62,8 @@
|
|||||||
</tbody>
|
</tbody>
|
||||||
<tfoot>
|
<tfoot>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="2"><em>{{ 'sum'|_ }}</em></td>
|
<td><em>{{ 'sum'|_ }}</em></td>
|
||||||
|
<td class="hidden-xs"> </td>
|
||||||
<td>{{ budgets.getBudgeted|formatAmount }}</td>
|
<td>{{ budgets.getBudgeted|formatAmount }}</td>
|
||||||
<td>
|
<td>
|
||||||
{% if budgets.getSpent != 0 %}
|
{% if budgets.getSpent != 0 %}
|
||||||
|
@ -68,8 +68,8 @@
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th colspan="2">{{ 'rule_name'|_ }}</th>
|
<th colspan="2">{{ 'rule_name'|_ }}</th>
|
||||||
<th>{{ 'rule_triggers'|_ }}</th>
|
<th class="hidden-xs">{{ 'rule_triggers'|_ }}</th>
|
||||||
<th>{{ 'rule_actions'|_ }}</th>
|
<th class="hidden-xs">{{ 'rule_actions'|_ }}</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@ -123,7 +123,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if rule.description != "" %}
|
{% if rule.description != "" %}
|
||||||
<small
|
<small class="hidden-xs"
|
||||||
{% if not rule.active %}
|
{% if not rule.active %}
|
||||||
class="text-muted"
|
class="text-muted"
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@ -131,7 +131,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td class="hidden-xs">
|
||||||
{% if rule.ruleTriggers.count > 0 %}
|
{% if rule.ruleTriggers.count > 0 %}
|
||||||
<ul class="small rule-triggers" data-id="{{ rule.id }}">
|
<ul class="small rule-triggers" data-id="{{ rule.id }}">
|
||||||
{% for trigger in rule.ruleTriggers %}
|
{% for trigger in rule.ruleTriggers %}
|
||||||
@ -151,7 +151,7 @@
|
|||||||
</ul>
|
</ul>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td class="hidden-xs">
|
||||||
{% if rule.ruleActions.count > 0 %}
|
{% if rule.ruleActions.count > 0 %}
|
||||||
<ul class="small rule-actions" data-id="{{ rule.id }}">
|
<ul class="small rule-actions" data-id="{{ rule.id }}">
|
||||||
{% for action in rule.ruleActions %}
|
{% for action in rule.ruleActions %}
|
||||||
|
Loading…
Reference in New Issue
Block a user