mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the same style when no search result was found

This commit is contained in:
Joas Schilling 2015-03-24 10:56:44 +01:00
parent f2be172ae8
commit 17fbffceeb
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/search/css/results.css
View File

@ -18,23 +18,23 @@
box-sizing: content-box; box-sizing: content-box;
} }
#searchresults #status { #searchresults .status {
background-color: rgba(255, 255, 255, .85); background-color: rgba(255, 255, 255, .85);
height: 12px; height: 12px;
padding: 28px 0 28px 56px; padding: 28px 0 28px 56px;
font-size: 18px; font-size: 18px;
} }
.has-favorites:not(.hidden) ~ #searchresults #status { .has-favorites:not(.hidden) ~ #searchresults .status {
padding-left: 102px; padding-left: 102px;
} }
#searchresults #status.fixed { #searchresults .status.fixed {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
z-index: 10; z-index: 10;
} }
#searchresults #status .spinner { #searchresults .status .spinner {
height: 16px; height: 16px;
width: 16px; width: 16px;
vertical-align: middle; vertical-align: middle;

9
core/search/js/search.js
View File

@ -125,6 +125,7 @@
//show spinner //show spinner
$searchResults.removeClass('hidden'); $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.html(t('core', 'Searching other places')+'<img class="spinner" alt="search in progress" src="'+OC.webroot+'/core/img/loading.gif" />');
// do the actual search query // do the actual search query
@ -209,8 +210,12 @@
var count = $searchResults.find('tr.result').length; var count = $searchResults.find('tr.result').length;
$status.data('count', count); $status.data('count', count);
if (count === 0) { if (count === 0) {
$status.text(t('core', 'No search result in other places')); $status.addClass('emptycontent').removeClass('status');
$status.html('');
$status.append('<div class="icon-search"></div>');
$status.append('<h2>' + t('core', 'No search result in other places') + '</h2>');
} else { } else {
$status.removeClass('emptycontent').addClass('status');
$status.text(n('core', '{count} search result in other places', '{count} search results in other places', count, {count:count})); $status.text(n('core', '{count} search result in other places', '{count} search results in other places', count, {count:count}));
} }
} }
@ -383,4 +388,4 @@ OC.search.customResults = {};
/** /**
* @deprecated use get/setRenderer() instead * @deprecated use get/setRenderer() instead
*/ */
OC.search.resultTypes = {}; OC.search.resultTypes = {};