aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-26 22:29:07 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-26 22:29:07 +0000
commit92cfe78f70407552bc3128640d28c2f969b28161 (patch)
tree50a247ef31603b783cfd89cf766421642a6e97ef /views
parenta4898df06bf1df35a309535b2fe953b23e1d0ca9 (diff)
downloadelgg-92cfe78f70407552bc3128640d28c2f969b28161.tar.gz
elgg-92cfe78f70407552bc3128640d28c2f969b28161.tar.bz2
moved admin messages into admin page shell
git-svn-id: http://code.elgg.org/elgg/trunk@8498 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
-rw-r--r--views/default/css/admin.php2
-rw-r--r--views/default/page/admin.php11
2 files changed, 12 insertions, 1 deletions
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 0b8aec774..a6e1c1e85 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -203,7 +203,7 @@ table.mceLayout {
content: "";
}
-.elgg-system-messages {
+.elgg-page-messages {
padding: 20px 40px 0;
width: 500px;
margin-bottom: -10px;
diff --git a/views/default/page/admin.php b/views/default/page/admin.php
index ba09071f7..fcf188af1 100644
--- a/views/default/page/admin.php
+++ b/views/default/page/admin.php
@@ -26,6 +26,16 @@ if (count_messages()) {
system_messages(null, "");
}
}
+
+$notices_html = '';
+if ($notices = elgg_get_admin_notices()) {
+ foreach ($notices as $notice) {
+ $notices_html .= elgg_view_entity($notice);
+ }
+
+ $notices_html = "<div class=\"admin_notices\">$notices_html</div>";
+}
+
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -41,6 +51,7 @@ if (count_messages()) {
</div>
<div class="elgg-page-messages">
<?php echo elgg_view('page/elements/messages', array('object' => $messages)); ?>
+ <?php echo $notices_html; ?>
</div>
<div class="elgg-page-body">
<div class="elgg-inner">