From 5396443ac0d4e7fb8d9eee4441a6ab1e738ee4c7 Mon Sep 17 00:00:00 2001 From: raulmateos <noreply@pandorafms.org> Date: Sat, 21 Nov 2009 13:53:10 +0000 Subject: [PATCH] 2009-11-21 Raul Mateos <raulofpandora@gmail.com> * extensions/*.php: Changed title for all extensions, improving common apparence. By the way... It's my brithday!!! git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2121 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 ++++ pandora_console/extensions/dbmanager.php | 2 +- pandora_console/extensions/hello.php | 4 +-- pandora_console/extensions/module_groups.php | 29 ++++++++++++------- .../extensions/plugin_registration.php | 2 +- .../extensions/update_manager/main.php | 2 +- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 5b839f2b46..c97dcb99f9 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2009-11-21 Raul Mateos <raulofpandora@gmail.com> + + * extensions/*.php: Changed title for all extensions, improving common + apparence. By the way... It's my brithday!!! + 2009-11-19 Miguel de Dios <miguel.dedios@artica.es> * include/functions.php: change the "safe_input" for estandarize the input diff --git a/pandora_console/extensions/dbmanager.php b/pandora_console/extensions/dbmanager.php index 3dd143defc..d411856cea 100644 --- a/pandora_console/extensions/dbmanager.php +++ b/pandora_console/extensions/dbmanager.php @@ -55,7 +55,7 @@ function dbmgr_extension_main () { $sql = (string) get_parameter ('sql'); - echo "<h1>Database interface</h1>"; + echo "<h2>".__('Extensions'). " » ".__('Database interface')."</h2>"; echo '<div class="notify">'; echo "This is an advanced extension to interface with Pandora FMS database directly from WEB console using native SQL sentences. Please note that <b>you can damage</b> your Pandora FMS installation if you don't know </b>exactly</b> what are you doing, this means that you can severily damage your setup using this extension. This extension is intended to be used <b>only by experienced users</b> with a depth knowledgue of Pandora FMS internals."; echo '</div>'; diff --git a/pandora_console/extensions/hello.php b/pandora_console/extensions/hello.php index 870204654a..a76859fce0 100644 --- a/pandora_console/extensions/hello.php +++ b/pandora_console/extensions/hello.php @@ -16,12 +16,12 @@ function hello_extension_main () { /* Here you can do almost all you want! */ - echo "<h1>Hello world!</h1>"; + echo "<h2>".__('Extensions'). " » Hello world!</h2>"; echo "This is a sample of minimal extension in the operation view"; } function test() { - echo "<h2>Hello administration world</h2>"; + echo "<h2>".__('Extensions'). " » Hello administration world</h2>"; echo "This is a sample of minimal extension in the godmode view"; } diff --git a/pandora_console/extensions/module_groups.php b/pandora_console/extensions/module_groups.php index 19c4456e7f..ad1f21e626 100644 --- a/pandora_console/extensions/module_groups.php +++ b/pandora_console/extensions/module_groups.php @@ -38,9 +38,10 @@ function mainModuleGroups() { WHERE id_module_group = %d AND disabled IS FALSE AND delete_pending IS FALSE) GROUP BY estado"; - echo "<h1>" . __("Combine table of agent group and module group") . "</h1>"; + echo "<h2>".__('Extensions'). " » "; + echo __("Combined table of agent group and module group") . "</h2>"; - echo "<p>" . __("This table show in columns the modules group and for rows agents group. The cell show all modules") . "</p>"; + echo "<p>" . __("This table shows in columns the modules group and in rows agents group. The cell shows all modules") . "</p>"; $agentGroups = get_user_groups ($config['id_user']); @@ -119,17 +120,23 @@ function mainModuleGroups() { echo "<p>" . __("The colours meaning:") . "<ul>" . '<li style="clear: both;"> - <div style="float: left; background: #babdb6; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;"> </div>' . - __("Grey when the cell for this model group and agent group hasn't modules.") . "</li>" . + <div style="float: left; background: #cc0000; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;"> </div>' . + __("Red when the cell for this model group and agent has at least one module in critical state and the others in any state.") . + '</li>' . '<li style="clear: both;"> - <div style="float: left; background: #8ae234; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;"> </div>' . - __("Green when the cell for this model group and agent has OK state all modules.") . "</li>" . - '<li style="clear: both;"><div style="float: left; background: #cc0000; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;"> </div>' . - __("Red when the cell for this model group and agent has at least one module in critical state and the rest in any state.") . "</li>" . - '<li style="clear: both;"><div style="float: left; background: #fce94f; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;"> </div>' . - __("Yellow when the cell for this model group and agent has at least one in warning state and the rest in green state.") . "</li>" . + <div style="float: left; background: #fce94f; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;"> </div>' . + __("Yellow when the cell for this model group and agent has at least one in warning state and the others in green state.") . + '</li>' . + '<li style="clear: both;"> + <div style="float: left; background: #8ae234; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;"> </div>' . + __("Green when the cell for this model group and agent has OK state all modules.") . + '</li>' . + '<li style="clear: both;"> + <div style="float: left; background: #babdb6; height: 20px; width: 80px;margin-right: 5px; margin-bottom: 5px;"> </div>' . + __("Grey when the cell for this model group and agent group haven't modules.") . + '</li>' . "</ul>" . - "</p>"; + "</p>"; } add_operation_menu_option("Modules groups", 'estado', 'module_groups/icon_menu.png'); diff --git a/pandora_console/extensions/plugin_registration.php b/pandora_console/extensions/plugin_registration.php index 64c4e940f3..5ad2a3c41d 100644 --- a/pandora_console/extensions/plugin_registration.php +++ b/pandora_console/extensions/plugin_registration.php @@ -16,7 +16,7 @@ function pluginreg_extension_main () { global $config; - echo "<h2>Plugin registration</h2>"; + echo "<h2>".__('Extensions'). " » ".__('Plugin registration')."</h2>"; echo "<div class=notify>"; echo __("This extension makes registration of server plugins more easy. Here you can upload a server plugin in Pandora FMS 3.x zipped format (.pspz). Please refer to documentation on how to obtain and use Pandora FMS Server Plugins.<br><br>You can get more plugins in our <a href='http://pandorafms.org/index.php?sec=community&sec2=repository&lng=en'>Public Resource Library</A>"); diff --git a/pandora_console/extensions/update_manager/main.php b/pandora_console/extensions/update_manager/main.php index 53e3c05949..5837d191f7 100644 --- a/pandora_console/extensions/update_manager/main.php +++ b/pandora_console/extensions/update_manager/main.php @@ -22,7 +22,7 @@ $db =& um_db_connect ('mysql', $config['dbhost'], $config['dbuser'], $settings = um_db_load_settings (); -echo '<h2>'.__('Update manager').'</h2>'; +echo '<h2>'.__('Extensions'). " » ". __('Update manager').'</h2>'; if ($settings->customer_key == FREE_USER) { echo '<div class="notify" style="width: 80%; text-align:left;" >';