From 5886f2cf90192af99e9d2f4891db22747d47689d Mon Sep 17 00:00:00 2001
From: aignatov-bio <aignatov@biosistemika.com>
Date: Tue, 18 Feb 2020 12:13:52 +0100
Subject: [PATCH] New description to import items modal window

---
 .travis.yml                                        |  2 +-
 .../stylesheets/shared_styles/elements/alerts.scss | 14 +++++++++++++-
 .../_import_repository_records_modal.html.erb      |  5 +++++
 .../_delete_column_modal_body.html.erb             |  2 +-
 config/locales/en.yml                              |  1 +
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 563a24baa..95291a551 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 env:
-  - DOCKER_COMPOSE_VERSION=1.13.0
+  - DOCKER_COMPOSE_VERSION=1.23.2
 
 sudo: required
 language: ruby
diff --git a/app/assets/stylesheets/shared_styles/elements/alerts.scss b/app/assets/stylesheets/shared_styles/elements/alerts.scss
index 3b426d63c..b54218af7 100644
--- a/app/assets/stylesheets/shared_styles/elements/alerts.scss
+++ b/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 {
diff --git a/app/views/repositories/_import_repository_records_modal.html.erb b/app/views/repositories/_import_repository_records_modal.html.erb
index 06d1645a4..8430e73bc 100644
--- a/app/views/repositories/_import_repository_records_modal.html.erb
+++ b/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") %>">
diff --git a/app/views/repository_columns/_delete_column_modal_body.html.erb b/app/views/repository_columns/_delete_column_modal_body.html.erb
index 764e23599..cbea4cade 100644
--- a/app/views/repository_columns/_delete_column_modal_body.html.erb
+++ b/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>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1ca27c84b..da9f55392 100644
--- a/config/locales/en.yml
+++ b/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."