Merge branch 'rhymix:master' into master

This commit is contained in:
Lastorder 2026-01-08 20:28:49 -08:00 committed by GitHub
commit 2efe733d5f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 67 additions and 22 deletions

View file

@ -341,7 +341,8 @@ $lang->set_manage_id = 'Separated by line breaks.';
$lang->count_manage_id = 'There are <span class="_deniedIDCount">%s</span> prohibited ID.';
$lang->count_manage_nick_name = 'There are <span class="_deniedNickNameCount">%s</span> prohibited nick name.';
$lang->user_list = 'Member List';
$lang->cmd_show_all_member = 'All Member';
$lang->cmd_show_all_member = 'All Members';
$lang->cmd_show_searched_member = 'Searched Members';
$lang->cmd_show_super_admin_member = 'Super Admin';
$lang->cmd_show_site_admin_member = 'Site Admin';
$lang->approval = 'Approval';

View file

@ -346,6 +346,7 @@ $lang->count_manage_id = '<span class="_deniedIDCount">%s</span>개의 금지
$lang->count_manage_nick_name = '<span class="_deniedNickNameCount">%s</span>개의 금지 닉네임이 있습니다.';
$lang->user_list = '회원 목록';
$lang->cmd_show_all_member = '모든 회원';
$lang->cmd_show_searched_member = '검색된 회원';
$lang->cmd_show_super_admin_member = '최고 관리자';
$lang->cmd_show_site_admin_member = '사이트 관리자';
$lang->approval = '승인';

View file

@ -14,7 +14,7 @@
<form action="" method="post">
<table id="memberList" class="x_table x_table-striped x_table-hover dsTg">
<caption>
<a href="{getUrl('filter_type', '', 'page', '')}" class="active"|cond="!$filter_type">{$lang->cmd_show_all_member}<block cond="!$filter_type">({$total_count})</block></a>
<a href="{getUrl('filter_type', '', 'page', '')}" class="active"|cond="empty($filter_type)">{empty($search_keyword) ? $lang->cmd_show_all_member : $lang->cmd_show_searched_member}<block cond="empty($filter_type)">({$total_count})</block></a>
<i>|</i>
<a href="{getUrl('filter_type', 'admin', 'page', '')}" class="active"|cond="$filter_type=='admin'">{$lang->cmd_show_super_admin_member}<block cond="$filter_type=='admin'">({$total_count})</block></a>
<i>|</i>