New description to import items modal window

This commit is contained in:
aignatov-bio 2020-02-18 12:13:52 +01:00
parent 618aa698d5
commit 5886f2cf90
5 changed files with 21 additions and 3 deletions

View file

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

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;
&.alert-danger .fas {

View file

@ -12,7 +12,12 @@
<%= f.hidden_field :team_id, value: current_team.id %>
<div class="modal-body">
<%= 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 class="modal-footer">
<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") %>">

View file

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

View file

@ -1139,6 +1139,7 @@ en:
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.'
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:
permission_error: "You don't have permission to edit this item."
not_found_error: "This inventory item does not exist."