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

New description to import items modal window [SCI-4365]

.travis.yml

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

app/assets/stylesheets/shared_styles/elements/alerts.scss

@@ -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 {

app/views/repositories/_import_repository_records_modal.html.erb

@@ -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") %>">

app/views/repository_columns/_delete_column_modal_body.html.erb

@@ -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>

config/locales/en.yml

@@ -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."