diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-07-11 12:51:51 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-08-13 18:26:03 +0200 |
| commit | 35746197991ce03d6832f7fe3fb92713d5812353 (patch) | |
| tree | 6cbdea63cc78c828232263a6f05e43c0c283c704 | |
| parent | f6c4aa96b03aa32dd33266263c92a8f58bfe4281 (diff) | |
| download | Ishtar-35746197991ce03d6832f7fe3fb92713d5812353.tar.bz2 Ishtar-35746197991ce03d6832f7fe3fb92713d5812353.zip | |
Search UI: auto launch search on bookmark selection and criteria close
| -rw-r--r-- | ishtar_common/static/js/ishtar.js | 2 | ||||
| -rw-r--r-- | ishtar_common/templates/blocks/DataTables.html | 1 | ||||
| -rw-r--r-- | ishtar_common/templates/widgets/search_input.html | 2 | ||||
| -rw-r--r-- | scss/custom.scss | 7 |
4 files changed, 11 insertions, 1 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index a446e6964..a71450fab 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -308,6 +308,7 @@ var load_bookmark_list = function(){ $("#id_search_vector").val( $(this).attr('data-query').replace(/''/g, '"')); enable_save(); + $(".search_button").click(); }); }, 'json'); } @@ -690,6 +691,7 @@ function register_advanced_search(){ document.getElementById('wizard-form').reset(); // restore main input $("#id_search_vector").val(base_query); + $(".search_button").click(); setTimeout(function(){ $("#id_search_vector").focus(); }, 200); // the hidden should be fire after anything is hide but... diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html index 4beabe82a..0ae6ba7d0 100644 --- a/ishtar_common/templates/blocks/DataTables.html +++ b/ishtar_common/templates/blocks/DataTables.html @@ -101,6 +101,7 @@ var query_vars = new Array({{col_idx|safe}}); var selItems_{{sname}} = new Array(); jQuery(document).ready(function(){ jQuery("#search_{{name}}").click(function (){ + $("#id_search_vector").removeClass('input-progress'); if ($('.modal-progress').length > 0){ $('.modal-progress').modal('show'); } diff --git a/ishtar_common/templates/widgets/search_input.html b/ishtar_common/templates/widgets/search_input.html index 842b2bcfb..611caf054 100644 --- a/ishtar_common/templates/widgets/search_input.html +++ b/ishtar_common/templates/widgets/search_input.html @@ -48,6 +48,8 @@ $(document).ready(function(){ if (key === "Enter") { $(".search_button").click(); $(this).focus(); + } else { + $("#id_search_vector").addClass('input-progress'); } if (key === "Escape") { $("#clear-search-button").click(); diff --git a/scss/custom.scss b/scss/custom.scss index 03d42f0ce..f35078862 100644 --- a/scss/custom.scss +++ b/scss/custom.scss @@ -112,7 +112,12 @@ pre { background-color: white; } -.card-header, +.input-progress.form-control:focus, +.input-progress{ + background-color: $gray-300; +} + +.card-header, .input-progress, .table-striped tbody tr:nth-of-type(2n+1), .dt-bootstrap4 table.dataTable.stripe tbody tr.odd, .dt-bootstrap4 table.dataTable.display tbody tr.odd { |