scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 23:15:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Add textareas to checklist name & items

Browse source 
Closes SCI-644
This commit is contained in:
Luka Murn 2016-11-08 11:46:30 +01:00
parent 55d8fea359
commit d44a757b25
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/assets/stylesheets/themes/scinote.scss
View file

@ -1497,11 +1497,24 @@ html.turbolinks-progress-bar::before {
} }
} }
// Only allow vertical resizing of all text areas
textarea {
resize: vertical;
}
textarea.textarea-sm {
height: 34px;
min-height: 34px;
&.form-control {
height: 34px;
}
}
.comment-form { .comment-form {
textarea { textarea {
height: 34px; height: 34px;
min-height: 34px; min-height: 34px;
resize: vertical;
} }
.btn.btn-default { .btn.btn-default {

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

@ -9,7 +9,7 @@
</div> </div>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<%= ff.text_field :name, label: t("protocols.steps.new.checklist_name"), class: "checklist_name", autofocus: true, placeholder: t("protocols.steps.new.checklist_name_placeholder") %> <%= ff.text_area :name, label: t("protocols.steps.new.checklist_name"), class: "checklist_name textarea-sm", autofocus: true, placeholder: t("protocols.steps.new.checklist_name_placeholder") %>
<%= ff.label t("protocols.steps.new.checklist_items") %> <%= ff.label t("protocols.steps.new.checklist_items") %>
<ul> <ul>
<%= ff.nested_fields_for :checklist_items, ordered_checklist_items(ff.object) do |chkItems| %> <%= ff.nested_fields_for :checklist_items, ordered_checklist_items(ff.object) do |chkItems| %>
@ -18,7 +18,7 @@
<span class="glyphicon glyphicon-chevron-right handle-move pull-left"></span> <span class="glyphicon glyphicon-chevron-right handle-move pull-left"></span>
<div class="row"> <div class="row">
<div class="col-xs-6"> <div class="col-xs-6">
<%= chkItems.text_field :text, autofocus: true, placeholder: t("protocols.steps.new.checklist_item_placeholder"), hide_label: true, class: "checklist-item-text form-control" %> <%= chkItems.text_area :text, autofocus: true, placeholder: t("protocols.steps.new.checklist_item_placeholder"), hide_label: true, class: "checklist-item-text form-control textarea-sm" %>
<%= chkItems.hidden_field :position, class: "checklist-item-pos" %> <%= chkItems.hidden_field :position, class: "checklist-item-pos" %>
</div> </div>
<div class="col-xs-1"> <div class="col-xs-1">