Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 25 insertions, 0 deletions

diff --git a/mod/habitorio_theme/views/default/page/elements/topbar.php b/mod/habitorio_theme/views/default/page/elements/topbar.php
new file mode 100644
index 000000000..ef70a83cc
--- /dev/null
+++ b/mod/habitorio_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;
+}