Pulled in the interface changes.

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

4 files changed, 128 insertions, 0 deletions

diff --git a/mod/pages/views/default/pages/sidebar/sidebarthis.php b/mod/pages/views/default/pages/sidebar/sidebarthis.php
new file mode 100644
index 000000000..47a262501
--- /dev/null
+++ b/mod/pages/views/default/pages/sidebar/sidebarthis.php
@@ -0,0 +1,92 @@
+[<?php
+	/**
+	 * Elgg Pages
+	 * 
+	 * @package ElggPages
+	 * @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/
+	 */
+
+	global $CONFIG;
+	$entity = $vars['entity'];
+	$parent = $vars['entity']->parent_guid;
+	
+	$currentpage = (int) get_input('currentpage');
+	if ($currentpage) {
+		
+		$path = pages_get_path($currentpage);
+		$pathstring = implode(',',$path);
+		
+	} else {
+		$path = array();
+	}
+	
+	function pages_draw_child($childentity, $path) {
+		
+				$child = "\n\t\t{\n";
+				$child .= "\t\t\t\"text\": \"<a href=\\\"{$childentity->getURL()}\\\">" . addslashes($childentity->title) . "</a>\"\n";
+				
+				$extras = "";
+				$haschild = elgg_get_entities_from_metadata(array('metadata_name' => 'parent_guid', 'metadata_value' => $childentity->guid, 'limit' => 9999));
+				if ($haschild) {
+					if (in_array($childentity->guid,$path)) {
+						$extras .= "\t\t\t,\"expanded\": true";
+						$extras .= "\t\t\t,\"children\": [\n";
+						
+						$childstring = "";
+						foreach($haschild as $subchild) {
+							$childstringtemp = pages_draw_child($subchild,$path);
+							if (!empty($childstringtemp)) {
+								if (!empty($childstring)) $childstring .= ", ";
+								$childstring .= $childstringtemp;
+							}
+						}
+						
+						$extras .= $childstring . "\n\t\t\t]\n";
+					} else {
+						$extras .= ",\t\t\t\"id\": \"{$childentity->getGUID()}\",\n\t\t\t\"hasChildren\": true\n";
+					}
+					
+				}				
+				$child .= $extras . "\t\t}"; 
+		return $child;
+	}
+	
+	if (!$parent) {
+		echo "{\n";
+		echo "\t\"text\": \"<a href=\\\"{$vars['entity']->getURL()}\\\">" . addslashes($vars['entity']->title) . "</a>\"\n";
+	}
+	
+		$children = "";
+		$temp = "";
+		if (isset($vars['children']) && is_array($vars['children']) && (!isset($vars['fulltree']) || $vars['fulltree'] == 0)) {
+			if (!$parent) $temp .= "\t" . '"expanded": true,' . "\n";
+			if (!$parent) $temp .= "\t" . '"children": [' . "\n";		
+			foreach($vars['children'] as $child) {
+				$childrentemp = pages_draw_child($child,$path);
+				if (!empty($childrentemp)) {
+					if (!empty($children)) $children .= ", \n";
+					$children .= $childrentemp;
+				}
+				/*
+				 $children .= "\n\t\t{\n";
+				$children .= "\t\t\t\"text\": \"<a href=\\\"{$child->getURL()}\\\">{$child->title}</a>\",\n";
+				
+				$haschild = get_entities_from_metadata('parent_guid',$child->guid,'','',0,10,0,'',0,true);
+				if ($haschild) {
+					$children .= "\t\t\t\"id\": \"{$child->getGUID()}\",\n\t\t\t\"hasChildren\": true\n";
+				}				
+				$children .= "\t\t}";
+				*/ 
+			}
+			if (!empty($temp)) echo ',' . $temp;
+			echo $children;
+			if (!$parent) echo "\t\t" . ']' . "\n";
+		
+		}
+		
+	if (!$parent) echo "}";
+
+?>]
\ No newline at end of file
diff --git a/mod/pages/views/default/pages/sidebar/starter.php b/mod/pages/views/default/pages/sidebar/starter.php
new file mode 100644
index 000000000..4734ca929
--- /dev/null
+++ b/mod/pages/views/default/pages/sidebar/starter.php
@@ -0,0 +1,21 @@
+<?php
+
+	if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) {
+
+?>
+
+<script type="text/javascript">
+			
+			$(document).ready( function() {
+			
+				$("#pagetree<?php echo $vars['entity']->getGUID(); ?>").click();
+			
+			});
+			
+</script>
+
+<?php
+
+	}
+
+?>
\ No newline at end of file
diff --git a/mod/pages/views/default/pages/sidebar/tree.php b/mod/pages/views/default/pages/sidebar/tree.php
new file mode 100644
index 000000000..c83e3f682
--- /dev/null
+++ b/mod/pages/views/default/pages/sidebar/tree.php
@@ -0,0 +1,8 @@
+<?php
+
+?>
+<div id="sidebar_page_tree">
+	    <h3><?php echo elgg_echo("pages:navigation"); ?></h3>	
+		<div id="pagesTree" class="pagesTreeContainer"></div>
+</div>
+<br class="clearfloat" />
\ No newline at end of file
diff --git a/mod/pages/views/default/pages/sidebar/wrapper.php b/mod/pages/views/default/pages/sidebar/wrapper.php
new file mode 100644
index 000000000..ed21b4dd6
--- /dev/null
+++ b/mod/pages/views/default/pages/sidebar/wrapper.php
@@ -0,0 +1,7 @@
+<?php
+
+	echo "[";
+	echo $vars['body'];
+	echo "]";
+
+?>
\ No newline at end of file