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

Merge pull request #2415 from aignatov-bio/ai-sci-4365-new-description-to-import-items

Browse source 
New description to import items modal window [SCI-4365]
This commit is contained in:
Alex Kriuchykhin 2020-02-26 17:34:57 +01:00 committed by GitHub
commit 6841cdd6a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -1,5 +1,5 @@
env: env:
- DOCKER_COMPOSE_VERSION=1.13.0 - DOCKER_COMPOSE_VERSION=1.23.2
sudo: required sudo: required
language: ruby language: ruby

14
app/assets/stylesheets/shared_styles/elements/alerts.scss
View file

@ -38,7 +38,19 @@
} }
} }
.alert:not(.alert-floating) { .inline-alert {
align-items: center;
display: flex;
padding: 9px 24px;
.alert-icon {
font-size: 18px;
margin-right: 16px;
}
}
.alert:not(.alert-floating),
.inline-alert {
color: $color-volcano; color: $color-volcano;
&.alert-danger .fas { &.alert-danger .fas {

5
app/views/repositories/_import_repository_records_modal.html.erb
View file

@ -12,7 +12,12 @@
<%= 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">
<%= f.file_field :file %> <%= f.file_field :file %>
<div class="inline-alert alert-info" role="alert">
<span class="fas fa-info-circle alert-icon"></span>
<span><%= t('repositories.modal_import.limit_description_html') %></span>
</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>
<input type="submit" class="btn btn-success" value="<%= t("repositories.modal_import.upload") %>"> <input type="submit" class="btn btn-success" value="<%= t("repositories.modal_import.upload") %>">

2
app/views/repository_columns/_delete_column_modal_body.html.erb
View file

@ -8,7 +8,7 @@
<h4 class="modal-title"><%= t("repositories.modal_delete_column.title") %></h4> <h4 class="modal-title"><%= t("repositories.modal_delete_column.title") %></h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="delete-content" <div class="delete-content">
<p><%= t("repositories.modal_delete_column.message", column: @repository_column.name) %></p> <p><%= t("repositories.modal_delete_column.message", column: @repository_column.name) %></p>
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger" role="alert">
<span class="fas fa-exclamation-triangle"></span> <span class="fas fa-exclamation-triangle"></span>

1
config/locales/en.yml
View file

@ -1139,6 +1139,7 @@ en:
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.'
upload: 'Upload' upload: 'Upload'
limit_description_html: 'When importing items, try to limit the amount to <b>500</b>.<br>Otherwise it may impede to process.'
js: js:
permission_error: "You don't have permission to edit this item." permission_error: "You don't have permission to edit this item."
not_found_error: "This inventory item does not exist." not_found_error: "This inventory item does not exist."