Commit fa25c7a0 authored by Dries's avatar Dries

- Code improvements by Stefan: use capital letters for header titles (and added some missing t() functions).
parent feb61eea
......@@ -41,7 +41,7 @@ function _locale_admin_manage_screen() {
$edit = &$_POST['edit'];
$languages = locale_supported_languages(TRUE, TRUE);
$header = array(array('data' => t('code')), array('data' => t('English name')), array('data' => t('enabled')), array('data' => t('default')), array('data' => t('translated')), array('data' => t('operations')));
$header = array(array('data' => t('Code')), array('data' => t('English name')), array('data' => t('Enabled')), array('data' => t('default')), array('data' => t('translated')), array('data' => t('Operations')));
foreach ($languages['name'] as $key => $lang) {
......@@ -1001,7 +1001,7 @@ function _locale_string_seek() {
$result = pager_query($sql, 50);
$header = array(t('string'), t('locales'), array('data' => t('operations'), 'colspan' => '2'));
$header = array(t('String'), t('Locales'), array('data' => t('Operations'), 'colspan' => '2'));
$arr = array();
while ($locale = db_fetch_object($result)) {
$arr[$locale->lid]['locales'][$locale->locale] = $locale->translation;
......
......@@ -696,7 +696,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"));
......@@ -707,7 +707,7 @@ function aggregator_view() {
$output .= '<h3>'. t('Category overview') .'</h3>';
$header = array(t('title'), t('items'), t('operations'));
$header = array(t('Title'), t('Items'), t('Operations'));
$rows = array();
while ($category = db_fetch_object($result)) {
$rows[] = array(l($category->title, "aggregator/categories/$category->cid"), format_plural($category->items, '1 item', '%count items'), l(t('edit'), "admin/aggregator/edit/category/$category->cid"));
......@@ -928,7 +928,7 @@ function _aggregator_page_list($sql, $op, $header = '') {
}
}
if ($categorize) {
$output .= form(theme('table', array('', t('categorize')), $rows) . form_submit(t('Save categories')));
$output .= form(theme('table', array('', t('Categorize')), $rows) . form_submit(t('Save categories')));
}
$output .= '</div>';
......
......@@ -696,7 +696,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"));
......@@ -707,7 +707,7 @@ function aggregator_view() {
$output .= '<h3>'. t('Category overview') .'</h3>';
$header = array(t('title'), t('items'), t('operations'));
$header = array(t('Title'), t('Items'), t('Operations'));
$rows = array();
while ($category = db_fetch_object($result)) {
$rows[] = array(l($category->title, "aggregator/categories/$category->cid"), format_plural($category->items, '1 item', '%count items'), l(t('edit'), "admin/aggregator/edit/category/$category->cid"));
......@@ -928,7 +928,7 @@ function _aggregator_page_list($sql, $op, $header = '') {
}
}
if ($categorize) {
$output .= form(theme('table', array('', t('categorize')), $rows) . form_submit(t('Save categories')));
$output .= form(theme('table', array('', t('Categorize')), $rows) . form_submit(t('Save categories')));
}
$output .= '</div>';
......
......@@ -167,7 +167,7 @@ function block_admin_display() {
$formats[$box->bid] = $box->format;
}
$header = array(t('block'), t('enabled'), t('custom'), t('throttle'), t('weight'), t('region'), t('path'), array('data' => t('operations'), 'colspan' => 2));
$header = array(t('Block'), t('Enabled'), t('Custom'), t('Throttle'), t('Weight'), t('Region'), t('Path'), array('data' => t('Operations'), 'colspan' => 2));
foreach ($blocks as $block) {
if ($block['module'] == 'block') {
......
......@@ -167,7 +167,7 @@ function block_admin_display() {
$formats[$box->bid] = $box->format;
}
$header = array(t('block'), t('enabled'), t('custom'), t('throttle'), t('weight'), t('region'), t('path'), array('data' => t('operations'), 'colspan' => 2));
$header = array(t('Block'), t('Enabled'), t('Custom'), t('Throttle'), t('Weight'), t('Region'), t('Path'), array('data' => t('Operations'), 'colspan' => 2));
foreach ($blocks as $block) {
if ($block['module'] == 'block') {
......
......@@ -685,7 +685,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));
......@@ -733,7 +733,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);
......
......@@ -685,7 +685,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));
......@@ -733,7 +733,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);
......
......@@ -264,7 +264,7 @@ function comment_node_link($node) {
if (user_access('administer comments')) {
$result = db_query('SELECT c.cid, c.subject, c.name, c.homepage, u.uid, u.name AS registered_name, c.name FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE nid = %d AND c.status = 0 ORDER BY c.timestamp', $node->nid);
$header = array(t('title'), t('author'), array('data' => t('operations'), 'colspan' => 3));
$header = array(t('Title'), t('Author'), array('data' => t('Operations'), 'colspan' => 3));
while ($comment = db_fetch_object($result)) {
$comment->name = $comment->registered_name ? $comment->registered_name : $comment->name;
......@@ -1016,11 +1016,11 @@ function comment_save($id, $edit) {
function comment_admin_overview($type = 'new') {
$header = array(
array('data' => t('subject'), 'field' => 'subject'),
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('Subject'), 'field' => 'subject'),
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)
);
$status = ($type == 'approval') ? 1 : 0;
......@@ -1063,7 +1063,7 @@ function comment_matrix_settings() {
drupal_set_message(t('The vote values have been saved.'));
}
$output .= '<h3>Moderation vote/value matrix</h3>';
$output .= '<h3>'. t('Moderation vote/value matrix') .'</h3>';
$result = db_query("SELECT r.rid, r.name FROM {role} r, {permission} p WHERE r.rid = p.rid AND p.perm LIKE '%moderate comments%'");
$role_names = array();
......@@ -1076,7 +1076,7 @@ function comment_matrix_settings() {
$mod_roles[$role->rid][$role->mid] = $role->value;
}
$header = array_merge(array(t('votes')), array_values($role_names));
$header = array_merge(array(t('Votes')), array_values($role_names));
$result = db_query('SELECT mid, vote FROM {moderation_votes} ORDER BY weight');
while ($vote = db_fetch_object($result)) {
......@@ -1114,7 +1114,7 @@ function comment_role_settings() {
$result = db_query("SELECT r.rid, r.name FROM {role} r, {permission} p WHERE r.rid = p.rid AND p.perm LIKE '%post comments%'");
$header = array(t('user role'), t('initial score'));
$header = array(t('User role'), t('Initial score'));
while ($role = db_fetch_object($result)) {
$rows[] = array($role->name, array('data' => form_textfield(NULL, $role->rid, $start_values[$role->rid], 4, 3), 'align' => 'center'));
......@@ -1153,7 +1153,7 @@ function comment_vote_settings($mid = 0) {
$output .= '<h3>'. t('Moderation votes overview') .'</h3>';
// load up and show any vote types previously defined.
$header = array(t('votes'), t('weight'), t('operations'));
$header = array(t('Votes'), t('Weight'), t('Operations'));
$result = db_query('SELECT mid, vote, weight FROM {moderation_votes} ORDER BY weight');
while ($vote = db_fetch_object($result)) {
$rows[] = array($vote->vote, array('data' => $vote->weight), array('data' => l(t('edit'), "admin/comment/configure/votes/$vote->mid")));
......@@ -1207,7 +1207,7 @@ function comment_threshold_settings($fid = 0) {
$output .= '<h3>Comment threshold overview</h3>';
// load up and show any thresholds previously defined.
$header = array(t('name'), t('minimum score'), t('operations'));
$header = array(t('Name'), t('Minimum score'), t('Operations'));
$result = db_query('SELECT fid, filter, minimum FROM {moderation_filters} ORDER BY minimum');
while ($filter = db_fetch_object($result)) {
$rows[] = array($filter->filter, array('data' => $filter->minimum), array('data' => l(t('edit'), "admin/comment/configure/thresholds/$filter->fid")));
......
......@@ -264,7 +264,7 @@ function comment_node_link($node) {
if (user_access('administer comments')) {
$result = db_query('SELECT c.cid, c.subject, c.name, c.homepage, u.uid, u.name AS registered_name, c.name FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE nid = %d AND c.status = 0 ORDER BY c.timestamp', $node->nid);
$header = array(t('title'), t('author'), array('data' => t('operations'), 'colspan' => 3));
$header = array(t('Title'), t('Author'), array('data' => t('Operations'), 'colspan' => 3));
while ($comment = db_fetch_object($result)) {
$comment->name = $comment->registered_name ? $comment->registered_name : $comment->name;
......@@ -1016,11 +1016,11 @@ function comment_save($id, $edit) {
function comment_admin_overview($type = 'new') {
$header = array(
array('data' => t('subject'), 'field' => 'subject'),
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('Subject'), 'field' => 'subject'),
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)
);
$status = ($type == 'approval') ? 1 : 0;
......@@ -1063,7 +1063,7 @@ function comment_matrix_settings() {
drupal_set_message(t('The vote values have been saved.'));
}
$output .= '<h3>Moderation vote/value matrix</h3>';
$output .= '<h3>'. t('Moderation vote/value matrix') .'</h3>';
$result = db_query("SELECT r.rid, r.name FROM {role} r, {permission} p WHERE r.rid = p.rid AND p.perm LIKE '%moderate comments%'");
$role_names = array();
......@@ -1076,7 +1076,7 @@ function comment_matrix_settings() {
$mod_roles[$role->rid][$role->mid] = $role->value;
}
$header = array_merge(array(t('votes')), array_values($role_names));
$header = array_merge(array(t('Votes')), array_values($role_names));
$result = db_query('SELECT mid, vote FROM {moderation_votes} ORDER BY weight');
while ($vote = db_fetch_object($result)) {
......@@ -1114,7 +1114,7 @@ function comment_role_settings() {
$result = db_query("SELECT r.rid, r.name FROM {role} r, {permission} p WHERE r.rid = p.rid AND p.perm LIKE '%post comments%'");
$header = array(t('user role'), t('initial score'));
$header = array(t('User role'), t('Initial score'));
while ($role = db_fetch_object($result)) {
$rows[] = array($role->name, array('data' => form_textfield(NULL, $role->rid, $start_values[$role->rid], 4, 3), 'align' => 'center'));
......@@ -1153,7 +1153,7 @@ function comment_vote_settings($mid = 0) {
$output .= '<h3>'. t('Moderation votes overview') .'</h3>';
// load up and show any vote types previously defined.
$header = array(t('votes'), t('weight'), t('operations'));
$header = array(t('Votes'), t('Weight'), t('Operations'));
$result = db_query('SELECT mid, vote, weight FROM {moderation_votes} ORDER BY weight');
while ($vote = db_fetch_object($result)) {
$rows[] = array($vote->vote, array('data' => $vote->weight), array('data' => l(t('edit'), "admin/comment/configure/votes/$vote->mid")));
......@@ -1207,7 +1207,7 @@ function comment_threshold_settings($fid = 0) {
$output .= '<h3>Comment threshold overview</h3>';
// load up and show any thresholds previously defined.
$header = array(t('name'), t('minimum score'), t('operations'));
$header = array(t('Name'), t('Minimum score'), t('Operations'));
$result = db_query('SELECT fid, filter, minimum FROM {moderation_filters} ORDER BY minimum');
while ($filter = db_fetch_object($result)) {
$rows[] = array($filter->filter, array('data' => $filter->minimum), array('data' => l(t('edit'), "admin/comment/configure/thresholds/$filter->fid")));
......
......@@ -174,11 +174,11 @@ function filter_admin_overview() {
$roles = user_roles();
$error = false;
$header = array(t('name'), t('default'));
$header = array(t('Name'), t('Default'));
foreach ($roles as $name) {
$header[] = $name;
}
$header[] = array('data' => t('operations'), 'colspan' => 2);
$header[] = array('data' => t('Operations'), 'colspan' => 2);
$rows = array();
foreach ($formats as $id => $format) {
......@@ -332,7 +332,7 @@ function filter_admin_filters() {
$enabled = filter_list_format($format);
// Table with filters
$header = array('enabled', 'name', 'description');
$header = array(t('Enabled'), t('Name'), t('Description'));
$rows = array();
foreach ($all as $id => $filter) {
$row = array();
......@@ -405,7 +405,7 @@ function filter_admin_order() {
// Get list (with forced refresh)
$filters = filter_list_format($format);
$header = array(t('name'), t('weight'));
$header = array(t('Name'), t('Weight'));
$rows = array();
foreach ($filters as $id => $filter) {
......
......@@ -174,11 +174,11 @@ function filter_admin_overview() {
$roles = user_roles();
$error = false;
$header = array(t('name'), t('default'));
$header = array(t('Name'), t('Default'));
foreach ($roles as $name) {
$header[] = $name;
}
$header[] = array('data' => t('operations'), 'colspan' => 2);
$header[] = array('data' => t('Operations'), 'colspan' => 2);
$rows = array();
foreach ($formats as $id => $format) {
......@@ -332,7 +332,7 @@ function filter_admin_filters() {
$enabled = filter_list_format($format);
// Table with filters
$header = array('enabled', 'name', 'description');
$header = array(t('Enabled'), t('Name'), t('Description'));
$rows = array();
foreach ($all as $id => $filter) {
$row = array();
......@@ -405,7 +405,7 @@ function filter_admin_order() {
// Get list (with forced refresh)
$filters = filter_list_format($format);
$header = array(t('name'), t('weight'));
$header = array(t('Name'), t('Weight'));
$rows = array();
foreach ($filters as $id => $filter) {
......
......@@ -338,7 +338,7 @@ function menu_edit_item_save($edit) {
*/
function menu_overview_tree() {
$menu = menu_get_menu();
$header = array(t('menu item'), array('data' => t('operations'), 'colspan' => 3));
$header = array(t('Menu item'), array('data' => t('Operations'), 'colspan' => 3));
$output = '';
foreach ($menu['items'][0]['children'] as $mid) {
......
......@@ -338,7 +338,7 @@ function menu_edit_item_save($edit) {
*/
function menu_overview_tree() {
$menu = menu_get_menu();
$header = array(t('menu item'), array('data' => t('operations'), 'colspan' => 3));
$header = array(t('Menu item'), array('data' => t('Operations'), 'colspan' => 3));
$output = '';
foreach ($menu['items'][0]['children'] as $mid) {
......
......@@ -769,7 +769,7 @@ 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));
......@@ -835,7 +835,7 @@ function node_revision_overview($nid) {
drupal_set_title($node->title);
if ($node->revisions) {
$header = array(t('older revisions'), array('colspan' => '3', 'data' => t('operations')));
$header = array(t('Older revisions'), array('colspan' => '3', 'data' => t('Operations')));
foreach ($node->revisions as $key => $revision) {
$rows[] = array(t('revision #%r revised by %u on %d', array('%r' => $key, '%u' => format_name(user_load(array('uid' => $revision['uid']))), '%d' => format_date($revision['timestamp'], 'small'))) . ($revision['history'] ? '<br /><small>'. $revision['history'] .'</small>' : ''), l(t('view'), "node/$node->nid", array(), "revision=$key"), l(t('rollback'), "node/$node->nid/rollback-revision/$key"), l(t('delete'), "node/$node->nid/delete-revision/$key"));
......
......@@ -769,7 +769,7 @@ 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));
......@@ -835,7 +835,7 @@ function node_revision_overview($nid) {
drupal_set_title($node->title);
if ($node->revisions) {
$header = array(t('older revisions'), array('colspan' => '3', 'data' => t('operations')));
$header = array(t('Older revisions'), array('colspan' => '3', 'data' => t('Operations')));
foreach ($node->revisions as $key => $revision) {
$rows[] = array(t('revision #%r revised by %u on %d', array('%r' => $key, '%u' => format_name(user_load(array('uid' => $revision['uid']))), '%d' => format_date($revision['timestamp'], 'small'))) . ($revision['history'] ? '<br /><small>'. $revision['history'] .'</small>' : ''), l(t('view'), "node/$node->nid", array(), "revision=$key"), l(t('rollback'), "node/$node->nid/rollback-revision/$key"), l(t('delete'), "node/$node->nid/delete-revision/$key"));
......
......@@ -252,9 +252,9 @@ function path_perm() {
function path_overview() {
$sql = 'SELECT * FROM {url_alias}';
$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('Alias'), 'field' => 'dst', 'sort' => 'asc'),
array('data' => t('System'), 'field' => 'src'),
array('data' => t('Operations'), 'colspan' => 2)
);
$sql .= tablesort_sql($header);
$result = pager_query($sql, 50);
......
......@@ -252,9 +252,9 @@ function path_perm() {
function path_overview() {
$sql = 'SELECT * FROM {url_alias}';
$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('Alias'), 'field' => 'dst', 'sort' => 'asc'),
array('data' => t('System'), 'field' => 'src'),
array('data' => t('Operations'), 'colspan' => 2)
);
$sql .= tablesort_sql($header);
$result = pager_query($sql, 50);
......
......@@ -498,7 +498,7 @@ function profile_admin_overview() {
$rows[] = array(array('data' => t('No fields defined.'), 'colspan' => '6'));
}
$header = array(t('title'), t('name'), t('type'), t('category'), array('data' => t('operations'), 'colspan' => '2'));
$header = array(t('Title'), t('Name'), t('Type'), t('Category'), array('data' => t('Operations'), 'colspan' => '2'));
$output = theme('table', $header, $rows);
$output .= '<h2>'. t('Add new field') .'</h2>';
......
......@@ -498,7 +498,7 @@ function profile_admin_overview() {
$rows[] = array(array('data' => t('No fields defined.'), 'colspan' => '6'));
}
$header = array(t('title'), t('name'), t('type'), t('category'), array('data' => t('operations'), 'colspan' => '2'));
$header = array(t('Title'), t('Name'), t('Type'), t('Category'), array('data' => t('Operations'), 'colspan' => '2'));
$output = theme('table', $header, $rows);
$output .= '<h2>'. t('Add new field') .'</h2>';
......
......@@ -113,7 +113,7 @@ function queue_vote($node, $vote) {
function queue_overview() {
global $user;
$header = array(array('data' => t('subject')), array('data' => t('author')), array('data' => t('type')), array('data' => t('score')));
$header = array(array('data' => t('Subject')), array('data' => t('Author')), array('data' => t('Type')), array('data' => t('Score')));
$sresult = pager_query('SELECT n.*, u.name, u.uid FROM {node} n INNER JOIN {users} u ON n.uid = u.uid WHERE n.moderate = 1', 10, 0);
......
......@@ -226,12 +226,12 @@ function statistics_admin_displaylog($type = 'all', $id = 0) {
}
$header = array(
array('data' => t('timestamp'), 'field' => 'timestamp', 'sort' => 'desc'),
array('data' => t('post'), 'field' => 'title'),
array('data' => t('user'), 'field' => 'uid'),
array('data' => t('hostname'), 'field' => 'hostname'),
array('data' => t('referrer'), 'field' => 'url'),
array('data' => t('operations'), 'colspan' => '3')
array('data' => t('Timestamp'), 'field' => 'timestamp', 'sort' => 'desc'),
array('data' => t('Post'), 'field' => 'title'),
array('data' => t('User'), 'field' => 'uid'),
array('data' => t('Hostname'), 'field' => 'hostname'),
array('data' => t('Referrer'), 'field' => 'url'),
array('data' => t('Operations'), 'colspan' => '3')
);
$sql .= tablesort_sql($header);
......@@ -274,11 +274,11 @@ function statistics_top_titles() {
$page_title = strtr($describe, array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200))));
$header = array(
array('data' => t('post'), 'field' => 'title'),
array('data' => t('last path'), 'field' => 'path'),
array('data' => t('hits'), 'field' => 'hits', 'sort' => 'desc'),
array('data' => t('last hit'), 'field' => 'last_hit'),
array('data' => t('operations'))
array('data' => t('Post'), 'field' => 'title'),
array('data' => t('Last path'), 'field' => 'path'),
array('data' => t('Hits'), 'field' => 'hits', 'sort' => 'desc'),
array('data' => t('Last hit'), 'field' => 'last_hit'),
array('data' => t('Operations'))
);
$sql .= tablesort_sql($header);
$result = pager_query($sql, 50, 0, $sql_cnt);
......@@ -305,11 +305,11 @@ function statistics_top_users() {
$page_title = strtr($describe, array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200))));
$header = array(
array('data' => t('user'), 'field' => 'user'),
array('data' => t('last 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('User'), 'field' => 'user'),
array('data' => t('Last 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)
);
$sql .= tablesort_sql($header);
$result = pager_query($sql, 50, 0, $sql_cnt);
......@@ -337,11 +337,11 @@ function statistics_top_hostnames() {
$page_title = strtr($describe, array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200))));
$header = array(
array('data' => t('hostname'), 'field' => 'hostname'),
array('data' => t('last 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('Hostname'), 'field' => 'hostname'),
array('data' => t('Last 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)
);
$sql .= tablesort_sql($header);
$result = pager_query($sql, 50, 0, $sql_cnt);
......@@ -387,9 +387,9 @@ function statistics_top_referrers($view = 'all') {
$title = strtr($describe, array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200))));
$header = array(
array('data' => t('URL'), 'field' => 'url'),
array('data' => t('hits'), 'field' => 'hits', 'sort' => 'desc'),
array('data' => t('last hit'), 'field' => 'last_hit')
array('data' => t('Url'), 'field' => 'url'),
array('data' => t('Hits'), 'field' => 'hits', 'sort' => 'desc'),
array('data' => t('Last hit'), 'field' => 'last_hit')
);
$query .= tablesort_sql($header);
......@@ -412,11 +412,11 @@ function statistics_top_referrers($view = 'all') {
*/
function statistics_admin_content() {
$header = array(
array('data' => t('post'), 'field' => 'n.title'),
array('data' => t('today'), 'field' => 's.daycount', 'sort' => 'desc'),
array('data' => t('all time'), 'field' => 's.totalcount'),
array('data' => t('last hit'), 'field' => 's.timestamp'),
array('data' => t('operations'))
array('data' => t('Post'), 'field' => 'n.title'),
array('data' => t('Today'), 'field' => 's.daycount', 'sort' => 'desc'),
array('data' => t('All time'), 'field' => 's.totalcount'),
array('data' => t('Last hit'), 'field' => 's.timestamp'),
array('data' => t('Operations'))
);
$sql = 'SELECT s.nid, s.daycount, s.totalcount, s.timestamp, n.title FROM {node_counter} s INNER JOIN {node} n ON s.nid = n.nid';
$sql .= tablesort_sql($header);
......
......@@ -226,12 +226,12 @@ function statistics_admin_displaylog($type = 'all', $id = 0) {
}
$header = array(
array('data' => t('timestamp'), 'field' => 'timestamp', 'sort' => 'desc'),
array('data' => t('post'), 'field' => 'title'),
array('data' => t('user'), 'field' => 'uid'),
array('data' => t('hostname'), 'field' => 'hostname'),
array('data' => t('referrer'), 'field' => 'url'),
array('data' => t('operations'), 'colspan' => '3')
array('data' => t('Timestamp'), 'field' => 'timestamp', 'sort' => 'desc'),
array('data' => t('Post'), 'field' => 'title'),
array('data' => t('User'), 'field' => 'uid'),
array('data' => t('Hostname'), 'field' => 'hostname'),
array('data' => t('Referrer'), 'field' => 'url'),
array('data' => t('Operations'), 'colspan' => '3')
);
$sql .= tablesort_sql($header);
......@@ -274,11 +274,11 @@ function statistics_top_titles() {
$page_title = strtr($describe, array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200))));