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, 27 insertions, 0 deletions

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