From 5f414fc66a7437b066be69f4e2473b101885c22e Mon Sep 17 00:00:00 2001 From: esanchezm Date: Thu, 26 Feb 2009 12:09:21 +0000 Subject: [PATCH] 2009-02-26 Esteban Sanchez * include/config_process.php, index.php: Added generated timer count as a HTML comment at the bottom. * include/functions_ui.php: Style correction. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1488 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/include/config_process.php | 2 ++ pandora_console/include/functions_ui.php | 5 +++-- pandora_console/index.php | 3 +++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 5a8d8a8d66..63eebe46ad 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2009-02-26 Esteban Sanchez + + * include/config_process.php, index.php: Added generated timer count as + a HTML comment at the bottom. + + * include/functions_ui.php: Style correction. + 2009-02-26 Esteban Sanchez * include/functions_db.php: Added support for queries elapsed time in diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 1738476ae3..de6afeeeb1 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,6 +20,8 @@ $build_version = 'PC090217'; $pandora_version = 'v2.1-dev'; +$config['start_time'] = microtime (true); + // Next is the directory where "/attachment" directory is placed, to upload files stores. // This MUST be writtable by http server user, and should be in pandora root. // By default, Pandora adds /attachment to this, so by default is the pandora console home dir diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index c529defc54..f4b8c7fd48 100644 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -585,8 +585,9 @@ function process_page_head ($string, $bitfield) { //Style should go first $config['css'] = array_merge (array ($config['style'] => "include/styles/".$config['style'].".css", - "menu" => "include/styles/menu.css", - "tip", "include/styles/tip.css"), $config['css']); + "menu" => "include/styles/menu.css", + "tip", "include/styles/tip.css"), + $config['css']); //We can't load empty and we loaded (conditionally) ie $loaded = array ('', 'ie'); diff --git a/pandora_console/index.php b/pandora_console/index.php index f80b2c58a9..38e9c88512 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -254,4 +254,7 @@ while (@ob_end_flush ()); print_database_debug (); echo ''; + +$run_time = format_numeric (microtime (true) - $config['start_time'], 3); +echo "\n\n"; ?>