Updating Default Widgets administration to use new canvas layout.

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

diff --git a/mod/defaultwidgets/dashboard.php b/mod/defaultwidgets/dashboard.php
index 889bc81210e0489152dd5939bf9a080835d4b609..86f96cb670d28d84c3d7c6cdb89221abad7f203e 100644 (file)
--- a/mod/defaultwidgets/dashboard.php
+++ b/mod/defaultwidgets/dashboard.php
@@ -28,4 +28,4 @@ $context = 'dashboard';
 $content = elgg_view ( "defaultwidgets/editor", array ('token' => $token, 'ts' => $ts, 'context' => $context ) );
 
 // Display main admin menu
-page_draw ( 'Default dashboard widgets for new users', $content );
+page_draw('Default dashboard widgets for new users', elgg_view_layout('administration', $content));

diff --git a/mod/defaultwidgets/profile.php b/mod/defaultwidgets/profile.php
index 68bf7a49229cd2618ddb9bc750c91e4cbbf96e92..69640a845e3c336af7a387fa7435922a0fc99951 100644 (file)
--- a/mod/defaultwidgets/profile.php
+++ b/mod/defaultwidgets/profile.php
@@ -28,4 +28,4 @@ $context = 'profile';
 $content = elgg_view ( "defaultwidgets/editor", array ('token' => $token, 'ts' => $ts, 'context' => $context ) );
 
 // Display main admin menu
-page_draw ( 'Default profile widgets for new users', $content );
+page_draw('Default profile widgets for new users', elgg_view_layout('administration', $content));

diff --git a/mod/defaultwidgets/start.php b/mod/defaultwidgets/start.php
index e76e16e261da69b0671ed31c5d77094a1374bb91..1143cafa611339de647555c20441e6ce2af07836 100644 (file)
--- a/mod/defaultwidgets/start.php
+++ b/mod/defaultwidgets/start.php
@@ -30,6 +30,7 @@ global $CONFIG;
  * @param unknown_type $object
  */
 function defaultwidgets_init() {
+       global $CONFIG;
        
        // Load system configuration
        register_page_handler ( 'defaultwidgets', 'defaultwidgets_page_handler' );
@@ -44,6 +45,18 @@ function defaultwidgets_init() {
        
        // Override metadata permissions
        //register_plugin_hook ( 'permissions_check:metadata', 'object', 'defaultwidgets_can_edit_metadata' );
+       
+       elgg_add_submenu_item(array(
+               'text' => elgg_echo('defaultwidgets:menu:profile'),
+               'href' => "{$CONFIG->wwwroot}pg/defaultwidgets/profile",
+               'parent_id' => 'appearance',
+       ), 'admin', 'default');
+       
+       elgg_add_submenu_item(array(
+               'text' => elgg_echo('defaultwidgets:menu:dashboard'),
+               'href' => "{$CONFIG->wwwroot}pg/defaultwidgets/dashboard",
+               'parent_id' => 'appearance',
+       ), 'admin', 'default');
 }
 
 /**
@@ -233,21 +246,8 @@ function defaultwidgets_page_handler($page) {
        return true;
 }
 
-/**
- * Page setup. Adds admin controls to the admin panel.
- *
- */
-function defaultwidgets_pagesetup() {
-       if (get_context () == 'admin' && isadminloggedin ()) {
-               global $CONFIG;
-               add_submenu_item ( elgg_echo ( 'defaultwidgets:menu:profile' ), $CONFIG->wwwroot . 'pg/defaultwidgets/profile' );
-               add_submenu_item ( elgg_echo ( 'defaultwidgets:menu:dashboard' ), $CONFIG->wwwroot . 'pg/defaultwidgets/dashboard' );
-       }
-}
-
 // Make sure the status initialisation function is called on initialisation
 register_elgg_event_handler ( 'init', 'system', 'defaultwidgets_init' );
-register_elgg_event_handler ( 'pagesetup', 'system', 'defaultwidgets_pagesetup' );
 
 register_plugin_hook ( 'permissions_check', 'user', 'defaultwidgets_can_edit' );
 register_plugin_hook ( 'permissions_check', 'object', 'defaultwidgets_can_edit' );

diff --git a/mod/defaultwidgets/views/default/defaultwidgets/editor.php b/mod/defaultwidgets/views/default/defaultwidgets/editor.php
index 2241dd264981dd78dfeef4937addf2d422073132..ef883ac01ffa2d99e3cf6df5226dbec12e03efbf 100644 (file)
--- a/mod/defaultwidgets/views/default/defaultwidgets/editor.php
+++ b/mod/defaultwidgets/views/default/defaultwidgets/editor.php
@@ -53,7 +53,7 @@
 ?>
 <script type="text/javascript">
 $(document).ready(function () {
-       $('div#customise_editpanel').slideToggle("fast");
+       //$('div#customise_editpanel').slideToggle("fast");
 });
 </script>