Refs #3340 pulls dashboard out as plugin

git-svn-id: http://code.elgg.org/elgg/trunk@9108 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 43b6980b2aef9ceec432740e21d319a87536062c..a7765a5e5239726239f0d861310c2ac46d31aa2c 100644 (file)
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1128,18 +1128,6 @@ function collections_page_handler($page_elements) {
        }
 }
 
-/**
- * Page handler for dashboard
- *
- * @param array $page_elements Page elements
- *
- * @return void
- */
-function dashboard_page_handler($page_elements) {
-       require_once(dirname(dirname(dirname(__FILE__))) . "/pages/dashboard.php");
-}
-
-
 /**
  * Page handler for registration
  *
@@ -1525,7 +1513,6 @@ function users_init() {
 
        elgg_register_page_handler('friends', 'friends_page_handler');
        elgg_register_page_handler('friendsof', 'friends_of_page_handler');
-       elgg_register_page_handler('dashboard', 'dashboard_page_handler');
        elgg_register_page_handler('register', 'registration_page_handler');
        elgg_register_page_handler('resetpassword', 'elgg_user_resetpassword_page_handler');
        elgg_register_page_handler('login', 'elgg_user_login_page_handler');

diff --git a/mod/dashboard/manifest.xml b/mod/dashboard/manifest.xml
new file mode 100644 (file)
index 0000000..b5e9cff
--- /dev/null
+++ b/mod/dashboard/manifest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+       <name>User Dashboard</name>
+       <author>Core developers</author>
+       <version>1.8</version>
+       <category>bundled</category>
+       <description>A widget-based dashboard for your users</description>
+       <website>http://www.elgg.org/</website>
+       <copyright>See COPYRIGHT.txt</copyright>
+       <license>GNU Public License version 2</license>
+       <requires>
+               <type>elgg_version</type>
+               <version>2010030101</version>
+       </requires>
+       <admin_interface>advanced</admin_interface>
+</plugin_manifest>
\ No newline at end of file

diff --git a/mod/dashboard/start.php b/mod/dashboard/start.php
new file mode 100644 (file)
index 0000000..4fa048b
--- /dev/null
+++ b/mod/dashboard/start.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * A user dashboard
+ */
+
+elgg_register_event_handler('init', 'system', 'dashboard_init');
+
+function dashboard_init() {
+       elgg_register_page_handler('dashboard', 'dashboard_page_handler');
+
+       elgg_register_menu_item('topbar', array(
+               'name' => 'dashboard',
+               'href' => 'dashboard',
+               'text' => elgg_view_icon('home') . elgg_echo('dashboard'),
+               'priority' => 450,
+               'section' => 'alt',
+       ));
+}
+
+function dashboard_page_handler() {
+       // Ensure that only logged-in users can see this page
+       gatekeeper();
+
+       // Set context and title
+       elgg_set_context('dashboard');
+       elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
+       $title = elgg_echo('dashboard');
+
+       // wrap intro message in a div
+       $intro_message = elgg_view('dashboard/blurb');
+
+       $params = array(
+               'content' => $intro_message,
+               'num_columns' => 3,
+               'show_access' => false,
+       );
+       $widgets = elgg_view_layout('widgets', $params);
+
+       $body = elgg_view_layout('one_column', array('content' => $widgets));
+
+       echo elgg_view_page($title, $body);
+}

diff --git a/views/default/core/dashboard/blurb.php b/mod/dashboard/views/default/dashboard/blurb.php
similarity index 76%
rename from views/default/core/dashboard/blurb.php
rename to mod/dashboard/views/default/dashboard/blurb.php
index 0c4e3947a8b6eef23e4f4add257d5843d0be1d85..202be1dc5e05ad31cba25b20248d878b43f2af7f 100644 (file)
--- a/views/default/core/dashboard/blurb.php
+++ b/mod/dashboard/views/default/dashboard/blurb.php
@@ -9,7 +9,7 @@
 <?php 
        echo elgg_view('output/longtext', array(
                'id' => 'dashboard-info',
-               'class' => 'elgg-inner pas mhs mbl',
+               'class' => 'elgg-inner elgg-border-plain pam mhs mbl mtn',
                'value' => elgg_echo("dashboard:nowidgets"),
        ));
 

diff --git a/pages/dashboard.php b/pages/dashboard.php
deleted file mode 100644 (file)
index 31cc908..0000000
--- a/pages/dashboard.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Elgg dashboard
- *
- * @package Elgg
- * @subpackage Core
- */
-
-// Ensure that only logged-in users can see this page
-gatekeeper();
-
-// Set context and title
-elgg_set_context('dashboard');
-elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
-$title = elgg_echo('dashboard');
-
-// wrap intro message in a div
-$intro_message = elgg_view('core/dashboard/blurb');
-
-$params = array(
-       'content' => $intro_message,
-       'num_columns' => 3,
-       'show_access' => false,
-);
-$widgets = elgg_view_layout('widgets', $params);
-
-$body = elgg_view_layout('one_column', array('content' => $widgets));
-
-echo elgg_view_page($title, $body);
\ No newline at end of file

diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php
index c8ba4f735664eed81945a7b050d55c02da6deb81..ebac2b91fbeff90e34bc02d3bf2183d1e55be7f9 100644 (file)
--- a/views/default/css/elements/misc.php
+++ b/views/default/css/elements/misc.php
@@ -8,10 +8,6 @@
        z-index: 100;
 }
 
-#dashboard-info .elgg-inner {
-       border: 2px solid #dedede;
-}
-
 /* ***************************************
        AVATAR UPLOADING & CROPPING
 *************************************** */