From eedfbb15b8d1e81e2e11b34f02b68df6700b288d Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Tue, 31 Jul 2012 22:09:18 +0200
Subject: Added doctype, header, footer and aside tags. Fixed time tag.

---
 views/default/page/elements/doctype.php     |  1 -
 views/default/page/elements/foot.php        | 11 ++++
 views/default/page/elements/footer.php      | 22 ++++++++
 views/default/page/elements/head.php        | 79 +++++++++++++++++++++++++++++
 views/default/page/elements/owner_block.php | 31 +++++++++++
 5 files changed, 143 insertions(+), 1 deletion(-)
 delete mode 100644 views/default/page/elements/doctype.php
 create mode 100644 views/default/page/elements/foot.php
 create mode 100644 views/default/page/elements/footer.php
 create mode 100644 views/default/page/elements/head.php
 create mode 100644 views/default/page/elements/owner_block.php

(limited to 'views/default/page/elements')
diff --git a/views/default/page/elements/doctype.php b/views/default/page/elements/doctype.php
deleted file mode 100644
index 763b0739b..000000000
--- a/views/default/page/elements/doctype.php
+++ /dev/null
@@ -1 +0,0 @@
-<!DOCTYPE html>
\ No newline at end of file
diff --git a/views/default/page/elements/foot.php b/views/default/page/elements/foot.php
new file mode 100644
index 000000000..a56b373b4
--- /dev/null
+++ b/views/default/page/elements/foot.php
@@ -0,0 +1,11 @@
+<?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
new file mode 100644
index 000000000..ded2cea9a
--- /dev/null
+++ b/views/default/page/elements/footer.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Elgg footer
+ * The standard HTML footer that displays across the site
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ */
+
+echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz'));
+
+$powered_url = elgg_get_site_url() . "_graphics/powered_by_elgg_badge_drk_bckgnd.gif";
+
+echo '<div 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>';
diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
new file mode 100644
index 000000000..b1556b547
--- /dev/null
+++ b/views/default/page/elements/head.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * The standard HTML head
+ *
+ * @uses $vars['title'] The page title
+ */
+
+// Set title
+if (empty($vars['title'])) {
+	$title = elgg_get_config('sitename');
+} else {
+	$title = elgg_get_config('sitename') . ": " . $vars['title'];
+}
+
+global $autofeed;
+if (isset($autofeed) && $autofeed == true) {
+	$url = full_url();
+	if (substr_count($url,'?')) {
+		$url .= "&view=rss";
+	} else {
+		$url .= "?view=rss";
+	}
+	$url = elgg_format_url($url);
+	$feedref = <<<END
+
+	<link rel="alternate" type="application/rss+xml" title="RSS" href="{$url}" />
+
+END;
+} else {
+	$feedref = "";
+}
+
+$js = elgg_get_loaded_js('head');
+$css = elgg_get_loaded_css();
+
+$version = get_version();
+$release = get_version(true);
+?>
+	<meta charset="utf-8" />
+	<meta name="ElggRelease" content="<?php echo $release; ?>" />
+	<meta name="ElggVersion" content="<?php echo $version; ?>" />
+	<title><?php echo $title; ?></title>
+	<?php echo elgg_view('page/elements/shortcut_icon', $vars); ?>
+
+<?php foreach ($css as $link) { ?>
+	<link rel="stylesheet" href="<?php echo $link; ?>" type="text/css" />
+<?php } ?>
+
+<?php
+	$ie_url = elgg_get_simplecache_url('css', 'ie');
+	$ie7_url = elgg_get_simplecache_url('css', 'ie7');
+	$ie6_url = elgg_get_simplecache_url('css', 'ie6');
+?>
+	<!--[if gt IE 7]>
+		<link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" />
+	<![endif]-->
+	<!--[if IE 7]>
+		<link rel="stylesheet" type="text/css" href="<?php echo $ie7_url; ?>" />
+	<![endif]-->
+	<!--[if IE 6]>
+		<link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" />
+	<![endif]-->
+
+<?php foreach ($js as $script) { ?>
+	<script type="text/javascript" src="<?php echo $script; ?>"></script>
+<?php } ?>
+
+<script type="text/javascript">
+	<?php echo elgg_view('js/initialize_elgg'); ?>
+</script>
+
+<?php
+echo $feedref;
+
+$metatags = elgg_view('metatags', $vars);
+if ($metatags) {
+	elgg_deprecated_notice("The metatags view has been deprecated. Extend page/elements/head instead", 1.8);
+	echo $metatags;
+}
\ No newline at end of file
diff --git a/views/default/page/elements/owner_block.php b/views/default/page/elements/owner_block.php
new file mode 100644
index 000000000..fc7f0f6d2
--- /dev/null
+++ b/views/default/page/elements/owner_block.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Elgg owner block
+ * Displays page ownership information
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ */
+
+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
-- 
cgit v1.2.3

