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

Merge pull request #2818 from mlorb/ml-sci-4572

Browse source 
Change step checklist and table edit mode [SCI-4572]
This commit is contained in:
aignatov-bio 2020-09-09 09:02:56 +02:00 committed by GitHub
commit ae1bec2a95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/stylesheets/steps.scss
View file

@ -20,6 +20,16 @@
}
}
}
.checklist-name-container,
.table-name-container {
align-items: center;
display: flex;
.remove-container {
padding-top: 10px;
}
}
}
#steps {

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

@ -1,20 +1,21 @@
<div class="panel panel-default panel-step-attachment">
<div class="panel-heading">
<span class="fas fa-tasks"></span>
<%= t("protocols.steps.new.checklist_panel_title") %>
<div class="pull-right">
<%= ff.remove_nested_fields_link do %>
<span class="fas fa-times"></span>
<% end %>
</div>
</div>
<div class="panel-body">
<%= ff.smart_text_area :name,
label: t('protocols.steps.new.checklist_name'),
class: 'checklist_name',
autofocus: true,
placeholder: t('protocols.steps.new.checklist_name_placeholder'),
data: { 'atwho-edit' => '' } %>
<div class="row checklist-name-container">
<div class="col-xs-11">
<%= ff.smart_text_area :name,
label: t('protocols.steps.new.checklist_name'),
class: 'checklist_name',
autofocus: true,
single_line: true,
placeholder: t('protocols.steps.new.checklist_name_placeholder'),
data: { 'atwho-edit' => '' } %>
</div>
<div class="col-xs-1 remove-container">
<%= ff.remove_nested_fields_link do %>
<span class="fas fa-times"></span>
<% end %>
</div>
</div>
<%= ff.label t("protocols.steps.new.checklist_items") %>
<ul>
<%= ff.nested_fields_for :checklist_items, ordered_checklist_items(ff.object) do |chkItems| %>

25
app/views/steps/_form_tables.html.erb
View file

@ -1,15 +1,20 @@
<div class="panel panel-default panel-step-attachment">
<div class="panel-heading">
<span class="fas fa-table"></span>
<%= t("protocols.steps.new.table_panel_title") %>
<div class="pull-right">
<%= ff.remove_nested_fields_link do %>
<span class="fas fa-times"></span>
<% end %>
</div>
</div>
<div class="panel-body">
<%= ff.smart_text_area :name, label: t("protocols.steps.new.table_name"), class: "table_name", autofocus: true, placeholder: t("protocols.steps.new.table_name_placeholder") %>
<div class="row table-name-container">
<div class="col-xs-11">
<%= ff.smart_text_area :name,
label: t("protocols.steps.new.table_name"),
class: "table_name",
autofocus: true,
single_line: true,
placeholder: t("protocols.steps.new.table_name_placeholder") %>
</div>
<div class="col-xs-1 remove-container">
<%= ff.remove_nested_fields_link do %>
<span class="fas fa-times"></span>
<% end %>
</div>
</div>
<div data-role="editable-table" class="panel-body">
<%= ff.hidden_field(:contents, value: ff.object.contents_utf_8, class: "hot-contents" ) %>
<div class="hot"></div>

2
config/locales/en.yml
View file

@ -2136,14 +2136,12 @@ en:
name_placeholder: "mRNA sequencing"
description: "Description"
description_placeholder: "Write what should be done here ..."
checklist_panel_title: "Checklist"
checklist_name: "Checklist name"
checklist_name_placeholder: "Checklist name"
checklist_items: "Items"
checklist_item_placeholder: "Task"
checklist_add_item: "Add item"
add_checklist: "Add checklist"
table_panel_title: "Table"
table_name: "Table title"
table_name_placeholder: "Table title"
add_table: "Add table"