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

Merge pull request #1066 from ZmagoD/zd_SCI_2235

Browse source 
updated repository import modal html [fixes SCI-2235]
This commit is contained in:
Zmago Devetak 2018-03-30 14:32:53 +02:00 • committed by GitHub
commit f5f6fa4a4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/views/repositories/_parse_records_modal.html.erb
View file

@ -13,7 +13,7 @@
remote: true) do |f|%> remote: true) do |f|%>
<%= f.hidden_field :team_id, value: current_team.id %> <%= f.hidden_field :team_id, value: current_team.id %>
<div class="modal-body"> <div class="modal-body">
<h4><%= t("teams.parse_sheet.help_text") %></h4> <p><%= t("teams.parse_sheet.help_text") %></p>
<div style="overflow-x: scroll"> <div style="overflow-x: scroll">
<table class="table parse-records-table" style="display: block"> <table class="table parse-records-table" style="display: block">
<thead> <thead>
@ -62,6 +62,12 @@
<div id="import-errors-container"> <div id="import-errors-container">
</div> </div>
<div class="alert alert-info" role="alert">
<ul>
<li><%= t('repositories.modal_parse.warning_1') %></li>
<li><%= t('repositories.modal_parse.warning_2') %></li>
</ul>
</div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" onClick="pageReload()"><%= t('general.cancel')%></button> <button type="button" class="btn btn-default" data-dismiss="modal" onClick="pageReload()"><%= t('general.cancel')%></button>

2
config/locales/en.yml
View file

@ -964,6 +964,8 @@ en:
delete: "Delete column" delete: "Delete column"
modal_parse: modal_parse:
title: 'Import items' title: 'Import items'
warning_1: 'Be careful when importing into Dropdown column/s! Each new unique cell value from the file will create a new Dropdown option. This could result in large amounts of Dropdown options.'
warning_2: 'Importing into file columns is not supported.'
modal_import: modal_import:
title: 'Import items' title: 'Import items'
notice: 'You may upload .csv file (comma separated) or tab separated file (.txt or .tsv) or Excel file (.xlsx). First row should include header names, followed by rows with sample data.' notice: 'You may upload .csv file (comma separated) or tab separated file (.txt or .tsv) or Excel file (.xlsx). First row should include header names, followed by rows with sample data.'