diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 59e7a925c6..5e5234d7de 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2009-07-01 Sancho Lerena + + * include/functions_config.php: Fixed setup problem for fontpath token. + + * godmode/setup/setup.php, setup_visuals.php: Moved some items to other + file (fontpath, flashgraph and agent graph options). + + * godmode/db/db_main.php: Bigger image. + 2009-07-01 Ramon Novoa * include/functions_custom_graphs.php, include/fgraph.php, diff --git a/pandora_console/godmode/db/db_main.php b/pandora_console/godmode/db/db_main.php index 33af0d6966..d0f25640a9 100644 --- a/pandora_console/godmode/db/db_main.php +++ b/pandora_console/godmode/db/db_main.php @@ -49,9 +49,11 @@ echo '

'.__('Database maintenance').' » '.__('Current database maintena '.__('Please check your Pandora Server setup and be sure that database maintenance daemon is running. It\'s very important to keep up-to-date database to get the best performance and results in Pandora').'
'; if ($config['flash_charts']) { + $width=600; + $height=400; echo grafico_db_agentes_purge ($id_agente, $width, $height); } else { - echo ''; + echo ''; } echo ' '; diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php index c2f4fb8aff..0987514696 100644 --- a/pandora_console/godmode/setup/setup.php +++ b/pandora_console/godmode/setup/setup.php @@ -102,22 +102,11 @@ $table->data[12][1] = __('Yes').' '.print_radio_button ('compact_header', 1 $table->data[12][1] .= __('No').' '.print_radio_button ('compact_header', 0, '', $config["compact_header"], true); -$table->data[13][0] = __('Font path'); -$table->data[13][1] = print_input_text ('fontpath', $config["fontpath"], '', 50, 255, true); - $table->data[14][0] = __('Attachment store'); $table->data[14][1] = print_input_text ('attachment_store', $config["attachment_store"], '', 50, 255, true); enterprise_hook ('setup'); -$table->data[18][0] = __('Use agent access graph'); -$table->data[18][1] = __('Yes').' '.print_radio_button ('agentaccess', 1, '', $config["agentaccess"], true).'  '; -$table->data[18][1] .= __('No').' '.print_radio_button ('agentaccess', 0, '', $config["agentaccess"], true); - -$table->data[19][0] = __('Flash charts'); -$table->data[19][1] = __('Yes').' '.print_radio_button ('flash_charts', 1, '', $config["flash_charts"], true).'  '; -$table->data[19][1] .= __('No').' '.print_radio_button ('flash_charts', 0, '', $config["flash_charts"], true); - echo '
'; print_input_hidden ('update_config', 1); print_table ($table); diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 7df3f62fd9..8ae69df653 100644 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -76,6 +76,19 @@ $iconsets["faces"] = __('Faces'); $iconsets["color_text"] = __('Colors and text'); $table->data[9][1] = print_select ($iconsets, 'status_images_set', $config["status_images_set"], '', '', '', true); + +$table->data[10][0] = __('Font path'); +$table->data[10][1] = print_input_text ('fontpath', $config["fontpath"], '', 50, 255, true); + +$table->data[11][0] = __('Use agent access graph'); +$table->data[11][1] = __('Yes').' '.print_radio_button ('agentaccess', 1, '', $config["agentaccess"], true).'  '; +$table->data[11][1] .= __('No').' '.print_radio_button ('agentaccess', 0, '', $config["agentaccess"], true); + +$table->data[12][0] = __('Flash charts'); +$table->data[12][1] = __('Yes').' '.print_radio_button ('flash_charts', 1, '', $config["flash_charts"], true).'  '; +$table->data[12][1] .= __('No').' '.print_radio_button ('flash_charts', 0, '', $config["flash_charts"], true); + + echo ''; print_input_hidden ('update_config', 1); print_table ($table); diff --git a/pandora_console/images/console/background/asia.jpg b/pandora_console/images/console/background/asia.jpg index e1c08529c5..1c33b04ac3 100644 Binary files a/pandora_console/images/console/background/asia.jpg and b/pandora_console/images/console/background/asia.jpg differ diff --git a/pandora_console/images/console/background/world.jpg b/pandora_console/images/console/background/world.jpg index 7514a07083..414b515ea8 100644 Binary files a/pandora_console/images/console/background/world.jpg and b/pandora_console/images/console/background/world.jpg differ diff --git a/pandora_console/images/console/icons/light_ok.png b/pandora_console/images/console/icons/light_ok.png index 0a67dafdf7..a785df52d5 100644 Binary files a/pandora_console/images/console/icons/light_ok.png and b/pandora_console/images/console/icons/light_ok.png differ diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 1cb9878790..ab98d69f5f 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -100,6 +100,7 @@ function update_config () { update_config_value ('loginhash_pwd', (string) get_parameter ('loginhash_pwd', $config["loginhash_pwd"])); update_config_value ('https', (bool) get_parameter ('https', $config["https"])); update_config_value ('compact_header', (bool) get_parameter ('compact_header', $config["compact_header"])); + update_config_value ('fontpath', (string) get_parameter ('fontpath', $config["fontpath"])); update_config_value ('round_corner', (bool) get_parameter ('round_corner', $config["round_corner"])); update_config_value ('status_images_set', (string) get_parameter ('status_images_set', $config["status_images_set"])); update_config_value ('agentaccess', (int) get_parameter ('agentaccess', $config['agentaccess']));