Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Request 64px avatars for the user management
Signed-off-by: Christoph Wurst <[email protected]>
  • Loading branch information
ChristophWurst committed Aug 22, 2022
commit 6a08c8945282b802106eae90c3f3445f73c2ca19
6 changes: 2 additions & 4 deletions apps/settings/src/components/UserList/UserRow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down
3 changes: 1 addition & 2 deletions apps/settings/src/components/UserList/UserRowSimple.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
6 changes: 2 additions & 4 deletions apps/settings/src/mixins/UserRowMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
)
Expand Down
4 changes: 2 additions & 2 deletions dist/settings-users-8351.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-users-8351.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-apps-users-management.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-apps-users-management.js.map

Large diffs are not rendered by default.