4 files changed, 76 insertions, 27 deletions
diff --git a/views/default/core/walled_garden/body.php b/views/default/core/walled_garden/body.php
index bee1c9805..67d8e0c37 100644
--- a/views/default/core/walled_garden/body.php
+++ b/views/default/core/walled_garden/body.php
@@ -3,31 +3,9 @@
  * Walled garden body
  */
 
-$title = elgg_get_site_entity()->name;
-$welcome = elgg_echo('walled_garden:welcome');
-$welcome .= ': <br/>' . $title;
+echo elgg_view('core/walled_garden/login');
+echo elgg_view('core/walled_garden/lost_password');
 
-$menu = elgg_view_menu('walled_garden', array(
-	'sort_by' => 'priority',
-	'class' => 'elgg-menu-general elgg-menu-hz',
-));
-
-$login_box = elgg_view('core/account/login_box', array('module' => 'walledgarden-login'));
-
-$content = <<<HTML
-<div class="elgg-col elgg-col-1of2">
-	<div class="elgg-inner">
-		<h1 class="elgg-heading-walledgarden">
-			$welcome
-		</h1>
-		$menu
-	</div>
-</div>
-<div class="elgg-col elgg-col-1of2">
-	<div class="elgg-inner">
-		$login_box
-	</div>
-</div>
-HTML;
-
-echo elgg_view_module('walledgarden', '', $content, $vars);
+if (elgg_get_config('allow_registration')) {
+	echo elgg_view('core/walled_garden/register');
+}
diff --git a/views/default/core/walled_garden/login.php b/views/default/core/walled_garden/login.php
new file mode 100644
index 000000000..069422bfa
--- /dev/null
+++ b/views/default/core/walled_garden/login.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Walled garden login
+ */
+
+$title = elgg_get_site_entity()->name;
+$welcome = elgg_echo('walled_garden:welcome');
+$welcome .= ': <br/>' . $title;
+
+$menu = elgg_view_menu('walled_garden', array(
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-general elgg-menu-hz',
+));
+
+$login_box = elgg_view('core/account/login_box', array('module' => 'walledgarden-login'));
+
+$content = <<<HTML
+<div class="elgg-col elgg-col-1of2">
+	<div class="elgg-inner">
+		<h1 class="elgg-heading-walledgarden">
+			$welcome
+		</h1>
+		$menu
+	</div>
+</div>
+<div class="elgg-col elgg-col-1of2">
+	<div class="elgg-inner">
+		$login_box
+	</div>
+</div>
+HTML;
+
+echo elgg_view_module('walledgarden', '', $content, array('class' => 'elgg-walledgarden-double'));
diff --git a/views/default/core/walled_garden/lost_password.php b/views/default/core/walled_garden/lost_password.php
new file mode 100644
index 000000000..60356aaf0
--- /dev/null
+++ b/views/default/core/walled_garden/lost_password.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Walled garden lost password
+ */
+
+$title = elgg_echo('user:password:lost');
+$body = elgg_view_form('user/requestnewpassword');
+$lost = <<<HTML
+<div class="elgg-inner">
+	<h3>$title</h3>
+	$body
+</div>
+HTML;
+
+echo elgg_view_module('walledgarden', '', $lost, array(
+	'class' => 'elgg-walledgarden-single elgg-walledgarden-password hidden',
+));
diff --git a/views/default/core/walled_garden/register.php b/views/default/core/walled_garden/register.php
new file mode 100644
index 000000000..951bd7295
--- /dev/null
+++ b/views/default/core/walled_garden/register.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Walled garden registration
+ */
+
+$title = elgg_echo('register');
+$body = elgg_view_form('register', array(), array(
+	'friend_guid' => (int) get_input('friend_guid', 0),
+	'invitecode' => get_input('invitecode'),
+));
+
+$content = <<<__HTML
+<div class="elgg-inner">
+	<h2>$title</h2>
+	$body
+</div>
+__HTML;
+
+echo elgg_view_module('walledgarden', '', $content, array(
+	'class' => 'elgg-walledgarden-single elgg-walledgarden-register hidden',
+));
+\ No newline at end of file