Refs #2344 - moves dashboard pages into pages directory

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

diff --git a/engine/lib/users.php b/engine/lib/users.php
index 5c2ac7731ffca154d89025c9a02d8316238a20ee..5d16decb7a3613b1a0244ccaf029782741be0f73 100644 (file)
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1176,7 +1176,7 @@ function collections_page_handler($page_elements) {
  * Page handler for dashboard
  */
 function dashboard_page_handler($page_elements) {
-       require_once(dirname(dirname(dirname(__FILE__))) . "/dashboard/index.php");
+       require_once(dirname(dirname(dirname(__FILE__))) . "/pages/dashboard/index.php");
 }
 
 

diff --git a/dashboard/index.php b/pages/dashboard/index.php
similarity index 82%
rename from dashboard/index.php
rename to pages/dashboard/index.php
index 174869cec6ee95a3de2183a12b95d8569a9c5689..26b811ce92b069308fa5793be940478ff73bdf86 100644 (file)
--- a/dashboard/index.php
+++ b/pages/dashboard/index.php
@@ -8,9 +8,6 @@
  * @link http://elgg.org/
  */
 
-// Get the Elgg engine
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
-
 // Ensure that only logged-in users can see this page
 gatekeeper();
 

diff --git a/dashboard/latest.php b/pages/dashboard/latest.php
similarity index 90%
rename from dashboard/latest.php
rename to pages/dashboard/latest.php
index c1a3d3db55aec62018dd3657feda37c7a1ad5436..f746820b1b3fd8378646b8b967a56cdc9d36aae7 100644 (file)
--- a/dashboard/latest.php
+++ b/pages/dashboard/latest.php
@@ -11,7 +11,7 @@
 /**
  * Start the Elgg engine
  */
-require_once(dirname(dirname(__FILE__)) . "/engine/start.php");
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
 // Load the front page
 global $CONFIG;

diff --git a/views/default/dashboard/blurb.php b/views/default/dashboard/blurb.php
index 4b71e70e1e29ccd2b6e0e11a128786037352e7c4..d4f9cfd4306945f1e500cdc6eb039b71b54a68bf 100644 (file)
--- a/views/default/dashboard/blurb.php
+++ b/views/default/dashboard/blurb.php
@@ -19,6 +19,6 @@
 ?>
 </p>
 <p>
-       <a href="<?php echo $vars['url']; ?>dashboard/latest.php"><?php echo elgg_echo('content:latest:blurb'); ?></a>
+       <a href="<?php echo $vars['url']; ?>pages/dashboard/latest.php"><?php echo elgg_echo('content:latest:blurb'); ?></a>
 </p>
 </div>
\ No newline at end of file