7 files changed, 284 insertions, 302 deletions

diff --git a/views/default/js/admin.php b/views/default/js/admin.php
new file mode 100644
index 000000000..e8aa0d2ed
--- /dev/null
+++ b/views/default/js/admin.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Admin-area specific javascript functions.
+ *
+ * @since 1.8
+ */
+
+if (0) { ?><script><?php }
+?>
+elgg.provide('elgg.admin');
+
+elgg.admin.init = function () {
+
+	// system messages do not fade in admin area, instead slide up when clicked
+	$('.elgg-system-messages li').stop(true);
+	$('.elgg-system-messages li').die('click');
+	$('.elgg-system-messages li').live('click', function() {
+		$(this).stop().slideUp('medium');
+	});
+
+	// draggable plugin reordering
+	$('#elgg-plugin-list > ul').sortable({
+		items:                'li:has(> .elgg-state-draggable)',
+		handle:               '.elgg-head',
+		forcePlaceholderSize: true,
+		placeholder:          'elgg-widget-placeholder',
+		opacity:              0.8,
+		revert:               500,
+		stop:                 elgg.admin.movePlugin
+	});
+
+	// in-line editing for custom profile fields.
+	// @note this requires jquery.jeditable plugin
+	$(".elgg-state-editable").editable(elgg.admin.editProfileField, {
+		type:   'text',
+		onblur: 'submit',
+		width:  '300px',
+		height: 'none',
+		style:  'display:inline;'
+	});
+
+	// draggable profile field reordering.
+	$('#elgg-profile-fields').sortable({
+		items: 'li',
+		handle: 'span.elgg-state-draggable',
+		stop: elgg.admin.moveProfileField
+	});
+
+	// admin notices delete ajax
+	$('a.elgg-admin-notice').click(elgg.admin.deleteNotice);
+};
+
+/**
+ * Save the plugin order after a move event.
+ *
+ * @param {Object} e  Event object.
+ * @param {Object} ui jQueryUI object
+ * @return void
+ */
+elgg.admin.movePlugin = function(e, ui) {
+	// get guid from id like elgg-object-<guid>
+	var pluginGuid = ui.item.attr('id');
+	pluginGuid = pluginGuid.replace('elgg-object-', '');
+
+	elgg.action('admin/plugins/set_priority', {
+		data: {
+				plugin_guid: pluginGuid,
+				// we start at priority 1
+				priority: ui.item.index() + 1
+			}
+	});
+};
+
+/**
+ * In-line editing for custom profile fields
+ *
+ * @param string   value    The new value
+ * @param {Object} settings The settings used for editable
+ * @return void
+ */
+elgg.admin.editProfileField = function(value, settings) {
+	var id = $(this).attr('id');
+	id = id.replace('elgg-profile-field-', '');
+
+	var data = {
+		id:    id,
+		label: value
+	};
+
+	elgg.action('profile/fields/edit', data);
+	return value;
+};
+
+/**
+ * Save the plugin profile order after a move event.
+ *
+ * @param {Object} e  Event object.
+ * @param {Object} ui jQueryUI object
+ * @return void
+ */
+elgg.admin.moveProfileField = function(e, ui) {
+	var orderArr = $('#elgg-profile-fields').sortable('toArray');
+	var orderStr = orderArr.join(',');
+
+	elgg.action('profile/fields/reorder', {
+		fieldorder: orderStr
+	});
+};
+
+/**
+ * Fires the ajax action to delete the admin notice then hides the notice.
+ *
+ * @return void
+ */
+elgg.admin.deleteNotice = function(e) {
+	e.preventDefault();
+	var $container = $(this).closest('p');
+	
+	elgg.action($(this).attr('href'), {
+		success: function(json) {
+			$container.slideUp('medium');
+		}
+	});
+};
+
+elgg.register_hook_handler('init', 'system', elgg.admin.init, 1000);
\ No newline at end of file
diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php
index 1bf7574bd..c3b56e398 100644
--- a/views/default/js/elgg.php
+++ b/views/default/js/elgg.php
@@ -28,11 +28,13 @@ foreach ($model_files as $file) {
 $libs = array(
 	//libraries
 	'prototypes',
-	'events',
+	'hooks',
 	'security',
 	'languages',
 	'ajax',
 	'session',
+	'pageowner',
+	'configuration',
 
 	//ui
 	'ui',
@@ -41,218 +43,31 @@ $libs = array(
 
 foreach ($libs as $file) {
 	include("{$CONFIG->path}js/lib/$file.js");
+	// putting a new line between the files to address https://github.com/elgg/elgg/issues/3081
+	echo "\n";
 }
 
 /**
  * Set some values that are cacheable
  */
+if (0) { ?><script><?php }
 ?>
 
 elgg.version = '<?php echo get_version(); ?>';
 elgg.release = '<?php echo get_version(true); ?>';
 elgg.config.wwwroot = '<?php echo elgg_get_site_url(); ?>';
-elgg.security.interval = 5 * 60 * 1000; <?php //@todo make this configurable ?>
-
-//Mimic PHP engine boot process
-
-//Before the DOM is ready -- note that plugins aren't loaded yet
-elgg.trigger_event('boot', 'system');
+<?php //@todo make this configurable ?>
+elgg.security.interval = 5 * 60 * 1000;
+elgg.config.domReady = false;
+elgg.config.language = '<?php echo isset($CONFIG->language) ? $CONFIG->language : 'en'; ?>';
+elgg.config.languageReady = false;
 
 //After the DOM is ready
 $(function() {
-	elgg.trigger_event('init', 'system');
-});
-
-
-// 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;
-}
-
-// 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'); }
-	);
-
-});
-
-};
-
-
-var submenuLayer = 1000;
-
-function setup_avatar_menu(parent) {
-	if (!parent) {
-		parent = document;
-	}
-
-	// avatar image menu link
-	$(parent).find("div.elgg-user-icon img").mouseover(function() {
-		// find nested avatar_menu_button and show
-		$(this.parentNode.parentNode).children(".avatar_menu_button").show();
-		$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow");
-		//$(this.parentNode.parentNode).css("z-index", submenuLayer);
-	})
-	.mouseout(function() {
-		if($(this).parent().parent().find("div.sub_menu").css('display')!="block") {
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow");
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_on");
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_hover");
-			$(this.parentNode.parentNode).children(".avatar_menu_button").hide();
-		}
-		else {
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow");
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_on");
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_hover");
-			$(this.parentNode.parentNode).children(".avatar_menu_button").show();
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow");
-		}
-	});
-
-
-	// avatar contextual menu
-	$(".avatar_menu_button img").click(function(e) {
-
-		//var submenu = $(this).parent().parent().find("div.sub_menu");
-		var submenu = $(this).parent().parent().find(".elgg-hover-menu");
-
-		// close submenu if arrow is clicked & menu already open
-		if (submenu.css('display') == "block") {
-			//submenu.hide();
-		} else {
-			// get avatar dimensions
-			var avatar = $(this).parent().parent().parent().find("div.elgg-user-icon");
-			//alert( "avatarWidth: " + avatar.width() + ", avatarHeight: " + avatar.height() );
-
-			// move submenu position so it aligns with arrow graphic
-			if (e.pageX < 840) { // popup menu to left of arrow if we're at edge of page
-				submenu.css("top",(avatar.height()) + "px")
-					.css("left",(avatar.width()-15) + "px")
-					.fadeIn('normal');
-			} else {
-				submenu.css("top",(avatar.height()) + "px")
-					.css("left",(avatar.width()-166) + "px")
-					.fadeIn('normal');
-			}
-
-			// force z-index - workaround for IE z-index bug
-			avatar.css("z-index",  submenuLayer);
-			avatar.find("a.icon img").css("z-index",  submenuLayer);
-			submenu.css("z-index", submenuLayer+1);
-
-			submenuLayer++;
-
-			// change arrow to 'on' state
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow");
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_hover");
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow_on");
-		}
-
-		// hide any other open submenus and reset arrows
-		$("div.sub_menu:visible").not(submenu).hide();
-		$(".avatar_menu_button").removeClass("avatar_menu_arrow");
-		$(".avatar_menu_button").removeClass("avatar_menu_arrow_on");
-		$(".avatar_menu_button").removeClass("avatar_menu_arrow_hover");
-		$(".avatar_menu_button").hide();
-		$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow_on");
-		$(this.parentNode.parentNode).children("div.avatar_menu_button").show();
-		//alert("submenuLayer = " +submenu.css("z-index"));
-	})
-	// hover arrow each time mouseover enters arrow graphic (eg. when menu is already shown)
-	.mouseover(function() {
-		$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_on");
-		$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow");
-		$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow_hover");
-	})
-	// if menu not shown revert arrow, else show 'menu open' arrow
-	.mouseout(function() {
-		if($(this).parent().parent().find("div.sub_menu").css('display')!="block"){
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_hover");
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow");
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow");
-		}
-		else {
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow_hover");
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").removeClass("avatar_menu_arrow");
-			$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow_on");
-		}
-	});
-
-	// hide avatar menu if click occurs outside of menu
-	// and hide arrow button
-	$(document).click(function(event) {
-			var target = $(event.target);
-			if (target.parents(".elgg-user-icon").length == 0) {
-				$(".elgg-hover-menu").fadeOut();
-				$(".avatar_menu_button").removeClass("avatar_menu_arrow");
-				$(".avatar_menu_button").removeClass("avatar_menu_arrow_on");
-				$(".avatar_menu_button").removeClass("avatar_menu_arrow_hover");
-				$(".avatar_menu_button").hide();
-			}
-	});
-
-
-}
-
-$(document).ready(function() {
-
-	setup_avatar_menu();
-
+	elgg.config.domReady = true;
+	elgg.initWhenReady();
 });
 
-
 <?php
 
 $previous_content = elgg_view('js/initialise_elgg');
diff --git a/views/default/js/friendsPickerv1.php b/views/default/js/friendsPickerv1.php
deleted file mode 100644
index e9a387844..000000000
--- a/views/default/js/friendsPickerv1.php
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-	elgg friendsPicker plugin
-	adapted from Niall Doherty's excellent Coda-Slider - http://www.ndoherty.com/coda-slider
-*/
-
-
-jQuery.fn.friendsPicker = function(iterator) {
-
-	var settings; 
-	settings = $.extend({ easeFunc: "easeOutExpo", easeTime: 1000, toolTip: false }, settings);
-	
-	return this.each(function() {
-	
-		var container = $(this);
-		container.addClass("friends-picker");
-		// set panelwidth manually as it's hidden initially - adjust this value for different themes/pagewidths 
-		var panelWidth = 730;
-
-		// count the panels in the container
-		var panelCount = container.find("div.panel").size();
-		// calculate the width of all the panels lined up end-to-end
-		var friendsPicker_containerWidth = panelWidth*panelCount;
-		// specify width for the friendsPicker_container
-		container.find("div.friends-picker-container").css("width" , friendsPicker_containerWidth);
-		
-		// global variables for container.each function below
-		var friendsPickerNavigationWidth = 0;
-		var currentPanel = 1;
-		
-		// generate appropriate nav for each container
-		container.each(function(i) {
-			// generate Left and Right arrows
-			$(this).before("<div class='friends-picker-navigation-l' id='friends-picker-navigation-l" + iterator + "'><a href='#'>Left</a><\/div>");
-			$(this).after("<div class='friends-picker-navigation-r' id='friends-picker-navigation-r" + iterator + "'><a href='#'>Right</a><\/div>");
-			
-			// generate a-z tabs
-			$(this).before("<div class='friends-picker-navigation' id='friends-picker-navigation" + iterator + "'><ul><\/ul><\/div>");
-			$(this).find("div.panel").each(function(individualTabItemNumber) {
-				$("div#friends-picker-navigation" + iterator + " ul").append("<li class='tab" + (individualTabItemNumber+1) + "'><a href='#" + (individualTabItemNumber+1) + "'>" + $(this).attr("title") + "<\/a><\/li>");		
-			});
-			
-			// tabs navigation
-			$("div#friends-picker-navigation" + iterator + " a").each(function(individualTabItemNumber) {
-				// calc friendsPickerNavigationWidth by summing width of each li
-				friendsPickerNavigationWidth += $(this).parent().width();
-				// set-up individual tab clicks
-				$(this).bind("click", function() {
-					$(this).addClass("current").parent().parent().find("a").not($(this)).removeClass("current"); 
-					var distanceToMoveFriendsPicker_container = - (panelWidth*individualTabItemNumber);
-					currentPanel = individualTabItemNumber + 1;
-					$(this).parent().parent().parent().next().find("div.friends-picker-container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
-				});
-			});
-			
-			// Right arow click function
-			$("div#friends-picker-navigation-r" + iterator + " a").click(function() {
-				if (currentPanel == panelCount) {
-					var distanceToMoveFriendsPicker_container = 0;
-					currentPanel = 1; 
-					$(this).parent().parent().find("div.friends-picker-navigation a.current").removeClass("current").parent().parent().find("a:eq(0)").addClass("current");
-				} else {
-					var distanceToMoveFriendsPicker_container = - (panelWidth*currentPanel);
-					currentPanel += 1;
-					$(this).parent().parent().find("div.friends-picker-navigation a.current").removeClass("current").parent().next().find("a").addClass("current");
-				};
-				$(this).parent().parent().find("div.friends-picker-container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
-				return false;
-			});
-			
-			// Left arrow click function
-			$("div#friends-picker-navigation-l" + iterator + " a").click(function() {
-				if (currentPanel == 1) {
-					var distanceToMoveFriendsPicker_container = - (panelWidth*(panelCount - 1));
-					currentPanel = panelCount;
-					$(this).parent().parent().find("div.friends-picker-navigation a.current").removeClass("current").parent().parent().find("li:last a").addClass("current");
-				} else {
-					currentPanel -= 1;
-					var distanceToMoveFriendsPicker_container = - (panelWidth*(currentPanel - 1));
-					$(this).parent().parent().find("div.friends-picker-navigation a.current").removeClass("current").parent().prev().find("a").addClass("current");
-				};
-				$(this).parent().parent().find("div.friends-picker-container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
-				return false;
-			});
-						
-				// apply 'current' class to currently selected tab link
-				$("div#friends-picker-navigation" + iterator + " a:eq(0)").addClass("current");
-		});
-
-		$("div#friends-picker-navigation" + iterator).append("<br />");		
-  });
-};
-
-
diff --git a/views/default/js/initialize_elgg.php b/views/default/js/initialize_elgg.php
index 03d5adc5a..b45c33463 100644
--- a/views/default/js/initialize_elgg.php
+++ b/views/default/js/initialize_elgg.php
@@ -1,20 +1,24 @@
 <?php 
 /**
- * 
+ * Initialize Elgg's js lib with the uncacheable data
  */
 
+if (0) { ?><script><?php }
 ?>
-<script type="text/javascript">
 /**
  * Don't want to cache these -- they could change for every request
  */
-elgg.config.lastcache = <?php echo (int)($vars['config']->lastcache); ?>;
+elgg.config.lastcache = <?php echo (int)elgg_get_config('lastcache'); ?>;
+elgg.config.viewtype = '<?php echo elgg_get_viewtype(); ?>';
+elgg.config.simplecache_enabled = <?php echo (int)elgg_is_simplecache_enabled(); ?>;
 
 elgg.security.token.__elgg_ts = <?php echo $ts = time(); ?>;
 elgg.security.token.__elgg_token = '<?php echo generate_action_token($ts); ?>';
 
 <?php
-$page_owner = elgg_get_page_owner();
+// @todo json export should be smoother than this...  
+// @todo Might also be nice to make url exportable. $entity->url? yes please!
+$page_owner = elgg_get_page_owner_entity();
 
 if ($page_owner instanceof ElggEntity) {
 	$page_owner_json = array();
@@ -25,10 +29,10 @@ if ($page_owner instanceof ElggEntity) {
 	$page_owner_json['subtype'] = $page_owner->getSubtype();
 	$page_owner_json['url'] = $page_owner->getURL();
 	
-	echo 'elgg.page_owner =  '.json_encode($page_owner_json).';'; 
+	echo 'elgg.page_owner =  ' . json_encode($page_owner_json) . ';'; 
 }
 
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 
 if ($user instanceof ElggUser) {
 	$user_json = array();
@@ -38,8 +42,11 @@ if ($user instanceof ElggUser) {
 	
 	$user_json['subtype'] = $user->getSubtype();
 	$user_json['url'] = $user->getURL();
+	$user_json['admin'] = $user->isAdmin();
 	
-	echo 'elgg.session.user = new elgg.ElggUser('.json_encode($user_json).');'; 
+	echo 'elgg.session.user = new elgg.ElggUser(' . json_encode($user_json) . ');'; 
 }
-?>;
-</script>
\ No newline at end of file
+?>
+
+//Before the DOM is ready, but elgg's js framework is fully initalized
+elgg.trigger_hook('boot', 'system');
\ No newline at end of file
diff --git a/views/default/js/languages.php b/views/default/js/languages.php
index 009e8159c..fcf903d4b 100644
--- a/views/default/js/languages.php
+++ b/views/default/js/languages.php
@@ -1,9 +1,33 @@
 <?php
 /**
  * @uses $vars['language']
+ * @uses $vars['lc'] if present, client will be sent long expires headers
  */
-global $CONFIG;
 
 $language = $vars['language'];
+$lastcache = elgg_extract('lc', $vars, 0);
 
-echo json_encode($CONFIG->translations[$language]);
\ No newline at end of file
+// @todo add server-side caching
+if ($lastcache) {
+	// we're relying on lastcache changes to predict language changes
+	$etag = '"' . md5("$language|$lastcache") .  '"';
+
+	header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', strtotime("+6 months")), true);
+	header("Pragma: public", true);
+	header("Cache-Control: public", true);
+	header("ETag: $etag");
+
+	if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && trim($_SERVER['HTTP_IF_NONE_MATCH']) === $etag) {
+		header("HTTP/1.1 304 Not Modified");
+		exit;
+	}
+}
+
+$all_translations = elgg_get_config('translations');
+$translations = $all_translations['en'];
+
+if ($language != 'en') {
+	$translations = array_merge($translations, $all_translations[$language]);
+}
+
+echo json_encode($translations);
\ No newline at end of file
diff --git a/views/default/js/lightbox.php b/views/default/js/lightbox.php
new file mode 100644
index 000000000..a1f018eea
--- /dev/null
+++ b/views/default/js/lightbox.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Elgg lightbox
+ *
+ * Usage
+ * Call elgg_load_js('lightbox') and elgg_load_css('lightbox') then
+ * apply the class elgg-lightbox to links.
+ *
+ * Advanced Usage
+ * Elgg is distributed with the Fancybox jQuery library. Please go to
+ * http://fancybox.net for more information on the options of this lightbox.
+ *
+ * Overriding
+ * In a plugin, override this view and override the registration for the
+ * lightbox JavaScript and CSS (@see elgg_views_boot()).
+ *
+ * @todo add support for passing options: $('#myplugin-lightbox').elgg.ui.lightbox(options);
+ */
+
+if (0) { ?><script><?php }
+?>
+
+/**
+ * Lightbox initialization
+ */
+elgg.ui.lightbox_init = function() {
+	$(".elgg-lightbox").fancybox();
+}
+
+elgg.register_hook_handler('init', 'system', elgg.ui.lightbox_init);
+
+<?php
+
+$js_path = elgg_get_config('path');
+$js_path = "{$js_path}vendors/jquery/fancybox/jquery.fancybox-1.3.4.pack.js";
+include $js_path;
diff --git a/views/default/js/walled_garden.php b/views/default/js/walled_garden.php
new file mode 100644
index 000000000..e228df507
--- /dev/null
+++ b/views/default/js/walled_garden.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Walled garden JavaScript
+ *
+ * @since 1.8
+ */
+
+$cancel_button = elgg_view('input/button', array(
+	'value' => elgg_echo('cancel'),
+	'class' => 'elgg-button-cancel mlm',
+));
+$cancel_button = json_encode($cancel_button);
+
+if (0) { ?><script><?php }
+?>
+
+elgg.provide('elgg.walled_garden');
+
+elgg.walled_garden.init = function () {
+
+	$('.forgot_link').click(elgg.walled_garden.load('lost_password'));
+	$('.registration_link').click(elgg.walled_garden.load('register'));
+
+	$('input.elgg-button-cancel').live('click', function(event) {
+		var $wgs = $('.elgg-walledgarden-single');
+		if ($wgs.is(':visible')) {
+			$('.elgg-walledgarden-double').fadeToggle();
+			$wgs.fadeToggle();
+			$wgs.remove();
+		}
+		event.preventDefault();
+	});
+};
+
+/**
+ * Creates a closure for loading walled garden content through ajax
+ *
+ * @param {String} view Name of the walled garden view
+ * @return {Object}
+ */
+elgg.walled_garden.load = function(view) {
+	return function(event) {
+		var id = '#elgg-walledgarden-' + view;
+		id = id.replace('_', '-');
+		//@todo display some visual element that indicates that loading of content is running
+		elgg.get('walled_garden/' + view, {
+			'success' : function(data) {
+				var $wg = $('.elgg-body-walledgarden');
+				$wg.append(data);
+				$(id).find('input.elgg-button-submit').after(<?php echo $cancel_button; ?>);
+
+				if (view == 'register' && $wg.hasClass('hidden')) {
+					// this was a failed register, display the register form ASAP
+					$('#elgg-walledgarden-login').toggle(false);
+					$(id).toggle();
+					$wg.removeClass('hidden');
+				} else {
+					$('#elgg-walledgarden-login').fadeToggle();
+					$(id).fadeToggle();
+				}
+			}
+		});
+		event.preventDefault();
+	};
+};
+
+elgg.register_hook_handler('init', 'system', elgg.walled_garden.init);
\ No newline at end of file