From 18f777c1bdce08147a4a1f3242ce737ff5879ac4 Mon Sep 17 00:00:00 2001 From: Greta Doci Date: Fri, 8 Nov 2019 16:23:54 +0100 Subject: [PATCH] add readmode rows Signed-off-by: Greta Doci --- apps/settings/css/settings.scss | 5 +- .../src/components/UserList/UserRow.vue | 88 ++++++---- .../src/components/UserList/UserRowSimple.vue | 164 ++++++++++++++++++ 3 files changed, 224 insertions(+), 33 deletions(-) create mode 100644 apps/settings/src/components/UserList/UserRowSimple.vue diff --git a/apps/settings/css/settings.scss b/apps/settings/css/settings.scss index 9de2ec8cbde77..526384e8f43ed 100644 --- a/apps/settings/css/settings.scss +++ b/apps/settings/css/settings.scss @@ -1343,7 +1343,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper { /* USERS LIST -------------------------------------------------------------- */ #body-settings { $grid-row-height: 60px; - $grid-col-min-width: 210px; + $grid-col-min-width: 150px; #app-content.user-list-grid { display: grid; grid-auto-columns: 1fr; @@ -1463,7 +1463,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper { > div, > form { grid-row: 1; - display: block; + display: inline-flex; align-items: center; color: var(--color-text-lighter); position: relative; @@ -1538,6 +1538,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper { } .toggleUserActions { position: relative; + display: flex; .icon-more { width: 44px; height: 44px; diff --git a/apps/settings/src/components/UserList/UserRow.vue b/apps/settings/src/components/UserList/UserRow.vue index fdc3312b086c4..23ddb5cf064bd 100644 --- a/apps/settings/src/components/UserList/UserRow.vue +++ b/apps/settings/src/components/UserList/UserRow.vue @@ -42,6 +42,26 @@ +
-
- {{ user.id }} -
-
- -
- - {{ user.displayname }} -
+
+
+ +
+
+ + + {{ t('settings', 'Done') }} + +
@@ -214,14 +235,18 @@ import ClickOutside from 'vue-click-outside' import Vue from 'vue' import VTooltip from 'v-tooltip' -import { PopoverMenu, Multiselect } from 'nextcloud-vue' +import { PopoverMenu, Multiselect, Actions, ActionButton } from 'nextcloud-vue' +import UserRowSimple from './UserRowSimple' Vue.use(VTooltip) export default { name: 'UserRow', components: { + UserRowSimple, PopoverMenu, + Actions, + ActionButton, Multiselect }, directives: { @@ -266,6 +291,7 @@ export default { rand: parseInt(Math.random() * 1000), openedMenu: false, feedbackMessage: '', + editing: false, loading: { all: false, displayName: false, @@ -552,9 +578,9 @@ export default { }, /** - * Create a new group and add user to it - * - * @param {string} gid Group id + * Create a new group and add user to it + * + * @param {string} gid Group id */ async createGroup(gid) { this.loading = { groups: true, subadmins: true } diff --git a/apps/settings/src/components/UserList/UserRowSimple.vue b/apps/settings/src/components/UserList/UserRowSimple.vue new file mode 100644 index 0000000000000..87c3b0f49246d --- /dev/null +++ b/apps/settings/src/components/UserList/UserRowSimple.vue @@ -0,0 +1,164 @@ + + + + +