From 06ce285ae2f44ce5b4b3d3a36122a7966377202b Mon Sep 17 00:00:00 2001
From: mlorb <mlorber@biosistemika.com>
Date: Wed, 16 May 2018 14:32:15 +0200
Subject: [PATCH 1/2] add locales

---
 app/assets/javascripts/my_modules/protocols.js.erb              | 2 +-
 app/assets/javascripts/protocols/index.js                       | 2 +-
 app/assets/javascripts/reports/reports_datatable.js.erb         | 2 +-
 app/assets/javascripts/repositories/repository_datatable.js.erb | 2 +-
 app/assets/javascripts/users/settings/teams/show.js             | 2 +-
 config/locales/en.yml                                           | 1 +
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/my_modules/protocols.js.erb b/app/assets/javascripts/my_modules/protocols.js.erb
index 73bbdae52..470d7826d 100644
--- a/app/assets/javascripts/my_modules/protocols.js.erb
+++ b/app/assets/javascripts/my_modules/protocols.js.erb
@@ -295,7 +295,7 @@ function initLoadFromRepositoryTable(content) {
       { data: "6" }
     ],
     oLanguage: {
-      sSearch: "Filter:"
+      sSearch: I18n.t('general.filter')
     },
     rowCallback: function(row, data, dataIndex) {
       // Get row ID
diff --git a/app/assets/javascripts/protocols/index.js b/app/assets/javascripts/protocols/index.js
index ac6fdfb36..d9f97c070 100644
--- a/app/assets/javascripts/protocols/index.js
+++ b/app/assets/javascripts/protocols/index.js
@@ -66,7 +66,7 @@ function initProtocolsTable() {
       { data: "6" }
     ],
     oLanguage: {
-      sSearch: "Filter:"
+      sSearch: I18n.t('general.filter')
     },
     rowCallback: function(row, data, dataIndex) {
       // Get row ID
diff --git a/app/assets/javascripts/reports/reports_datatable.js.erb b/app/assets/javascripts/reports/reports_datatable.js.erb
index 7175e51d3..4fe49c637 100644
--- a/app/assets/javascripts/reports/reports_datatable.js.erb
+++ b/app/assets/javascripts/reports/reports_datatable.js.erb
@@ -147,7 +147,7 @@
         'render': renderCheckboxHTML
       }],
       'oLanguage': {
-        'sSearch': "Filter:"
+        'sSearch': I18n.t('general.filter')
       },
       'fnDrawCallback': tableDrowCallback,
       'createdRow': appendEditPathToRow
diff --git a/app/assets/javascripts/repositories/repository_datatable.js.erb b/app/assets/javascripts/repositories/repository_datatable.js.erb
index f8a06a8a6..51d14b900 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js.erb
+++ b/app/assets/javascripts/repositories/repository_datatable.js.erb
@@ -93,7 +93,7 @@ var RepositoryDatatable = (function(global) {
         }
       }],
       oLanguage: {
-        sSearch: "Filter:"
+        sSearch: I18n.t('general.filter')
       },
       rowCallback: function(row, data) {
         // Get row ID
diff --git a/app/assets/javascripts/users/settings/teams/show.js b/app/assets/javascripts/users/settings/teams/show.js
index 8183b9b64..31f8bf979 100644
--- a/app/assets/javascripts/users/settings/teams/show.js
+++ b/app/assets/javascripts/users/settings/teams/show.js
@@ -122,7 +122,7 @@ function initUsersTable() {
       { data: "5" }
     ],
     oLanguage: {
-      sSearch: "Filter:"
+      sSearch: I18n.t('general.filter')
     }
   });
 }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e7d3cb07e..917a6cfed 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1915,6 +1915,7 @@ en:
       length_too_short: "Search query is too short (minimum is %{min_length} characters)"
     busy: "The server is still processing your request. If you leave this page, the changes will be lost! Are you sure you want to continue?"
     no_name: "(no name)"
+    filter: "Filter:"
 
   api:
     core:

From 933a98c1f63c3b460c50e7860befe74e05d6710e Mon Sep 17 00:00:00 2001
From: mlorb <mlorber@biosistemika.com>
Date: Thu, 17 May 2018 11:01:15 +0200
Subject: [PATCH 2/2] fix smart anotation color

---
 app/assets/stylesheets/themes/scinote.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index d30b5b708..148d7337d 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -1721,9 +1721,8 @@ th.custom-field .modal-tooltiptext {
 }
 
 .sa-type {
-  border: 1px solid $color-black;
+  border: 1px solid $color-emperor;
   border-radius: 4px;
-  color: $color-black;
   font-weight: 600;
   padding: 0 2px;
   text-decoration: none;