Merge commit '7f5de67cb46e028792e179a4f6314e13771086da' as 'mod/purity_theme'

5 files changed, 107 insertions, 0 deletions

diff --git a/mod/purity_theme/views/default/page/elements/footer.php b/mod/purity_theme/views/default/page/elements/footer.php
new file mode 100644
index 000000000..2459545c0
--- /dev/null
+++ b/mod/purity_theme/views/default/page/elements/footer.php
@@ -0,0 +1,12 @@
+<?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'));
+?>
\ No newline at end of file
diff --git a/mod/purity_theme/views/default/page/elements/header.php b/mod/purity_theme/views/default/page/elements/header.php
new file mode 100644
index 000000000..ad3bfabce
--- /dev/null
+++ b/mod/purity_theme/views/default/page/elements/header.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Elgg page header
+ * In the default theme, the header lives between the topbar and main content area.
+ */
+
+// link back to main site.
+echo elgg_view('page/elements/header_logo', $vars);
+
+// drop-down login
+echo elgg_view('core/account/login_dropdown');
+
+// insert site-wide navigation
+?>
+<div id="social_menu">
+<?php
+echo elgg_view_menu('site');
+?>
+<div style="clear:both;"></div>
+</div>
+<?php echo elgg_view('page/elements/topbar', $vars); ?>
+<div style="clear:both;"></div>
diff --git a/mod/purity_theme/views/default/page/elements/header_logo.php b/mod/purity_theme/views/default/page/elements/header_logo.php
new file mode 100644
index 000000000..373ce27f7
--- /dev/null
+++ b/mod/purity_theme/views/default/page/elements/header_logo.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Elgg header logo
+ */
+
+$site = elgg_get_site_entity();
+$site_name = $site->name;
+$site_url = elgg_get_site_url();
+$site_description = $site->description;
+?>
+
+<h1 style="float:left;margin-top:10px;">
+	<a class="elgg-heading-site" href="<?php echo $site_url; ?>">
+		<?php echo $site_name; ?>
+	</a>
+</h1>
+
+
+<div style="clear:left;"></div>
+<p style="float:left;margin-left:20px;"><?php echo $site_description; ?></p>
+
diff --git a/mod/purity_theme/views/default/page/elements/messages.php b/mod/purity_theme/views/default/page/elements/messages.php
new file mode 100644
index 000000000..869ce2b5e
--- /dev/null
+++ b/mod/purity_theme/views/default/page/elements/messages.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Elgg global system message list
+ * Lists all system messages
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['object'] The array of message registers
+ */
+echo '<div style="width:990px;margin:0px auto;position:relative;">';
+echo '<ul class="elgg-system-messages">';
+
+// hidden li so we validate
+echo '<li class="hidden"></li>';
+
+if (isset($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
+	foreach ($vars['object'] as $type => $list ) {
+		foreach ($list as $message) {
+			echo "<li class=\"elgg-message elgg-state-$type\">";
+			echo autop($message);
+			echo '</li>';
+		}
+	}
+}
+
+echo '</ul></div>';
diff --git a/mod/purity_theme/views/default/page/elements/topbar.php b/mod/purity_theme/views/default/page/elements/topbar.php
new file mode 100644
index 000000000..ef70a83cc
--- /dev/null
+++ b/mod/purity_theme/views/default/page/elements/topbar.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Elgg topbar
+ * The standard elgg top toolbar
+ */
+
+// Elgg logo
+?>
+<div id="social_topbar">
+		<div style="width:930px;margin:0px auto;">
+			<?php if (elgg_is_logged_in()):
+				echo elgg_view_menu('topbar', array('sort_by' => 'priority', array('elgg-menu-hz')));
+			endif ?>
+		</div>
+		<div style="clear:both;"></div>
+</div>
+<?php
+
+// elgg tools menu
+// need to echo this empty view for backward compatibility.
+$content = elgg_view("navigation/topbar_tools");
+if ($content) {
+	elgg_deprecated_notice('navigation/topbar_tools was deprecated. Extend the topbar menus or the page/elements/topbar view directly', 1.8);
+	echo $content;
+}