diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/tablesort.inc | 37 | ||||
| -rw-r--r-- | includes/theme.inc | 18 |
2 files changed, 23 insertions, 32 deletions
diff --git a/includes/tablesort.inc b/includes/tablesort.inc index 83230c427..ce30a409a 100644 --- a/includes/tablesort.inc +++ b/includes/tablesort.inc @@ -5,12 +5,10 @@ function tablesort_init($header) { static $ts; if (empty($ts)) { - $ts['order'] = tablesort_get_order($header); - $ts['order_sql'] = tablesort_get_order_sql($header, $ts['order']); + $ts = tablesort_get_order($header); $ts['sort'] = tablesort_get_sort($header); $ts['query_string'] = tablesort_get_querystring(); } - return $ts; } @@ -22,7 +20,9 @@ function tablesort_pager() { function tablesort_sql($header) { $ts = tablesort_init($header); - return " ORDER BY ". $ts['order_sql']. " ". strtoupper($ts['sort']); + $sql = check_query($ts['sql']); + $sort = strtoupper(check_query($ts['sort'])); + return " ORDER BY $sql $sort"; } function tablesort($cell, $header) { @@ -30,21 +30,20 @@ function tablesort($cell, $header) { $title = t("sort by %s", array("%s" => $cell['data'])); // special formatting for the currently sorted column header - if ($cell['data'] == $ts['order']) { + if ($cell['data'] == $ts['name']) { $ts['sort'] = (($ts['sort'] == 'asc') ? 'desc' : 'asc'); - $cell['class'] = 'cell-highlight'; + $cell['class'] = 'active'; $image = ' <img src="' . theme('image', 'arrow-' . $ts['sort'] . '.gif') . '" alt="'. t('sort icon') .'" />'; $title = ($ts['sort'] == 'asc' ? t("sort ascending") : t("sort descending")); - } else { + } + else { // If the user clicks a different header, we want to sort ascending initially. $ts['sort'] = "asc"; } $cell['data'] = l($cell['data'] . $image, $_GET['q'], array("title" => $title), "sort=". $ts['sort']. "&order=". urlencode($cell['data']). $ts['query_string']); - unset($cell['field']); - unset($cell['sort']); - + unset($cell['field'], $cell['sort']); return $cell; } @@ -62,11 +61,11 @@ function tablesort_get_order($headers) { $order = $_GET['order']; foreach ($headers as $header) { if ($order == $header['data']) { - return $header['data']; + return array('name' => $header['data'], 'sql' => $header['field']); } if ($header['sort'] == 'asc' || $header['sort'] == 'desc') { - $default = $header['data']; + $default = array('name' => $header['data'], 'sql' => $header['field']); } } @@ -75,15 +74,11 @@ function tablesort_get_order($headers) { } else { // The first column specified is initial 'order by' field unless otherwise specified - $first = reset($headers); - return $first['data']; - } -} - -function tablesort_get_order_sql($header, $order) { - foreach ($header as $cell) { - if ($cell['data'] == $order) { - return $cell['field']; + if (is_array($headers[0])) { + return array('name' => $headers[0]['name'], 'sql' => $headers[0]['field']); + } + else { + return array('name' => $headers[0]); } } } diff --git a/includes/theme.inc b/includes/theme.inc index e77a79ce9..5101fa516 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -318,6 +318,7 @@ function theme_table($header, $rows, $attributes = NULL) { */ if (is_array($header)) { + $ts = tablesort_init($header); $output .= " <tr>"; foreach ($header as $cell) { if (is_array($cell) && $cell['field']) { @@ -343,16 +344,12 @@ function theme_table($header, $rows, $attributes = NULL) { } foreach ($row as $cell) { - // highlight the currently sorted column. only applies to tables with headers. - if (is_array($header)) { - $ts = tablesort_init($header); - if ($i === $ts['index']) { - if (is_array($cell)) { - $cell['class'] = 'active'; - } - else { - $cell = array('data' => $cell, 'class' => 'active'); - } + if ($header[$i]['data'] == $ts['name'] && $header[$i]['field']) { + if (is_array($cell)) { + $cell['class'] .= ' active'; + } + else { + $cell = array('data' => $cell, 'class' => 'active'); } } $output .= _theme_table_cell($cell, 0); @@ -364,7 +361,6 @@ function theme_table($header, $rows, $attributes = NULL) { } $output .= "</table>\n"; - return $output; } |