wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix new user table

Browse source 
Signed-off-by: GretaD <gretadoci@gmail.com>
This commit is contained in:
GretaD 2020-01-06 13:42:25 +01:00 committed by Julius Härtl
parent 20303281f0
commit 1818ef9ef8
4 changed files with 53 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/settings/css/settings.scss
View file

@ -1414,7 +1414,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
@include position('sticky');
align-self: normal;
background-color: var(--color-main-background);
z-index: 55; /* above multiselect */
z-index: 100; /* above multiselect */
top: $header-height;
&.sticky {
box-shadow: 0 -2px 10px 1px var(--color-box-shadow);
@ -1430,8 +1430,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
}
// separate prop to set initial value to top: 50px
&#new-user {
top: $header-height + $grid-row-height;
height: 90px;
height: 120px;
.row {
padding-top: 50px;
}

BIN
apps/settings/js/vue-2.js Normal file
View file

Binary file not shown.

BIN
apps/settings/js/vue-2.js.map Normal file
View file

Binary file not shown.

103
apps/settings/src/components/UserList.vue
View file

@ -22,58 +22,6 @@
<template>
<div id="app-content" class="user-list-grid" @scroll.passive="onScroll">
<div id="grid-header"
:class="{'sticky': scrolled && !showConfig.showNewUserForm}"
class="row">
<div id="headerAvatar" class="avatar" />
<div id="headerName" class="name">
{{ t('settings', 'Username') }}
<div class="subtitle">
{{ t('settings', 'Display name') }}
</div>
</div>
<div id="headerPassword" class="password">
{{ t('settings', 'Password') }}
</div>
<div id="headerAddress" class="mailAddress">
{{ t('settings', 'Email') }}
</div>
<div id="headerGroups" class="groups">
{{ t('settings', 'Groups') }}
</div>
<div v-if="subAdminsGroups.length>0 && settings.isAdmin"
id="headerSubAdmins"
class="subadmins">
{{ t('settings', 'Group admin for') }}
</div>
<div id="headerQuota" class="quota">
{{ t('settings', 'Quota') }}
</div>
<div v-if="showConfig.showLanguages"
id="headerLanguages"
class="languages">
{{ t('settings', 'Language') }}
</div>
<div v-if="showConfig.showUserBackend || showConfig.showStoragePath"
class="headerUserBackend userBackend">
<div v-if="showConfig.showUserBackend" class="userBackend">
{{ t('settings', 'User backend') }}
</div>
<div v-if="showConfig.showStoragePath"
class="subtitle storageLocation">
{{ t('settings', 'Storage location') }}
</div>
</div>
<div v-if="showConfig.showLastLogin"
class="headerLastLogin lastLogin">
{{ t('settings', 'Last login') }}
</div>
<div class="userActions" />
</div>
<form v-show="showConfig.showNewUserForm"
id="new-user"
:class="{'sticky': scrolled && showConfig.showNewUserForm}"
@ -206,6 +154,57 @@
value="">
</div>
</form>
<div id="grid-header"
:class="{'sticky': scrolled && !showConfig.showNewUserForm}"
class="row">
<div id="headerAvatar" class="avatar" />
<div id="headerName" class="name">
{{ t('settings', 'Username') }}
<div class="subtitle">
{{ t('settings', 'Display name') }}
</div>
</div>
<div id="headerPassword" class="password">
{{ t('settings', 'Password') }}
</div>
<div id="headerAddress" class="mailAddress">
{{ t('settings', 'Email') }}
</div>
<div id="headerGroups" class="groups">
{{ t('settings', 'Groups') }}
</div>
<div v-if="subAdminsGroups.length>0 && settings.isAdmin"
id="headerSubAdmins"
class="subadmins">
{{ t('settings', 'Group admin for') }}
</div>
<div id="headerQuota" class="quota">
{{ t('settings', 'Quota') }}
</div>
<div v-if="showConfig.showLanguages"
id="headerLanguages"
class="languages">
{{ t('settings', 'Language') }}
</div>
<div v-if="showConfig.showUserBackend || showConfig.showStoragePath"
class="headerUserBackend userBackend">
<div v-if="showConfig.showUserBackend" class="userBackend">
{{ t('settings', 'User backend') }}
</div>
<div v-if="showConfig.showStoragePath"
class="subtitle storageLocation">
{{ t('settings', 'Storage location') }}
</div>
</div>
<div v-if="showConfig.showLastLogin"
class="headerLastLogin lastLogin">
{{ t('settings', 'Last login') }}
</div>
<div class="userActions" />
</div>
<user-row v-for="(user, key) in filteredUsers"
:key="key"