scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-25 01:04:02 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5920 from sboursen-scinote/sb_SCI-8983

Browse source 
Shared task - Details - multiple issues [SCI-8983]
This commit is contained in:
Alex Kriuchykhin 2023-08-08 11:42:14 +02:00 committed by GitHub
commit ab758c747f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/shareable_links/date_formatting.js
View file

@ -2,12 +2,13 @@
(function() {
$('.iso-formatted-date').each(function() {
const userLang = navigator.language || navigator.userLanguage || 'en-US';
let text = $(this).text().trim();
if (!text) {
return;
}
$(this).text(moment(text).local().format());
$(this).text(moment(text).local(userLang).format('LLL'));
});
}());

3
app/helpers/application_helper.rb
View file

@ -181,7 +181,8 @@ module ApplicationHelper
File.open(file_path) do |file|
Base64.strict_encode64(file.read)
end
"data:#{avatar_link.split('.').last};base64,#{encoded_data}"
"data:image/svg+xml;base64,#{encoded_data}"
else
avatar_link
end

2
app/views/shareable_links/my_modules/_comments_list.html.erb
View file

@ -3,7 +3,7 @@
<div class="comment-container" data-comment-id="<%= comment.id %>">
<% unless user == comment.user%>
<div class="comment-header">
<%= image_tag avatar_path(comment.user, :icon_small), class: 'user-avatar' %>
<%= image_tag user_avatar_absolute_url(comment.user, :icon_small, true), class: 'user-avatar' %>
<div class="user-name">
<%= comment.user.full_name %>
</div>

4
app/views/shareable_links/my_modules/_my_module_details.html.erb
View file

@ -1,5 +1,3 @@
<% my_module_editable = false %>
<div class="flex-block date-block">
<div class="flex-block-label">
<span class="sn-icon block-icon sn-icon-calendar mr-2.5"></span>
@ -31,7 +29,7 @@
<% if @my_module.completed? %>
<div class="flex-block date-block" >
<div class="flex-block-label">
<span class="fas block-icon fa-calendar-day"></span>
<span class="sn-icon block-icon sn-icon-calendar mr-2.5"></span>
<span class="hidden-xs hidden-sm hidden-md"><%= t('my_modules.details.completed_date') %></span>
</div>
<div class="datetime-container">

2
app/views/shareable_links/my_modules/_user_my_modules.html.erb
View file

@ -2,7 +2,7 @@
<% my_module.user_my_modules.each do |um| %>
<% user = um.user %>
<div class="inline-flex gap-2 flex-nowrap h-6 px-2 py-1 items-center select-none" title="<%= user.full_name %>">
<img class="block rounded-full h-5" src="<%= avatar_path(user, :icon_small)%>" alt="<%= user.full_name %>">
<img class="block rounded-full h-5" src="<%= user_avatar_absolute_url(user, :icon_small, true) %>" alt="<%= user.full_name %>">
<span style="block"><%= user.full_name %></span>
</div>
<% end %>