5 files changed, 25 insertions, 53 deletions
diff --git a/views/default/page/default.php b/views/default/page/default.php
index 7a74a0459..4ff2215da 100644
--- a/views/default/page/default.php
+++ b/views/default/page/default.php
@@ -32,9 +32,14 @@ $header = elgg_view('page/elements/header', $vars);
 $body = elgg_view('page/elements/body', $vars);
 $footer = elgg_view('page/elements/footer', $vars);
 
+// Set the content type
+header("Content-type: text/html; charset=UTF-8");
+
+$lang = get_current_language();
+
 ?>
 <!DOCTYPE html>
-<html lang="<?php echo get_current_language(); ?>">
+<html lang="<?php echo $lang; ?>">
 <head>
 <?php echo elgg_view('page/elements/head', $vars); ?>
 </head>
@@ -43,14 +48,14 @@ $footer = elgg_view('page/elements/footer', $vars);
 	<div class="elgg-page-messages">
 		<?php echo $messages; ?>
 	</div>
-
-	<?php if (elgg_is_logged_in()): ?>
+	
+	<?php if (elgg_is_logged_in()){ ?>
 	<header class="elgg-page-topbar">
 		<div class="elgg-inner">
 			<?php echo $topbar; ?>
 		</div>
 	</header>
-	<?php endif; ?>
+	<?php } ?>
 
 	<header class="elgg-page-header">
 		<div class="elgg-inner">
diff --git a/views/default/page/elements/foot.php b/views/default/page/elements/foot.php
deleted file mode 100644
index 6736fe3ab..000000000
--- a/views/default/page/elements/foot.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * @override views/default/page/elements/foot.php
- */
-
-echo elgg_view('footer/analytics');
-
-$js = elgg_get_loaded_js('footer');
-foreach ($js as $script) { ?>
-	<script type="text/javascript" src="<?php echo $script; ?>"></script>
-<?php
-}
-
-?>
-\ No newline at end of file
diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php
index f1e120d52..c0da2f370 100644
--- a/views/default/page/elements/footer.php
+++ b/views/default/page/elements/footer.php
@@ -13,11 +13,11 @@ echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-me
 
 $powered_url = elgg_get_site_url() . "_graphics/powered_by_elgg_badge_drk_bckgnd.gif";
 
-echo '<div class="mts clearfloat float-alt">';
+echo '<footer class="mts clearfloat float-alt">';
 echo elgg_view('output/url', array(
 	'href' => 'http://elgg.org',
 	'text' => "<img src=\"$powered_url\" alt=\"Powered by Elgg\" width=\"106\" height=\"15\" />",
 	'class' => '',
 	'is_trusted' => true,
 ));
-echo '</div>';
+echo '</footer>';
diff --git a/views/default/page/elements/owner_block.php b/views/default/page/elements/owner_block.php
deleted file mode 100644
index 3a234c162..000000000
--- a/views/default/page/elements/owner_block.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Elgg owner block
- * Displays page ownership information
- *
- * @package Elgg
- * @subpackage Core
- * @override views/default/page/elements/owner_block.php
- *
- */
-
-elgg_push_context('owner_block');
-
-// groups and other users get owner block
-$owner = elgg_get_page_owner_entity();
-if ($owner instanceof ElggGroup ||
-	($owner instanceof ElggUser && $owner->getGUID() != elgg_get_logged_in_user_guid())) {
-
-	$header = elgg_view_entity($owner, array('full_view' => false));
-
-	$body = elgg_view_menu('owner_block', array('entity' => $owner));
-
-	$body .= elgg_view('page/elements/owner_block/extend', $vars);
-
-	echo elgg_view('page/components/module', array(
-		'header' => $header,
-		'body' => $body,
-		'class' => 'elgg-owner-block',
-	));
-}
-
-elgg_pop_context();
-\ No newline at end of file
diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php
index 1075ea811..c12a7203d 100644
--- a/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@ -7,6 +7,12 @@
  * @override views/default/page/walled_garden.php
  */
 
+$is_sticky_register = elgg_is_sticky_form('register');
+$wg_body_class = 'elgg-body-walledgarden';
+if ($is_sticky_register) {
+	$wg_body_class .= ' hidden';
+}
+
 // Set the content type
 header("Content-type: text/html; charset=UTF-8");
 ?>
@@ -20,10 +26,17 @@ header("Content-type: text/html; charset=UTF-8");
 	<div class="elgg-page-messages">
 		<?php echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); ?>
 	</div>
-	<div class="elgg-body-walledgarden">
+	<div class="<?php echo $wg_body_class; ?>">
 		<?php echo $vars['body']; ?>
 	</div>
 </div>
+<?php if ($is_sticky_register): ?>
+<script type="text/javascript">
+elgg.register_hook_handler('init', 'system', function() {
+	$('.registration_link').trigger('click');
+});
+</script>
+<?php endif; ?>
 <?php echo elgg_view('page/elements/foot'); ?>
 </body>
 </html>