Merge branch 'admin-users' into shigusegubu-themes3

src/components/list/list.vue

@@ -52,10 +52,9 @@
       </div>
       <div
         v-if="finalItems.length === 0 && !!$slots.empty"
-        class="list-empty-content faint"
+        class="list-item list-empty-content faint"
       >
         <slot name="empty" />
-        <slot name="load" />
       </div>
       <div class="footer">
         <button
@@ -64,7 +63,6 @@
           @click="fetchEntries"
         >
           {{ $t('general.generic_error') }}
-          {{ error }}
         </button>
         <FAIcon
           v-else-if="loading"
@@ -79,7 +77,7 @@
         >
           {{ $t('general.more') }}
         </a>
-        <span v-else>
+        <span v-else-if="finalItems.length !== 0">
           {{ $t('general.no_more') }}
         </span>
       </div>

src/components/settings_modal/admin_tabs/users_tab.scss

@@ -1,5 +1,5 @@
 .UsersTab {
-  max-height: 100%;
+  height: 100%;
   display: flex;
   flex-direction: column;
   padding: 0;
@@ -10,7 +10,7 @@
   }
 
   .splitter {
-    max-height: 100%;
+    height: 100%;
     display: flex;
     overflow-y: hidden;
   }

src/components/settings_modal/admin_tabs/users_tab.vue

@@ -135,11 +135,8 @@
         <template #item="{item}">
           <AdminUserCard :user-id="item.id" />
         </template>
-        <template #load>
-          <span> loading </span>
-        </template>
         <template #empty>
-          <span> no users </span>
+          <span>{{ $t('admin_dash.users.no_users_found')}}</span>
         </template>
       </List>
     </div>

src/i18n/en.json

@@ -1295,6 +1295,7 @@
     "users": {
       "title": "Users",
       "local_id": "Local ID",
+      "no_users_found": "No users found",
       "labels": {
         "query": "Search",
         "nickname": "{'@'}handle",