Merge pull request #81 from sembrestels/e778258e839965597e5ebb8da362806db83e0dfb

Fixes #3947 by adding site pages to the list of public pages

3 files changed, 17 insertions, 0 deletions

diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php
index 1de4d5ec8..ce911bf10 100644
--- a/mod/externalpages/start.php
+++ b/mod/externalpages/start.php
@@ -12,6 +12,9 @@ function expages_init() {
 	elgg_register_page_handler('terms', 'expages_page_handler');
 	elgg_register_page_handler('privacy', 'expages_page_handler');
 	elgg_register_page_handler('expages', 'expages_page_handler');
+	
+	// Register public external pages
+	elgg_register_plugin_hook_handler('public_pages', 'walled_garden', 'expages_public');
 
 	// add a menu item for the admin edit page
 	elgg_register_admin_menu_item('configure', 'expages', 'appearance');
@@ -25,6 +28,15 @@ function expages_init() {
 }
 
 /**
+ * Extend the public pages range
+ *
+ */
+function expages_public($hook, $handler, $return, $params){
+	$pages = array('about', 'terms', 'privacy');
+	return array_merge($pages, $return);
+}
+
+/**
  * Setup the links to site pages
  */
 function expages_setup_footer_menu() {
diff --git a/views/default/css/walled_garden.php b/views/default/css/walled_garden.php
index 75bf0f29e..47850425b 100644
--- a/views/default/css/walled_garden.php
+++ b/views/default/css/walled_garden.php
@@ -28,6 +28,10 @@ $url = elgg_get_site_url();
 	margin: 35px 15px 15px 35px;
 }
 
+#elgg-walledgarden-intro ul {
+	float: left;
+}
+
 #elgg-walledgarden-login {
 	width: 230px;
 	float: left;
diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php
index 95d17fcff..62d8bb077 100644
--- a/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@ -31,6 +31,7 @@ $title = $site->name;
 						echo $title;
 					?>
 				</h1>
+				<?php echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz')); ?>
 			</div>
 			<div id="elgg-walledgarden-login">
 				<?php echo $vars['body']; ?>