From 94375458d5983afdb3b80cb7fd50fc6b09834b0c Mon Sep 17 00:00:00 2001 From: alex-brainstorm Date: Mon, 3 May 2004 12:09:30 +0000 Subject: [PATCH] UI changes in show/hide saved/recent git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7349 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/search.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/search.php b/src/search.php index 118098a5..0b597a94 100644 --- a/src/search.php +++ b/src/search.php @@ -54,16 +54,18 @@ function asearch_get_href($params = '') /** Builds a [link] */ -function asearch_get_link(&$href, $text) +function asearch_get_link(&$href, $text, $title = '') { - return '[' . $text . ']'; + if ($title != '') + $title = ' title="' . $title . '"'; + return '[' . $text . ']'; } /** Builds a toggle [link] */ -function asearch_get_toggle_link($value, $action, $text_array) +function asearch_get_toggle_link($value, $action, $text_array, $title_array = array()) { - return ' - ' . asearch_get_link(asearch_get_href($action . '=' . (int)$value), $text_array[$value]); + return asearch_get_link(asearch_get_href($action . '=' . (int)$value), $text_array[$value], asearch_nz($title_array[$value])); } /** @@ -537,11 +539,13 @@ function asearch_print_query_array(&$boxes, &$query_array, &$query_keys, &$actio global $data_dir, $username; $show_flag = getPref($data_dir, $username, $show_pref, 0) & 1; - $toggle_link = asearch_get_toggle_link(!$show_flag, $show_pref, array(_("Hide"), _("Show"))); + $toggle_link = asearch_get_toggle_link(!$show_flag, $show_pref, array(_("-"), _("+")), array(_("Hide"), _("Show"))); echo "
\n"; echo html_tag('table', '', 'center', $color[9], 'width="95%" cellpadding="1" cellspacing="1" border="0"'); - echo html_tag('tr', html_tag('td', asearch_get_title_display($color, $title) . $toggle_link, 'center', $color[5], 'colspan=5')); + echo html_tag('tr', + html_tag('td', $toggle_link, 'center', $color[5], 'width="5%"') + . html_tag('td', asearch_get_title_display($color, $title), 'center', $color[5], 'colspan=4')); if ($show_flag) { $main_key = $query_keys[ASEARCH_WHERE]; $query_count = count($query_array[$main_key]); @@ -1237,7 +1241,7 @@ do_hook('search_before_form'); if (!$search_silent) { //Add a link to the other search mode if allowed if ($allow_advanced_search > 1) - $toggle_link = asearch_get_toggle_link(!$search_advanced, 'advanced', array(_("Standard search"), _("Advanced search"))); + $toggle_link = ' - ' . asearch_get_toggle_link(!$search_advanced, 'advanced', array(_("Standard search"), _("Advanced search"))); else $toggle_link = ''; -- 2.25.1