diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index 5d66c9f4d..7ce5eb4d8 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -854,6 +854,14 @@ a[data-toggle="tooltip"] {
.dataTables_paginate {
float: right;
+
+ .pagination {
+ margin: 2px 0;
+ }
+ }
+
+ .dataTables_info{
+ padding-top: 8px;
}
}
diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb
index b0d46a564..b469e59be 100644
--- a/app/controllers/steps_controller.rb
+++ b/app/controllers/steps_controller.rb
@@ -1,4 +1,7 @@
class StepsController < ApplicationController
+ include ActionView::Helpers::TextHelper
+ include ApplicationHelper
+
before_action :load_vars, only: [:edit, :update, :destroy, :show]
before_action :load_vars_nested, only: [:new, :create]
before_action :load_paperclip_vars
@@ -286,7 +289,7 @@ class StepsController < ApplicationController
message = t(
str,
user: current_user.full_name,
- checkbox: chkItem.text,
+ checkbox: smart_annotation_parser(simple_format(chkItem.text)),
step: chkItem.checklist.step.position + 1,
step_name: chkItem.checklist.step.name,
completed: completed_items,
diff --git a/app/views/reports/elements/_experiment_element.html.erb b/app/views/reports/elements/_experiment_element.html.erb
index 61560454b..ce2a6c285 100644
--- a/app/views/reports/elements/_experiment_element.html.erb
+++ b/app/views/reports/elements/_experiment_element.html.erb
@@ -27,9 +27,10 @@
<% if experiment.description.present? %>
- <%= auto_link(simple_format(experiment.description),
+ <%= auto_link(smart_annotation_parser(simple_format(experiment.description)),
link: :urls,
- html: { target: '_blank' }) %>
+ sanitize: false,
+ html: { target: '_blank' }).html_safe %>
<% else %>
<%=t "projects.reports.elements.experiment.no_description" %>
<% end %>
diff --git a/app/views/reports/elements/_result_comments_element.html.erb b/app/views/reports/elements/_result_comments_element.html.erb
index 9cf568a36..66f571972 100644
--- a/app/views/reports/elements/_result_comments_element.html.erb
+++ b/app/views/reports/elements/_result_comments_element.html.erb
@@ -31,9 +31,10 @@
<% end %>
diff --git a/app/views/reports/elements/_step_checklist_element.html.erb b/app/views/reports/elements/_step_checklist_element.html.erb
index 1308ed95e..c946bcd0f 100644
--- a/app/views/reports/elements/_step_checklist_element.html.erb
+++ b/app/views/reports/elements/_step_checklist_element.html.erb
@@ -8,7 +8,10 @@
- <%=t 'projects.reports.elements.step_checklist.checklist_name', name: checklist.name %>
+ <%= auto_link(smart_annotation_parser(simple_format(checklist.name)),
+ link: :urls,
+ sanitize: false,
+ html: { target: '_blank' }).html_safe %>
<%=t 'projects.reports.elements.step_checklist.user_time', timestamp: l(timestamp, format: :full) %>
@@ -24,10 +27,10 @@
/>
- <%= auto_link(simple_format(item.text),
- link: :urls,
- html: { target: '_blank' }) %>
-
+ <%= auto_link(smart_annotation_parser(simple_format(item.text)),
+ link: :urls,
+ sanitize: false,
+ html: { target: '_blank' }).html_safe %>
<% end %>
diff --git a/app/views/reports/elements/_step_comments_element.html.erb b/app/views/reports/elements/_step_comments_element.html.erb
index 7bacca06f..d9e7cec70 100644
--- a/app/views/reports/elements/_step_comments_element.html.erb
+++ b/app/views/reports/elements/_step_comments_element.html.erb
@@ -31,9 +31,10 @@
<% end %>