diff options
Diffstat (limited to 'views/default')
| -rw-r--r-- | views/default/admin/appearance/menu_items.php | 1 | ||||
| -rw-r--r-- | views/default/admin/appearance/profile_fields.php | 2 | ||||
| -rw-r--r-- | views/default/admin/overview/numentities.php | 7 | ||||
| -rw-r--r-- | views/default/admin/overview/online.php | 22 | ||||
| -rw-r--r-- | views/default/admin/overview/statistics.php | 1 | ||||
| -rw-r--r-- | views/default/admin/plugins/advanced.php | 4 | ||||
| -rw-r--r-- | views/default/admin/plugins/simple.php | 4 | ||||
| -rw-r--r-- | views/default/admin/site/advanced.php | 1 | ||||
| -rw-r--r-- | views/default/admin/site/basic.php | 1 | ||||
| -rw-r--r-- | views/default/admin/users/add.php | 1 | ||||
| -rw-r--r-- | views/default/admin/users/newest.php | 23 | ||||
| -rw-r--r-- | views/default/admin/users/online.php | 21 | ||||
| -rw-r--r-- | views/default/layout/shells/admin.php (renamed from views/default/layout/shells/administration.php) | 5 |
13 files changed, 22 insertions, 71 deletions
diff --git a/views/default/admin/appearance/menu_items.php b/views/default/admin/appearance/menu_items.php index 7572d2e0c..eee5ef374 100644 --- a/views/default/admin/appearance/menu_items.php +++ b/views/default/admin/appearance/menu_items.php @@ -18,7 +18,6 @@ foreach ($menu_items as $item) { } $dropdown_values[''] = elgg_echo('none'); -echo elgg_view_title(elgg_echo('admin:menu_items')); echo "<div class='admin_settings menuitems'><h3>".elgg_echo('admin:menu_items:configure')."</h3>"; echo "<p class='margin-top'>".strip_tags(elgg_view('output/longtext', array('value' => elgg_echo("admin:menu_items:description"))))."</p>"; $form_body = ''; diff --git a/views/default/admin/appearance/profile_fields.php b/views/default/admin/appearance/profile_fields.php index f20bbaeb6..66a9855bd 100644 --- a/views/default/admin/appearance/profile_fields.php +++ b/views/default/admin/appearance/profile_fields.php @@ -3,8 +3,6 @@ * Admin area: edit default profile fields */ -$title = elgg_view_title(elgg_echo('admin:profile:fields')); - $add = elgg_view_form('profile/fields/add', array(), array()); $list = elgg_view('admin/appearance/profile_fields/list'); $reset = elgg_view_form('profile/fields/reset', array(), array()); diff --git a/views/default/admin/overview/numentities.php b/views/default/admin/overview/numentities.php deleted file mode 100644 index 6ecd388dd..000000000 --- a/views/default/admin/overview/numentities.php +++ /dev/null @@ -1,7 +0,0 @@ -<?php -/** - * Elgg statistics screen - * - * @package Elgg - * @subpackage Core - */ diff --git a/views/default/admin/overview/online.php b/views/default/admin/overview/online.php deleted file mode 100644 index f8b890c91..000000000 --- a/views/default/admin/overview/online.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php -/** - * Elgg statistics screen - * - * @package Elgg - * @subpackage Core - */ - -// users online -if( (is_plugin_enabled('search')) && (is_plugin_enabled('profile')) ) { - elgg_push_context('search'); - $users_online = get_online_users(); - elgg_pop_context(); - ?> - - <div class="admin_settings members-list users_online"> - <h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3> - <?php echo $users_online; ?> - </div> -<?php -} -?>
\ No newline at end of file diff --git a/views/default/admin/overview/statistics.php b/views/default/admin/overview/statistics.php index 05b96d166..09678fc9a 100644 --- a/views/default/admin/overview/statistics.php +++ b/views/default/admin/overview/statistics.php @@ -14,7 +14,6 @@ $total_users = get_number_users(true); $version = get_version(); $release = get_version(true); -echo elgg_view_title(elgg_echo('admin:overview')); ?> <div class="admin_settings site_stats"> <?php echo elgg_view('overview/extend'); ?> diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php index 1a308df73..1c01b2708 100644 --- a/views/default/admin/plugins/advanced.php +++ b/views/default/admin/plugins/advanced.php @@ -58,9 +58,6 @@ $category_form = elgg_view('input/form', array( 'body' => $category_pulldown . $category_button )); -// Page Header elements -$title = elgg_view_title(elgg_echo('admin:plugins')); - // @todo Until "en/deactivate all" means "All plugins on this page" hide when not looking at all. if (!isset($show_category) || empty($show_category)) { $activate_url = "{$CONFIG->url}action/admin/plugins/activate_all?__elgg_token=$token&__elgg_ts=$ts"; @@ -78,7 +75,6 @@ $buttons .= $category_form; // construct page header ?> <div id="content_header" class="clearfix"> - <div class="content-header-title"><?php echo $title ?></div> <div class="content-header-options"><?php echo $buttons ?></div> </div> <br /> diff --git a/views/default/admin/plugins/simple.php b/views/default/admin/plugins/simple.php index a0e3f3445..e9d7d5ffb 100644 --- a/views/default/admin/plugins/simple.php +++ b/views/default/admin/plugins/simple.php @@ -11,7 +11,6 @@ elgg_generate_plugin_entities(); $installed_plugins = elgg_get_plugins('any'); $plugin_list = array(); -$title = elgg_view_title(elgg_echo('admin:plugins')); foreach ($installed_plugins as $plugin) { if (!$plugin->isValid()) { @@ -26,9 +25,6 @@ foreach ($installed_plugins as $plugin) { ksort($plugin_list); $form_body .= <<<___END - <div id="content_header" class="clearfix"> - <div class="content-header-title">$title</div> - </div> <ul class="admin_plugins margin-top"> ___END; diff --git a/views/default/admin/site/advanced.php b/views/default/admin/site/advanced.php index 048ffa883..65c796fbd 100644 --- a/views/default/admin/site/advanced.php +++ b/views/default/admin/site/advanced.php @@ -63,5 +63,4 @@ $form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'val $form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo("save"))); $form_body = "<div class='admin_settings site_admin margin-top'>".$form_body."</div>"; -echo elgg_view_title(elgg_echo('admin:site:advanced') . " " . elgg_echo('admin:site')); echo elgg_view('input/form', array('action' => $action, 'body' => $form_body)); diff --git a/views/default/admin/site/basic.php b/views/default/admin/site/basic.php index 9b8f4652d..d7d36f25b 100644 --- a/views/default/admin/site/basic.php +++ b/views/default/admin/site/basic.php @@ -25,5 +25,4 @@ $form_body .= "<p>" . elgg_echo('installation:language') . elgg_view("input/pull $form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo("save"))); $form_body = "<div class='admin_settings site_admin margin-top'>".$form_body."</div>"; -echo elgg_view_title(elgg_echo('admin:site')); echo elgg_view('input/form', array('action' => $action, 'body' => $form_body)); diff --git a/views/default/admin/users/add.php b/views/default/admin/users/add.php index 9caeedd89..83cad6106 100644 --- a/views/default/admin/users/add.php +++ b/views/default/admin/users/add.php @@ -3,5 +3,4 @@ * Display an add user form. */ -echo elgg_view_title(elgg_echo('admin:users')); echo elgg_view('forms/useradd', array('show_admin'=>true));
\ No newline at end of file diff --git a/views/default/admin/users/newest.php b/views/default/admin/users/newest.php index 4d5b85836..c224df215 100644 --- a/views/default/admin/users/newest.php +++ b/views/default/admin/users/newest.php @@ -1,17 +1,14 @@ <?php // newest users -if (is_plugin_enabled('profile')) { - $users = elgg_list_entities(array( - 'type' => 'user', 'subtype'=>null, - 'full_view' => FALSE - )); +$users = elgg_list_entities(array( + 'type' => 'user', + 'subtype'=> null, + 'full_view' => FALSE +)); - echo elgg_view_title(elgg_echo('admin:users')); - ?> +?> - <div class="admin_settings members-list users_online"> - <h3><?php echo elgg_echo('admin:users:newest'); ?></h3> - <?php echo $users; ?> - </div> -<?php -}
\ No newline at end of file +<div class="admin_settings members-list users_online"> + <h3><?php echo elgg_echo('admin:users:newest'); ?></h3> + <?php echo $users; ?> +</div> diff --git a/views/default/admin/users/online.php b/views/default/admin/users/online.php index 9c0f52c7f..aa3515948 100644 --- a/views/default/admin/users/online.php +++ b/views/default/admin/users/online.php @@ -1,16 +1,9 @@ <?php -// users online -if ((is_plugin_enabled('search')) && (is_plugin_enabled('profile'))) { - elgg_push_context('search'); - $users_online = get_online_users(); - elgg_pop_context(); - - echo elgg_view_title(elgg_echo('admin:users')); - ?> - <div class="admin_settings members-list users_online"> - <h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3> - <?php echo $users_online; ?> - </div> -<?php -}
\ No newline at end of file +$users_online = get_online_users(); + +?> +<div class="admin_settings members-list users_online"> + <h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3> + <?php echo $users_online; ?> +</div> diff --git a/views/default/layout/shells/administration.php b/views/default/layout/shells/admin.php index 0740ed78e..e33c1c62f 100644 --- a/views/default/layout/shells/administration.php +++ b/views/default/layout/shells/admin.php @@ -7,6 +7,7 @@ * * @uses $vars['content'] Content string * @uses $vars['sidebar'] Optional sidebar content + * @uses $vars['title'] Title string */ ?> @@ -30,6 +31,10 @@ </div> <div class="elgg-main elgg-body"> <?php + if (isset($vars['title'])) { + echo elgg_view_title($vars['title']); + } + if (isset($vars['content'])) { echo $vars['content']; } |