diff options
| -rw-r--r-- | engine/lib/admin.php | 17 | ||||
| -rw-r--r-- | views/default/css/admin.php | 2 | ||||
| -rw-r--r-- | views/default/page/admin.php | 11 |
3 files changed, 14 insertions, 16 deletions
diff --git a/engine/lib/admin.php b/engine/lib/admin.php index 0ea029cdc..1e4b63cdd 100644 --- a/engine/lib/admin.php +++ b/engine/lib/admin.php @@ -280,14 +280,12 @@ function admin_pagesetup() { * @return void */ function admin_settings_page_handler($page) { - global $CONFIG; admin_gatekeeper(); elgg_admin_add_plugin_settings_menu(); elgg_set_context('admin'); elgg_unregister_css('elgg'); - $url = elgg_get_simplecache_url('js', 'admin'); elgg_register_js($url, 'admin'); @@ -313,9 +311,7 @@ function admin_settings_page_handler($page) { $view = 'admin/plugin_settings'; $plugin = elgg_get_plugin_from_id($page[1]); $vars['plugin'] = $plugin; - - // @todo ??? - $title = elgg_echo("admin:plugin_settings:{$page[1]}"); + $title = elgg_echo("admin:{$page[0]}"); } else { $view = 'admin/' . implode('/', $page); @@ -325,21 +321,12 @@ function admin_settings_page_handler($page) { } } - // allow a place to store helper views outside of the web-accessible views + // gets content and prevents direct access to 'components' views if ($page[0] == 'components' || !($content = elgg_view($view, $vars))) { $title = elgg_echo('admin:unknown_section'); $content = elgg_echo('admin:unknown_section'); } - $notices_html = ''; - if ($notices = elgg_get_admin_notices()) { - foreach ($notices as $notice) { - $notices_html .= elgg_view_entity($notice); - } - - $content = "<div class=\"admin_notices\">$notices_html</div>$content"; - } - $body = elgg_view_layout('admin', array('content' => $content, 'title' => $title)); echo elgg_view_page($title, $body, 'admin'); } 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"> |