Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 40 insertions, 0 deletions

diff --git a/views/default/js/walled_garden.php b/views/default/js/walled_garden.php
new file mode 100644
index 000000000..46c2934ff
--- /dev/null
+++ b/views/default/js/walled_garden.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Walled garden JavaScript
+ *
+ * @todo update for new JS lib
+ */
+
+$cancel_button = elgg_view('input/button', array(
+	'value' => elgg_echo('cancel'),
+	'class' => 'elgg-button-cancel mlm',
+));
+$cancel_button = trim($cancel_button);
+
+?>
+
+$(document).ready(function() {
+
+	// add cancel button to inline forms
+	$(".elgg-walledgarden-password").find('input.elgg-button-submit').after('<?php echo $cancel_button; ?>');
+	$('.elgg-walledgarden-register').find('input.elgg-button-submit').after('<?php echo $cancel_button; ?>');
+
+	$(".forgot_link").click(function(event) {
+		event.preventDefault();
+		$(".elgg-walledgarden-password").fadeToggle();
+	});
+
+	$(".registration_link").click(function(event) {
+		event.preventDefault();
+		$(".elgg-walledgarden-register").fadeToggle();
+	});
+
+	$('input.elgg-button-cancel').click(function(event) {
+		if ($(".elgg-walledgarden-password").is(':visible')) {
+			$(".forgot_link").click();
+		} else if ($('.elgg-walledgarden-register').is(':visible')) {
+			$(".registration_link").click();
+		}
+		event.preventDefault();
+	});
+});
\ No newline at end of file