From 354d9eebf2c84b66f1103a61a8f4ffa832f350b6 Mon Sep 17 00:00:00 2001 From: brettp Date: Thu, 4 Mar 2010 00:59:34 +0000 Subject: Updated external pages to new interface. git-svn-id: http://code.elgg.org/elgg/trunk@5268 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/externalpages/actions/addfront.php | 52 -------- mod/externalpages/index.php | 58 +++++---- mod/externalpages/read.php | 67 +++++------ mod/externalpages/start.php | 133 ++++++++++----------- mod/externalpages/views/default/expages/css.php | 27 ++--- .../views/default/expages/footer_menu.php | 25 ++-- .../views/default/expages/forms/editfront.php | 78 ------------ .../views/default/expages/front_left.php | 27 ----- .../views/default/expages/front_right.php | 35 ------ mod/externalpages/views/default/expages/menu.php | 35 +++--- 10 files changed, 164 insertions(+), 373 deletions(-) delete mode 100644 mod/externalpages/actions/addfront.php delete mode 100644 mod/externalpages/views/default/expages/forms/editfront.php delete mode 100644 mod/externalpages/views/default/expages/front_left.php delete mode 100644 mod/externalpages/views/default/expages/front_right.php (limited to 'mod/externalpages') diff --git a/mod/externalpages/actions/addfront.php b/mod/externalpages/actions/addfront.php deleted file mode 100644 index e7dc167c6..000000000 --- a/mod/externalpages/actions/addfront.php +++ /dev/null @@ -1,52 +0,0 @@ - - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.org/ - */ - - // Make sure we're logged as admin - admin_gatekeeper(); - - // Get input data - $contents_left = get_input('front_left', '', false); - $contents_right = get_input('front_right', '', false); - $previous_guid = get_input('front_guid'); - - //remove the old front page - if(get_entity($previous_guid)){ - delete_entity($previous_guid); - } - - // Initialise a new ElggObject - $frontpage = new ElggObject(); - // Tell the system what type of external page it is - $frontpage->subtype = "front"; - // Set its owner to the current user - $frontpage->owner_guid = $_SESSION['user']->getGUID(); - // For now, set its access to public - $frontpage->access_id = 2; - // Set its title and description appropriately - $frontpage->title = $contents_left; - $frontpage->description = $contents_right; - - // Before we can set metadata, save - if (!$frontpage->save()) { - register_error(elgg_echo("expages:error")); - forward("pg/expages/index.php?type=front"); - } - - // Success message - system_message(elgg_echo("expages:posted")); - - - // Forward back to the page - forward("pg/expages/index.php?type=front"); - -?> diff --git a/mod/externalpages/index.php b/mod/externalpages/index.php index f0b5187d5..a7c33a515 100644 --- a/mod/externalpages/index.php +++ b/mod/externalpages/index.php @@ -1,37 +1,33 @@ $type)); - //display the title - $title = elgg_view_title(elgg_echo('expages')); +// Display the menu +$body = elgg_view('page_elements/elgg_content',array('body' => elgg_view('expages/menu', array('type' => $type)).$edit)); - // Display the correct form - if($type == "front") - $edit = elgg_view('expages/forms/editfront'); - else - $edit = elgg_view('expages/forms/edit', array('type' => $type)); - - // Display the menu - $body = elgg_view('page_elements/contentwrapper',array('body' => elgg_view('expages/menu', array('type' => $type)).$edit)); - - // Display - page_draw(elgg_echo('expages'),elgg_view_layout("two_column_left_sidebar", '', $title . $body)); +// Display +page_draw(elgg_echo('expages'),elgg_view_layout("one_column_with_sidebar", '', $title . $body)); ?> \ No newline at end of file diff --git a/mod/externalpages/read.php b/mod/externalpages/read.php index 503efbb03..10ef4e3a1 100644 --- a/mod/externalpages/read.php +++ b/mod/externalpages/read.php @@ -1,39 +1,36 @@ + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ +*/ - /** - * Elgg read external page - * - * @package ElggExpages - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ +// Load Elgg engine +define('externalpage',true); +require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - // Load Elgg engine - define('externalpage',true); - require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - - // set some variables - $type = get_input('expages'); - - // Set the title appropriately - $area1 = elgg_view_title(elgg_echo("expages:". strtolower($type))); - - //get contents - $contents = elgg_get_entities(array('type' => 'object', 'subtype' => $type, 'limit' => 1)); - - if($contents){ - foreach($contents as $c){ - $area1 .= elgg_view('page_elements/contentwrapper',array('body' => $c->description)); - } - }else - $area1 .= elgg_view('page_elements/contentwrapper',array('body' => elgg_echo("expages:notset"))); +// set some variables +$type = get_input('expages'); + +// Set the title appropriately +$area1 = elgg_view_title(elgg_echo("expages:". strtolower($type))); - // Display through the correct canvas area - $body = elgg_view_layout("one_column", $area1); - - // Display page - page_draw($title,$body); - -?> \ No newline at end of file +//get contents +$contents = elgg_get_entities(array('type' => 'object', 'subtype' => $type, 'limit' => 1)); + +if($contents){ + foreach($contents as $c){ + $area1 .= elgg_view('page_elements/elgg_content',array('body' => $c->description)); + } +}else + $area1 .= elgg_view('page_elements/elgg_content',array('body' => elgg_echo("expages:notset"))); + +// Display through the correct canvas area +$body = elgg_view_layout("one_column_with_sidebar", '', $area1); + +// Display page +page_draw($title,$body); \ No newline at end of file diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php index 6ce69c74d..9f3f494bc 100644 --- a/mod/externalpages/start.php +++ b/mod/externalpages/start.php @@ -1,78 +1,77 @@ wwwroot . 'pg/expages/'); - } - } - - function expages_url($expage) { - - global $CONFIG; - return $CONFIG->url . "pg/expages/"; - - } + // Register a page handler, so we can have nice URLs + register_page_handler('expages','expages_page_handler'); + // Register a URL handler for external pages + register_entity_url_handler('expages_url','object','expages'); - function expages_page_handler($page) - { + // extend views + elgg_extend_view('footer/links', 'expages/footer_menu'); + + // Extend CSS + elgg_extend_view('css','expages/css'); +} + +/** + * Page setup. Adds admin controls to the admin panel. + * + */ +function expages_pagesetup() +{ + if (get_context() == 'admin' && isadminloggedin()) { global $CONFIG; + add_submenu_item(elgg_echo('expages'), $CONFIG->wwwroot . 'pg/expages/'); + } +} + +function expages_url($expage) { + + global $CONFIG; + return $CONFIG->url . "pg/expages/"; - if ($page[0]) +} + + +function expages_page_handler($page) +{ + global $CONFIG; + + if ($page[0]) + { + switch ($page[0]) { - switch ($page[0]) - { - case "read": set_input('expages',$page[1]); - include(dirname(__FILE__) . "/read.php"); - break; - default : include($CONFIG->pluginspath . "externalpages/index.php"); - } + case "read": set_input('expages',$page[1]); + include(dirname(__FILE__) . "/read.php"); + break; + default : include($CONFIG->pluginspath . "externalpages/index.php"); } - else - include($CONFIG->pluginspath . "externalpages/index.php"); } - - // Initialise log browser - register_elgg_event_handler('init','system','expages_init'); - register_elgg_event_handler('pagesetup','system','expages_pagesetup'); - - // Register actions - global $CONFIG; - register_action("expages/add",false,$CONFIG->pluginspath . "externalpages/actions/add.php"); - register_action("expages/addfront",false,$CONFIG->pluginspath . "externalpages/actions/addfront.php"); - register_action("expages/edit",false,$CONFIG->pluginspath . "externalpages/actions/edit.php"); - register_action("expages/delete",false,$CONFIG->pluginspath . "externalpages/actions/delete.php"); - + else + include($CONFIG->pluginspath . "externalpages/index.php"); +} + +// Initialise log browser +register_elgg_event_handler('init','system','expages_init'); +register_elgg_event_handler('pagesetup','system','expages_pagesetup'); + +// Register actions + global $CONFIG; + register_action("expages/add",false,$CONFIG->pluginspath . "externalpages/actions/add.php"); + //register_action("expages/addfront",false,$CONFIG->pluginspath . "externalpages/actions/addfront.php"); + register_action("expages/edit",false,$CONFIG->pluginspath . "externalpages/actions/edit.php"); + register_action("expages/delete",false,$CONFIG->pluginspath . "externalpages/actions/delete.php"); + ?> \ No newline at end of file diff --git a/mod/externalpages/views/default/expages/css.php b/mod/externalpages/views/default/expages/css.php index c511a45db..9cc760dde 100644 --- a/mod/externalpages/views/default/expages/css.php +++ b/mod/externalpages/views/default/expages/css.php @@ -1,17 +1,16 @@ - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.org/ - */ +/** + * Elgg externalpages CSS + * + * @package externalpages + * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 + * @author Curverider + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.org/ + */ ?> - -/* IE6 */ -* html #front_left_tbl { width:676px !important; } -* html #front_right_tbl { width:676px !important; } \ No newline at end of file +#footer_toolbar_links { + text-align:right; + margin-bottom:5px; +} diff --git a/mod/externalpages/views/default/expages/footer_menu.php b/mod/externalpages/views/default/expages/footer_menu.php index 0e7b40b56..225fd5a13 100644 --- a/mod/externalpages/views/default/expages/footer_menu.php +++ b/mod/externalpages/views/default/expages/footer_menu.php @@ -1,20 +1,17 @@ - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - * - */ - - +/** + * Elgg External pages footer menu + * + * @package ElggExpages + * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 + * @author Curverider Ltd + * @copyright Curverider Ltd 2008-2010 + * @link http://elgg.com/ + * + */ ?> -
| +