Skip to content
Snippets Groups Projects
Commit 400d11ab authored by smayer's avatar smayer
Browse files

Some visual changes

parent 411ec8fc
No related branches found
No related tags found
1 merge request!2Merging development into onb as preparation for Annolyzer release
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="d-flex align-items-center justify-content-between" style="height: 30vh;"> <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" %> <%= 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"> <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"> <p class="w-50">
This project has received funding from the This project has received funding from the
European Union’s Horizon 2020 research and European Union’s Horizon 2020 research and
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<div class="col-4"> <div class="col-4">
<% if !highlight.nil? and !highlight.first.nil? %> <% if !highlight.nil? and !highlight.first.nil? %>
<%# highlight.first[1].each do |extract| %> <%# 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 %>
<% end %> <% end %>
</div> </div>
......
...@@ -32,6 +32,6 @@ ...@@ -32,6 +32,6 @@
<%= yield %> <%= yield %>
</div> </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> </body>
</html> </html>
<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"> <nav class="w-100 p-0 navbar navbar-expand-lg">
<a class="navbar-brand" href="/"> <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> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarContent" aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation"> <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> <span class="navbar-toggler-icon"></span>
......
...@@ -84,7 +84,7 @@ class ExportDatasetWorker ...@@ -84,7 +84,7 @@ class ExportDatasetWorker
File.delete("/tmp/#{filename}") if filename File.delete("/tmp/#{filename}") if filename
end end
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}", { ActionCable.server.broadcast("notifications.#{user_id}", {
type: "notify", type: "notify",
html: ApplicationController.render(partial: "shared/notification", locals: { notif_title: dataset.title, notif_content: content, notif_autohide: "false" }), html: ApplicationController.render(partial: "shared/notification", locals: { notif_title: dataset.title, notif_content: content, notif_autohide: "false" }),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment