tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-10-25 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_extensions.php, extensions/pandora_logs.php,
	extensions/update_manager.php, extensions/resource_registration.php,
	extensions/resource_exportation.php, extensions/module_groups.php,
	extensions/plugin_registration.php, extensions/snmp_explorer.php,
	extensions/system_info.php, operation/menu.php: cleaned source code
	style.
	
	* include/functions_menu.php: fixed the hidden icons the extensions
	in  menu.
	
	Fixes: #3568966




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7096 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-10-25 16:46:52 +00:00
parent 6f27f7ec28
commit e33cebbd8e
12 changed files with 88 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/ChangeLog
View File

@ -1,3 +1,17 @@
2012-10-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_extensions.php, extensions/pandora_logs.php,
extensions/update_manager.php, extensions/resource_registration.php,
extensions/resource_exportation.php, extensions/module_groups.php,
extensions/plugin_registration.php, extensions/snmp_explorer.php,
extensions/system_info.php, operation/menu.php: cleaned source code
style.
* include/functions_menu.php: fixed the hidden icons the extensions
in menu.
Fixes: #3568966
2012-10-25 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_reporting.php

3
pandora_console/extensions/snmp_explorer.php
View File

@ -344,9 +344,6 @@ function snmp_explorer() {
echo "</form>";
//echo "</tr></table>";
//echo "</form>";
if (!empty($interfaces_list)) {
echo '<span id="form_interfaces">';
echo '<span id ="none_text" style="display: none;">' . __('None') . '</span>';

4
pandora_console/extensions/system_info.php
View File

@ -267,7 +267,8 @@ function mainSystemInfo() {
$table->align = array();
$table->align[1] = 'right';
if ($pandora_diag) {
$table->data[0][0] = '<a href="#diag_info">' . __('Pandora Diagnostic info') . "</a>";
$table->data[0][0] = '<a href="#diag_info">' .
__('Pandora Diagnostic info') . "</a>";
}
else {
$table->data[0][0] = __('Pandora Diagnostic info');
@ -291,7 +292,6 @@ function mainSystemInfo() {
$table->data[3][1] = html_print_input_text('log_num_lines', $log_num_lines, __('Number lines of log'), 5, 10, true);
html_print_table($table);
echo "<div style='width: " . $table->width . "; text-align: right;'>";
//html_print_submit_button(__('Show'), 'show', false, 'class="sub next"');
html_print_submit_button(__('Generate file'), 'generate', false, 'class="sub next"');
echo "</div>";
echo "</form>";

10
pandora_console/include/functions_extensions.php
View File

@ -300,16 +300,20 @@ function extensions_add_operation_menu_option ($name, $fatherId = null, $icon =
global $config;
global $extension_file;
/* $config['extension_file'] is set in extensions_load_extensions(), since that function must
be called before any function the extension call, we are sure it will
be set. */
/*
$config['extension_file'] is set in extensions_load_extensions(),
since that function must be called before any function the extension
call, we are sure it will be set.
*/
$option_menu['name'] = $name;
$extension = &$config['extensions'][$extension_file];
$option_menu['sec2'] = $extension['dir'] . '/' . mb_substr ($extension_file, 0, -4);
$option_menu['fatherId'] = $fatherId;
$option_menu['icon'] = $icon;
$option_menu['version'] = $version;
$extension['operation_menu'] = $option_menu;
}

10
pandora_console/include/functions_menu.php
View File

@ -200,8 +200,10 @@ function menu_print_menu (&$menu) {
//Ini Add icon extension
$secExtension = null;
if (array_key_exists('extension',$sub)) $secExtensionBool = $sub["extension"];
else $secExtensionBool = false;
if (array_key_exists('extension',$sub))
$secExtensionBool = $sub["extension"];
else
$secExtensionBool = false;
if ($secExtensionBool) {
$imageIconDefault = 'images/extensions.png';
@ -224,8 +226,8 @@ function menu_print_menu (&$menu) {
else {
$imageIcon = $imageIconDefault;
}
//Delete extension Icon before the was a style with background: url('.$imageIcon.') no-repeat;
$submenu_output .= '<div style="width: 16px; height: 16px; float: left; margin: 5px 0px 0px 3px;">&nbsp;</div>';
$submenu_output .= '<div style="background: url('.$imageIcon.') no-repeat; width: 16px; height: 16px; float: left; margin: 5px 0px 0px 3px;">&nbsp;</div>';
}