From b781db9667700d79a9699b5d9922c1f84dfefbe7 Mon Sep 17 00:00:00 2001
From: zmagod <zmago_devetak@yahoo.com>
Date: Wed, 16 Nov 2016 15:30:14 +0100
Subject: [PATCH] fixed bullets

---
 app/views/protocols/import_export/_preview_templates.html.erb | 4 ++--
 app/views/reports/elements/_result_text_element.html.erb      | 4 ++--
 app/views/reports/elements/_step_element.html.erb             | 4 ++--
 app/views/results/_result_text.html.erb                       | 4 +++-
 app/views/steps/_step.html.erb                                | 4 +++-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/views/protocols/import_export/_preview_templates.html.erb b/app/views/protocols/import_export/_preview_templates.html.erb
index 29aead7fc..3418bab85 100644
--- a/app/views/protocols/import_export/_preview_templates.html.erb
+++ b/app/views/protocols/import_export/_preview_templates.html.erb
@@ -14,7 +14,7 @@
   <br>
   <div class="tab-content">
     <div class="tab-pane active" role="tabpanel">
-      <span data-val="description"></span>
+      <span data-val="description" class="ql-editor"></span>
       <hr>
       <div class="row">
         <div data-toggle="tables" class="col-xs-12">
@@ -52,4 +52,4 @@
       <span data-val="text"></span>
     </label>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/reports/elements/_result_text_element.html.erb b/app/views/reports/elements/_result_text_element.html.erb
index 078c522a4..559b2a04f 100644
--- a/app/views/reports/elements/_result_text_element.html.erb
+++ b/app/views/reports/elements/_result_text_element.html.erb
@@ -2,7 +2,7 @@
 <% result_text = result.result_text %>
 <% comments = result.comments %>
 <% timestamp = result.created_at %>
-<% name = result.name %> 
+<% name = result.name %>
 <div class="report-element report-result-element report-result-text-element" data-ts="<%= timestamp.to_i %>" data-type="result_text" data-id="<%= result.id %>" data-modal-title="<%=t "projects.reports.elements.modals.result_contents.head_title", result: result.name %>" data-name="<%= name %>" data-icon-class="glyphicon-asterisk">
   <div class="report-element-header">
     <div class="row">
@@ -22,7 +22,7 @@
   </div>
   <div class="report-element-body">
     <div class="row">
-      <div class="col-xs-12 text-container">
+      <div class="col-xs-12 text-container ql-editor">
         <%= result_text.text.html_safe %>
       </div>
     </div>
diff --git a/app/views/reports/elements/_step_element.html.erb b/app/views/reports/elements/_step_element.html.erb
index 980a77506..41f19a57a 100644
--- a/app/views/reports/elements/_step_element.html.erb
+++ b/app/views/reports/elements/_step_element.html.erb
@@ -25,8 +25,8 @@
       </div>
     </div>
     <div class="row">
-      <div class="col-xs-12">
-        <% if step.description.present? %>
+      <div class="col-xs-12 ql-editor">
+        <% if strip_tags(step.description).present? %>
           <%= step.description.html_safe %>
         <% else %>
            <em><%=t "projects.reports.elements.step.no_description" %></em>
diff --git a/app/views/results/_result_text.html.erb b/app/views/results/_result_text.html.erb
index 8f88d1c1a..5093e44b8 100644
--- a/app/views/results/_result_text.html.erb
+++ b/app/views/results/_result_text.html.erb
@@ -1 +1,3 @@
-<%= result.result_text.text.html_safe %>
+<div class="ql-editor">
+  <%= result.result_text.text.html_safe %>
+</div>
diff --git a/app/views/steps/_step.html.erb b/app/views/steps/_step.html.erb
index c7399546e..8180124d8 100644
--- a/app/views/steps/_step.html.erb
+++ b/app/views/steps/_step.html.erb
@@ -35,7 +35,9 @@
           <% if strip_tags(step.description).blank? %>
             <em><%= t("protocols.steps.no_description") %></em>
           <% else %>
-            <%= step.description.html_safe %>
+            <div class="ql-editor">
+              <%= step.description.html_safe %>
+            </div>
           <% end %>
           <hr>
           <div class="row">