Skip to content

Commit

Permalink
fix design
Browse files Browse the repository at this point in the history 
Signed-off-by: Greta Doci <gretadoci@gmail.com>
  • Loading branch information
@GretaD
GretaD committed Nov 7, 2019
1 parent 2cdbe3a commit 433dd70
Show file tree
Hide file tree
Showing 10 changed files with 66 additions and 10,454 deletions.
75 changes: 38 additions & 37 deletions apps/settings/src/components/UserList.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@
<div id="headerAvatar" class="avatar" />
<div id="headerName" class="name">
{{ t('settings', 'Username') }}
</div>
<div id="headerDisplayName" class="displayName">
{{ t('settings', 'Display name') }}

<div id="subtitle" class="subtitle">
{{ t('settings', 'Display name') }}
</div>
</div>
<div id="headerPassword" class="password">
{{ t('settings', 'Password') }}
Expand Down Expand Up @@ -377,9 +378,9 @@ export default {
// deleting the last user, reset the list
if (val === 0 && old === 1) {
this.$refs.infiniteLoading.stateChanger.reset()
// adding the first user, warn the infiniteLoader that
// the list is not empty anymore (we don't fetch the newly
// added user as we already have all the info we need)
// adding the first user, warn the infiniteLoader that
// the list is not empty anymore (we don't fetch the newly
// added user as we already have all the info we need)
} else if (val === 1 && old === 0) {
this.$refs.infiniteLoading.stateChanger.loaded()
}
Expand All @@ -391,18 +392,18 @@ export default {
}
/**
* Reset and init new user form
*/
* Reset and init new user form
*/
this.resetForm()
/**
* Register search
*/
* Register search
*/
this.userSearch = new OCA.Search(this.search, this.resetSearch)
/**
* If disabled group but empty, redirect
*/
* If disabled group but empty, redirect
*/
this.redirectIfDisabled()
},
methods: {
Expand All @@ -411,11 +412,11 @@ export default {
},
/**
* Validate quota string to make sure it's a valid human file size
*
* @param {string} quota Quota in readable format '5 GB'
* @returns {Object}
*/
* Validate quota string to make sure it's a valid human file size
*
* @param {string} quota Quota in readable format '5 GB'
* @returns {Object}
*/
validateQuota(quota) {
// only used for new presets sent through @Tag
let validQuota = OC.Util.computerFileSize(quota)
Expand Down Expand Up @@ -455,18 +456,18 @@ export default {
this.newUser = Object.assign({}, newUser)
/**
* Init default language from server data. The use of this.settings
* requires a computed variable, which break the v-model binding of the form,
* this is a much easier solution than getter and setter on a computed var
*/
* Init default language from server data. The use of this.settings
* requires a computed variable, which break the v-model binding of the form,
* this is a much easier solution than getter and setter on a computed var
*/
if (this.settings.defaultLanguage) {
Vue.set(this.newUser.language, 'code', this.settings.defaultLanguage)
}
/**
* In case the user directly loaded the user list within a group
* the watch won't be triggered. We need to initialize it.
*/
* In case the user directly loaded the user list within a group
* the watch won't be triggered. We need to initialize it.
*/
this.setNewUserDefaultGroup(this.selectedGroup)
this.loading.all = false
Expand All @@ -492,10 +493,10 @@ export default {
if (error.response && error.response.data && error.response.data.ocs && error.response.data.ocs.meta) {
const statuscode = error.response.data.ocs.meta.statuscode
if (statuscode === 102) {
// wrong username
// wrong username
this.$refs.newusername.focus()
} else if (statuscode === 107) {
// wrong password
// wrong password
this.$refs.newuserpassword.focus()
}
}
Expand All @@ -515,11 +516,11 @@ export default {
},
/**
* Create a new group
*
* @param {string} gid Group id
* @returns {Promise}
*/
* Create a new group
*
* @param {string} gid Group id
* @returns {Promise}
*/
createGroup(gid) {
this.loading.groups = true
this.$store.dispatch('addGroup', gid)
Expand All @@ -534,15 +535,15 @@ export default {
},
/**
* If the selected group is the disabled group but the count is 0
* redirect to the all users page.
* * we only check for 0 because we don't have the count on ldap
* * and we therefore set the usercount to -1 in this specific case
*/
* If the selected group is the disabled group but the count is 0
* redirect to the all users page.
* * we only check for 0 because we don't have the count on ldap
* * and we therefore set the usercount to -1 in this specific case
*/
redirectIfDisabled() {
const allGroups = this.$store.getters.getGroups
if (this.selectedGroup === 'disabled'
&& allGroups.findIndex(group => group.id === 'disabled' && group.usercount === 0) > -1) {
&& allGroups.findIndex(group => group.id === 'disabled' && group.usercount === 0) > -1) {
// disabled group is empty, redirection to all users
this.$router.push({ name: 'users' })
this.$refs.infiniteLoading.stateChanger.reset()
Expand Down
52 changes: 28 additions & 24 deletions apps/settings/src/components/UserList/UserRow.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,28 +55,32 @@
<!-- dirty hack to ellipsis on two lines -->
<div class="name">
{{ user.id }}
</div>
<form class="displayName" :class="{'icon-loading-small': loading.displayName}" @submit.prevent="updateDisplayName">
<template v-if="user.backendCapabilities.setDisplayName">
<input v-if="user.backendCapabilities.setDisplayName"
:id="'displayName'+user.id+rand"
ref="displayName"
type="text"
:disabled="loading.displayName||loading.all"
:value="user.displayname"
autocomplete="new-password"
autocorrect="off"
autocapitalize="off"
spellcheck="false">
<input v-if="user.backendCapabilities.setDisplayName"
type="submit"
class="icon-confirm"
value="">
</template>
<div v-else v-tooltip.auto="t('settings', 'The backend does not support changing the display name')" class="name">
<div class="displayName">
<form v-if="false"
class="displayName"
:class="{'icon-loading-small': loading.displayName}"
@submit.prevent="updateDisplayName">
<template v-if="user.backendCapabilities.setDisplayName">
<input
:id="'displayName'+user.id+rand"
ref="displayName"
type="text"
:disabled="loading.displayName||loading.all"
:value="user.displayname"
autocomplete="new-password"
autocorrect="off"
autocapitalize="off"
spellcheck="false">
<input
type="submit"
class="icon-confirm"
value="">
</template>
<div v-else v-tooltip.auto="t('settings', 'The backend does not support changing the display name')" class="name" />
</form>
{{ user.displayname }}
</div>
</form>
</div>
<form v-if="settings.canChangePassword && user.backendCapabilities.setPassword"
class="password"
:class="{'icon-loading-small': loading.password}"
Expand Down Expand Up @@ -516,10 +520,10 @@ 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 }
try {
Expand Down
Loading

0 comments on commit 433dd70

Please sign in to comment.