diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-26 21:32:05 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-26 21:32:05 +0000 |
| commit | a4898df06bf1df35a309535b2fe953b23e1d0ca9 (patch) | |
| tree | 098385fe5a8f9b928a13839d604875654410534e | |
| parent | 15fd33f8fcb63cd56d158fa714a476c434f1491a (diff) | |
| download | elgg-a4898df06bf1df35a309535b2fe953b23e1d0ca9.tar.gz elgg-a4898df06bf1df35a309535b2fe953b23e1d0ca9.tar.bz2 | |
Fixes #2913 - directs the user to admin dashboard when installer finishes
git-svn-id: http://code.elgg.org/elgg/trunk@8497 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/admin.php | 2 | ||||
| -rw-r--r-- | install/ElggInstaller.php | 7 | ||||
| -rw-r--r-- | languages/en.php | 2 | ||||
| -rw-r--r-- | views/default/css/admin.php | 2 | ||||
| -rw-r--r-- | views/default/widgets/admin_welcome/content.php | 7 |
5 files changed, 14 insertions, 6 deletions
diff --git a/engine/lib/admin.php b/engine/lib/admin.php index 4e9f202c0..0ea029cdc 100644 --- a/engine/lib/admin.php +++ b/engine/lib/admin.php @@ -219,7 +219,7 @@ function admin_init() { )); // widgets - $widgets = array('online_users', 'new_users', 'content_stats'); + $widgets = array('online_users', 'new_users', 'content_stats', 'admin_welcome'); foreach ($widgets as $widget) { elgg_register_widget_type( $widget, diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php index aaa786033..aa5903a08 100644 --- a/install/ElggInstaller.php +++ b/install/ElggInstaller.php @@ -26,16 +26,15 @@ class ElggInstaller { protected $isAction = FALSE; - protected $autoLogin = FALSE; + protected $autoLogin = TRUE; /** * @var array An array of widgets to add to the admin dashboard. * - * @warning Columbus start on the right at 1. * In the form column => array of handlers in order, top to bottom */ protected $adminWidgets = array( - 1 => array('content_stats'), + 1 => array('admin_welcome', 'content_stats'), 2 => array('online_users', 'new_users'), ); @@ -507,7 +506,7 @@ class ElggInstaller { $params = array(); if ($this->autoLogin) { - $params['destination'] = 'pg/admin/plugins/simple'; + $params['destination'] = 'pg/admin/'; } else { $params['destination'] = 'index.php'; } diff --git a/languages/en.php b/languages/en.php index d5575f572..f87f3bec5 100644 --- a/languages/en.php +++ b/languages/en.php @@ -553,6 +553,8 @@ $english = array( 'admin:widget:content_stats:help' => 'Keep track of the content created by your users', 'widget:content_stats:type' => 'Content type', 'widget:content_stats:number' => 'Number', + 'admin:widget:admin_welcome' => 'Welcome', + 'admin:widget:admin_welcome:help' => "A short introduction to Elgg's admin area", /** * Plugins diff --git a/views/default/css/admin.php b/views/default/css/admin.php index acb5a384d..0b8aec774 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -509,7 +509,7 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover WIDGETS *************************************** */ .elgg-widgets { - float: right; + float: left; min-height: 30px; } .elgg-widget-add-control { diff --git a/views/default/widgets/admin_welcome/content.php b/views/default/widgets/admin_welcome/content.php new file mode 100644 index 000000000..dd7078837 --- /dev/null +++ b/views/default/widgets/admin_welcome/content.php @@ -0,0 +1,7 @@ +<?php +/** + * Welcome widget for admins + */ + +?> +Welcome to Elgg
\ No newline at end of file |