From ccdf37d90e33c6887c781f0cbc66aa83abac5125 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 12 Apr 2012 12:38:42 +0000 Subject: [PATCH] 2012-04-12 Miguel de Dios * include/styles/pandora.css: add changes for the new standarized messages. * extensions/update_manager/update_pandora.php: reverded the deleted file, sorry. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5959 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 + .../update_manager/update_pandora.php | 194 ++++++++++++++++++ pandora_console/include/styles/pandora.css | 29 ++- 3 files changed, 225 insertions(+), 5 deletions(-) create mode 100644 pandora_console/extensions/update_manager/update_pandora.php diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index fc16e4e369..585a42eb28 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2012-04-12 Miguel de Dios + + * include/styles/pandora.css: add changes for the new standarized messages. + + * extensions/update_manager/update_pandora.php: reverded the deleted file, + sorry. + 2012-04-12 Miguel de Dios * include/functions_ui.php: standariced the messages and added one more for diff --git a/pandora_console/extensions/update_manager/update_pandora.php b/pandora_console/extensions/update_manager/update_pandora.php new file mode 100644 index 0000000000..1fb24fb71f --- /dev/null +++ b/pandora_console/extensions/update_manager/update_pandora.php @@ -0,0 +1,194 @@ +width = '98%'; + $table->style = array(); + $table->style[0] = 'font-weight: bolder; font-size: 20px;'; + $table->data = array(); + $table->data[0][0] = __('Your Pandora FMS open source package installed is') . + ' ' . $conf_update_pandora['last_installed']; + html_print_table($table); + + + ui_print_info_message( + '

' . + __('This is a automatilly update Pandora Console only. Be careful if you have changed any php file of console, please make a backup this modified files php. Because the update action ovewrite all php files in Pandora console.') . + '

' . + '

' . + __('Update Manager sends anonymous information about Pandora FMS usage (number of agents and modules running). To disable it, just delete extension or remove remote server address from Update Manager plugin setup.') . + '

' + ); + + $table = null; + $table->width = '98%'; + $table->data = array(); + $table->data[0][0] = '

' . __('Online') . '

'; + $table->data[1][0] = + '' . + ' + + + + + ' . + '
' . + __('Get list online Package') . " " . html_print_image('images/spinner.gif', true) . + '
'; + html_print_table($table); + + ?> + + width = '98%'; + $tableMain->data = array(); + $tableMain->data[0][0] = '

' . __('Downloaded Packages') . '

'; + + $list_downloaded_packages = update_pandora_get_list_downloaded_packages('administration'); + $table = null; + $table->width = '100%'; + $table->size = array('50%', '25%', '25%'); + $table->align = array('left', 'center'); + $table->data = array(); + foreach ($list_downloaded_packages as $package) { + $actions = ''; + if (!isset($package['empty'])) { + if (!$package['current']) { + $actions = html_print_button(__('Install'), + 'install_' . uniqid(), false, + 'ajax_start_install_package(\'' . $package['name'] . '\');', + 'class="sub next" style="width: 40%;"', true); + } + else { + $actions = html_print_button(__('Reinstall'), + 'reinstall_' . uniqid(), false, + 'ajax_start_install_package(\'' . $package['name'] . '\');', + 'class="sub upd" style="width: 40%;"', true); + } + $actions .= ' ' . html_print_button(__('Delete'), + 'delete' . uniqid(), false, + 'delete_package(\'' . $package['name'] . '\');', + 'class="sub delete" style="width: 40%;"', true); + } + $table->data[] = array($package['name'], $package['time'], $actions); + } + $tableMain->data[1][0] = html_print_table($table, true); + + html_print_table($tableMain); + + ui_require_css_file ('dialog'); + ui_require_jquery_file ('ui.core'); + ui_require_jquery_file ('ui.dialog'); + + update_pandora_print_javascript_admin(); +} +?> diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 3fed6d0ee7..f02d5587ce 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -310,7 +310,8 @@ label { th > label { padding-top: 7px; } -input.chk {margin-right: 0px; +input.chk { + margin-right: 0px; border: 0px none; height: 14px; } @@ -845,7 +846,7 @@ span.rmess, span.nrmess { /* Style for login form */ .databox_login { #margin-top: 100px !important; - width: 657x !important; + width: 657px !important; height: 400px; border: none !important; background-color: #fafafa; @@ -853,7 +854,7 @@ span.rmess, span.nrmess { } /* Style for login form */ .databox_logout { - width: 657x !important; + width: 657px !important; height: 400px; border: none !important; background-color: #fafafa; @@ -861,7 +862,7 @@ span.rmess, span.nrmess { } .databox_error { - width: 657x !important; + width: 657px !important; height: 400px; border: none !important; background-color: #fafafa; @@ -1436,7 +1437,7 @@ div.cellCritical { } div.cellWarning { - width:100%; + width:100%; height:100%; background: #fce94f; color: #000; @@ -1474,3 +1475,21 @@ div.cellBig { height:100%; font-size: 18px; } + +.info_box { + background: #EBEBEB; + margin: 10px auto; + padding: 5px; + border: 1px solid #A8A8A8; + width: 85% !important; +} + +.info_box .title * { + font-size: 10pt !important; + font-weight: bolder; +} + +.info_box .icon { + width: 30px !important; + text-align: center; +}