From 2304742d874e20fd02e21640423511f751e3dc75 Mon Sep 17 00:00:00 2001
From: Luka Murn <luka.murn@biosistemika.com>
Date: Tue, 27 Dec 2016 08:45:23 +0100
Subject: [PATCH 1/2] Add tooltips to samples column dropdown

Closes SCI-802.
---
 app/assets/javascripts/samples/sample_datatable.js.erb | 10 +++++-----
 config/locales/en.yml                                  |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/samples/sample_datatable.js.erb b/app/assets/javascripts/samples/sample_datatable.js.erb
index 05063e1fd..1eee80b53 100644
--- a/app/assets/javascripts/samples/sample_datatable.js.erb
+++ b/app/assets/javascripts/samples/sample_datatable.js.erb
@@ -975,11 +975,11 @@ function changeToEditMode() {
           '<span class="text">' + generateColumnNameTooltip(thederName) + '</span> ' +
           '<span class="form-group"><input type="text" class="text-edit form-control" style="display: none;" />' +
           '<span class="pull-right controls">' +
-          '<span class="ok glyphicon glyphicon-ok" style="display: none;"></span>' +
-          '<span class="cancel glyphicon glyphicon-remove" style="display: none;"></span>' +
-          '<span class="vis glyphicon ' + visClass + '"></span> ' +
-          '<span class="edit glyphicon glyphicon-pencil ' + editClass + '"></span>' +
-          '<span class="del glyphicon glyphicon-trash ' + delClass + '"></span>' +
+          '<span class="ok glyphicon glyphicon-ok" style="display: none;" title="<%= I18n.t("general.update") %>"></span>' +
+          '<span class="cancel glyphicon glyphicon-remove" style="display: none;" title="<%= I18n.t("general.cancel") %>"></span>' +
+          '<span class="vis glyphicon ' + visClass + '" title="<%= I18n.t("samples.columns_visibility") %>"></span> ' +
+          '<span class="edit glyphicon glyphicon-pencil ' + editClass + '" title="<%= I18n.t("general.edit") %>"></span>' +
+          '<span class="del glyphicon glyphicon-trash ' + delClass + '" title="<%= I18n.t("samples.columns_delete") %>"></span>' +
           '</span><br></span></li>';
         dropdownList.append(html);
       }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ee50c5e15..edec40cb4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -805,6 +805,8 @@ en:
 
   samples:
     columns: "Columns"
+    columns_visibility: "Toggle visibility"
+    columns_delete: "Delete"
     types_and_groups: "Types and groups"
     actions: "Actions"
     add_new_sample: "Add new sample"

From 2c5b27ce8183a0787b14c621850ca479caf23a29 Mon Sep 17 00:00:00 2001
From: Luka Murn <luka.murn@biosistemika.com>
Date: Wed, 4 Jan 2017 11:29:34 +0100
Subject: [PATCH 2/2] Change "Update" to "Save"

Closes SCI-802.
---
 app/assets/javascripts/samples/sample_datatable.js.erb | 2 +-
 config/locales/en.yml                                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/samples/sample_datatable.js.erb b/app/assets/javascripts/samples/sample_datatable.js.erb
index 1eee80b53..c5d5f46f2 100644
--- a/app/assets/javascripts/samples/sample_datatable.js.erb
+++ b/app/assets/javascripts/samples/sample_datatable.js.erb
@@ -975,7 +975,7 @@ function changeToEditMode() {
           '<span class="text">' + generateColumnNameTooltip(thederName) + '</span> ' +
           '<span class="form-group"><input type="text" class="text-edit form-control" style="display: none;" />' +
           '<span class="pull-right controls">' +
-          '<span class="ok glyphicon glyphicon-ok" style="display: none;" title="<%= I18n.t("general.update") %>"></span>' +
+          '<span class="ok glyphicon glyphicon-ok" style="display: none;" title="<%= I18n.t("general.save") %>"></span>' +
           '<span class="cancel glyphicon glyphicon-remove" style="display: none;" title="<%= I18n.t("general.cancel") %>"></span>' +
           '<span class="vis glyphicon ' + visClass + '" title="<%= I18n.t("samples.columns_visibility") %>"></span> ' +
           '<span class="edit glyphicon glyphicon-pencil ' + editClass + '" title="<%= I18n.t("general.edit") %>"></span>' +
diff --git a/config/locales/en.yml b/config/locales/en.yml
index edec40cb4..f06ba8afd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1457,6 +1457,7 @@ en:
   # application.
 
   general:
+    save: "Save"
     update: "Update"
     edit: "Edit"
     cancel: "Cancel"