diff options
author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-03 17:53:05 +0000 |
---|---|---|
committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-03 17:53:05 +0000 |
commit | 4766f36a4d74924f21ff329c4318ce4e069ffa04 (patch) | |
tree | 969b84632f2a8b0db79788a8a6db8e41d63e5cb4 /views/default/messages/errors | |
parent | 57a217fd6b708844407486046a1faa23b46cac08 (diff) | |
download | elgg-4766f36a4d74924f21ff329c4318ce4e069ffa04.tar.gz elgg-4766f36a4d74924f21ff329c4318ce4e069ffa04.tar.bz2 |
Pulled in the interface changes.
git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/messages/errors')
-rw-r--r-- | views/default/messages/errors/error.php | 6 | ||||
-rw-r--r-- | views/default/messages/errors/list.php | 30 |
2 files changed, 4 insertions, 32 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 |