From 400d11ab2294678f2ac39c2e8397a9bced535040 Mon Sep 17 00:00:00 2001
From: Simon Mayer <simon.mayer@onb.ac.at>
Date: Wed, 12 Oct 2022 17:09:57 +0200
Subject: [PATCH] Some visual changes
---
app/views/catalog/home.html.erb | 2 +-
app/views/dataset/_document.html.erb | 2 +-
app/views/layouts/application.html.erb | 2 +-
app/views/shared/_navigation.html.erb | 4 ++--
app/workers/export_dataset_worker.rb | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/views/catalog/home.html.erb b/app/views/catalog/home.html.erb
index a96db57..d761eb6 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 3c27f28..a16319a 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 5e33ac4..a689c50 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 0fe44e1..2852884 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 e6fc2f0..4bb9952 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" }),
--
GitLab