- Patch #12783 by Stefan: various small consistency/usability improvements.

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"));

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"));

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);

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);

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);

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);

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));

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));

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,

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,

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);

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);

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) {

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) {

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>';

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>';

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);

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);

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">';

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);