Fixes #2640 - elgg_view_layout now uses a parameter array like all the other elgg_view* functions

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

7 files changed, 36 insertions, 265 deletions

diff --git a/views/default/canvas/default.php b/views/default/canvas/default.php
index cfcee9484..60dc90b0d 100644
--- a/views/default/canvas/default.php
+++ b/views/default/canvas/default.php
@@ -4,9 +4,15 @@
  *
  * @package Elgg
  * @subpackage Core
+ *
+ * @uses $vars['content'] Content string
  */
 
+// @todo deprecated so remove in Elgg 2.0
 if (isset($vars['area1'])) {
 	echo $vars['area1'];
 }
 
+if (isset($vars['content'])) {
+	echo $vars['content'];
+}
diff --git a/views/default/canvas/layouts/administration.php b/views/default/canvas/layouts/administration.php
index 9b0144ade..0e18eb7e8 100644
--- a/views/default/canvas/layouts/administration.php
+++ b/views/default/canvas/layouts/administration.php
@@ -4,6 +4,9 @@
  *
  * @package Elgg
  * @subpackage Core
+ *
+ * @uses $vars['content'] Content string
+ * @uses $vars['sidebar'] Optional sidebar content
  */
 ?>
 <style type="text/css">
@@ -885,8 +888,10 @@ ul.admin_plugins {
 <div id="elgg_content" class="clearfix admin_area">
 	
 	<div id="elgg_page_contents" class="clearfix">
-		<?php 
-			if (isset($vars['area1'])) echo $vars['area1'];
+		<?php
+			if (isset($vars['content'])) {
+				echo $vars['content'];
+			}
 		?>
 	</div>
 	<div id="elgg_sidebar" class="clearfix">
diff --git a/views/default/canvas/layouts/one_column.php b/views/default/canvas/layouts/one_column.php
index 67366efc6..e4a7845f5 100644
--- a/views/default/canvas/layouts/one_column.php
+++ b/views/default/canvas/layouts/one_column.php
@@ -4,10 +4,13 @@
  *
  * @package Elgg
  * @subpackage Core
+ *
+ * @uses $vars['content'] Content string
  */
 ?>
 <div id="elgg_content" class="clearfix">
 	<div id="elgg_page_contents" class="clearfix one_column">
+		<?php echo $vars['content']; ?>
 		<?php echo $vars['area1']; ?>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/default/canvas/layouts/one_column_with_sidebar.php b/views/default/canvas/layouts/one_column_with_sidebar.php
index dff45a452..046c49997 100644
--- a/views/default/canvas/layouts/one_column_with_sidebar.php
+++ b/views/default/canvas/layouts/one_column_with_sidebar.php
@@ -1,9 +1,12 @@
 <?php
 /**
- * Elgg 1 column with sidebar canvas layout
+ * Elgg 1 column with sidebar layout
  *
  * @package Elgg
  * @subpackage Core
+ *
+ * @uses $vars['content'] The content string for the main column
+ * @uses $vars['sidebar'] Optional content that is displayed in the sidebar
  */
 ?>
 <div id="elgg_content" class="clearfix sidebar">
@@ -14,10 +17,14 @@
 	</div>
 	
 	<div id="elgg_page_contents" class="clearfix">
-		<?php 
+		<?php
+			// @todo deprecated so remove in Elgg 2.0
 			if (isset($vars['area1'])) {
 				echo $vars['area1'];
 			}
+			if (isset($vars['content'])) {
+				echo $vars['content'];
+			}
 		?>
 	</div>
 </div>
diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php
index 0c6fb7e88..4e6da8203 100644
--- a/views/default/js/initialise_elgg.php
+++ b/views/default/js/initialise_elgg.php
@@ -55,262 +55,3 @@ $(function() {
 	elgg.trigger_event('init', 'system');
 });
 
-$(document).ready(function () {
-
-	// COLLAPSABLE WIDGETS (on Dashboard? & Profile pages)
-	// toggle widget box contents
-	$('a.toggle_box_contents').bind('click', toggleContent);
-
-	// WIDGET GALLERY EDIT PANEL
-	// Sortable widgets
-	var els = ['#leftcolumn_widgets', '#middlecolumn_widgets', '#rightcolumn_widgets', '#widget_picker_gallery' ];
-	var $els = $(els.toString());
-
-	$els.sortable({
-		items: '.draggable_widget',
-		handle: '.drag_handle',
-		forcePlaceholderSize: true,
-		placeholder: 'ui-state-highlight',
-		cursor: 'move',
-		revert: true,
-		opacity: 0.9,
-		appendTo: 'body',
-		connectWith: els,
-		start:function(e,ui) {
-
-		},
-		stop: function(e,ui) {
-			// refresh list before updating hidden fields with new widget order
-			$(this).sortable( "refresh" );
-
-			var widgetNamesLeft = outputWidgetList('#leftcolumn_widgets');
-			var widgetNamesMiddle = outputWidgetList('#middlecolumn_widgets');
-			var widgetNamesRight = outputWidgetList('#rightcolumn_widgets');
-
-			document.getElementById('debugField1').value = widgetNamesLeft;
-			document.getElementById('debugField2').value = widgetNamesMiddle;
-			document.getElementById('debugField3').value = widgetNamesRight;
-		}
-	});
-
-	// bind more info buttons - called when new widgets are created
-	widget_moreinfo();
-
-	// set-up hover class for dragged widgets
-	$("#rightcolumn_widgets").droppable({
-		accept: ".draggable_widget",
-		hoverClass: 'droppable-hover'
-	});
-	$("#middlecolumn_widgets").droppable({
-		accept: ".draggable_widget",
-		hoverClass: 'droppable-hover'
-	});
-	$("#leftcolumn_widgets").droppable({
-		accept: ".draggable_widget",
-		hoverClass: 'droppable-hover'
-	});
-
-	// user likes
-	$(".likes_list_button").click(function(event) {	
-		if ($(this).next(".likes_list").css('display') == 'none') {	// show list
-			// hide any other currently viewable likes lists
-			$('.likes_list').fadeOut();
-			
-			var topPosition = - $(this).next(".likes_list").height();
-			topPosition10 = topPosition + 10 + "px";
-			topPosition = topPosition - 5 + "px";
-			$('.likes_list').css('top',topPosition10);
-			$('.likes_list').css('left', -$('.likes_list').width()+110);
-			$(this).next(".likes_list").animate({opacity: "toggle", top: topPosition}, 500);
-			
-			// set up cancel for a click outside the likes list
-			$(document).click(function(event) { 		
-					var target = $(event.target);
-					if (target.parents(".likes_list_holder").length == 0) {				
-						$(".likes_list").fadeOut();
-					}
-			});
-			
-		} else { // hide list
-			var topPosition = - $(this).next(".likes_list").height() + 5;
-			$(this).next(".likes_list").animate({opacity: "toggle", top: topPosition}, 500);
-		}
-	});
-	
-	elgg_system_message();
-
-}); /* end document ready function */
-
-
-
-// display & hide elgg system messages
-function elgg_system_message() {
-	$("#elgg_system_message").animate({opacity: 0.9}, 1000);
-	$("#elgg_system_message").animate({opacity: 0.9}, 5000);
-	$("#elgg_system_message").fadeOut('slow');
-
-	$("#elgg_system_message").click(function () {
-		$("#elgg_system_message").stop();
-		$("#elgg_system_message").fadeOut('slow');
-	return false;
-	});
-}
-
-// reusable slide in/out toggle function
-function elgg_slide_toggle(activateLink, parentElement, toggleElement) {
-	$(activateLink).closest(parentElement).find(toggleElement).animate({"height": "toggle"}, { duration: 400 });
-	return false;
-}
-
-// List active widgets for each page column
-function outputWidgetList(forElement) {
-	return( $("input[name='handler'], input[name='guid']", forElement ).makeDelimitedList("value") );
-}
-
-// Make delimited list
-jQuery.fn.makeDelimitedList = function(elementAttribute) {
-
-	var delimitedListArray = new Array();
-	var listDelimiter = "::";
-
-	// Loop over each element in the stack and add the elementAttribute to the array
-	this.each(function(e) {
-			var listElement = $(this);
-			// Add the attribute value to our values array
-			delimitedListArray[delimitedListArray.length] = listElement.attr(elementAttribute);
-		}
-	);
-
-	// Return value list by joining the array
-	return(delimitedListArray.join(listDelimiter));
-}
-
-
-// Read each widgets collapsed/expanded state from cookie and apply
-function widget_state(forWidget) {
-
-	var thisWidgetState = $.cookie(forWidget);
-
-	if (thisWidgetState == 'collapsed') {
-		forWidget = "#" + forWidget;
-		$(forWidget).find("div.collapsable_box_content").hide();
-		$(forWidget).find("a.toggle_box_contents").html('+');
-		$(forWidget).find("a.toggle_box_edit_panel").fadeOut('medium');
-	};
-}
-
-
-// Toggle widgets contents and save to a cookie
-var toggleContent = function(e) {
-var targetContent = $('div.collapsable_box_content', this.parentNode.parentNode);
-	if (targetContent.css('display') == 'none') {
-		targetContent.slideDown(400);
-		$(this).html('-');
-		$(this.parentNode).children(".toggle_box_edit_panel").fadeIn('medium');
-
-		// set cookie for widget panel open-state
-		var thisWidgetName = $(this.parentNode.parentNode.parentNode).attr('id');
-		$.cookie(thisWidgetName, 'expanded', { expires: 365 });
-
-	} else {
-		targetContent.slideUp(400);
-		$(this).html('+');
-		$(this.parentNode).children(".toggle_box_edit_panel").fadeOut('medium');
-		// make sure edit pane is closed
-		$(this.parentNode.parentNode).children(".collapsable_box_editpanel").hide();
-
-		// set cookie for widget panel closed-state
-		var thisWidgetName = $(this.parentNode.parentNode.parentNode).attr('id');
-		$.cookie(thisWidgetName, 'collapsed', { expires: 365 });
-	}
-	return false;
-};
-
-// More info tooltip in widget gallery edit panel
-function widget_moreinfo() {
-
-	$("img.more_info").hover(function(e) {
-	var widgetdescription = $("input[name='description']", this.parentNode.parentNode.parentNode ).attr('value');
-	$("body").append("<p id='widget_moreinfo'><b>"+ widgetdescription +" </b></p>");
-
-		if (e.pageX < 900) {
-			$("#widget_moreinfo")
-				.css("top",(e.pageY + 10) + "px")
-				.css("left",(e.pageX + 10) + "px")
-				.fadeIn("medium");
-		}
-		else {
-			$("#widget_moreinfo")
-				.css("top",(e.pageY + 10) + "px")
-				.css("left",(e.pageX - 210) + "px")
-				.fadeIn("medium");
-		}
-	},
-	function() {
-		$("#widget_moreinfo").remove();
-	});
-
-	$("img.more_info").mousemove(function(e) {
-		// action on mousemove
-	});
-};
-
-// ELGG DROP DOWN MENU
-$.fn.elgg_dropdownmenu = function(options) {
-
-options = $.extend({speed: 350}, options || {});
-
-this.each(function() {
-
-	var root = this, zIndex = 5000;
-
-	function getSubnav(ele) {
-	if (ele.nodeName.toLowerCase() == 'li') {
-		var subnav = $('> ul', ele);
-		return subnav.length ? subnav[0] : null;
-	} else {
-
-		return ele;
-	}
-	}
-
-	function getActuator(ele) {
-	if (ele.nodeName.toLowerCase() == 'ul') {
-		return $(ele).parents('li')[0];
-	} else {
-		return ele;
-	}
-	}
-
-	function hide() {
-	var subnav = getSubnav(this);
-	if (!subnav) return;
-	$.data(subnav, 'cancelHide', false);
-	setTimeout(function() {
-		if (!$.data(subnav, 'cancelHide')) {
-		$(subnav).slideUp(100);
-		}
-	}, 250);
-	}
-
-	function show() {
-	var subnav = getSubnav(this);
-	if (!subnav) return;
-	$.data(subnav, 'cancelHide', true);
-	$(subnav).css({zIndex: zIndex++}).slideDown(options.speed);
-	if (this.nodeName.toLowerCase() == 'ul') {
-		var li = getActuator(this);
-		$(li).addClass('hover');
-		$('> a', li).addClass('hover');
-	}
-	}
-
-	$('ul, li', this).hover(show, hide);
-	$('li', this).hover(
-	function() { $(this).addClass('hover'); $('> a', this).addClass('hover'); },
-	function() { $(this).removeClass('hover'); $('> a', this).removeClass('hover'); }
-	);
-
-});
-
-};
diff --git a/views/default/messages/exceptions/exception.php b/views/default/messages/exceptions/exception.php
index 6e66445a3..ecbd791e5 100644
--- a/views/default/messages/exceptions/exception.php
+++ b/views/default/messages/exceptions/exception.php
@@ -34,4 +34,5 @@ END;
 
 $title = $class;
 
-echo elgg_view_layout("one_column", elgg_view_title($title) . $body);
\ No newline at end of file
+$content = elgg_view_title($title) . $body;
+echo elgg_view_layout("one_column", array('content' => $content));
\ No newline at end of file
diff --git a/views/default/page_elements/sidebar.php b/views/default/page_elements/sidebar.php
index 2706a23c5..8a5574da6 100644
--- a/views/default/page_elements/sidebar.php
+++ b/views/default/page_elements/sidebar.php
@@ -1,18 +1,26 @@
 <?php
 /**
  * Elgg sidebar contents
- * 
+ *
+ * @uses $vars['sidebar'] Optional content that is displayed at the bottom of sidebar
  **/
 
 echo elgg_view('page_elements/owner_block');
 
 echo elgg_view('navigation/sidebar_menu');
 
+// optional 'sidebar' parameter
+if (isset($vars['sidebar'])) {
+	echo $vars['sidebar'];
+}
+
+// @todo deprecated so remove in Elgg 2.0
 // optional second parameter of elgg_view_layout
 if (isset($vars['area2'])) {
 	echo $vars['area2'];
 }
 
+// @todo deprecated so remove in Elgg 2.0
 // optional third parameter of elgg_view_layout
 if (isset($vars['area3'])) {
 	echo $vars['area3'];