From a45cfbc2d2754030510ac98607ca2cc53d750b57 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Fri, 9 Sep 2016 18:01:00 +0200
Subject: search design details

---
 apps/files/js/filelist.js | 2 +-
 apps/files/js/search.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'apps/files/js')

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 26c6b34d098..2e36e884346 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2427,7 +2427,7 @@
 				$('#searchresults .emptycontent').addClass('emptycontent-search');
 				if ( $('#searchresults').length === 0 || $('#searchresults').hasClass('hidden') ) {
 					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('h2').text(t('files', "No results in this folder for {filter}", {filter:this._filter},  null, {'escape': false}));
 				}
 			} 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);
-- 
cgit v1.2.3


From 1930aa3102b52258480c52998661802432c866b1 Mon Sep 17 00:00:00 2001
From: skjnldsv <fremulon@protonmail.com>
Date: Tue, 11 Oct 2016 14:21:37 +0200
Subject: Fix bold no results search text Fix wording

---
 apps/files/js/filelist.js | 3 ++-
 core/search/js/search.js  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'apps/files/js')

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 2e36e884346..09c35e0d061 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('h2').text(t('files', "No results in this folder for {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/core/search/js/search.js b/core/search/js/search.js
index 559fbcf9adf..93b1961eea5 100644
--- a/core/search/js/search.js
+++ b/core/search/js/search.js
@@ -217,7 +217,8 @@
 					$status.addClass('emptycontent').removeClass('status');
 					$status.html('');
 					$status.append('<div class="icon-search"></div>');
-					$status.append('<h2>' + t('core', 'No search results in other folders {filter}', {filter:lastQuery}) + '</h2>');
+					var error = t('core', "No search results in other folders for '{tag}{filter}{endtag}'", {filter:lastQuery});
+					$status.append('<h2>' + error.replace('{tag}', '<strong>').replace('{endtag}', '</strong>') + '</h2>');
 				} 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}));
-- 
cgit v1.2.3