diff options
Diffstat (limited to 'modules')
29 files changed, 91 insertions, 63 deletions
diff --git a/modules/aggregator.module b/modules/aggregator.module index 2de00187d..82832881a 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -705,7 +705,7 @@ function aggregator_view() { $output .= '<h3>'. t('Feed overview') .'</h3>'; - $header = array(t('Title'), t('Items'), t('Last update'), t('Next update'), array('data' => t('Operations'), 'colspan' => 3)); + $header = array(t('Title'), t('Items'), t('Last update'), t('Next update'), array('data' => t('Operations'), 'colspan' => '3')); $rows = array(); while ($feed = db_fetch_object($result)) { $rows[] = array(l($feed->title, "aggregator/sources/$feed->fid"), format_plural($feed->items, '1 item', '%count items'), ($feed->checked ? t('%time ago', array('%time' => format_interval(time() - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - time()))) : t('never')), l(t('edit'), "admin/aggregator/edit/feed/$feed->fid"), l(t('remove items'), "admin/aggregator/remove/$feed->fid"), l(t('update items'), "admin/aggregator/update/$feed->fid")); diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 2de00187d..82832881a 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -705,7 +705,7 @@ function aggregator_view() { $output .= '<h3>'. t('Feed overview') .'</h3>'; - $header = array(t('Title'), t('Items'), t('Last update'), t('Next update'), array('data' => t('Operations'), 'colspan' => 3)); + $header = array(t('Title'), t('Items'), t('Last update'), t('Next update'), array('data' => t('Operations'), 'colspan' => '3')); $rows = array(); while ($feed = db_fetch_object($result)) { $rows[] = array(l($feed->title, "aggregator/sources/$feed->fid"), format_plural($feed->items, '1 item', '%count items'), ($feed->checked ? t('%time ago', array('%time' => format_interval(time() - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - time()))) : t('never')), l(t('edit'), "admin/aggregator/edit/feed/$feed->fid"), l(t('remove items'), "admin/aggregator/remove/$feed->fid"), l(t('update items'), "admin/aggregator/update/$feed->fid")); diff --git a/modules/block.module b/modules/block.module index c004ca158..63d2f0678 100644 --- a/modules/block.module +++ b/modules/block.module @@ -74,7 +74,7 @@ function block_menu($may_cache) { 'access' => user_access('administer blocks'), 'callback' => 'block_box_delete', 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/block/add', 'title' => t('add'), + $items[] = array('path' => 'admin/block/add', 'title' => t('add block'), 'access' => user_access('administer blocks'), 'callback' => 'block_box_add', 'type' => MENU_LOCAL_TASK); diff --git a/modules/block/block.module b/modules/block/block.module index c004ca158..63d2f0678 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -74,7 +74,7 @@ function block_menu($may_cache) { 'access' => user_access('administer blocks'), 'callback' => 'block_box_delete', 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/block/add', 'title' => t('add'), + $items[] = array('path' => 'admin/block/add', 'title' => t('add block'), 'access' => user_access('administer blocks'), 'callback' => 'block_box_add', 'type' => MENU_LOCAL_TASK); diff --git a/modules/book.module b/modules/book.module index 1b6583073..858518eac 100644 --- a/modules/book.module +++ b/modules/book.module @@ -699,7 +699,7 @@ function book_admin_view($nid, $depth = 0) { $output .= '<h3>'. $node->title .'</h3>'; - $header = array(t('Title'), t('Weight'), array('data' => t('Operations'), 'colspan' => 3)); + $header = array(t('Title'), t('Weight'), array('data' => t('Operations'), 'colspan' => '3')); $rows[] = book_admin_view_line($node); $rows = array_merge($rows, book_admin_view_book($nid)); @@ -747,7 +747,7 @@ function book_admin_orphan() { if ($pages) { $output .= '<h3>'. t('Orphan pages') .'</h3>'; - $header = array(t('Title'), t('Weight'), array('data' => t('Operations'), 'colspan' => 3)); + $header = array(t('Title'), t('Weight'), array('data' => t('Operations'), 'colspan' => '3')); foreach ($pages as $nid => $node) { if ($node->parent && empty($pages[$node->parent])) { $rows[] = book_admin_view_line($node, $depth); diff --git a/modules/book/book.module b/modules/book/book.module index 1b6583073..858518eac 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -699,7 +699,7 @@ function book_admin_view($nid, $depth = 0) { $output .= '<h3>'. $node->title .'</h3>'; - $header = array(t('Title'), t('Weight'), array('data' => t('Operations'), 'colspan' => 3)); + $header = array(t('Title'), t('Weight'), array('data' => t('Operations'), 'colspan' => '3')); $rows[] = book_admin_view_line($node); $rows = array_merge($rows, book_admin_view_book($nid)); @@ -747,7 +747,7 @@ function book_admin_orphan() { if ($pages) { $output .= '<h3>'. t('Orphan pages') .'</h3>'; - $header = array(t('Title'), t('Weight'), array('data' => t('Operations'), 'colspan' => 3)); + $header = array(t('Title'), t('Weight'), array('data' => t('Operations'), 'colspan' => '3')); foreach ($pages as $nid => $node) { if ($node->parent && empty($pages[$node->parent])) { $rows[] = book_admin_view_line($node, $depth); diff --git a/modules/comment.module b/modules/comment.module index f50dc01d1..dc37ab5bb 100644 --- a/modules/comment.module +++ b/modules/comment.module @@ -997,7 +997,7 @@ function comment_admin_overview($type = 'new') { array('data' => t('Author'), 'field' => 'u.name'), array('data' => t('Status'), 'field' => 'status'), array('data' => t('Time'), 'field' => 'c.timestamp', 'sort' => 'desc'), - array('data' => t('Operations'), 'colspan' => 2) + array('data' => t('Operations'), 'colspan' => '2') ); $status = ($type == 'approval') ? 1 : 0; @@ -1018,7 +1018,11 @@ function comment_admin_overview($type = 'new') { } if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => 6)); + $rows[] = array(array('data' => $pager, 'colspan' => '6')); + } + + if (!$rows) { + $rows[] = array(array('data' => t('No comments available.'), 'colspan' => '6')); } print theme('page', theme('table', $header, $rows)); diff --git a/modules/comment/comment.module b/modules/comment/comment.module index f50dc01d1..dc37ab5bb 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -997,7 +997,7 @@ function comment_admin_overview($type = 'new') { array('data' => t('Author'), 'field' => 'u.name'), array('data' => t('Status'), 'field' => 'status'), array('data' => t('Time'), 'field' => 'c.timestamp', 'sort' => 'desc'), - array('data' => t('Operations'), 'colspan' => 2) + array('data' => t('Operations'), 'colspan' => '2') ); $status = ($type == 'approval') ? 1 : 0; @@ -1018,7 +1018,11 @@ function comment_admin_overview($type = 'new') { } if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => 6)); + $rows[] = array(array('data' => $pager, 'colspan' => '6')); + } + + if (!$rows) { + $rows[] = array(array('data' => t('No comments available.'), 'colspan' => '6')); } print theme('page', theme('table', $header, $rows)); diff --git a/modules/filter.module b/modules/filter.module index 1d47c1143..96287c911 100644 --- a/modules/filter.module +++ b/modules/filter.module @@ -136,19 +136,19 @@ function filter_menu($may_cache) { 'type' => MENU_CALLBACK, 'access' => user_access('administer filters')); - $items[] = array('path' => 'admin/filters/'. arg(2) .'/list', 'title' => t('list filters'), + $items[] = array('path' => 'admin/filters/'. arg(2) .'/list', 'title' => t('list'), 'callback' => 'filter_admin_filters', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => 0, 'access' => user_access('administer filters')); - $items[] = array('path' => 'admin/filters/'. arg(2) .'/configure', 'title' => t('configure filters'), + $items[] = array('path' => 'admin/filters/'. arg(2) .'/configure', 'title' => t('configure'), 'callback' => 'filter_admin_configure', 'type' => MENU_LOCAL_TASK, 'weight' => 1, 'access' => user_access('administer filters')); - $items[] = array('path' => 'admin/filters/'. arg(2) .'/order', 'title' => t('rearrange filters'), + $items[] = array('path' => 'admin/filters/'. arg(2) .'/order', 'title' => t('rearrange'), 'callback' => 'filter_admin_order', 'type' => MENU_LOCAL_TASK, 'weight' => 2, diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 1d47c1143..96287c911 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -136,19 +136,19 @@ function filter_menu($may_cache) { 'type' => MENU_CALLBACK, 'access' => user_access('administer filters')); - $items[] = array('path' => 'admin/filters/'. arg(2) .'/list', 'title' => t('list filters'), + $items[] = array('path' => 'admin/filters/'. arg(2) .'/list', 'title' => t('list'), 'callback' => 'filter_admin_filters', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => 0, 'access' => user_access('administer filters')); - $items[] = array('path' => 'admin/filters/'. arg(2) .'/configure', 'title' => t('configure filters'), + $items[] = array('path' => 'admin/filters/'. arg(2) .'/configure', 'title' => t('configure'), 'callback' => 'filter_admin_configure', 'type' => MENU_LOCAL_TASK, 'weight' => 1, 'access' => user_access('administer filters')); - $items[] = array('path' => 'admin/filters/'. arg(2) .'/order', 'title' => t('rearrange filters'), + $items[] = array('path' => 'admin/filters/'. arg(2) .'/order', 'title' => t('rearrange'), 'callback' => 'filter_admin_order', 'type' => MENU_LOCAL_TASK, 'weight' => 2, diff --git a/modules/forum.module b/modules/forum.module index 147947f60..d19961328 100644 --- a/modules/forum.module +++ b/modules/forum.module @@ -587,7 +587,7 @@ function theme_forum_list($forums, $parents, $tid) { } $description .= "</div>\n"; - $rows[] = array(array('data' => $description, 'class' => 'container', 'colspan' => 4)); + $rows[] = array(array('data' => $description, 'class' => 'container', 'colspan' => '4')); } else { $forum->old_topics = _forum_topics_read($forum->tid, $user->uid); diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 147947f60..d19961328 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -587,7 +587,7 @@ function theme_forum_list($forums, $parents, $tid) { } $description .= "</div>\n"; - $rows[] = array(array('data' => $description, 'class' => 'container', 'colspan' => 4)); + $rows[] = array(array('data' => $description, 'class' => 'container', 'colspan' => '4')); } else { $forum->old_topics = _forum_topics_read($forum->tid, $user->uid); diff --git a/modules/menu.module b/modules/menu.module index dba13e9f1..d2fc770a5 100644 --- a/modules/menu.module +++ b/modules/menu.module @@ -354,7 +354,7 @@ function menu_edit_item_save($edit) { */ function menu_overview_tree() { $menu = menu_get_menu(); - $header = array(t('Menu item'), t('Expanded'), array('data' => t('Operations'), 'colspan' => 3)); + $header = array(t('Menu item'), t('Expanded'), array('data' => t('Operations'), 'colspan' => '3')); $output = ''; foreach ($menu['items'][0]['children'] as $mid) { @@ -400,7 +400,7 @@ function menu_overview_tree_rows($pid = 0, $depth = 0) { // Populate the operations field. $operations = array(); if (!($menu['items'][$mid]['type'] & MENU_MODIFIABLE_BY_ADMIN)) { - $operations[] = array('data' => t('locked'), 'colspan' => 3, 'align' => 'center'); + $operations[] = array('data' => t('locked'), 'colspan' => '3', 'align' => 'center'); } else { if ($menu['items'][$mid]['type'] & MENU_VISIBLE_IN_TREE) { diff --git a/modules/menu/menu.module b/modules/menu/menu.module index dba13e9f1..d2fc770a5 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -354,7 +354,7 @@ function menu_edit_item_save($edit) { */ function menu_overview_tree() { $menu = menu_get_menu(); - $header = array(t('Menu item'), t('Expanded'), array('data' => t('Operations'), 'colspan' => 3)); + $header = array(t('Menu item'), t('Expanded'), array('data' => t('Operations'), 'colspan' => '3')); $output = ''; foreach ($menu['items'][0]['children'] as $mid) { @@ -400,7 +400,7 @@ function menu_overview_tree_rows($pid = 0, $depth = 0) { // Populate the operations field. $operations = array(); if (!($menu['items'][$mid]['type'] & MENU_MODIFIABLE_BY_ADMIN)) { - $operations[] = array('data' => t('locked'), 'colspan' => 3, 'align' => 'center'); + $operations[] = array('data' => t('locked'), 'colspan' => '3', 'align' => 'center'); } else { if ($menu['items'][$mid]['type'] & MENU_VISIBLE_IN_TREE) { diff --git a/modules/node.module b/modules/node.module index 195cba7e8..75b6f4594 100644 --- a/modules/node.module +++ b/modules/node.module @@ -768,14 +768,18 @@ function node_admin_nodes() { $output .= "<div class=\"container-inline\">$form</div>"; // Overview table: - $header = array(NULL, t('Title'), t('Type'), t('Author'), t('Status'), array('data' => t('Operations'), 'colspan' => 2)); + $header = array(NULL, t('Title'), t('Type'), t('Author'), t('Status'), array('data' => t('Operations'), 'colspan' => '2')); while ($node = db_fetch_object($result)) { $rows[] = array(form_checkbox(NULL, 'status]['. $node->nid, 1, 0), l($node->title, 'node/'. $node->nid) .' '. (node_is_new($node->nid, $node->changed) ? theme_mark() : ''), node_invoke($node, 'node_name'), format_name($node), ($node->status ? t('published') : t('not published')), l(t('edit'), 'node/'. $node->nid .'/edit'), l(t('delete'), 'admin/node/delete/'. $node->nid)); } if ($pager = theme('pager', NULL, 50, 0)) { - $rows[] = array(array('data' => $pager, 'colspan' => 7)); + $rows[] = array(array('data' => $pager, 'colspan' => '7')); + } + + if (!$rows) { + $rows[] = array(array('data' => t('No posts available.'), 'colspan' => '7')); } $output .= '<h3>'. $filters[$filter][0] .'</h3>'; diff --git a/modules/node/node.module b/modules/node/node.module index 195cba7e8..75b6f4594 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -768,14 +768,18 @@ function node_admin_nodes() { $output .= "<div class=\"container-inline\">$form</div>"; // Overview table: - $header = array(NULL, t('Title'), t('Type'), t('Author'), t('Status'), array('data' => t('Operations'), 'colspan' => 2)); + $header = array(NULL, t('Title'), t('Type'), t('Author'), t('Status'), array('data' => t('Operations'), 'colspan' => '2')); while ($node = db_fetch_object($result)) { $rows[] = array(form_checkbox(NULL, 'status]['. $node->nid, 1, 0), l($node->title, 'node/'. $node->nid) .' '. (node_is_new($node->nid, $node->changed) ? theme_mark() : ''), node_invoke($node, 'node_name'), format_name($node), ($node->status ? t('published') : t('not published')), l(t('edit'), 'node/'. $node->nid .'/edit'), l(t('delete'), 'admin/node/delete/'. $node->nid)); } if ($pager = theme('pager', NULL, 50, 0)) { - $rows[] = array(array('data' => $pager, 'colspan' => 7)); + $rows[] = array(array('data' => $pager, 'colspan' => '7')); + } + + if (!$rows) { + $rows[] = array(array('data' => t('No posts available.'), 'colspan' => '7')); } $output .= '<h3>'. $filters[$filter][0] .'</h3>'; diff --git a/modules/path.module b/modules/path.module index 2e1fd2364..8b9705945 100644 --- a/modules/path.module +++ b/modules/path.module @@ -82,7 +82,7 @@ function path_menu($may_cache) { 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/path/list', 'title' => t('list'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'admin/path/add', 'title' => t('add'), + $items[] = array('path' => 'admin/path/add', 'title' => t('add alias'), 'callback' => 'path_admin_edit', 'access' => user_access('administer url aliases'), 'type' => MENU_LOCAL_TASK); @@ -259,7 +259,7 @@ function path_overview() { $header = array( array('data' => t('Alias'), 'field' => 'dst', 'sort' => 'asc'), array('data' => t('System'), 'field' => 'src'), - array('data' => t('Operations'), 'colspan' => 2) + array('data' => t('Operations'), 'colspan' => '2') ); $sql .= tablesort_sql($header); $result = pager_query($sql, 50); diff --git a/modules/path/path.module b/modules/path/path.module index 2e1fd2364..8b9705945 100644 --- a/modules/path/path.module +++ b/modules/path/path.module @@ -82,7 +82,7 @@ function path_menu($may_cache) { 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/path/list', 'title' => t('list'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'admin/path/add', 'title' => t('add'), + $items[] = array('path' => 'admin/path/add', 'title' => t('add alias'), 'callback' => 'path_admin_edit', 'access' => user_access('administer url aliases'), 'type' => MENU_LOCAL_TASK); @@ -259,7 +259,7 @@ function path_overview() { $header = array( array('data' => t('Alias'), 'field' => 'dst', 'sort' => 'asc'), array('data' => t('System'), 'field' => 'src'), - array('data' => t('Operations'), 'colspan' => 2) + array('data' => t('Operations'), 'colspan' => '2') ); $sql .= tablesort_sql($header); $result = pager_query($sql, 50); diff --git a/modules/queue.module b/modules/queue.module index 891457380..934881e92 100644 --- a/modules/queue.module +++ b/modules/queue.module @@ -136,7 +136,11 @@ function queue_overview() { } if ($pager = theme('pager', NULL, 10, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => 4)); + $rows[] = array(array('data' => $pager, 'colspan' => '4')); + } + + if (!$rows) { + $rows[] = array(array('data' => t('No posts available in queue.'), 'colspan' => '4')); } $output = '<div id="queue">'; diff --git a/modules/statistics.module b/modules/statistics.module index 0ad65b778..a384b4076 100644 --- a/modules/statistics.module +++ b/modules/statistics.module @@ -263,7 +263,7 @@ function statistics_admin_displaylog($type = 'all', $id = 0) { } if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => 8)); + $rows[] = array(array('data' => $pager, 'colspan' => '8')); } $output = theme('table', $header, $rows); @@ -294,7 +294,7 @@ function statistics_top_titles() { $rows[] = array(l(_statistics_column_width($title->title, '_title', 56), $title->path), _statistics_column_width($title->path, '_title', 56), $title->hits, format_date($title->last_hit, 'small'), ($title->title ? l(t('track title'), 'admin/logs/hits/page/'. urlencode($title->title)) : '')); } if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => 5)); + $rows[] = array(array('data' => $pager, 'colspan' => '5')); } $output = theme('table', $header, $rows); @@ -316,7 +316,7 @@ function statistics_top_users() { array('data' => t('Hostname'), 'field' => 'hostname'), array('data' => t('Hits'), 'field' => 'hits', 'sort' => 'desc'), array('data' => t('Last hit'), 'field' => 'last_hit'), - array('data' => t('Operations'), 'colspan' => 2) + array('data' => t('Operations'), 'colspan' => '2') ); $sql .= tablesort_sql($header); $result = pager_query($sql, 50, 0, $sql_cnt); @@ -326,7 +326,7 @@ function statistics_top_users() { $rows[] = array(format_name($user), $u->hostname, $u->hits, format_date($u->last_hit, 'small'), ($u->uid ? l(t('track user'), "admin/logs/hits/user/$user->uid") : ''), ($u->hostname ? l(t('track host'), "admin/logs/hits/host/$u->hostname") : '')); } if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => 6)); + $rows[] = array(array('data' => $pager, 'colspan' => '6')); } $output = theme('table', $header, $rows); @@ -348,7 +348,7 @@ function statistics_top_hostnames() { array('data' => t('User'), 'field' => 'user'), array('data' => t('Hits'), 'field' => 'hits', 'sort' => 'desc'), array('data' => t('Last hit'), 'field' => 'last_hit'), - array('data' => t('Operations'), 'colspan' => 2) + array('data' => t('Operations'), 'colspan' => '2') ); $sql .= tablesort_sql($header); $result = pager_query($sql, 50, 0, $sql_cnt); @@ -358,7 +358,7 @@ function statistics_top_hostnames() { $rows[] = array($hostname->hostname, format_name($user), $hostname->hits, format_date($hostname->last_hit, 'small'), ($hostname->hostname ? l(t('track host'), "admin/logs/hits/host/$hostname->hostname") : ''), ($hostname->uid ? l(t('track user'), "admin/logs/hits/user/$hostname->uid") :'')); } if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => 3)); + $rows[] = array(array('data' => $pager, 'colspan' => '3')); } $output = theme('table', $header, $rows); @@ -406,7 +406,7 @@ function statistics_top_referrers($view = 'all') { $rows[] = array('<a href="'. $referrer->url .'">'. _statistics_column_width($referrer->url, '_refer', 75) .'</a>', $referrer->hits, format_date($referrer->last_hit, 'small')); } if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => 3)); + $rows[] = array(array('data' => $pager, 'colspan' => '3')); } $output .= theme('table', $header, $rows); @@ -433,7 +433,7 @@ function statistics_admin_content() { $rows[] = array(l($nid->title, 'node/'. $nid->nid, array('title' => t('View this posting.'))), $nid->daycount, $nid->totalcount, format_date($nid->timestamp, 'small'), l(t('track title'), 'admin/logs/hits/page/'. urlencode($nid->title))); } if ($pager = theme('pager', NULL, 20, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => 5)); + $rows[] = array(array('data' => $pager, 'colspan' => '5')); } $output = theme('table', $header, $rows); diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module index 0ad65b778..a384b4076 100644 --- a/modules/statistics/statistics.module +++ b/modules/statistics/statistics.module @@ -263,7 +263,7 @@ function statistics_admin_displaylog($type = 'all', $id = 0) { } if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => 8)); + $rows[] = array(array('data' => $pager, 'colspan' => '8')); } $output = theme('table', $header, $rows); @@ -294,7 +294,7 @@ function statistics_top_titles() { $rows[] = array(l(_statistics_column_width($title->title, '_title', 56), $title->path), _statistics_column_width($title->path, '_title', 56), $title->hits, format_date($title->last_hit, 'small'), ($title->title ? l(t('track title'), 'admin/logs/hits/page/'. urlencode($title->title)) : '')); } if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => 5)); + $rows[] = array(array('data' => $pager, 'colspan' => '5')); } $output = theme('table', $header, $rows); @@ -316,7 +316,7 @@ function statistics_top_users() { array('data' => t('Hostname'), 'field' => 'hostname'), array('data' => t('Hits'), 'field' => 'hits', 'sort' => 'desc'), array('data' => t('Last hit'), 'field' => 'last_hit'), - array('data' => t('Operations'), 'colspan' => 2) + array('data' => t('Operations'), 'colspan' => '2') ); $sql .= tablesort_sql($header); $result = pager_query($sql, 50, 0, $sql_cnt); @@ -326,7 +326,7 @@ function statistics_top_users() { $rows[] = array(format_name($user), $u->hostname, $u->hits, format_date($u->last_hit, 'small'), ($u->uid ? l(t('track user'), "admin/logs/hits/user/$user->uid") : ''), ($u->hostname ? l(t('track host'), "admin/logs/hits/host/$u->hostname") : '')); } if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => 6)); + $rows[] = array(array('data' => $pager, 'colspan' => '6')); } $output = theme('table', $header, $rows); @@ -348,7 +348,7 @@ function statistics_top_hostnames() { array('data' => t('User'), 'field' => 'user'), array('data' => t('Hits'), 'field' => 'hits', 'sort' => 'desc'), array('data' => t('Last hit'), 'field' => 'last_hit'), - array('data' => t('Operations'), 'colspan' => 2) + array('data' => t('Operations'), 'colspan' => '2') ); $sql .= tablesort_sql($header); $result = pager_query($sql, 50, 0, $sql_cnt); @@ -358,7 +358,7 @@ function statistics_top_hostnames() { $rows[] = array($hostname->hostname, format_name($user), $hostname->hits, format_date($hostname->last_hit, 'small'), ($hostname->hostname ? l(t('track host'), "admin/logs/hits/host/$hostname->hostname") : ''), ($hostname->uid ? l(t('track user'), "admin/logs/hits/user/$hostname->uid") :'')); } if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => 3)); + $rows[] = array(array('data' => $pager, 'colspan' => '3')); } $output = theme('table', $header, $rows); @@ -406,7 +406,7 @@ function statistics_top_referrers($view = 'all') { $rows[] = array('<a href="'. $referrer->url .'">'. _statistics_column_width($referrer->url, '_refer', 75) .'</a>', $referrer->hits, format_date($referrer->last_hit, 'small')); } if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => 3)); + $rows[] = array(array('data' => $pager, 'colspan' => '3')); } $output .= theme('table', $header, $rows); @@ -433,7 +433,7 @@ function statistics_admin_content() { $rows[] = array(l($nid->title, 'node/'. $nid->nid, array('title' => t('View this posting.'))), $nid->daycount, $nid->totalcount, format_date($nid->timestamp, 'small'), l(t('track title'), 'admin/logs/hits/page/'. urlencode($nid->title))); } if ($pager = theme('pager', NULL, 20, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => 5)); + $rows[] = array(array('data' => $pager, 'colspan' => '5')); } $output = theme('table', $header, $rows); diff --git a/modules/system.module b/modules/system.module index de83f63c3..e38cbe5fc 100644 --- a/modules/system.module +++ b/modules/system.module @@ -80,7 +80,7 @@ function system_menu($may_cache) { $items[] = array('path' => 'admin/themes', 'title' => t('themes'), 'callback' => 'system_themes', 'access' => $access); - $items[] = array('path' => 'admin/themes/select', 'title' => t('select'), + $items[] = array('path' => 'admin/themes/select', 'title' => t('list'), 'callback' => 'system_themes', 'access' => $access, 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -1); diff --git a/modules/system/system.module b/modules/system/system.module index de83f63c3..e38cbe5fc 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -80,7 +80,7 @@ function system_menu($may_cache) { $items[] = array('path' => 'admin/themes', 'title' => t('themes'), 'callback' => 'system_themes', 'access' => $access); - $items[] = array('path' => 'admin/themes/select', 'title' => t('select'), + $items[] = array('path' => 'admin/themes/select', 'title' => t('list'), 'callback' => 'system_themes', 'access' => $access, 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -1); diff --git a/modules/taxonomy.module b/modules/taxonomy.module index 503449daa..42ece7d17 100644 --- a/modules/taxonomy.module +++ b/modules/taxonomy.module @@ -343,7 +343,7 @@ function _taxonomy_confirm_del_term($tid) { * Generate a tabular listing of administrative functions for vocabularies. */ function taxonomy_overview() { - $header = array(t('Name'), t('Node types'), array('data' => t('Operations'), 'colspan' => 3)); + $header = array(t('Name'), t('Type'), array('data' => t('Operations'), 'colspan' => '3')); $vocabularies = taxonomy_get_vocabularies(); @@ -361,10 +361,14 @@ function taxonomy_overview() { foreach ($tree as $term) { $data .= _taxonomy_depth($term->depth) .' '. $term->name .' ('. l(t('edit term'), "admin/taxonomy/edit/term/$term->tid") .')<br />'; } - $rows[] = array(array('data' => $data, 'colspan' => 5)); + $rows[] = array(array('data' => $data, 'colspan' => '5')); } } + if (!$rows) { + $rows[] = array(array('data' => t('No categories available.'), 'colspan' => '5')); + } + return theme('table', $header, $rows); } diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 503449daa..42ece7d17 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -343,7 +343,7 @@ function _taxonomy_confirm_del_term($tid) { * Generate a tabular listing of administrative functions for vocabularies. */ function taxonomy_overview() { - $header = array(t('Name'), t('Node types'), array('data' => t('Operations'), 'colspan' => 3)); + $header = array(t('Name'), t('Type'), array('data' => t('Operations'), 'colspan' => '3')); $vocabularies = taxonomy_get_vocabularies(); @@ -361,10 +361,14 @@ function taxonomy_overview() { foreach ($tree as $term) { $data .= _taxonomy_depth($term->depth) .' '. $term->name .' ('. l(t('edit term'), "admin/taxonomy/edit/term/$term->tid") .')<br />'; } - $rows[] = array(array('data' => $data, 'colspan' => 5)); + $rows[] = array(array('data' => $data, 'colspan' => '5')); } } + if (!$rows) { + $rows[] = array(array('data' => t('No categories available.'), 'colspan' => '5')); + } + return theme('table', $header, $rows); } diff --git a/modules/tracker.module b/modules/tracker.module index f18b43f66..f31389a80 100644 --- a/modules/tracker.module +++ b/modules/tracker.module @@ -72,7 +72,7 @@ function tracker_page($uid = 0) { else { $result = pager_query('SELECT n.nid, n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n '. node_access_join_sql() .' INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 AND '. node_access_where_sql() .' ORDER BY last_post DESC', 25, 0, 'SELECT COUNT(n.nid) FROM {node} n '. node_access_join_sql() .' WHERE n.status = 1 AND '. node_access_where_sql()); } - + while ($node = db_fetch_object($result)) { // Determine the number of comments: $comments = 0; @@ -95,7 +95,7 @@ function tracker_page($uid = 0) { } if ($pager = theme('pager', NULL, 25, 0)) { - $rows[] = array(array('data' => $pager, 'colspan' => 5)); + $rows[] = array(array('data' => $pager, 'colspan' => '5')); } $header = array(t('Type'), t('Post'), t('Author'), t('Replies'), t('Last post')); diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module index f18b43f66..f31389a80 100644 --- a/modules/tracker/tracker.module +++ b/modules/tracker/tracker.module @@ -72,7 +72,7 @@ function tracker_page($uid = 0) { else { $result = pager_query('SELECT n.nid, n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n '. node_access_join_sql() .' INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 AND '. node_access_where_sql() .' ORDER BY last_post DESC', 25, 0, 'SELECT COUNT(n.nid) FROM {node} n '. node_access_join_sql() .' WHERE n.status = 1 AND '. node_access_where_sql()); } - + while ($node = db_fetch_object($result)) { // Determine the number of comments: $comments = 0; @@ -95,7 +95,7 @@ function tracker_page($uid = 0) { } if ($pager = theme('pager', NULL, 25, 0)) { - $rows[] = array(array('data' => $pager, 'colspan' => 5)); + $rows[] = array(array('data' => $pager, 'colspan' => '5')); } $header = array(t('Type'), t('Post'), t('Author'), t('Replies'), t('Last post')); diff --git a/modules/user.module b/modules/user.module index d6ee673df..390eb075e 100644 --- a/modules/user.module +++ b/modules/user.module @@ -662,7 +662,7 @@ function user_menu($may_cache) { 'callback' => 'user_admin', 'access' => $access); $items[] = array('path' => 'admin/user/list', 'title' => t('list'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'admin/user/create', 'title' => t('add'), + $items[] = array('path' => 'admin/user/create', 'title' => t('add user'), 'callback' => 'user_admin', 'access' => $access, 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/user/configure', 'title' => t('configure'), @@ -1549,7 +1549,7 @@ function user_admin_account() { $pager = theme('pager', NULL, 50, 0, tablesort_pager()); if (!empty($pager)) { - $rows[] = array(array('data' => $pager, 'colspan' => 6)); + $rows[] = array(array('data' => $pager, 'colspan' => '6')); } return theme('table', $header, $rows); } diff --git a/modules/user/user.module b/modules/user/user.module index d6ee673df..390eb075e 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -662,7 +662,7 @@ function user_menu($may_cache) { 'callback' => 'user_admin', 'access' => $access); $items[] = array('path' => 'admin/user/list', 'title' => t('list'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'admin/user/create', 'title' => t('add'), + $items[] = array('path' => 'admin/user/create', 'title' => t('add user'), 'callback' => 'user_admin', 'access' => $access, 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/user/configure', 'title' => t('configure'), @@ -1549,7 +1549,7 @@ function user_admin_account() { $pager = theme('pager', NULL, 50, 0, tablesort_pager()); if (!empty($pager)) { - $rows[] = array(array('data' => $pager, 'colspan' => 6)); + $rows[] = array(array('data' => $pager, 'colspan' => '6')); } return theme('table', $header, $rows); } |