Pulled in the interface changes.

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

9 files changed, 338 insertions, 0 deletions

diff --git a/mod/externalpages/views/default/expages/analytics.php b/mod/externalpages/views/default/expages/analytics.php
new file mode 100644
index 000000000..8aac0e9d9
--- /dev/null
+++ b/mod/externalpages/views/default/expages/analytics.php
@@ -0,0 +1,25 @@
+<?php
+
+	/**
+	 * Elgg Analytics view
+	 * 
+	 * @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 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
new file mode 100644
index 000000000..c511a45db
--- /dev/null
+++ b/mod/externalpages/views/default/expages/css.php
@@ -0,0 +1,17 @@
+<?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/
+	 */
+
+?>
+
+/* 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
new file mode 100644
index 000000000..0e7b40b56
--- /dev/null
+++ b/mod/externalpages/views/default/expages/footer_menu.php
@@ -0,0 +1,21 @@
+<?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/
+	 * 
+	 */
+	 
+	
+?>
+
+<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
new file mode 100644
index 000000000..2f638d549
--- /dev/null
+++ b/mod/externalpages/views/default/expages/forms/edit.php
@@ -0,0 +1,92 @@
+<?php
+
+	/**
+	 * Elgg External pages edit
+	 * 
+	 * @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 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;
+			 $tags = $pc->tags;
+			 $guid = $pc->guid;
+		 }
+	}else {		
+		$tags = "";
+		$description = "";
+	}
+		
+	// set the required form variables
+		$input_area = elgg_view('input/longtext', array('internalname' => 'expagescontent', 'value' => $description));
+		$tag_input = elgg_view('input/tags', array('internalname' => 'expagestags', 'value' => $tags));
+        $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));
+		$tag_label = elgg_echo('tags') . "<br/>";  
+		
+		//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>
+		<p>
+			$tag_label
+			$tag_input
+		</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
new file mode 100644
index 000000000..ee4c89989
--- /dev/null
+++ b/mod/externalpages/views/default/expages/forms/editfront.php
@@ -0,0 +1,78 @@
+<?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
new file mode 100644
index 000000000..1c6c2442e
--- /dev/null
+++ b/mod/externalpages/views/default/expages/front_left.php
@@ -0,0 +1,27 @@
+<?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
new file mode 100644
index 000000000..a28b5748c
--- /dev/null
+++ b/mod/externalpages/views/default/expages/front_right.php
@@ -0,0 +1,35 @@
+<?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
new file mode 100644
index 000000000..10c07397b
--- /dev/null
+++ b/mod/externalpages/views/default/expages/menu.php
@@ -0,0 +1,29 @@
+<?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/
+	 * 
+	 */
+	 
+	 //type
+	 $type = $vars['type'];
+	 
+	 //set the url
+	 $url = $vars['url'] . "pg/expages/index.php?type=";
+
+?>
+
+<div id="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 == '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
diff --git a/mod/externalpages/views/default/object/expages.php b/mod/externalpages/views/default/object/expages.php
new file mode 100644
index 000000000..e7f0385b1
--- /dev/null
+++ b/mod/externalpages/views/default/object/expages.php
@@ -0,0 +1,14 @@
+<?php
+
+	/**
+	 * Elgg expages view
+	 * 
+	 * @package ElggExPages
+	 * @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.com/
+	 * 
+	 */
+
+?>
\ No newline at end of file