diff --git a/app/views/catalog/home.html.erb b/app/views/catalog/home.html.erb index a96db57518f2da2f26e8d44fe5edc497956dea08..d761eb6af3f393d1696ab349de3b386dfafa56a1 100644 --- a/app/views/catalog/home.html.erb +++ b/app/views/catalog/home.html.erb @@ -3,7 +3,7 @@ <div class="d-flex align-items-center justify-content-between" style="height: 30vh;"> <%= image_pack_tag "media/images/newseye_logo.png", class: "mh-100 ms-auto me-auto d-block" %> <div class="d-flex flex-column justify-content-center align-items-center"> - <%= image_pack_tag "media/images/eu_flag_yellow.jpg", size: "224x150"%> + <%= image_pack_tag "media/images/eu_flag_yellow.jpg", size: "224x150", style: "margin:20px" %> <p class="w-50"> This project has received funding from the European Union’s Horizon 2020 research and diff --git a/app/views/dataset/_document.html.erb b/app/views/dataset/_document.html.erb index 3c27f28fe579c5ecc219a5a2f4b5de92fff643f4..a16319a08dc79bb9ae469b52885ca5f5bf8c3169 100644 --- a/app/views/dataset/_document.html.erb +++ b/app/views/dataset/_document.html.erb @@ -29,7 +29,7 @@ <div class="col-4"> <% if !highlight.nil? and !highlight.first.nil? %> <%# highlight.first[1].each do |extract| %> - <p><%= highlight unless doc.is_a?(Issue) %><%#= extract.gsub(/\n/, "<br/>").gsub("<br/><br/>", "<br/>").html_safe %></p> + <p><%= highlight[0..250] + '...' unless doc.is_a?(Issue) %><%#= extract.gsub(/\n/, "<br/>").gsub("<br/><br/>", "<br/>").html_safe %></p> <%# end %> <% end %> </div> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5e33ac4cb6faaa264484f7dc3f628ca65dddd51e..a689c50f04fcc1ad57c62f848fab2ff6ef06408a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -32,6 +32,6 @@ <%= yield %> </div> - <div id="notifications" class="toast-container position-absolute bottom-0 end-0 p-3"></div> + <div id="notifications" class="toast-container position-fixed bottom-0 end-0 p-3"></div> </body> </html> diff --git a/app/views/shared/_navigation.html.erb b/app/views/shared/_navigation.html.erb index 0fe44e12ccd670987cef5ed2cd0510c7006caddd..2852884632e6186609f265b0f31bb7ab2fea7097 100644 --- a/app/views/shared/_navigation.html.erb +++ b/app/views/shared/_navigation.html.erb @@ -1,7 +1,7 @@ -<div id="navigation" class="d-flex align-items-center px-3 mb-2 border-bottom border-2 bg-light"> +<div id="navigation" class="d-flex align-items-center px-3 mb-2 border-bottom border-2 bg-light" style="border-top:7px solid;border-top-color:#b3c3c7"> <nav class="w-100 p-0 navbar navbar-expand-lg"> <a class="navbar-brand" href="/"> - <%= image_pack_tag "media/images/newseye_logo_small.png" %> + <%= image_pack_tag "media/images/newseye_logo_small.png", size: "65x40", style: "padding:5px" %> </a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarContent" aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation"> <span class="navbar-toggler-icon"></span> diff --git a/app/workers/export_dataset_worker.rb b/app/workers/export_dataset_worker.rb index e6fc2f0314cf7a52402aa9d4bf5984ab49b2299b..4bb9952d3ba1428a2a328d72d81778e033a3f8e1 100644 --- a/app/workers/export_dataset_worker.rb +++ b/app/workers/export_dataset_worker.rb @@ -84,7 +84,7 @@ class ExportDatasetWorker File.delete("/tmp/#{filename}") if filename end end - content = "<p>Your dataset is ready. <a target=\"_blank\" href=\"/en/tool/newspapers-platform/send?filename=#{File.basename(file.path)}\">Click here</a> to download it.</p>" + content = "<p>Your dataset is ready. <a target=\"_blank\" href=\"/en/tool/annolyzer/send?filename=#{File.basename(file.path)}\">Click here</a> to download it.</p>" ActionCable.server.broadcast("notifications.#{user_id}", { type: "notify", html: ApplicationController.render(partial: "shared/notification", locals: { notif_title: dataset.title, notif_content: content, notif_autohide: "false" }),