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

Merge pull request #272 from mlorb/ml-sci-638

Browse source 
Integrate library with default settings [SCI-638]
This commit is contained in:
mlorb 2016-11-09 17:10:19 +01:00 committed by GitHub
commit 19433850c8
6 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -58,6 +58,7 @@ gem 'aws-sdk-v1'
gem 'delayed_job_active_record' gem 'delayed_job_active_record'
gem 'devise-async' gem 'devise-async'
gem 'ruby-graphviz', '~> 1.2' # Graphviz for rails gem 'ruby-graphviz', '~> 1.2' # Graphviz for rails
gem 'quill-rails', '~> 0.1.0' # Rich text editor
group :development, :test do group :development, :test do
gem 'byebug' gem 'byebug'

3
Gemfile.lock
View file

@ -193,6 +193,8 @@ GEM
polyglot (0.3.5) polyglot (0.3.5)
powerpack (0.1.1) powerpack (0.1.1)
puma (2.15.3) puma (2.15.3)
quill-rails (0.1.4)
railties (>= 3.1.0, < 5.0)
rack (1.6.4) rack (1.6.4)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
@ -353,6 +355,7 @@ DEPENDENCIES
paperclip (~> 4.3) paperclip (~> 4.3)
pg pg
puma puma
quill-rails (~> 0.1.0)
rails (= 4.2.5) rails (= 4.2.5)
rails_12factor rails_12factor
redcarpet redcarpet

1
app/assets/javascripts/application.js.erb
View file

@ -31,6 +31,7 @@
//= require i18n.js //= require i18n.js
//= require i18n/translations //= require i18n/translations
//= require turbolinks //= require turbolinks
//= require quill
// Initialize links for submitting forms. This is useful for submitting // Initialize links for submitting forms. This is useful for submitting

1
app/assets/stylesheets/application.scss
View file

@ -7,6 +7,7 @@
*= require constants *= require constants
*= require introjs *= require introjs
*= stub reports_pdf *= stub reports_pdf
*= require quill.snow
*/ */
@import "bootstrap-sprockets"; @import "bootstrap-sprockets";
@import "bootstrap"; @import "bootstrap";

3
app/views/steps/_empty_step.html.erb
View file

@ -26,8 +26,7 @@
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane active" role="tabpanel" id="new-step-main"> <div class="tab-pane active" role="tabpanel" id="new-step-main">
<%= f.text_field :name, label: t("protocols.steps.new.name"), placeholder: t("protocols.steps.new.name_placeholder") %> <%= f.text_field :name, label: t("protocols.steps.new.name"), placeholder: t("protocols.steps.new.name_placeholder") %>
<%= quill_editor nil, { name: 'step[description]', value: @step.description } %>
<%= f.text_area :description, label: t("protocols.steps.new.description"), placeholder: t("protocols.steps.new.description_placeholder") %>
</div> </div>
<div class="tab-pane" role="tabpanel" id="new-step-checklists"> <div class="tab-pane" role="tabpanel" id="new-step-checklists">
<%= f.nested_fields_for :checklists do |ff| %> <%= f.nested_fields_for :checklists do |ff| %>

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

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