flashii/misuzu
flashii/misuzu
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made the error page when a role has no members less jarring.

Browse source
This commit is contained in:
flash 2019-12-03 02:28:56 +01:00
parent 0cb7aacf39
commit 216e46eb59
3 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
assets/less/userlist.less
View file

@ -11,6 +11,13 @@
display: flex; display: flex;
} }
&__empty {
text-align: center;
font-size: 2em;
line-height: 1.5em;
margin: 1em;
}
&__container { &__container {
padding: 5px; padding: 5px;
margin: 2px 0; margin: 2px 0;

6
public/members.php
View file

@ -90,7 +90,7 @@ if(empty($role)) {
$usersPagination = pagination_create($role['role_user_count'], 15); $usersPagination = pagination_create($role['role_user_count'], 15);
$usersOffset = pagination_offset($usersPagination, pagination_param()); $usersOffset = pagination_offset($usersPagination, pagination_param());
if(!pagination_is_valid_offset($usersOffset)) { if($usersOffset > 0 && !pagination_is_valid_offset($usersOffset)) {
echo render_error(404); echo render_error(404);
return; return;
} }
@ -162,6 +162,10 @@ $getUsers->bind('take', $usersPagination['range']);
$getUsers->bind('current_user_id', user_session_current('user_id', 0)); $getUsers->bind('current_user_id', user_session_current('user_id', 0));
$users = $getUsers->fetchAll(); $users = $getUsers->fetchAll();
if(empty($users)) {
http_response_code(404);
}
echo tpl_render('user.listing', [ echo tpl_render('user.listing', [
'roles' => $roles, 'roles' => $roles,
'role' => $role, 'role' => $role,

22
templates/user/listing.twig
View file

@ -9,7 +9,7 @@
'role': url_role, 'role': url_role,
'sort': url_sort, 'sort': url_sort,
'direction': url_direction, 'direction': url_direction,
'page': users_pagination.page > 2 ? users_pagination.page : 0, 'page': users_pagination.page|default(0) > 2 ? users_pagination.page : 0,
}) %} }) %}
{% set title = role.role_id == 1 ? 'Members' : 'Role » ' ~ role.role_name %} {% set title = role.role_id == 1 ? 'Members' : 'Role » ' ~ role.role_name %}
{% set manage_link = url('manage-users') %} {% set manage_link = url('manage-users') %}
@ -48,13 +48,19 @@
{{ member_nav }} {{ member_nav }}
</div> </div>
<div class="userlist"> {% if users|length > 0 %}
{% for user in users %} <div class="userlist">
<div class="userlist__item"> {% for user in users %}
{{ user_card(user) }} <div class="userlist__item">
</div> {{ user_card(user) }}
{% endfor %} </div>
</div> {% endfor %}
</div>
{% else %}
<div class="userlist__empty">
This role has no members
</div>
{% endif %}
<div class="container userlist__container" style="{{ role.role_colour|html_colour('--accent-colour') }}"> <div class="container userlist__container" style="{{ role.role_colour|html_colour('--accent-colour') }}">
{{ member_nav }} {{ member_nav }}