From a9281ed51feebd6f94027da4a2e03b56828ccaed Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 3 May 2012 11:29:04 +0000 Subject: [PATCH] 2012-05-03 Miguel de Dios * include/styles/menu.css: fixed bad colour name "#grey" for correct colour name "grey". * include/constants.php: added constants for backup. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6246 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 11 +++++++++++ pandora_console/include/constants.php | 12 ++++++++++++ pandora_console/include/styles/menu.css | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index f4178e070f..973ba5404b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,14 @@ +2012-05-03 Miguel de Dios + + * include/styles/menu.css: fixed bad colour name "#grey" for correct + colour name "grey". + + * include/functions_visual_map.php: cleaned source code style. + + * include/constants.php: added constants for backup. + + MERGED FROM 4.0.2 + 2012-05-03 Juan Manuel Ramon * include/styles/pandora.css: Removed background color of diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index 071830d349..ea9953fdd8 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -67,4 +67,16 @@ define('SEPARATOR_ROW', chr(10)); //chr(10) = '\n' define('SEPARATOR_COLUMN_CSV', "#"); define('SEPARATOR_ROW_CSV', "@\n"); +/* Backup paths */ +switch ($config["dbtype"]) { + case "mysql": + case "postgresql": + define ('BACKUP_DIR', 'attachment/backups'); + define ('BACKUP_FULLPATH', $config['homedir'] . '/' . BACKUP_DIR); + break; + case "oracle": + define ('BACKUP_DIR', 'DATA_PUMP_DIR'); + define ('BACKUP_FULLPATH', 'DATA_PUMP_DIR'); + break; +} ?> diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css index 0a1a7efea0..22106cf052 100644 --- a/pandora_console/include/styles/menu.css +++ b/pandora_console/include/styles/menu.css @@ -44,7 +44,7 @@ } .menu li.subselected a{ - background-color: #grey !important; + background-color: grey !important; } .menu a:hover {