updates externalpages to 1.8

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

10 files changed, 94 insertions, 289 deletions

diff --git a/mod/externalpages/views/default/expages/analytics.php b/mod/externalpages/views/default/expages/analytics.php
deleted file mode 100644
index 40f7b6a8d..000000000
--- a/mod/externalpages/views/default/expages/analytics.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-	/**
-	 * Elgg Analytics view
-	 * 
-	 * @package ElggExpages
-	 * 
-	 */
-
-	 
-	 //get analytics content 
-		$contents = elgg_get_entities(array('type' => 'object', 'subtype' => 'analytics', 'limit' => 1));
-		
-		if($contents){
-			foreach($contents as $c){
-				echo $c->description;
-			}
-		}
-
-?>
-
diff --git a/mod/externalpages/views/default/expages/css.php b/mod/externalpages/views/default/expages/css.php
deleted file mode 100644
index 609f77f69..000000000
--- a/mod/externalpages/views/default/expages/css.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-	/**
-	 * Elgg externalpages CSS
-	 * 
-	 * @package externalpages
-	 */
-
-?>
-
-/* IE6 */
-* html #front_left_tbl { width:676px !important; }
-* html #front_right_tbl { width:676px !important; }
\ No newline at end of file
diff --git a/mod/externalpages/views/default/expages/footer_menu.php b/mod/externalpages/views/default/expages/footer_menu.php
deleted file mode 100644
index a2e1616d2..000000000
--- a/mod/externalpages/views/default/expages/footer_menu.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-	/**
-	 * Elgg External pages footer menu
-	 * 
-	 * @package ElggExpages
-	 * 
-	 */
-	 
-	
-?>
-
-<div class="footer_toolbar_links">| 
-<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> |
-</div>
\ No newline at end of file
diff --git a/mod/externalpages/views/default/expages/forms/edit.php b/mod/externalpages/views/default/expages/forms/edit.php
deleted file mode 100644
index 1cdec4198..000000000
--- a/mod/externalpages/views/default/expages/forms/edit.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-	/**
-	 * Elgg External pages edit
-	 * 
-	 * @package ElggExpages
-	 * 
-	 */
-	 
-	 //get the page type
-	 $type = $vars['type'];
-	 
-	 //action
-	 $action = "expages/add";
-	 
-	 //grab the required entity
-	 $page_contents = elgg_get_entities(array('type' => 'object', 'subtype' => $type, 'limit' => 1));
-	 
-	if($page_contents){
-		 foreach($page_contents as $pc){
-			 $description = $pc->description;
-			 $guid = $pc->guid;
-		 }
-	}else {		
-		$description = "";
-	}
-		
-	// set the required form variables
-		$input_area = elgg_view('input/longtext', array('internalname' => 'expagescontent', 'value' => $description));
-        $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
-		$hidden_value = elgg_view('input/hidden', array('internalname' => 'content_type', 'value' => $type));
-		$hidden_guid = elgg_view('input/hidden', array('internalname' => 'expage_guid', 'value' => $guid));
-		
-		//type
-		$type = $vars['type'];
-		//set the url
-		$url = $vars['url'] . "pg/expages/index.php?type=";
-		
-		if($type == 'about') { 
-			$external_page_title = elgg_echo('expages:about');
-		}
-		else if($type == 'terms') {
-			$external_page_title = elgg_echo('expages:terms');
-		}
-		else if($type == 'privacy') {
-			$external_page_title = elgg_echo('expages:privacy');     
-		}
-	//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'>$external_page_title</h3>
-		<p class='longtext_editarea'>$input_area</p>
-			$hidden_value
-			$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)
-		echo $description;
-	else
-		echo elgg_echo('expages:nopreview');
-*/
-?>
-</div>
--->
\ No newline at end of file
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 3e7e8c83b..000000000
--- a/mod/externalpages/views/default/expages/forms/editfront.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-	/**
-	 * Elgg edit frontpage
-	 * 
-	 * @package ElggExpages
-	 * 
-	 */
-	 
-	 //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 {		
-		$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 14d999ead..000000000
--- a/mod/externalpages/views/default/expages/front_left.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-	/**
-	 * Elgg Frontpage left
-	 * 
-	 * @package ElggExpages
-	 * 
-	 */
-
-	 
-	 //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 ab999f890..000000000
--- a/mod/externalpages/views/default/expages/front_right.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-	/**
-	 * Elgg Frontpage right
-	 * 
-	 * @package ElggExpages
-	 * 
-	 */
-	 
-	 //get frontpage right code
-		$contents = elgg_get_entities(array('type' => 'object', 'subtype' => 'front', 'limit' => 1));
-
-		// nothing to show so we return TRUE to indicate the view was valid
-		if ($contents == FALSE) {
-			return TRUE;
-		}
-
-		$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 d91418065..e471619b8 100644
--- a/mod/externalpages/views/default/expages/menu.php
+++ b/mod/externalpages/views/default/expages/menu.php
@@ -1,17 +1,44 @@
 <?php
+/**
+ * External pages menu
+ *
+ * @uses $vars['type']
+ */
 
-	/**
-	 * Elgg External pages menu
-	 * 
-	 * @package ElggExpages
-	 * 
-	 */
-	 
-	 //type
-	 $type = $vars['type'];
-	 
-	 //set the url
-	 $url = $vars['url'] . "pg/expages/index.php?type=";
+$type = $vars['type'];
+
+ //set the url
+ $url = $vars['url'] . "pg/admin/site/expages?type=";
+ 
+$pages = array('about', 'terms', 'privacy');
+$tabs = array();
+foreach ($pages as $page) {
+	$tabs[] = array(
+		'title' => elgg_echo("expages:$page"),
+		'url' => "pg/admin/site/expages?type=$page",
+		'selected' => $page == $type,
+	);
+}
+
+echo elgg_view('navigation/tabs', array('tabs' => $tabs));
+
+return true;
+
+/**
+ * Tab navigation
+ *
+ * @uses string $vars['type'] horizontal || vertical - Defaults to horizontal
+ * @uses string $vars['class'] Additional class to add to ul
+ * @uses array $vars['tabs'] A multi-dimensional array of tab entries in the format array(
+ * 	'title' => string, // Title of link
+ * 	'url' => string, // URL for the link
+ * 	'class' => string  // Class of the li element
+ * 	'id' => string, // ID of the li element
+ * 	'selected' => bool // if this li element is currently selected
+ * 	'url_class' => string, // Class to pass to the link
+ * 	'url_id' => string, // ID to pass to the link
+ * )
+ */
 
 ?>
 
diff --git a/mod/externalpages/views/default/forms/expages/edit.php b/mod/externalpages/views/default/forms/expages/edit.php
new file mode 100644
index 000000000..afe091337
--- /dev/null
+++ b/mod/externalpages/views/default/forms/expages/edit.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Edit form body for external pages
+ * 
+ * @uses $vars['type']
+ * 
+ */
+
+$type = $vars['type'];
+
+//grab the required entity
+$page_contents = elgg_get_entities(array(
+	'type' => 'object',
+	'subtype' => $type,
+	'limit' => 1,
+));
+
+if ($page_contents) {
+	$description = $page_contents[0]->description;
+	$guid = $page_contents[0]->guid;
+} else {
+	$description = "";
+	$guid = 0;
+}
+
+// set the required form variables
+$input_area = elgg_view('input/longtext', array(
+	'internalname' => 'expagescontent',
+	'value' => $description,
+));
+$submit_input = elgg_view('input/submit', array(
+	'internalname' => 'submit',
+	'value' => elgg_echo('save'),
+));
+$hidden_type = elgg_view('input/hidden', array(
+	'internalname' => 'content_type',
+	'value' => $type,
+));
+$hidden_guid = elgg_view('input/hidden', array(
+	'internalname' => 'guid',
+	'value' => $guid,
+));
+
+$external_page_title = elgg_echo("expages:$type");
+
+//construct the form
+echo <<<EOT
+<h3 class="mvm">$external_page_title</h3>
+<div>$input_area</div>
+	$hidden_value
+	$hidden_type
+	$submit_input
+
+EOT;
+
diff --git a/mod/externalpages/views/default/object/expages.php b/mod/externalpages/views/default/object/expages.php
deleted file mode 100644
index 69ec7233e..000000000
--- a/mod/externalpages/views/default/object/expages.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-	/**
-	 * Elgg expages view
-	 * 
-	 * @package ElggExPages
-	 * 
-	 */
-
-?>
\ No newline at end of file