mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-30 17:25:26 +02:00
2013-05-24 Sergio Martin <sergio.martin@artica.es>
* include/styles/pandora.css extensions/update_manager/settings.php extensions/update_manager/main.php godmode/agentes/module_manager.php: Fixed various visual issues like update manager icons or width of left tab in godmode sections * godmode/agentes/module_manager_editor_plugin.php: Fixed tips of plugins help fields * extensions/snmp_explorer.php: avoid interfaces without name in snmp explorer * operation/agentes/bulbs.php: Remove old file git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8207 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
parent
d80313c933
commit
554fc18435
@ -1,3 +1,20 @@
|
|||||||
|
2013-05-24 Sergio Martin <sergio.martin@artica.es>
|
||||||
|
|
||||||
|
* include/styles/pandora.css
|
||||||
|
extensions/update_manager/settings.php
|
||||||
|
extensions/update_manager/main.php
|
||||||
|
godmode/agentes/module_manager.php: Fixed
|
||||||
|
various visual issues like update manager icons
|
||||||
|
or width of left tab in godmode sections
|
||||||
|
|
||||||
|
* godmode/agentes/module_manager_editor_plugin.php:
|
||||||
|
Fixed tips of plugins help fields
|
||||||
|
|
||||||
|
* extensions/snmp_explorer.php: avoid interfaces
|
||||||
|
without name in snmp explorer
|
||||||
|
|
||||||
|
* operation/agentes/bulbs.php: Remove old file
|
||||||
|
|
||||||
2013-05-24 Ramon Novoa <rnovoa@artica.es>
|
2013-05-24 Ramon Novoa <rnovoa@artica.es>
|
||||||
|
|
||||||
* include/functions.php: Cleaned junk characters.
|
* include/functions.php: Cleaned junk characters.
|
||||||
|
@ -71,7 +71,8 @@ function snmp_explorer() {
|
|||||||
$keydata = explode('::',$key);
|
$keydata = explode('::',$key);
|
||||||
$keydata2 = explode('.',$keydata[1]);
|
$keydata2 = explode('.',$keydata[1]);
|
||||||
|
|
||||||
if (!isset($keydata2[1])) {
|
// Avoid results without index and interfaces without name
|
||||||
|
if (!isset($keydata2[1]) || !isset($data[1])) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ function main_view() {
|
|||||||
'admin' => array(
|
'admin' => array(
|
||||||
'active' => false,
|
'active' => false,
|
||||||
'text' => '<a href="index.php?sec=gextensions&sec2=extensions/update_manager">' .
|
'text' => '<a href="index.php?sec=gextensions&sec2=extensions/update_manager">' .
|
||||||
html_print_image ("images/god7.png",
|
html_print_image ("images/setup.png",
|
||||||
true, array ("title" => __('Update manager'))) .'</a>'));
|
true, array ("title" => __('Update manager'))) .'</a>'));
|
||||||
|
|
||||||
ui_print_page_header (__('Update manager'), "images/extensions.png",
|
ui_print_page_header (__('Update manager'), "images/extensions.png",
|
||||||
|
@ -33,7 +33,7 @@ $buttons = array(
|
|||||||
'admin' => array(
|
'admin' => array(
|
||||||
'active' => false,
|
'active' => false,
|
||||||
'text' => '<a href="index.php?sec=extensions&sec2=extensions/update_manager">' .
|
'text' => '<a href="index.php?sec=extensions&sec2=extensions/update_manager">' .
|
||||||
html_print_image ("images/eye.png",
|
html_print_image ("images/operation.png",
|
||||||
true, array ("title" => __('Update manager'))) .'</a>'));
|
true, array ("title" => __('Update manager'))) .'</a>'));
|
||||||
|
|
||||||
ui_print_page_header (__('Update manager').' - '. __('Settings'),
|
ui_print_page_header (__('Update manager').' - '. __('Settings'),
|
||||||
|
@ -95,8 +95,9 @@ global $policy_page;
|
|||||||
if (!isset($policy_page))
|
if (!isset($policy_page))
|
||||||
$policy_page = false;
|
$policy_page = false;
|
||||||
|
|
||||||
|
$show_creation = false;
|
||||||
|
|
||||||
if (($policy_page) || (isset($agent))) {
|
if (($policy_page) || (isset($agent))) {
|
||||||
$show_creation = false;
|
|
||||||
if ($policy_page) {
|
if ($policy_page) {
|
||||||
$show_creation = true;
|
$show_creation = true;
|
||||||
}
|
}
|
||||||
@ -114,11 +115,6 @@ if (($policy_page) || (isset($agent))) {
|
|||||||
echo '<td class="datos">';
|
echo '<td class="datos">';
|
||||||
echo '<input align="right" name="updbutton" type="submit" class="sub next" value="'.__('Create').'">';
|
echo '<input align="right" name="updbutton" type="submit" class="sub next" value="'.__('Create').'">';
|
||||||
echo '</td>';
|
echo '</td>';
|
||||||
echo '<td class="datos" style="text-align:center;">';
|
|
||||||
echo "<strong>";
|
|
||||||
echo "<a style='color: #004A1B;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules in Pandora FMS Library")."</a>";
|
|
||||||
echo "</strong>";
|
|
||||||
echo '</td>';
|
|
||||||
echo '</tr>';
|
echo '</tr>';
|
||||||
echo "</form>";
|
echo "</form>";
|
||||||
}
|
}
|
||||||
@ -126,6 +122,12 @@ if (($policy_page) || (isset($agent))) {
|
|||||||
|
|
||||||
echo "</table>";
|
echo "</table>";
|
||||||
|
|
||||||
|
echo '<div style="text-align: right; width: 98%;">';
|
||||||
|
echo "<strong>";
|
||||||
|
echo "<a style='color: #004A1B;' target='_blank' href='http://pandorafms.com/Library/Library/'>".__("Get more modules in Pandora FMS Library")."</a>";
|
||||||
|
echo "</strong>";
|
||||||
|
echo '</div>';
|
||||||
|
|
||||||
if (! isset ($id_agente))
|
if (! isset ($id_agente))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -102,6 +102,7 @@ function changePluginSelect() {
|
|||||||
},
|
},
|
||||||
function (data, status) {
|
function (data, status) {
|
||||||
$("#plugin_description").html(data);
|
$("#plugin_description").html(data);
|
||||||
|
forced_title_callback();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -1399,7 +1399,7 @@ div.title_line {
|
|||||||
|
|
||||||
#menu_tab_left ul.mn li.nomn {
|
#menu_tab_left ul.mn li.nomn {
|
||||||
background: #ababab url('../../images/tab_grey_bg.png');
|
background: #ababab url('../../images/tab_grey_bg.png');
|
||||||
width: 380px;
|
width: 450px;
|
||||||
min-width: 300px;
|
min-width: 300px;
|
||||||
padding: 1px 5px;
|
padding: 1px 5px;
|
||||||
|
|
||||||
|
@ -1,38 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
// Pandora FMS - http://pandorafms.com
|
|
||||||
// ==================================================
|
|
||||||
// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
|
|
||||||
// Please see http://pandorafms.org for full contribution list
|
|
||||||
|
|
||||||
// This program is free software; you can redistribute it and/or
|
|
||||||
// modify it under the terms of the GNU General Public License
|
|
||||||
// as published by the Free Software Foundation for version 2.
|
|
||||||
// This program is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
// GNU General Public License for more details.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
echo '
|
|
||||||
<table cellpadding="3" cellspacing="3">
|
|
||||||
<tr>
|
|
||||||
<td class="f9i">' . ui_print_status_image(STATUS_AGENT_OK, __('All Monitors OK'), true) . __('All Monitors OK') . '</td>
|
|
||||||
<td class="f9i">' . ui_print_status_image(STATUS_MODULE_CRITICAL, __('At least one monitor fails'), true) . __('At least one monitor fails') . '</td>
|
|
||||||
<td class="f9i">' . ui_print_status_image(STATUS_MODULE_WARNING, __('Change between Green/Red state'), true) . __('Change between Green/Red state') . '</td>
|
|
||||||
|
|
||||||
<td class="f9i">' . ui_print_status_image(STATUS_ALERT_FIRED, __('Alert fired'), true) . __('Alert fired') . '</td>
|
|
||||||
<td class="f9i">' . ui_print_status_image(STATUS_ALERT_DISABLED, __('Alert disabled'), true) . __('Alerts disabled') . '</td>
|
|
||||||
|
|
||||||
</tr><tr>
|
|
||||||
|
|
||||||
<td class="f9i">' . ui_print_status_image(STATUS_AGENT_NO_DATA, __('Agent without data'), true) . __('Agent without data') . '</td>
|
|
||||||
<td class="f9i">' . ui_print_status_image(STATUS_AGENT_DOWN, __('Agent down'), true) . __('Agent down') . '</td>
|
|
||||||
|
|
||||||
<td class="f9i">' . ui_print_status_image(STATUS_ALERT_NOT_FIRED, __('Alert not fired'), true) . __('Alert not fired') . '</td>
|
|
||||||
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
';
|
|
||||||
?>
|
|
Loading…
x
Reference in New Issue
Block a user