Merge branch '1.8' of gitorious.org:lorea/html5 into 1.8

Conflicts:
	views/default/page/elements/foot.php
	views/default/page/elements/owner_block.php

3 files changed, 2 insertions, 48 deletions

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