finished the admin title modifications

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

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index baecc6592e7031f6fb1f51bc3e9e89994bf34dfc..1e8d51cdf986577d4b65181d6cd2960021ca9685 100644 (file)
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -204,6 +204,7 @@ function admin_settings_page_handler($page) {
        } else {
                $view = 'admin/' . implode('/', $page);
                $title = elgg_echo("admin:{$page[0]}");
+               $title .= ' : ' . elgg_echo('admin:' .  implode(':', $page));
        }
 
        // allow a place to store helper views outside of the web-accessible views

diff --git a/mod/diagnostics/languages/en.php b/mod/diagnostics/languages/en.php
index 476c4fb5cf2978d264ba61b26a2d67dcbd9bc97c..a02a3f66c0fc739315678e009e773a4700624039 100644 (file)
--- a/mod/diagnostics/languages/en.php
+++ b/mod/diagnostics/languages/en.php
@@ -7,6 +7,7 @@
 
        $english = array(
 
+                       'admin:utilities:diagnostics' => 'System diagnostics',
                        'diagnostics' => 'System diagnostics',
                        'diagnostics:report' => 'Diagnostics Report',
                        'diagnostics:unittester' => 'Unit Tests',

diff --git a/mod/logbrowser/languages/en.php b/mod/logbrowser/languages/en.php
index 3a6555431dfd9289d4d14dc0e56cdbcbb7e8ebb9..90689a1b06a87b6626ecdae50d8bf7eec7c8b952 100644 (file)
--- a/mod/logbrowser/languages/en.php
+++ b/mod/logbrowser/languages/en.php
@@ -6,6 +6,7 @@
  */
 
 $english = array(
+       'admin:utilities:logbrowser' => 'Log browser',
        'logbrowser' => 'Log browser',
        'logbrowser:browse' => 'Browse system log',
        'logbrowser:search' => 'Refine results',

diff --git a/mod/logbrowser/views/default/admin/utilities/logbrowser.php b/mod/logbrowser/views/default/admin/utilities/logbrowser.php
index 373e48a492d6cc4dd44ba29a81a572cd1c765981..67fdaa5535c9c6f1f5de34cfdaef4e454fcb2b8f 100644 (file)
--- a/mod/logbrowser/views/default/admin/utilities/logbrowser.php
+++ b/mod/logbrowser/views/default/admin/utilities/logbrowser.php
@@ -34,8 +34,6 @@ if ($timeupper) {
        $timeupper = strtotime($timeupper);
 }
 
-$title = elgg_view_title(elgg_echo('logbrowser'));
-
 $form = elgg_view('logbrowser/form', array(
        'user_guid' => $user,
        'timeupper' => $timeupper,