diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-06-18 13:12:03 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-06-19 23:53:19 +0200 |
| commit | e5f08620d4bc285087704c9a018bd7fb0a28bdfb (patch) | |
| tree | bffeb9cce8aea1da1faf3da52d557d2c593f5c78 /core/search/js | |
| parent | 7fdba6f607a9d13284c09b4c8888b671ca07d517 (diff) | |
| download | nextcloud-server-e5f08620d4bc285087704c9a018bd7fb0a28bdfb.tar.gz nextcloud-server-e5f08620d4bc285087704c9a018bd7fb0a28bdfb.zip | |
Better design for core search, fixes and style to scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/search/js')
| -rw-r--r-- | core/search/js/search.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/search/js/search.js b/core/search/js/search.js index b4175c49a3e..8c30ce74f1c 100644 --- a/core/search/js/search.js +++ b/core/search/js/search.js @@ -100,7 +100,6 @@ */ this.search = function(query, inApps, page, size) { if (query) { - OC.addStyle('core/search','results'); if (typeof page !== 'number') { page = 1; } @@ -128,8 +127,8 @@ //show spinner $searchResults.removeClass('hidden'); - $status.addClass('status'); - $status.html(t('core', 'Searching other places')+'<img class="spinner" alt="search in progress" src="'+OC.webroot+'/core/img/loading.gif" />'); + $status.addClass('status emptycontent'); + $status.html('<div class="icon-loading"></div><h2>' + t('core', 'Searching other places') + '</h2>'); // do the actual search query $.getJSON(OC.generateUrl('core/search'), {query:query, inApps:inApps, page:page, size:size }, function(results) { @@ -220,8 +219,8 @@ var error = t('core', 'No search results in other folders for {tag}{filter}{endtag}', {filter:lastQuery}); $status.append($('<h2>').html(error.replace('{tag}', '<strong>').replace('{endtag}', '</strong>'))); } else { - $status.removeClass('emptycontent').addClass('status'); - $status.text(n('core', '{count} search result in another folder', '{count} search results in other folders', count, {count:count})); + $status.removeClass('emptycontent').addClass('status summary'); + $status.html('<span class="info">' + n('core', '{count} search result in another folder', '{count} search results in other folders', count, {count:count}) + '</span>'); } } function renderCurrent() { |