scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 06:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5690 from aignatov-bio/ai-sci-8638-replace-default-avatars

Browse source 
Replace default avatars with initials [SCI-8638]
This commit is contained in:
aignatov-bio 2023-07-07 13:21:46 +02:00 committed by GitHub
parent dc71f77caf e79d4b65d7
commit da2c7aee82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/sitewide/user_avatar.js
View file

@ -10,5 +10,5 @@ function userAvatar(url, initials, title) {
</div>`;
}
return `<div class="relative w-6 h-6" title="${title}">${avatar}</div>`;
return `<div class="relative w-6 h-6 shrink-0" title="${title}">${avatar}</div>`;
}

4
app/assets/javascripts/users/settings/teams/invite_users_modal.js
View file

@ -31,13 +31,13 @@
delimiter: true,
optionClass: 'users-dropdown-list',
optionLabel: (data) => {
return `<img class="item-avatar" src="${data.params.avatar_url}"/>
return `<span class="mr-2">${userAvatar(data.params.avatar_url, data.params.initials)}</span>
${data.label}
<span class="item-email pull-right">${data.params.email}</span>`;
},
tagLabel: (data) => {
if (data.params) {
return `<img class="item-avatar" src="${data.params.avatar_url}"/> ${data.label}`;
return `<span class="mr-2">${userAvatar(data.params.avatar_url, data.params.initials)}</span> ${data.label}`;
}
return data.label;
},

4
app/controllers/repositories_controller.rb
View file

@ -446,7 +446,9 @@ class RepositoriesController < ApplicationController
label: u.full_name,
value: u.id,
params: {
email: u.email, avatar_url: u.avatar_url('icon_small')
email: u.email,
avatar_url: (u.avatar.attached? ? u.avatar_url('icon_small') : nil),
initials: u.initials
}
}
end }

4
app/javascript/vue/repository_filter/filters/repositoryUserValue.vue
View file

@ -67,8 +67,8 @@
this.value = value
},
renderOption(data) {
return `<span class="user-filter-option" title="${data.label.trim()} | ${data.params.email}">
<img class="item-avatar" src="${data.params.avatar_url}"/>
return `<span class="user-filter-option flex gap-2 items-center" title="${data.label.trim()} | ${data.params.email}">
${userAvatar(data.params.avatar_url, data.params.initials)}
${data.label}
</span>`;
}

2
app/javascript/vue/shared/user_avatar.vue
View file

@ -1,5 +1,5 @@
<template>
<div class="relative w-6 h-6" :title="title">
<div class="relative w-6 h-6 shrink-0" :title="title">
<img v-if="avatarUrl" src="avatarUrl" class="rounded-full w-full h-full" />
<div v-else class="w-full h-full rounded-full border border-sn-light-grey bg-sn-super-light-grey flex justify-center items-center">
<span class="text-[.625rem] leading-3 font-normal">

2
app/views/shared/_user_avatar.html.erb
View file

@ -1,5 +1,5 @@
<% title = user.full_name unless defined?(title)%>
<div class="relative w-6 h-6" title="<%= title %>">
<div class="relative w-6 h-6 shrink-0" title="<%= title %>">
<% if user.avatar.attached? %>
<%= image_tag avatar_path(user, :icon_small), class: 'rounded-full w-full h-full' %>
<% else %>