Merge branch 'walled_garden' of https://github.com/cash/Elgg into 1.8

2 files changed, 25 insertions, 2 deletions

diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php
index 152a8b4d9..74da7f828 100644
--- a/mod/externalpages/start.php
+++ b/mod/externalpages/start.php
@@ -77,9 +77,16 @@ function expages_page_handler($page, $handler) {
 	} else {
 		$content .= elgg_echo("expages:notset");
 	}
+	$content = elgg_view('expages/wrapper', array('content' => $content));
 
-	$body = elgg_view_layout("one_sidebar", array('content' => $content));
-	echo elgg_view_page($title, $body);
+	if (elgg_is_logged_in() || !elgg_get_config('walled_garden')) {
+		$body = elgg_view_layout('one_sidebar', array('content' => $content));
+		echo elgg_view_page($title, $body);
+	} else {
+		elgg_load_css('elgg.walled_garden');
+		$body = elgg_view_layout('walled_garden', array('content' => $content));
+		echo elgg_view_page($title, $body, 'walled_garden');
+	}
 	return true;
 }
 
diff --git a/mod/externalpages/views/default/expages/wrapper.php b/mod/externalpages/views/default/expages/wrapper.php
new file mode 100644
index 000000000..8eb0b2f84
--- /dev/null
+++ b/mod/externalpages/views/default/expages/wrapper.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Wrapper for site pages content area
+ *
+ * @uses $vars['content']
+ */
+
+echo $vars['content'];
+
+echo '<div class="mtm">';
+echo elgg_view('output/url', array(
+	'text' => 'Back',
+	'href' => $_SERVER['HTTP_REFERER'],
+	'class' => 'float-alt'
+));
+echo '</div>';