Commit 7c31bcde authored by Gábor Hojtsy's avatar Gábor Hojtsy

#165140 by dww: rename logs to reports (usability improvement)

parent 6dcfce01
......@@ -24,7 +24,7 @@ function db_status_report($phase) {
$form['mysql'] = array(
'title' => $t('MySQL database'),
'value' => ($phase == 'runtime') ? l($version, 'admin/logs/status/sql') : $version,
'value' => ($phase == 'runtime') ? l($version, 'admin/reports/status/sql') : $version,
);
if (version_compare($version, DRUPAL_MINIMUM_MYSQL) < 0) {
......
......@@ -28,7 +28,7 @@ function db_status_report($phase) {
$form['mysql'] = array(
'title' => $t('MySQL database'),
'value' => ($phase == 'runtime') ? l($version, 'admin/logs/status/sql') : $version,
'value' => ($phase == 'runtime') ? l($version, 'admin/reports/status/sql') : $version,
);
if (version_compare($version, DRUPAL_MINIMUM_MYSQL) < 0) {
......
......@@ -68,7 +68,7 @@ function dblog_overview() {
$icons[$dblog->severity],
t($dblog->type),
format_date($dblog->timestamp, 'small'),
l(truncate_utf8(_dblog_format_message($dblog), 56, TRUE, TRUE), 'admin/logs/event/'. $dblog->wid, array('html' => TRUE)),
l(truncate_utf8(_dblog_format_message($dblog), 56, TRUE, TRUE), 'admin/reports/event/'. $dblog->wid, array('html' => TRUE)),
theme('username', $dblog),
$dblog->link,
),
......@@ -316,5 +316,5 @@ function dblog_filter_form_submit($form, &$form_state) {
$_SESSION['dblog_overview_filter'] = array();
break;
}
return 'admin/logs/dblog';
return 'admin/reports/dblog';
}
......@@ -22,7 +22,7 @@ function dblog_help($path, $arg) {
$output .= '<p>'. t('The dblog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information. Administrators should check the dblog report on a regular basis to ensure their site is working properly.') .'</p>';
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@dblog">Dblog page</a>.', array('@dblog' => 'http://drupal.org/handbook/modules/dblog/')) .'</p>';
return $output;
case 'admin/logs/dblog':
case 'admin/reports/dblog':
return '<p>'. t('The dblog module monitors your website, capturing system events in a log to be reviewed by an authorized individual at a later time. The dblog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information. It is vital to check the dblog report on a regular basis as it is often the only way to tell what is going on.') .'</p>';
}
}
......@@ -50,28 +50,28 @@ function dblog_menu() {
'file' => 'dblog.admin.inc',
);
$items['admin/logs/dblog'] = array(
$items['admin/reports/dblog'] = array(
'title' => 'Recent log entries',
'description' => 'View events that have recently been logged.',
'page callback' => 'dblog_overview',
'weight' => -1,
'file' => 'dblog.admin.inc',
);
$items['admin/logs/page-not-found'] = array(
$items['admin/reports/page-not-found'] = array(
'title' => "Top 'page not found' errors",
'description' => "View 'page not found' errors (404s).",
'page callback' => 'dblog_top',
'page arguments' => array('page not found'),
'file' => 'dblog.admin.inc',
);
$items['admin/logs/access-denied'] = array(
$items['admin/reports/access-denied'] = array(
'title' => "Top 'access denied' errors",
'description' => "View 'access denied' errors (403s).",
'page callback' => 'dblog_top',
'page arguments' => array('access denied'),
'file' => 'dblog.admin.inc',
);
$items['admin/logs/event/%'] = array(
$items['admin/reports/event/%'] = array(
'title' => 'Details',
'page callback' => 'dblog_event',
'page arguments' => array(3),
......
......@@ -185,7 +185,7 @@ function search_menu() {
'type' => MENU_CALLBACK,
'file' => 'search.admin.inc',
);
$items['admin/logs/search'] = array(
$items['admin/reports/search'] = array(
'title' => 'Top search phrases',
'description' => 'View most popular search phrases.',
'page callback' => 'dblog_top',
......
......@@ -26,7 +26,7 @@ function statistics_recent_hits() {
array('data' => format_date($log->timestamp, 'small'), 'class' => 'nowrap'),
_statistics_format_item($log->title, $log->path),
theme('username', $log),
l(t('details'), "admin/logs/access/$log->aid"));
l(t('details'), "admin/reports/access/$log->aid"));
}
if (empty($rows)) {
......
......@@ -33,13 +33,13 @@ function statistics_help($path, $arg) {
');
$output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@statistics">Statistics page</a>.', array('@statistics' => 'http://drupal.org/handbook/modules/statistics/')) .'</p>';
return $output;
case 'admin/logs/settings':
return '<p>'. t('Settings for the statistical information that Drupal will keep about the site. See <a href="@statistics">site statistics</a> for the actual information.', array('@statistics' => url('admin/logs/hits'))) .'</p>';
case 'admin/logs/hits':
case 'admin/reports/settings':
return '<p>'. t('Settings for the statistical information that Drupal will keep about the site. See <a href="@statistics">site statistics</a> for the actual information.', array('@statistics' => url('admin/reports/hits'))) .'</p>';
case 'admin/reports/hits':
return '<p>'. t('This page shows you the most recent hits.') .'</p>';
case 'admin/logs/referrers':
case 'admin/reports/referrers':
return '<p>'. t('This page shows you all external referrers. These are links pointing to your website from outside your website.') .'</p>';
case 'admin/logs/visitors':
case 'admin/reports/visitors':
return '<p>'. t("When you ban a visitor, you prevent the visitor's IP address from accessing your site. Unlike blocking a user, banning a visitor works even for anonymous users. The most common use for this is to block bots/web crawlers that are consuming too many resources.") .'</p>';
}
}
......@@ -100,14 +100,14 @@ function statistics_link($type, $node = NULL, $teaser = FALSE) {
* Implementation of hook_menu().
*/
function statistics_menu() {
$items['admin/logs/hits'] = array(
$items['admin/reports/hits'] = array(
'title' => 'Recent hits',
'description' => 'View pages that have recently been visited.',
'page callback' => 'statistics_recent_hits',
'access arguments' => array('access statistics'),
'file' => 'statistics.admin.inc',
);
$items['admin/logs/pages'] = array(
$items['admin/reports/pages'] = array(
'title' => 'Top pages',
'description' => 'View pages that have been hit frequently.',
'page callback' => 'statistics_top_pages',
......@@ -115,7 +115,7 @@ function statistics_menu() {
'weight' => 1,
'file' => 'statistics.admin.inc',
);
$items['admin/logs/visitors'] = array(
$items['admin/reports/visitors'] = array(
'title' => 'Top visitors',
'description' => 'View visitors that hit many pages.',
'page callback' => 'statistics_top_visitors',
......@@ -123,14 +123,14 @@ function statistics_menu() {
'weight' => 2,
'file' => 'statistics.admin.inc',
);
$items['admin/logs/referrers'] = array(
$items['admin/reports/referrers'] = array(
'title' => 'Top referrers',
'description' => 'View top referrers.',
'page callback' => 'statistics_top_referrers',
'access arguments' => array('access statistics'),
'file' => 'statistics.admin.inc',
);
$items['admin/logs/access/%'] = array(
$items['admin/reports/access/%'] = array(
'title' => 'Details',
'description' => 'View access log.',
'page callback' => 'statistics_access_log',
......@@ -139,7 +139,7 @@ function statistics_menu() {
'type' => MENU_CALLBACK,
'file' => 'statistics.admin.inc',
);
$items['admin/logs/settings'] = array(
$items['admin/reports/settings'] = array(
'title' => 'Access log settings',
'description' => 'Control details about what and how your site logs.',
'page callback' => 'drupal_get_form',
......
......@@ -22,7 +22,7 @@ function statistics_node_tracker() {
array('data' => format_date($log->timestamp, 'small'), 'class' => 'nowrap'),
_statistics_link($log->url),
theme('username', $log),
l(t('details'), "admin/logs/access/$log->aid"));
l(t('details'), "admin/reports/access/$log->aid"));
}
if (empty($rows)) {
......@@ -53,7 +53,7 @@ function statistics_user_tracker() {
$rows[] = array(
array('data' => format_date($log->timestamp, 'small'), 'class' => 'nowrap'),
_statistics_format_item($log->title, $log->path),
l(t('details'), "admin/logs/access/$log->aid"));
l(t('details'), "admin/reports/access/$log->aid"));
}
if (empty($rows)) {
......
......@@ -19,7 +19,7 @@ function system_main_admin_page($arg = NULL) {
// Check for status report errors.
if (system_status(TRUE)) {
drupal_set_message(t('One or more problems were detected with your Drupal installation. Check the <a href="@status">status report</a> for more information.', array('@status' => url('admin/logs/status'))), 'error');
drupal_set_message(t('One or more problems were detected with your Drupal installation. Check the <a href="@status">status report</a> for more information.', array('@status' => url('admin/reports/status'))), 'error');
}
$blocks = array();
if ($admin = db_fetch_array(db_query("SELECT menu_name, mlid FROM {menu_links} WHERE link_path = 'admin' AND module = 'system'"))) {
......@@ -1601,7 +1601,7 @@ function system_run_cron() {
drupal_set_message(t('Cron run failed'));
}
drupal_goto('admin/logs/status');
drupal_goto('admin/reports/status');
}
/**
......
......@@ -51,7 +51,7 @@ function system_requirements($phase) {
// Test PHP version
$requirements['php'] = array(
'title' => $t('PHP'),
'value' => ($phase == 'runtime') ? l(phpversion(), 'admin/logs/status/php') : phpversion(),
'value' => ($phase == 'runtime') ? l(phpversion(), 'admin/reports/status/php') : phpversion(),
);
if (version_compare(phpversion(), DRUPAL_MINIMUM_PHP) < 0) {
$requirements['php']['description'] = $t('Your PHP installation is too old. Drupal requires at least PHP %version.', array('%version' => DRUPAL_MINIMUM_PHP));
......@@ -105,7 +105,7 @@ function system_requirements($phase) {
}
$requirements['cron'] += array('description' => '');
$requirements['cron']['description'] .= ' '. $t('You can <a href="@cron">run cron manually</a>.', array('@cron' => url('admin/logs/status/run-cron')));
$requirements['cron']['description'] .= ' '. $t('You can <a href="@cron">run cron manually</a>.', array('@cron' => url('admin/reports/status/run-cron')));
$requirements['cron']['title'] = $t('Cron maintenance tasks');
}
......
......@@ -66,7 +66,7 @@ function system_help($path, $arg) {
return $output;
case 'admin/settings/actions/configure':
return t('An advanced action offers additional configuration options which may be filled out below. Changing the <em>Description</em> field is recommended, in order to better identify the precise action taking place. This description will be displayed in modules such as the trigger module when assigning actions to system events, so it is best if it is as descriptive as possible (for example, "Send e-mail to Moderation Team" rather than simply "Send e-mail").');
case 'admin/logs/status':
case 'admin/reports/status':
return '<p>'. t("Here you can find a short overview of your Drupal site's parameters as well as any problems detected with your installation. It is useful to copy/paste this information when you need support.") .'</p>';
}
}
......@@ -402,16 +402,16 @@ function system_menu() {
'file' => 'system.admin.inc',
);
// Logs:
$items['admin/logs'] = array(
'title' => 'Logs',
'description' => 'View system logs and other status information.',
// Reports:
$items['admin/reports'] = array(
'title' => 'Reports',
'description' => 'View reports from system logs and other status information.',
'page callback' => 'system_admin_menu_block_page',
'weight' => 5,
'position' => 'left',
'file' => 'system.admin.inc',
);
$items['admin/logs/status'] = array(
$items['admin/reports/status'] = array(
'title' => 'Status report',
'description' => "Get a status report about your site's operation and any detected problems.",
'page callback' => 'system_status',
......@@ -419,19 +419,19 @@ function system_menu() {
'access arguments' => array('administer site configuration'),
'file' => 'system.admin.inc',
);
$items['admin/logs/status/run-cron'] = array(
$items['admin/reports/status/run-cron'] = array(
'title' => 'Run cron',
'page callback' => 'system_run_cron',
'type' => MENU_CALLBACK,
'file' => 'system.admin.inc',
);
$items['admin/logs/status/php'] = array(
$items['admin/reports/status/php'] = array(
'title' => 'PHP',
'page callback' => 'system_php',
'type' => MENU_CALLBACK,
'file' => 'system.admin.inc',
);
$items['admin/logs/status/sql'] = array(
$items['admin/reports/status/sql'] = array(
'title' => 'SQL',
'page callback' => 'system_sql',
'type' => MENU_CALLBACK,
......
......@@ -16,7 +16,7 @@ function update_manual_status() {
else {
drupal_set_message(t('Unable to fetch any information about available new releases and updates.'), 'error');
}
drupal_goto('admin/logs/updates');
drupal_goto('admin/reports/updates');
}
/**
......@@ -45,10 +45,10 @@ function _update_refresh() {
$frequency = variable_get('update_check_frequency', 1);
cache_set('update_info', $available, 'cache_update', time() + (60 * 60 * 24 * $frequency));
variable_set('update_last_check', time());
watchdog('update', 'Fetched information about all available new releases and updates.', array(), WATCHDOG_NOTICE, l('view', 'admin/logs/updates'));
watchdog('update', 'Fetched information about all available new releases and updates.', array(), WATCHDOG_NOTICE, l('view', 'admin/reports/updates'));
}
else {
watchdog('update', 'Unable to fetch any information about available new releases and updates.', array(), WATCHDOG_ERROR, l('view', 'admin/logs/updates'));
watchdog('update', 'Unable to fetch any information about available new releases and updates.', array(), WATCHDOG_ERROR, l('view', 'admin/reports/updates'));
}
return $available;
}
......
......@@ -6,7 +6,7 @@
* The "Update status" module checks for available updates of Drupal core and
* any installed contributed modules and themes. It warns site administrators
* if newer releases are available via the system status report
* (admin/logs/status), the module and theme pages, and optionally via email.
* (admin/reports/status), the module and theme pages, and optionally via email.
*/
/**
......@@ -46,7 +46,7 @@
*/
function update_help($path, $arg) {
switch ($path) {
case 'admin/logs/updates':
case 'admin/reports/updates':
return '<p>'. t('Here you can find information about available updates for your installed modules and themes. Note that each module or theme is part of a "project", which may or may not have the same name, and might include multiple modules or themes within it.') .'</p>';
case 'admin/build/themes':
......@@ -64,10 +64,10 @@ function update_help($path, $arg) {
}
}
}
return '<p>'. t('See the <a href="@available_updates">available updates</a> page for information on installed modules and themes with new versions released.', array('@available_updates' => url('admin/logs/updates'))) .'</p>';
return '<p>'. t('See the <a href="@available_updates">available updates</a> page for information on installed modules and themes with new versions released.', array('@available_updates' => url('admin/reports/updates'))) .'</p>';
case 'admin/logs/updates/settings':
case 'admin/logs/status':
case 'admin/reports/updates/settings':
case 'admin/reports/status':
// These two pages don't need additional nagging.
break;
......@@ -97,7 +97,7 @@ function update_help($path, $arg) {
function update_menu() {
$items = array();
$items['admin/logs/updates'] = array(
$items['admin/reports/updates'] = array(
'title' => 'Available updates',
'description' => 'Get a status report about available updates for your installed modules and themes.',
'page callback' => 'update_status',
......@@ -105,14 +105,14 @@ function update_menu() {
'file' => 'update.report.inc',
'weight' => 10,
);
$items['admin/logs/updates/list'] = array(
$items['admin/reports/updates/list'] = array(
'title' => 'List',
'page callback' => 'update_status',
'access arguments' => array('administer site configuration'),
'file' => 'update.report.inc',
'type' => MENU_DEFAULT_LOCAL_TASK,
);
$items['admin/logs/updates/settings'] = array(
$items['admin/reports/updates/settings'] = array(
'title' => 'Settings',
'page callback' => 'drupal_get_form',
'page arguments' => array('update_settings'),
......@@ -120,7 +120,7 @@ function update_menu() {
'file' => 'update.settings.inc',
'type' => MENU_LOCAL_TASK,
);
$items['admin/logs/updates/check'] = array(
$items['admin/reports/updates/check'] = array(
'title' => 'Manual update check',
'page callback' => 'update_manual_status',
'access arguments' => array('administer site configuration'),
......@@ -266,8 +266,8 @@ function update_form_alter(&$form, $form_state, $form_id) {
function _update_no_data() {
$destination = drupal_get_destination();
return t('No information is available about potential new releases for currently installed modules and themes. To check for updates, you may need to <a href="@run_cron">run cron</a> or you can <a href="@check_manually">check manually</a>. Please note that checking for available updates can take a long time, so please be patient.', array(
'@run_cron' => url('admin/logs/status/run-cron', array('query' => $destination)),
'@check_manually' => url('admin/logs/updates/check', array('query' => $destination)),
'@run_cron' => url('admin/reports/status/run-cron', array('query' => $destination)),
'@check_manually' => url('admin/reports/updates/check', array('query' => $destination)),
));
}
......@@ -332,7 +332,7 @@ function update_mail($key, &$message, $params) {
foreach ($params as $msg_type => $msg_reason) {
$message['body'][] = _update_message_text($msg_type, $msg_reason, FALSE, $language);
}
$message['body'][] = t('See the available updates page for more information:', array(), $langcode) ."\n". url('admin/logs/updates', array('absolute' => TRUE, 'language' => $language));
$message['body'][] = t('See the available updates page for more information:', array(), $langcode) ."\n". url('admin/reports/updates', array('absolute' => TRUE, 'language' => $language));
}
/**
......@@ -340,7 +340,7 @@ function update_mail($key, &$message, $params) {
* of date or missing a security update.
*
* These error messages are shared by both update_requirements() for the
* site-wide status report at admin/logs/status and in the body of the
* site-wide status report at admin/reports/status and in the body of the
* notification emails generated by update_cron().
*
* @param $msg_type
......@@ -380,7 +380,7 @@ function _update_message_text($msg_type, $msg_reason, $report_link = FALSE, $lan
}
if ($report_link) {
$text .= ' '. t('See the <a href="@available_updates">available updates</a> page for more information.', array('@available_updates' => url('admin/logs/updates', array('language' => $language))), $langcode);
$text .= ' '. t('See the <a href="@available_updates">available updates</a> page for more information.', array('@available_updates' => url('admin/reports/updates', array('language' => $language))), $langcode);
}
return $text;
......
......@@ -26,7 +26,7 @@ function update_status() {
function theme_update_report($data) {
$last = variable_get('update_last_check', 0);
$output = '<div class="update checked">'. t('Last checked: ') . ($last ? format_interval(time() - $last) .' '. t('ago') : t('Never'));
$output .= ' <span class="check-manually">('. l(t('Check manually'), 'admin/logs/updates/check') .')</span>';
$output .= ' <span class="check-manually">('. l(t('Check manually'), 'admin/reports/updates/check') .')</span>';
$output .= "</div>\n";
if (!is_array($data)) {
......
......@@ -40,7 +40,7 @@ function update_settings() {
'all' => t('All newer versions'),
'security' => t('Only security updates'),
),
'#description' => t('If there are updates available of Drupal core or any of your installed modules and themes, your site will print an error message on the <a href="@status_report">status report</a>, the <a href="@modules_page">modules page</a>, and the <a href="@themes_page">themes page</a>. You can choose to only see these error messages if a security update is available, or to be notified about any newer versions.', array('@status_report' => url('admin/logs/status'), '@modules_page' => url('admin/build/modules'), '@themes_page' => url('admin/build/themes')))
'#description' => t('If there are updates available of Drupal core or any of your installed modules and themes, your site will print an error message on the <a href="@status_report">status report</a>, the <a href="@modules_page">modules page</a>, and the <a href="@themes_page">themes page</a>. You can choose to only see these error messages if a security update is available, or to be notified about any newer versions.', array('@status_report' => url('admin/reports/status'), '@modules_page' => url('admin/build/modules'), '@themes_page' => url('admin/build/themes')))
);
$form = system_settings_form($form);
......
......@@ -416,7 +416,7 @@ function update_results_page() {
update_task_list();
// Report end result
if (module_exists('dblog')) {
$log_message = ' All errors have been <a href="'. base_path() .'?q=admin/logs/dblog">logged</a>.';
$log_message = ' All errors have been <a href="'. base_path() .'?q=admin/reports/dblog">logged</a>.';
}
else {
$log_message = ' All errors have been logged.';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment