From 354d9eebf2c84b66f1103a61a8f4ffa832f350b6 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
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/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 +++++-----
 6 files changed, 39 insertions(+), 188 deletions(-)
 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/views')

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
-- 
cgit v1.2.3