5 files changed, 31 insertions, 26 deletions
diff --git a/views/default/messages/list.php b/views/default/messages/list.php
deleted file mode 100644
index dad1c23ab..000000000
--- a/views/default/messages/list.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Elgg global system message list
- * Lists all system messages
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['object'] The array of message registers
- */
-
-if (!empty($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
-?>
-
-<ul class="elgg-system-messages">
-<?php 
-	foreach ($vars['object'] as $register => $list ) {
-		echo elgg_view("messages/{$register}/list", array('object' => $list));
-	}
-?>
-</ul>
-<?php
-}
diff --git a/views/default/page_elements/messages.php b/views/default/page_elements/messages.php
new file mode 100644
index 000000000..f44d1204b
--- /dev/null
+++ b/views/default/page_elements/messages.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Elgg global system message list
+ * Lists all system messages
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['object'] The array of message registers
+ */
+
+if (isset($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
+
+	echo '<ul class="elgg-system-messages">';
+
+	foreach ($vars['object'] as $type => $list ) {
+		foreach ($list as $message) {
+			echo "<li class=\"elgg-state-$type radius8\">";
+			echo elgg_view('output/longtext', array(
+				'value' => $message,
+				'parse_urls' => false
+			));
+			echo '</li>';
+		}
+	}
+
+	echo '</ul>';
+}
diff --git a/views/default/page_shells/admin.php b/views/default/page_shells/admin.php
index 9fdbf2e28..ff427a6b7 100644
--- a/views/default/page_shells/admin.php
+++ b/views/default/page_shells/admin.php
@@ -24,6 +24,6 @@ if (empty($vars['title'])) {
 }
 
 echo elgg_view('page_elements/html_begin', $vars);
-echo elgg_view('messages/list', array('object' => $vars['sysmessages']));
+echo elgg_view('page_elements/messages', array('object' => $vars['sysmessages']));
 echo elgg_view('page_elements/content', $vars);
 echo elgg_view('page_elements/html_end', $vars);
 \ No newline at end of file
diff --git a/views/default/page_shells/default.php b/views/default/page_shells/default.php
index 3c643933a..3380188d9 100644
--- a/views/default/page_shells/default.php
+++ b/views/default/page_shells/default.php
@@ -27,7 +27,7 @@ if (empty($vars['title'])) {
 echo elgg_view('page_elements/html_begin', $vars);
 
 echo '<div class="elgg-page">';
-echo elgg_view('messages/list', array('object' => $vars['sysmessages']));
+echo elgg_view('page_elements/messages', array('object' => $vars['sysmessages']));
 echo elgg_view('page_elements/topbar', $vars);
 echo elgg_view('page_elements/header', $vars);
 echo elgg_view('page_elements/body', $vars);
diff --git a/views/default/page_shells/walled_garden.php b/views/default/page_shells/walled_garden.php
index 5c4e54b75..dbd8d3ac0 100644
--- a/views/default/page_shells/walled_garden.php
+++ b/views/default/page_shells/walled_garden.php
@@ -268,7 +268,7 @@ body {background: white;}
 </style>
 
 <?php
-$view = elgg_view('messages/list', array('object' => $vars['sysmessages']));
+$view = elgg_view('page_elements/messages', array('object' => $vars['sysmessages']));
 
 echo "<div id='walledgarden_sysmessages' class='clearfix'>$view</div>";       
 echo '<div id="walledgarden_container"><div id="walledgarden" class="clearfix">';