';
- $output .= theme('system_compact_link');
-
foreach ($container as $id => $data) {
$output .= '
';
$output .= $data;
@@ -1995,52 +1979,6 @@ function theme_admin_page($blocks) {
return $output;
}
-/**
- * Theme output of the dashboard page.
- *
- * @param $menu_items
- * An array of modules to be displayed.
- * @ingroup themeable
- */
-function theme_system_admin_by_module($menu_items) {
- $stripe = 0;
- $output = '';
- $container = array('left' => '', 'right' => '');
- $flip = array('left' => 'right', 'right' => 'left');
- $position = 'left';
-
- // Iterate over all modules
- foreach ($menu_items as $module => $block) {
- list($description, $items) = $block;
-
- // Output links
- if (count($items)) {
- $block = array();
- $block['title'] = $module;
- $block['content'] = theme('item_list', $items);
- $block['description'] = t($description);
-
- if ($block_output = theme('admin_block', $block)) {
- if (!isset($block['position'])) {
- // Perform automatic striping.
- $block['position'] = $position;
- $position = $flip[$position];
- }
- $container[$block['position']] .= $block_output;
- }
- }
- }
-
- $output = '
';
- foreach ($container as $id => $data) {
- $output .= '
';
- $output .= $data;
- $output .= '
';
- }
- $output .= '
';
-
- return $output;
-}
/**
* Theme requirements status report.
Index: modules/system/system.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.css,v
retrieving revision 1.53
diff -u -p -r1.53 system.css
--- modules/system/system.css 5 Dec 2008 12:50:28 -0000 1.53
+++ modules/system/system.css 18 Feb 2009 05:55:32 -0000
@@ -111,6 +111,9 @@ div.ok, tr.ok {
padding: 0;
list-style: disc;
}
+.item-list ul.menu li {
+ list-style: none;
+}
ol.task-list li.active {
font-weight: bold;
}
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.667
diff -u -p -r1.667 system.module
--- modules/system/system.module 11 Feb 2009 05:33:18 -0000 1.667
+++ modules/system/system.module 18 Feb 2009 05:55:32 -0000
@@ -465,19 +465,27 @@ function system_menu() {
'access arguments' => array('access administration pages'),
'type' => MENU_CALLBACK,
);
- $items['admin/by-task'] = array(
- 'title' => 'By task',
+ $items['admin/dashboard'] = array(
+ 'title' => 'Dashboard',
'page callback' => 'system_main_admin_page',
'access arguments' => array('access administration pages'),
'type' => MENU_DEFAULT_LOCAL_TASK,
);
- $items['admin/by-module'] = array(
- 'title' => 'By module',
- 'page callback' => 'system_admin_by_module',
+ $items['admin/add-widget'] = array(
+ 'title' => 'Add widget',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('system_main_admin_add_widget'),
'access arguments' => array('access administration pages'),
'type' => MENU_LOCAL_TASK,
'weight' => 2,
);
+ $items['admin/remove-widget/%'] = array(
+ 'title' => 'Remove widget',
+ 'page callback' => 'system_main_admin_remove_widget',
+ 'page arguments' => array(2),
+ 'access arguments' => array('access administration pages'),
+ 'type' => MENU_CALLBACK,
+ );
$items['admin/content'] = array(
'title' => 'Content management',
'description' => "Manage your site's content.",
@@ -2238,6 +2246,52 @@ function system_timezone($abbreviation =
}
/**
+ * Implementation of hook_widgets().
+ */
+function system_widgets() {
+ $widgets = array();
+
+ $widgets['status-report'] = array(
+ 'title' => 'Status report',
+ 'callback' => 'system_admin_widget_status_report',
+ );
+
+ return $widgets;
+}
+
+/**
+ * Status report widget. Displays a status report.
+ */
+function system_admin_widget_status_report() {
+ // Load .install files
+ include_once DRUPAL_ROOT . '/includes/install.inc';
+ drupal_load_updates();
+
+ // Check run-time requirements and status information.
+ $requirements = module_invoke_all('requirements', 'runtime');
+ usort($requirements, '_system_sort_requirements');
+ $classes = array(
+ REQUIREMENT_INFO => 'info',
+ REQUIREMENT_OK => 'ok',
+ REQUIREMENT_WARNING => 'warning',
+ REQUIREMENT_ERROR => 'error',
+ );
+ foreach ($requirements as $key => $requirement) {
+ $severity = isset($requirement['severity']) ? (int)$requirement['severity'] : 0;
+ if ($severity == REQUIREMENT_INFO || $severity == REQUIREMENT_OK) {
+ unset($requirements[$key]);
+ }
+ }
+ if (empty($requirements)) {
+ $requirements[] = array(
+ 'title' => t('Status'),
+ 'value' => t('Perfect!'),
+ );
+ }
+ return theme('status_report', $requirements);
+}
+
+/**
* Format the Powered by Drupal text.
*
* @ingroup themeable
Index: modules/system/system.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.test,v
retrieving revision 1.39
diff -u -p -r1.39 system.test
--- modules/system/system.test 11 Feb 2009 05:33:18 -0000 1.39
+++ modules/system/system.test 18 Feb 2009 05:55:32 -0000
@@ -321,73 +321,6 @@ class CronRunTestCase extends DrupalWebT
}
}
-class AdminOverviewTestCase extends DrupalWebTestCase {
- /**
- * Implementation of getInfo().
- */
- function getInfo() {
- return array(
- 'name' => t('Admin overview'),
- 'description' => t('Confirm that the admin overview page appears as expected.'),
- 'group' => t('System')
- );
- }
-
- /**
- * Test the overview page by task.
- */
- function testAdminOverview() {
- $admin_user1 = $this->drupalCreateUser(array('access administration pages'));
- $this->drupalLogin($admin_user1);
-
- $this->drupalGet('admin');
- $this->checkOverview();
-
- $this->drupalGet('admin/by-module');
- $this->checkOverview();
-
- // Comments on permissions follow the format: [task], [module] that the permission relates to.
- $permissions = array();
- $permissions[] = 'access administration pages';
- $permissions[] = 'administer comments'; // Content management, Comment.
- $permissions[] = 'administer blocks'; // Site building, Block.
- $permissions[] = 'administer filters'; // Site configuration, Filter.
- $permissions[] = 'administer users'; // User management, User.
- $permissions[] = 'access site reports'; // Reports, Database logging.
- $admin_user2 = $this->drupalCreateUser($permissions);
- $this->drupalLogin($admin_user2);
-
- $this->drupalGet('admin');
- $this->checkOverview(array(t('Content management'), t('User management'), t('Reports'), t('Site building'), t('Site configuration')));
-
- $this->drupalGet('admin/by-module');
- $this->checkOverview(array(t('Comment'), t('Block'), t('Filter'), t('User'), t('Database logging')));
- }
-
- /**
- * Check the overview page panels.
- *
- * @param array $panels List of panels to be found.
- */
- function checkOverview(array $panels = array()) {
- if ($this->parse()) {
- $found = 0;
- $extra = 0;
- $divs = $this->xpath("//div[@class='admin-panel']");
- foreach ($divs as $panel) {
- if (in_array(trim($panel->h3), $panels)) {
- $found++;
- }
- else {
- $extra++;
- }
- }
- $this->assertTrue(count($panels) == $found, t('Required panels found.'));
- $this->assertFalse($extra, t('No extra panels found.'));
- }
- }
-}
-
class AdminMetaTagTestCase extends DrupalWebTestCase {
/**
* Implementation of getInfo().
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.963
diff -u -p -r1.963 user.module
--- modules/user/user.module 9 Feb 2009 07:36:15 -0000 1.963
+++ modules/user/user.module 18 Feb 2009 05:55:32 -0000
@@ -1030,6 +1030,34 @@ function user_block_view($delta = '') {
}
/**
+ * Implementation of hook_widgets().
+ */
+function user_widgets() {
+ $widgets = array();
+
+ $widgets['new-users'] = array(
+ 'title' => t('New users'),
+ 'callback' => 'user_widget_new_users',
+ );
+
+ return $widgets;
+}
+
+/**
+ * New users widget. Displays a list of the 5 newest users.
+ */
+function user_widget_new_users() {
+ $users = db_query_range('SELECT uid, name FROM {users} WHERE status != 0 AND access != 0 ORDER BY created DESC', array(), 0, 5);
+ if (!empty($users)) {
+ foreach ($users as $user) {
+ $items[] = theme('username', $user);
+ }
+ return theme('item_list', $items, NULL, 'ul', array('class' => 'menu'));
+ }
+}
+
+
+/**
* Process variables for user-picture.tpl.php.
*
* The $variables array contains the following arguments: