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

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 4e9f202c036194ca30c630126c346f632557e9e1..0ea029cdc5cd94a1ffbd99464b638429a7bad337 100644 (file)
--- 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 aaa7860332850c629efbb7ffd48b9a827ed9a791..aa5903a08a14fb1cf7d81831488bff2878ba9f6c 100644 (file)
--- 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 d5575f57237e62e7a11f073fa6441d4f00466543..f87f3bec5d71306ebb7de9d204fa8aa2dc700f4a 100644 (file)
--- 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 acb5a384dd0e22099df31322c3368429d152573a..0b8aec774750987d7f52e25706cf5dd6a415740c 100644 (file)
--- 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 (file)
index 0000000..dd70788
--- /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