Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

search design details #1606

Merged
merged 3 commits into from
Oct 18, 2016
Merged

search design details #1606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a45cfbc
search design details
jancborchardt Sep 9, 2016
35a7a4f
Use the correct query variable
nickvergessen Oct 5, 2016
1930aa3
Fix bold no results search text
Oct 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/files/js/filelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
4 changes: 2 additions & 2 deletions apps/files/js/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
1 change: 0 additions & 1 deletion apps/files_sharing/templates/list.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
3 changes: 2 additions & 1 deletion core/search/js/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') + '</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}));
Expand Down