10 files changed, 164 insertions, 373 deletions
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 @@
-<?php
-
-	/**
-	 * Elgg front pages: add/edit
-	 * Here we use the title field for the lefthand side and the description for the righthand side
-	 * 
-	 * @package ElggExPages
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @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 @@
 <?php
-	/**
-	 * Elgg External pages
-	 * 
-	 * @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/
-	 */
+/**
+ * Elgg External pages
+ * 
+ * @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/
+ */
 
-	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
-	admin_gatekeeper();
-	set_context('admin');
-	$type = get_input('type'); //the type of page e.g about, terms etc
-	if(!$type)
-		$type = "front"; //default to the frontpage
-	
-	// Set admin user for user block
-	set_page_owner($_SESSION['guid']);
+admin_gatekeeper();
+set_context('admin');
+//the type of page e.g about, terms, privacy, etc
+$type = get_input('type', 'about');
+
+// Set admin user for user block
+set_page_owner($_SESSION['guid']);
+
+//display the title
+$title = elgg_view_title(elgg_echo('expages'));
+
+// Display the correct form
+$edit = elgg_view('expages/forms/edit', array('type' => $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 @@
 <?php
+/**
+ * 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 <info@elgg.com>
+ * @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 <info@elgg.com>
-	 * @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 @@
 <?php
-	/**
-	 * Elgg Simple editing of external pages frontpage/about/term/contact and privacy
-	 * 
-	 * @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/
-	 */
+/**
+ * Elgg Simple editing of external pages frontpage/about/term/contact and privacy
+ * 
+ * @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/
+ */
 
-	function expages_init() {
-		
-		global $CONFIG;
-		
-		// 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');
-		
-		// extend views
-		elgg_extend_view('footer/links', 'expages/footer_menu');
-		elgg_extend_view('index/righthandside', 'expages/front_right');
-		elgg_extend_view('index/lefthandside', 'expages/front_left');
-		
-	}
+function expages_init() {
+	global $CONFIG;
 	
-	/**
-	 * 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/";
-			
-	}
+	// 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 @@
 <?php
-
-	/**
-	 * Elgg externalpages CSS
-	 * 
-	 * @package externalpages
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider <info@elgg.com>
-	 * @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 <info@elgg.com>
+ * @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 @@
 <?php
-
-	/**
-	 * 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 <info@elgg.com>
-	 * @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 <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ * 
+ */
 ?>
 
-<div class="footer_toolbar_links">| 
+<div id="footer_toolbar_links" class="clearfloat">| 
 <a href="<?php echo $vars['url']; ?>pg/expages/read/About/"><?php echo elgg_echo('expages:about'); ?></a> |
 <a href="<?php echo $vars['url']; ?>pg/expages/read/Terms/"><?php echo elgg_echo('expages:terms'); ?></a> |
 <a href="<?php echo $vars['url']; ?>pg/expages/read/Privacy/"><?php echo elgg_echo('expages:privacy'); ?></a> |
diff --git a/mod/externalpages/views/default/expages/forms/editfront.php b/mod/externalpages/views/default/expages/forms/editfront.php
deleted file mode 100644
index ee4c89989..000000000
--- a/mod/externalpages/views/default/expages/forms/editfront.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-	/**
-	 * Elgg edit frontpage
-	 * 
-	 * @package ElggExpages
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 * 
-	 */
-	 
-	 //action
-	 $action = "expages/addfront";
-	 
-	 //grab the required entity
-	 $page_contents = elgg_get_entities(array('type' => 'object', 'subtype' => 'front', 'limit' => 1));
-	 
-	if($page_contents){
-		 foreach($page_contents as $pc){
-			 $description_right = $pc->description;
-			 $description_left = $pc->title;
-			 $guid = $pc->guid;
-		 }
-	}else {		
-		$tags = "";
-		$description = "";
-	}
-		
-	// set the required form variables
-		$input_area_left = elgg_view('input/longtext', array('internalname' => 'front_left', 'value' => $description_left));
-		$input_area_right = elgg_view('input/longtext', array('internalname' => 'front_right', 'value' => $description_right));
-		$submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
-		$hidden_guid = elgg_view('input/hidden', array('internalname' => 'front_guid', 'value' => $guid));
-		$lefthand = elgg_echo("expages:lefthand");
-		$righthand = elgg_echo("expages:righthand");
-		
-	//preview link
-	//	echo "<div class=\"page_preview\"><a href=\"#preview\">" . elgg_echo('expages:preview') . "</a></div>";
-		
-	//construct the form
-		$form_body = <<<EOT
-
-		<h3 class='settings'>$lefthand</h3>
-		<p class='longtext_editarea'>$input_area_left</p><br />
-		<h3 class='settings'>$righthand</h3>
-		<p class='longtext_editarea'>$input_area_right</p>
-		
-			$hidden_guid
-			<br />
-			$submit_input
-
-EOT;
-?>
-<?php
-	//display the form
-	echo elgg_view('input/form', array('action' => "{$vars['url']}action/$action", 'body' => $form_body));
-?>
-
-<!-- preview page contents -->
-<!--
-<div class="expage_preview">
-<a name="preview"></a>
-<h2>Preview</h2>
-<?php 
-	if($description_left){
-		echo "The left column header space<br />";
-		echo $description_left;
-	}
-	if($description_right){
-		echo "The right column header space<br />";
-		echo $description_right;
-	}else
-		echo elgg_echo('expages:nopreview');
-?>
-</div>
--->
-\ No newline at end of file
diff --git a/mod/externalpages/views/default/expages/front_left.php b/mod/externalpages/views/default/expages/front_left.php
deleted file mode 100644
index 1c6c2442e..000000000
--- a/mod/externalpages/views/default/expages/front_left.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-	/**
-	 * Elgg Frontpage left
-	 * 
-	 * @package ElggExpages
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 * 
-	 */
-
-	 
-	 //get frontpage right code
-		$contents = elgg_get_entities(array('type' => 'object', 'subtype' => 'front', 'limit' => 1));
-		
-		if($contents){
-			foreach($contents as $c){
-				echo $c->title; // title is the left hand content
-			}
-		}else{
-			echo "<p>" . elgg_echo("expages:addcontent") . "</p>";
-		}
-		
-?>
-
diff --git a/mod/externalpages/views/default/expages/front_right.php b/mod/externalpages/views/default/expages/front_right.php
deleted file mode 100644
index a28b5748c..000000000
--- a/mod/externalpages/views/default/expages/front_right.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-	/**
-	 * Elgg Frontpage right
-	 * 
-	 * @package ElggExpages
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 * 
-	 */
-	 
-	 //get frontpage right code
-		$contents = elgg_get_entities(array('type' => 'object', 'subtype' => 'front', 'limit' => 1));
-
-		$show = '';
-		foreach($contents as $cont){
-			$show = $cont->description;
-		}
-
-		if($show != ''){
-			echo "<div id=\"index_welcome\">";
-
-			if($contents){
-				foreach($contents as $c){
-					echo $c->description;
-				}
-			}else{
-				echo elgg_echo("expages:addcontent");
-			}
-			echo "</div>";
-		}
-
-?>
-\ No newline at end of file
diff --git a/mod/externalpages/views/default/expages/menu.php b/mod/externalpages/views/default/expages/menu.php
index 10c07397b..7e4f2c981 100644
--- a/mod/externalpages/views/default/expages/menu.php
+++ b/mod/externalpages/views/default/expages/menu.php
@@ -1,29 +1,24 @@
 <?php
+/**
+ * Elgg External pages menu
+ * 
+ * @package ElggExpages
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ * 
+ */
 
-	/**
-	 * Elgg External pages menu
-	 * 
-	 * @package ElggExpages
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 * 
-	 */
-	 
-	 //type
-	 $type = $vars['type'];
-	 
-	 //set the url
-	 $url = $vars['url'] . "pg/expages/index.php?type=";
+$type = $vars['type'];
 
+$url = $vars['url'] . "pg/expages/index.php?type=";
 ?>
 
-<div id="elgg_horizontal_tabbed_nav">
+<div class="elgg_horizontal_tabbed_nav">
 <ul>
-	<li <?php if($type == 'front') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>front"><?php echo elgg_echo('expages:frontpage'); ?></a></li>
-	<li <?php if($type == 'about') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>about"><?php echo elgg_echo('expages:about'); ?></a></li>
-	<li <?php if($type == 'terms') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>terms"><?php echo elgg_echo('expages:terms'); ?></a></li>
+	<li <?php if($type == 'about')   echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>about"><?php echo elgg_echo('expages:about'); ?></a></li>
+	<li <?php if($type == 'terms')   echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>terms"><?php echo elgg_echo('expages:terms'); ?></a></li>
 	<li <?php if($type == 'privacy') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>privacy"><?php echo elgg_echo('expages:privacy'); ?></a></li>
 </ul>
 </div>
 \ No newline at end of file