Browse Source

Merge pull request #33638 from nextcloud/fix/user-mgmt-avatar-size

Request 64px avatars for the user management
tags/v25.0.0beta3
Christoph Wurst 1 year ago
parent
commit
7c6c26ba3a
No account linked to committer's email address

+ 2
- 4
apps/settings/src/components/UserList/UserRow.vue View File

@@ -28,8 +28,7 @@
<div :class="{'icon-loading-small': loading.delete || loading.disable || loading.wipe}"
class="avatar">
<img v-if="!loading.delete && !loading.disable && !loading.wipe"
:src="generateAvatar(user.id, 32)"
:srcset="generateAvatar(user.id, 64)+' 2x, '+generateAvatar(user.id, 128)+' 4x'"
:src="generateAvatar(user.id)"
alt=""
height="32"
width="32">
@@ -66,8 +65,7 @@
<div :class="{'icon-loading-small': loading.delete || loading.disable || loading.wipe}"
class="avatar">
<img v-if="!loading.delete && !loading.disable && !loading.wipe"
:src="generateAvatar(user.id, 32)"
:srcset="generateAvatar(user.id, 64)+' 2x, '+generateAvatar(user.id, 128)+' 4x'"
:src="generateAvatar(user.id)"
alt=""
height="32"
width="32">

+ 1
- 2
apps/settings/src/components/UserList/UserRowSimple.vue View File

@@ -7,8 +7,7 @@
alt=""
width="32"
height="32"
:src="generateAvatar(user.id, 32)"
:srcset="generateAvatar(user.id, 64)+' 2x, '+generateAvatar(user.id, 128)+' 4x'">
:src="generateAvatar(user.id)" />
</div>
<!-- dirty hack to ellipsis on two lines -->
<div class="name">

+ 2
- 4
apps/settings/src/mixins/UserRowMixin.js View File

@@ -158,15 +158,13 @@ export default {
* Generate avatar url
*
* @param {string} user The user name
* @param {number} size Size integer, default 32
* @return {string}
*/
generateAvatar(user, size = 32) {
generateAvatar(user) {
return generateUrl(
'/avatar/{user}/{size}?v={version}',
'/avatar/{user}/64?v={version}',
{
user,
size,
version: oc_userconfig.avatar.version,
}
)

+ 2
- 2
dist/settings-users-8351.js
File diff suppressed because it is too large
View File


+ 1
- 1
dist/settings-users-8351.js.map
File diff suppressed because it is too large
View File


+ 2
- 2
dist/settings-vue-settings-apps-users-management.js
File diff suppressed because it is too large
View File


+ 1
- 1
dist/settings-vue-settings-apps-users-management.js.map
File diff suppressed because it is too large
View File


Loading…
Cancel
Save