scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-10 13:59:56 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixed bullets

Browse source
This commit is contained in:
zmagod 2016-11-16 15:30:14 +01:00
parent e5ba134e83
commit b781db9667
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/protocols/import_export/_preview_templates.html.erb
View file

@ -14,7 +14,7 @@
<br> <br>
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane active" role="tabpanel"> <div class="tab-pane active" role="tabpanel">
<span data-val="description"></span> <span data-val="description" class="ql-editor"></span>
<hr> <hr>
<div class="row"> <div class="row">
<div data-toggle="tables" class="col-xs-12"> <div data-toggle="tables" class="col-xs-12">
@ -52,4 +52,4 @@
<span data-val="text"></span> <span data-val="text"></span>
</label> </label>
</div> </div>
</div> </div>

4
app/views/reports/elements/_result_text_element.html.erb
View file

@ -2,7 +2,7 @@
<% result_text = result.result_text %> <% result_text = result.result_text %>
<% comments = result.comments %> <% comments = result.comments %>
<% timestamp = result.created_at %> <% 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 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="report-element-header">
<div class="row"> <div class="row">
@ -22,7 +22,7 @@
</div> </div>
<div class="report-element-body"> <div class="report-element-body">
<div class="row"> <div class="row">
<div class="col-xs-12 text-container"> <div class="col-xs-12 text-container ql-editor">
<%= result_text.text.html_safe %> <%= result_text.text.html_safe %>
</div> </div>
</div> </div>

4
app/views/reports/elements/_step_element.html.erb
View file

@ -25,8 +25,8 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12 ql-editor">
<% if step.description.present? %> <% if strip_tags(step.description).present? %>
<%= step.description.html_safe %> <%= step.description.html_safe %>
<% else %> <% else %>
<em><%=t "projects.reports.elements.step.no_description" %></em> <em><%=t "projects.reports.elements.step.no_description" %></em>

4
app/views/results/_result_text.html.erb
View file

@ -1 +1,3 @@
<%= result.result_text.text.html_safe %> <div class="ql-editor">
<%= result.result_text.text.html_safe %>
</div>

4
app/views/steps/_step.html.erb
View file

@ -35,7 +35,9 @@
<% if strip_tags(step.description).blank? %> <% if strip_tags(step.description).blank? %>
<em><%= t("protocols.steps.no_description") %></em> <em><%= t("protocols.steps.no_description") %></em>
<% else %> <% else %>
<%= step.description.html_safe %> <div class="ql-editor">
<%= step.description.html_safe %>
</div>
<% end %> <% end %>
<hr> <hr>
<div class="row"> <div class="row">