diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-10-18 13:48:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-18 13:48:01 +0200 |
| commit | 2bb031ecc6d8aaee496ffedaaff02a7485f9b16c (patch) | |
| tree | 2b03fb16e4cd093c7660c4269362521feec74bc7 /apps | |
| parent | 129fdf2e2ec8caedadf7896e3400213144c23a8e (diff) | |
| parent | 1930aa3102b52258480c52998661802432c866b1 (diff) | |
| download | nextcloud-server-2bb031ecc6d8aaee496ffedaaff02a7485f9b16c.tar.gz nextcloud-server-2bb031ecc6d8aaee496ffedaaff02a7485f9b16c.zip | |
Merge pull request #1606 from nextcloud/search-detail
search design details
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/filelist.js | 3 | ||||
| -rw-r--r-- | apps/files/js/search.js | 4 | ||||
| -rw-r--r-- | apps/files_sharing/templates/list.php | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 98d0f132ad6..896af1dd6e5 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -2426,8 +2426,9 @@ $('#searchresults').addClass('filter-empty'); $('#searchresults .emptycontent').addClass('emptycontent-search'); if ( $('#searchresults').length === 0 || $('#searchresults').hasClass('hidden') ) { + var error = t('files', "No search results in other folders for '{tag}{filter}{endtag}'", {filter:this._filter}, null, {'escape': false}); this.$el.find('.nofilterresults').removeClass('hidden'). - find('p').text(t('files', "No entries in this folder match '{filter}'", {filter:this._filter}, null, {'escape': false})); + find('p').html(error.replace('{tag}', '<strong>').replace('{endtag}', '</strong>')); } } else { $('#searchresults').removeClass('filter-empty'); diff --git a/apps/files/js/search.js b/apps/files/js/search.js index 625e4b13f4b..fa79d695165 100644 --- a/apps/files/js/search.js +++ b/apps/files/js/search.js @@ -63,7 +63,7 @@ show size and last modified date on the right */ this.updateLegacyMimetype(result); - var $pathDiv = $('<div class="path"></div>').text(result.path); + var $pathDiv = $('<div class="path"></div>').text(result.path.substr(1)); $row.find('td.info div.name').after($pathDiv).text(result.name); $row.find('td.result a').attr('href', result.link); @@ -80,7 +80,7 @@ show size and last modified date on the right */ this.updateLegacyMimetype(result); - var $pathDiv = $('<div class="path"></div>').text(result.path); + var $pathDiv = $('<div class="path"></div>').text(result.path.substr(1)); $row.find('td.info div.name').after($pathDiv).text(result.name); $row.find('td.result a').attr('href', result.link); diff --git a/apps/files_sharing/templates/list.php b/apps/files_sharing/templates/list.php index f59cb7653d8..785b2bc72a4 100644 --- a/apps/files_sharing/templates/list.php +++ b/apps/files_sharing/templates/list.php @@ -8,7 +8,6 @@ <div class="nofilterresults hidden"> <div class="icon-search"></div> <h2><?php p($l->t('No entries found in this folder')); ?></h2> - <p></p> </div> <table id="filestable"> |