drying up the title creation in the admin backend

git-svn-id: http://code.elgg.org/elgg/trunk@7864 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index be3f8eaccd355aaebff0c0adab5692e7c3e9f0ab..baecc6592e7031f6fb1f51bc3e9e89994bf34dfc 100644 (file)
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -123,7 +123,7 @@ function admin_init() {
 
        // admin area overview and basic site settings
        elgg_add_admin_menu_item('overview', elgg_echo('admin:overview'));
-       elgg_add_admin_menu_item('statistics', elgg_echo('admin:statistics'), 'overview');
+       elgg_add_admin_menu_item('statistics', elgg_echo('admin:overview:statistics'), 'overview');
 
        // site
        elgg_add_admin_menu_item('site', elgg_echo('admin:site'));
@@ -132,8 +132,8 @@ function admin_init() {
 
        // appearance
        elgg_add_admin_menu_item('appearance', elgg_echo('admin:appearance'));
-       elgg_add_admin_menu_item('menu_items', elgg_echo('admin:menu_items'), 'appearance');
-       elgg_add_admin_menu_item('profile_fields', elgg_echo('admin:profile:fields'), 'appearance');
+       elgg_add_admin_menu_item('menu_items', elgg_echo('admin:appearance:menu_items'), 'appearance');
+       elgg_add_admin_menu_item('profile_fields', elgg_echo('admin:appearance:profile_fields'), 'appearance');
 
        // users
        elgg_add_admin_menu_item('users', elgg_echo('admin:users'));
@@ -200,9 +200,10 @@ function admin_settings_page_handler($page) {
                $vars['plugin'] = $page[1];
                $vars['entity'] = find_plugin_settings($page[1]);
                $title = elgg_echo("admin:plugin_settings:{$page[1]}");
+               $title = elgg_echo("admin:{$page[0]}");
        } else {
                $view = 'admin/' . implode('/', $page);
-               $title = elgg_echo('admin:' .  implode(':', $page));
+               $title = elgg_echo("admin:{$page[0]}");
        }
 
        // allow a place to store helper views outside of the web-accessible views
@@ -220,7 +221,7 @@ function admin_settings_page_handler($page) {
                $content = "<div class=\"admin_notices\">$notices_html</div>$content";
        }
 
-       $body = elgg_view_layout('administration', array('content' => $content));
+       $body = elgg_view_layout('admin', array('content' => $content, 'title' => $title));
        echo elgg_view_page($title, $body, 'admin');
 }
 

diff --git a/languages/en.php b/languages/en.php
index 1219a3de51c974ed7fe0e1df06aa0a2bf632f61a..7d87958c47852032cf0aa02b256d3a173b9fad98 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -363,7 +363,7 @@ $english = array(
        'profile:twitter' => "Twitter username",
        'profile:saved' => "Your profile was successfully saved.",
 
-       'admin:profile:fields' => 'Edit profile fields',
+       'admin:appearance:profile_fields' => 'Edit profile fields',
        'profile:label' => "Profile label",
        'profile:type' => "Profile type",
        'profile:editdefault:delete:fail' => 'Removed default profile item field failed',
@@ -585,7 +585,7 @@ $english = array(
        'admin:plugins:dependencies:local_value' => 'Actual value',
        'admin:plugins:dependencies:comment' => 'Comment',
 
-       'admin:statistics' => "Statistics",
+       'admin:overview:statistics' => "Statistics",
        'admin:statistics:description' => "This is an overview of statistics on your site. If you need more detailed statistics, a professional administration feature is available.",
        'admin:statistics:opt:description' => "View statistical information about users and objects on your site.",
        'admin:statistics:opt:linktext' => "View statistics...",
@@ -620,7 +620,7 @@ $english = array(
        'admin:user:removeadmin:no' => "We could not remove administrator privileges from this user.",
        'admin:user:self:removeadmin:no' => "You cannot remove your own administrator privileges.",
 
-       'admin:menu_items' => 'Menu Items',
+       'admin:appearance:menu_items' => 'Menu Items',
        'admin:menu_items:configure' => 'Configure main menu items',
        'admin:menu_items:description' => 'Select which menu items you want to show as featured links.  Unused items will be added as "More" at the end of the list.',
        'admin:menu_items:hide_toolbar_entries' => 'Remove links from tool bar menu?',

diff --git a/mod/defaultwidgets/start.php b/mod/defaultwidgets/start.php
index 5dc89503a3b718208b7a268700dda9f9c4f409b4..4e6766dd4720f56932da5b41bd5af7049748ea58 100644 (file)
--- a/mod/defaultwidgets/start.php
+++ b/mod/defaultwidgets/start.php
@@ -32,8 +32,8 @@ function defaultwidgets_init() {
        }
 
        // @todo These submenu pages should be DRYed up
-       elgg_add_admin_menu_item('default_profile_widgets', elgg_echo('defaultwidgets:menu:profile'), 'appearance');
-       elgg_add_admin_menu_item('default_dashboard_widgets', elgg_echo('defaultwidgets:menu:dashboard'), 'appearance');
+       //elgg_add_admin_menu_item('default_profile_widgets', elgg_echo('defaultwidgets:menu:profile'), 'appearance');
+       //elgg_add_admin_menu_item('default_dashboard_widgets', elgg_echo('defaultwidgets:menu:dashboard'), 'appearance');
 }
 
 /**

diff --git a/mod/diagnostics/views/default/admin/utilities/diagnostics.php b/mod/diagnostics/views/default/admin/utilities/diagnostics.php
index 44e6fa17b5aa7b9ea53ba9f7a9e7fad487721d05..4c4fcc2fd2179b5b9392ae0629161ca8d8db7fbd 100644 (file)
--- a/mod/diagnostics/views/default/admin/utilities/diagnostics.php
+++ b/mod/diagnostics/views/default/admin/utilities/diagnostics.php
@@ -1,8 +1,6 @@
 <?php
 
 
-$title = elgg_view_title(elgg_echo('diagnostics'));
-
 $diagnostics = "<h3>".elgg_echo('diagnostics:report')."</h3>";
 $diagnostics .= elgg_echo('diagnostics:description');
 $diagnostics .= elgg_view('diagnostics/forms/download');

diff --git a/mod/uservalidationbyemail/languages/en.php b/mod/uservalidationbyemail/languages/en.php
index f01dba2690f55bd1d506b433756a017d48ca76dc..0c385cab5efbb3be9d82676b7a9d8b0a9f90f687 100644 (file)
--- a/mod/uservalidationbyemail/languages/en.php
+++ b/mod/uservalidationbyemail/languages/en.php
@@ -7,6 +7,8 @@
  */
 
 $english = array(
+       'admin:users:unvalidated' => 'Unvalidated',
+       
        'email:validate:subject' => "%s please confirm your email address for %s!",
        'email:validate:body' => "%s,
 

diff --git a/views/default/admin/appearance/menu_items.php b/views/default/admin/appearance/menu_items.php
index 7572d2e0cdbf076b1cbaacfbd923fcbaa1aaa85d..eee5ef3744f23d007f443293b98de3e887769811 100644 (file)
--- 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 f20bbaeb6c7a9c62521b2cc915012f04e018be16..66a9855bdbe1a96b3914fd984194e8794abe37b5 100644 (file)
--- 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 (file)
index 6ecd388..0000000
--- 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 (file)
index f8b890c..0000000
--- 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 05b96d1663783e795555e5219c5e3c7b251b5b17..09678fc9a9fe4a313c224d5fd411f07e1c9e9d98 100644 (file)
--- 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 1a308df73f9d43013a106f63a801477d92f86765..1c01b270802109402ba2e959d382da9e16578baa 100644 (file)
--- 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 a0e3f3445dace7aa5c8a274d71ff3d2fe47cd3c3..e9d7d5ffb9cc813c79fda1dcf0aed74f4d703d6b 100644 (file)
--- 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 048ffa883dee0180afbf531b551f712c553b469c..65c796fbd4f1f40cded31b397d1fe96be469f253 100644 (file)
--- 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 9b8f4652d4138566cb8ebf9ea8a1a535143f0005..d7d36f25ba0183237c5f0e841c9c9b1ac8790bd9 100644 (file)
--- 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 9caeedd89e7e61993072a23081327a49a0cebf77..83cad6106bfb09e41c9ed83d6f1095d0cbdb0763 100644 (file)
--- 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 4d5b8583647ca3b9cdd24d52134cfd4daa3645f4..c224df215ac7d773c29a618bba41d2c2f17d3202 100644 (file)
--- 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 9c0f52c7f440389fd3488a0d9d58ee6e532704eb..aa35159482393852accabeb7112c99992b3735fc 100644 (file)
--- 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
similarity index 83%
rename from views/default/layout/shells/administration.php
rename to views/default/layout/shells/admin.php
index 0740ed78e9a3ce0a3177d3e1c848047c14e65db2..e33c1c62fd9bf44b30902712d9983b5431329b34 100644 (file)
--- 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'];
                        }