4 files changed, 8 insertions, 62 deletions
diff --git a/views/default/messages/errors/error.php b/views/default/messages/errors/error.php
index 26a24c807..3175521d4 100644
--- a/views/default/messages/errors/error.php
+++ b/views/default/messages/errors/error.php
@@ -10,8 +10,4 @@
  *
  * @uses $vars['object'] An error message (string)
  */
-?>
-
-<p>
-	<?php echo elgg_view('output/longtext', array('value' => $vars['object'])); ?>
-</p>
-\ No newline at end of file
+echo elgg_view('output/longtext', array('value' => $vars['object']));
diff --git a/views/default/messages/errors/list.php b/views/default/messages/errors/list.php
index 846e22a80..5e4b2ff31 100644
--- a/views/default/messages/errors/list.php
+++ b/views/default/messages/errors/list.php
@@ -14,37 +14,13 @@
 if (!empty($vars['object']) && is_array($vars['object'])) {
 
 ?>
-<!-- used to fade out the system messages after 3 seconds -->
-<script>
-$(document).ready(function () {
-	$('.messages_error').animate({opacity: 1.0}, 1000);
-	$('.messages_error').animate({opacity: 1.0}, 5000);
-	$('.messages_error').fadeOut('slow');
-
-	$('span.closeMessages a').click(function () {
-		$(".messages_error").stop();
-		$('.messages_error').fadeOut('slow');
-	return false;
-	});
-
-	$('div.messages_error').click(function () {
-		$(".messages_error").stop();
-		$('.messages_error').fadeOut('slow');
-	return false;
-	});
-
-});
-</script>
-
-	<div class="messages_error">
-	<span class="closeMessages"><a href="#"><?php echo elgg_echo('systemmessages:dismiss'); ?></a></span>
-
+<div id="elgg_system_message" class="hidden radius8 error">
+<script type="text/javascript">$(document).ready(function(){ elgg_system_message() });</script>
 <?php
 	foreach($vars['object'] as $error) {
 		echo elgg_view('messages/errors/error',array('object' => $error));
 	}
 ?>
-
-	</div>
+</div>
 <?php
 }
 \ No newline at end of file
diff --git a/views/default/messages/messages/list.php b/views/default/messages/messages/list.php
index 67da01657..36b55a20e 100644
--- a/views/default/messages/messages/list.php
+++ b/views/default/messages/messages/list.php
@@ -14,37 +14,14 @@
 if (!empty($vars['object']) && is_array($vars['object'])) {
 
 ?>
-<!-- used to fade out the system messages after 3 seconds -->
-<script type="text/javascript">
-$(document).ready(function () {
-	$('.messages').animate({opacity: 1.0}, 1000);
-	$('.messages').animate({opacity: 1.0}, 5000);
-	$('.messages').fadeOut('slow');
-
-	$('span.closeMessages a').click(function () {
-		$(".messages").stop();
-		$('.messages').fadeOut('slow');
-	return false;
-	});
-
-	$('div.messages').click(function () {
-		$(".messages").stop();
-		$('.messages').fadeOut('slow');
-	return false;
-	});
-});
-</script>
-
-	<div class="messages">
-	<span class="closeMessages"><a href="#"><?php echo elgg_echo('systemmessages:dismiss'); ?></a></span>
+<div id="elgg_system_message" class="hidden radius8">
+<script type="text/javascript">$(document).ready(function(){ elgg_system_message() });</script>
 <?php
 	foreach($vars['object'] as $message) {
 		echo elgg_view('messages/messages/message',array('object' => $message));
 	}
 ?>
-
-	</div>
-
+</div>
 <?php
 
 }
diff --git a/views/default/messages/messages/message.php b/views/default/messages/messages/message.php
index 717fd5e57..58777a3cc 100644
--- a/views/default/messages/messages/message.php
+++ b/views/default/messages/messages/message.php
@@ -10,8 +10,5 @@
  *
  * @uses $vars['object'] A system message (string)
  */
-?>
 
-<p>
-	<?php echo elgg_view('output/longtext', array('value' => $vars['object'])); ?>
-</p>
-\ No newline at end of file
+echo elgg_view('output/longtext', array('value' => $vars['object']));