diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-05-10 17:05:05 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-05-16 09:50:24 +0200 |
| commit | 170746dadae678d02657515206ac4c96976c8173 (patch) | |
| tree | 4637212d217562e1136a7d0204fd514656a2c627 /settings/src | |
| parent | b2389d0f017ce0f5afbe34af15b878b30880432c (diff) | |
| download | nextcloud-server-170746dadae678d02657515206ac4c96976c8173.tar.gz nextcloud-server-170746dadae678d02657515206ac4c96976c8173.zip | |
Design fixes
- Gap between columns
- Click on icon more closes the menu
- Fixed select height
- Focus input on new user click
- Cursor fix on select
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings/src')
| -rw-r--r-- | settings/src/components/userList.vue | 2 | ||||
| -rw-r--r-- | settings/src/components/userList/userRow.vue | 6 | ||||
| -rw-r--r-- | settings/src/views/Users.vue | 10 |
3 files changed, 13 insertions, 5 deletions
diff --git a/settings/src/components/userList.vue b/settings/src/components/userList.vue index 6d1a275a3d7..05aa1f520db 100644 --- a/settings/src/components/userList.vue +++ b/settings/src/components/userList.vue @@ -160,7 +160,7 @@ export default { let disabledUsers = this.users.filter(user => user.enabled !== true); if (disabledUsers.length===0 && this.$refs.infiniteLoading && this.$refs.infiniteLoading.isComplete) { // disabled group is empty, redirection to all users - this.$router.push('users'); + this.$router.push('/settings/users'); this.$refs.infiniteLoading.$emit('$InfiniteLoading:reset'); } return disabledUsers; diff --git a/settings/src/components/userList/userRow.vue b/settings/src/components/userList/userRow.vue index 6686c4ab025..c6394832fd4 100644 --- a/settings/src/components/userList/userRow.vue +++ b/settings/src/components/userList/userRow.vue @@ -73,7 +73,7 @@ </div> <div class="userActions"> <div class="toggleUserActions" v-if="OC.currentUser !== user.id && user.id !== 'admin' && !loading.all"> - <div class="icon-more" v-click-outside="hideMenu" @click="showMenu"></div> + <div class="icon-more" v-click-outside="hideMenu" @click="toggleMenu"></div> <div class="popovermenu" :class="{ 'open': openedMenu }"> <popover-menu :menu="userActions" /> </div> @@ -196,8 +196,8 @@ export default { }, methods: { /* MENU HANDLING */ - showMenu() { - this.openedMenu = true; + toggleMenu() { + this.openedMenu = !this.openedMenu; }, hideMenu() { this.openedMenu = false; diff --git a/settings/src/views/Users.vue b/settings/src/views/Users.vue index 343bb7568d0..0f74b76e38c 100644 --- a/settings/src/views/Users.vue +++ b/settings/src/views/Users.vue @@ -81,6 +81,14 @@ export default { } }, methods: { + toggleNewUserMenu() { + this.showConfig.showNewUserForm = !this.showConfig.showNewUserForm; + if (this.showConfig.showNewUserForm) { + Vue.nextTick(() => { + window.newusername.focus(); + }); + } + }, getLocalstorage(key) { // force initialization let localConfig = this.$localStorage.get(key); @@ -287,7 +295,7 @@ export default { id:'new-user-button', text: t('settings','New user'), icon: 'icon-add', - action: () => this.showConfig.showNewUserForm=!this.showConfig.showNewUserForm + action: this.toggleNewUserMenu }, items: groups } |