From d029b542917ea1f9728d704cc16eedaba3770ee7 Mon Sep 17 00:00:00 2001 From: Gregor Lasnibat Date: Thu, 7 Sep 2023 20:45:51 +0200 Subject: [PATCH] Fix shared task issues [SCI-9226] --- app/assets/stylesheets/reports.scss | 2 ++ app/assets/stylesheets/reports_print.scss | 2 ++ app/views/shareable_links/my_module_results_show.html.erb | 2 +- .../my_modules/results/_comments_list.html.erb | 4 ++-- .../shareable_links/my_modules/step_elements/_table.html.erb | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/reports.scss b/app/assets/stylesheets/reports.scss index a8d342c66..308bfaf8d 100644 --- a/app/assets/stylesheets/reports.scss +++ b/app/assets/stylesheets/reports.scss @@ -67,6 +67,8 @@ label { * Global fix for handsontable */ .hot-table-container { + display: flex; + overflow: auto; .ht_master .wtHolder { height: auto !important; width: auto !important; diff --git a/app/assets/stylesheets/reports_print.scss b/app/assets/stylesheets/reports_print.scss index 18ac71a92..46f7f3fbb 100644 --- a/app/assets/stylesheets/reports_print.scss +++ b/app/assets/stylesheets/reports_print.scss @@ -29,6 +29,8 @@ div.print-report { } .hot-table-container { + display: flex; + overflow: auto; .ht_master .wtHolder { overflow: hidden !important; diff --git a/app/views/shareable_links/my_module_results_show.html.erb b/app/views/shareable_links/my_module_results_show.html.erb index 31be4be4c..604804799 100644 --- a/app/views/shareable_links/my_module_results_show.html.erb +++ b/app/views/shareable_links/my_module_results_show.html.erb @@ -6,7 +6,7 @@ -
+
<%= render partial: 'shareable_links/my_modules/header_actions' %>
diff --git a/app/views/shareable_links/my_modules/results/_comments_list.html.erb b/app/views/shareable_links/my_modules/results/_comments_list.html.erb index 2143a1f94..dbd59eb23 100644 --- a/app/views/shareable_links/my_modules/results/_comments_list.html.erb +++ b/app/views/shareable_links/my_modules/results/_comments_list.html.erb @@ -2,13 +2,13 @@
- <%= image_tag avatar_path(comment.user, :icon_small), class: 'avatar' %> + <%= image_tag user_avatar_absolute_url(comment.user, :icon_small, true), class: 'user-avatar' %>
<%= comment.user.full_name %>
-
<%= comment.created_at.iso8601 %>
+
<%= l(comment.created_at, format: :full) %>
<%= smart_annotation_text(comment.message) %>
diff --git a/app/views/shareable_links/my_modules/step_elements/_table.html.erb b/app/views/shareable_links/my_modules/step_elements/_table.html.erb index 567be700a..c04811a1d 100644 --- a/app/views/shareable_links/my_modules/step_elements/_table.html.erb +++ b/app/views/shareable_links/my_modules/step_elements/_table.html.erb @@ -4,7 +4,7 @@ <% if element.name.present? %>
<%= render partial: "shareable_links/my_modules/inline_view", locals: { text: element.name, smart_annotation_enabled: false } %> -
+
<% end %>