kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-04 12:29:47 +00:00
Code Issues Projects Releases Wiki Activity

Clean up code, fixes #392

Browse Source
This commit is contained in:
James Cole
2016-11-08 20:35:30 +01:00
parent 5b8583dd2b
commit 49cc8a97a3
9 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
resources/views/admin/users/index.twig
View File

@@ -14,47 +14,47 @@
<table class="table table-condensed sortable">
<thead>
<tr>
<th colspan="2">&nbsp;</th>
<th class="hidden-xs" colspan="2">&nbsp;</th>
<th>{{ trans('list.email') }}</th>
<th>{{ trans('list.registered_at') }}</th>
<th>{{ trans('list.registered_from') }}</th>
<th>{{ trans('list.confirmed_from') }}</th>
<th>{{ trans('list.is_admin') }}</th>
<th>{{ trans('list.has_two_factor') }}</th>
<th class="hidden-xs">{{ trans('list.registered_at') }}</th>
<th class="hidden-xs">{{ trans('list.registered_from') }}</th>
<th class="hidden-xs">{{ trans('list.confirmed_from') }}</th>
<th class="hidden-xs">{{ trans('list.is_admin') }}</th>
<th class="hidden-xs">{{ trans('list.has_two_factor') }}</th>
<th>{{ trans('list.is_activated') }}</th>
<th>{{ trans('list.is_blocked') }}</th>
<th>{{ trans('list.blocked_code') }}</th>
<th class="hidden-xs">{{ trans('list.blocked_code') }}</th>
</tr>
</thead>
<tbody>
{% for user in users %}
<tr>
<td data-value="{{ user.id }}">
<td class="hidden-xs" data-value="{{ user.id }}">
<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>
</div>
</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 }}">
<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.format('H:i') }}
</td>
<td>
<td class="hidden-xs">
{{ Preferences.getForUser(user,"registration_ip_address").data }}
</td>
<td>
<td class="hidden-xs">
{{ Preferences.getForUser(user,"confirmation_ip_address").data }}
</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 %}
<small class="text-success"><i class="fa fa-fw fa-check"></i></small>
{% else %}
<small class="text-danger"><i class="fa fa-fw fa-times"></i></small>
{% endif %}
</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 %}
<small class="text-success"><i class="fa fa-fw fa-check"></i></small>
{% else %}
@@ -75,7 +75,7 @@
<small class="text-success"><i class="fa fa-fw fa-times" title="{{ 'no'|_ }}"></i></small>
{% endif %}
</td>
<td>
<td class="hidden-xs">
<small>
{% if user.blocked == 1 %}
{% if user.blocked_code == "" %}