diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2014-04-07 17:01:30 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2014-04-07 17:01:30 +0200 |
| commit | 6dc1a6645168e5e777a3db97b92d360a9e6b0c86 (patch) | |
| tree | c2031248d0e3c0ad66729dcabf99ac37292e9a89 | |
| parent | e8cb51669a325a3d5b60fcc37b99d494809bf837 (diff) | |
Fix page title and folder selection in search mode
| -rw-r--r-- | program/js/app.js | 2 | ||||
| -rw-r--r-- | program/localization/en_US/labels.inc | 1 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/search.inc | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js index 7c27d21b3..adf135695 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -712,7 +712,7 @@ function rcube_webmail() var oldmbox = this.env.search_scope == 'all' ? '*' : this.env.mailbox; this.env.search_mods[props] = this.env.search_mods[oldmbox]; // copy search mods from active search this.env.mailbox = props; - this.env.search_scope = 'base'; + this.env.search_scope = 'sub'; this.qsearch(this.gui_objects.qsearchbox.value); this.select_folder(this.env.mailbox, '', true); break; diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 05eab6713..5bb645d29 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -319,6 +319,7 @@ $labels['assistant'] = 'Assistant'; $labels['spouse'] = 'Spouse'; $labels['allfields'] = 'All fields'; $labels['search'] = 'Search'; +$labels['searchfor'] = 'Search for "$q"'; $labels['advsearch'] = 'Advanced Search'; $labels['advanced'] = 'Advanced'; $labels['other'] = 'Other'; diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 0d6f9cdfc..4ff8fcb30 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -420,7 +420,7 @@ function rcmail_js_message_list($a_headers, $insert_top=false, $a_show_cols=null $OUTPUT->command('set_message_coltypes', $a_show_cols, $thead, $smart_col); - if ($multifolder) { + if ($multifolder && $_SESSION['search_scope'] == 'all') { $OUTPUT->command('select_folder', ''); } diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc index 941e68bd9..797c8fcd8 100644 --- a/program/steps/mail/search.inc +++ b/program/steps/mail/search.inc @@ -170,4 +170,5 @@ $OUTPUT->set_env('messagecount', $count); $OUTPUT->set_env('pagecount', ceil($count/$RCMAIL->storage->get_pagesize())); $OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS')); $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1), $mbox); +$OUTPUT->set_pagetitle($RCMAIL->gettext(array('name' => 'searchfor', 'vars' => array('q' => $str)))); $OUTPUT->send(); |