diff --git a/app/assets/javascripts/my_modules/repositories.js b/app/assets/javascripts/my_modules/repositories.js index b3e6fff24..0e0017ce0 100644 --- a/app/assets/javascripts/my_modules/repositories.js +++ b/app/assets/javascripts/my_modules/repositories.js @@ -170,7 +170,7 @@ var MyModuleRepositories = (function() { fnInitComplete: function() { var dataTableWrapper = $(tableContainer).closest('.dataTables_wrapper'); DataTableHelpers.initLengthApearance(dataTableWrapper); - DataTableHelpers.initSearchField(dataTableWrapper); + DataTableHelpers.initSearchField(dataTableWrapper, I18n.t('repositories.show.filter_inventory_items')); dataTableWrapper.find('.main-actions, .pagination-row').removeClass('hidden'); if (options.assign_mode) { renderFullViewAssignButtons(); diff --git a/app/assets/javascripts/repositories/index.js b/app/assets/javascripts/repositories/index.js index ecb76b540..a9465e6b4 100644 --- a/app/assets/javascripts/repositories/index.js +++ b/app/assets/javascripts/repositories/index.js @@ -97,7 +97,7 @@ } }); DataTableHelpers.initLengthApearance(dataTableWrapper); - DataTableHelpers.initSearchField(dataTableWrapper); + DataTableHelpers.initSearchField(dataTableWrapper, I18n.t('repositories.index.filter_inventory')); $('.content-body .toolbar').html($('#repositoriesListButtons').html()); dataTableWrapper.find('.main-actions, .pagination-row').removeClass('hidden'); $('#createRepoBtn').initializeModal('#create-repo-modal'); diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js index eccc6f6a7..18361b8cd 100644 --- a/app/assets/javascripts/repositories/repository_datatable.js +++ b/app/assets/javascripts/repositories/repository_datatable.js @@ -594,7 +594,7 @@ var RepositoryDatatable = (function(global) { initCancelButton(); DataTableHelpers.initLengthApearance($(TABLE_ID).closest('.dataTables_wrapper')); - DataTableHelpers.initSearchField($(TABLE_ID).closest('.dataTables_wrapper')); + DataTableHelpers.initSearchField($(TABLE_ID).closest('.dataTables_wrapper'), I18n.t('repositories.show.filter_inventory_items')); if ($('.repository-show').length) { $('.dataTables_scrollBody, .dataTables_scrollHead').css('overflow', ''); diff --git a/app/assets/javascripts/sitewide/datatable_helpers.js b/app/assets/javascripts/sitewide/datatable_helpers.js index 1ec8f78da..02ed215cc 100644 --- a/app/assets/javascripts/sitewide/datatable_helpers.js +++ b/app/assets/javascripts/sitewide/datatable_helpers.js @@ -22,9 +22,9 @@ var DataTableHelpers = (function() { }); }, - initSearchField: function(dataTableWraper) { + initSearchField: function(dataTableWraper, searchText) { var tableFilterInput = $(dataTableWraper).find('.dataTables_filter input'); - tableFilterInput.attr('placeholder', I18n.t('repositories.index.filter_inventory')) + tableFilterInput.attr('placeholder', searchText) .addClass('sci-input-field') .css('margin', 0); $('.dataTables_filter').append(` @@ -126,4 +126,3 @@ DataTableCheckboxes.prototype.initSelectAllCheckbox = function() { }); }); }; - diff --git a/app/assets/stylesheets/shared/datatable.scss b/app/assets/stylesheets/shared/datatable.scss index 9b518163e..514492f86 100644 --- a/app/assets/stylesheets/shared/datatable.scss +++ b/app/assets/stylesheets/shared/datatable.scss @@ -70,6 +70,7 @@ tr[data-state]:not([data-state='']) { td.item-name::after { + @include font-small; background-color: $color-concrete; color: $color-silver-chalice; content: attr(data-state); diff --git a/config/locales/en.yml b/config/locales/en.yml index d2589a038..817e26dab 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1079,7 +1079,7 @@ en: share_inventory: "Share" view_only_permission_label: "You have veiw-only permission" show_per_page: "Show %{number} per page" - filter_inventory: "Filter inventory item" + filter_inventory: "Filter inventories" no_inventories: "No inventories here" no_inventories_matched: "No inventories matched your search request" no_archived_inventories: "No archived inventories here" @@ -1138,6 +1138,7 @@ en: active: "These are individually archived items from the %{repository_name} inventory. The inventory itself is active." archived_on: "Inventory archived on" archived_by: "by" + filter_inventory_items: "Filter inventory items" no_items: "No items here" no_items_matched: "No items matched your search request" no_archived_items: "No archived items here"