tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente

Browse Source 
Former-commit-id: fa717670f0b841f81f0f8ee566be36203cd7eba6
This commit is contained in:
Ramon Novoa 2019-02-12 13:47:44 +01:00
commit 6e236c404b
55 changed files with 2004 additions and 1659 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.731-190207 Version: 7.0NG.731-190212
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.731-190207" pandora_version="7.0NG.731-190212"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -42,7 +42,7 @@ my $Sem = undef;
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.731'; use constant AGENT_VERSION => '7.0NG.731';
use constant AGENT_BUILD => '190207'; use constant AGENT_BUILD => '190212';
# Agent log default file size maximum and instances # Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000; use constant DEFAULT_MAX_LOG_SIZE => 600000;

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.731 %define version 7.0NG.731
%define release 190207 %define release 190212
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.731 %define version 7.0NG.731
%define release 190207 %define release 190212
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.731" PI_VERSION="7.0NG.731"
PI_BUILD="190207" PI_BUILD="190212"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{190207} {190212}
ViewReadme ViewReadme
{Yes} {Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils; using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1 #define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.731(Build 190207)") #define PANDORA_VERSION ("7.0NG.731(Build 190212)")
string pandora_path; string pandora_path;
string pandora_dir; string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST" VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent" VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.731(Build 190207))" VALUE "ProductVersion", "(7.0NG.731(Build 190212))"
VALUE "FileVersion", "1.0.0.0" VALUE "FileVersion", "1.0.0.0"
END END
END END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.731-190207 Version: 7.0NG.731-190212
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.731-190207" pandora_version="7.0NG.731-190212"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

2
pandora_console/extensions/module_groups.php
View File

@ -309,7 +309,7 @@ function mainModuleGroups()
ui_print_info_message(['no_close' => true, 'message' => __('There are no defined groups or module groups') ]); ui_print_info_message(['no_close' => true, 'message' => __('There are no defined groups or module groups') ]);
} }
ui_require_css_file('cluetip','include/styles/js/'); ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('cluetip'); ui_require_jquery_file('cluetip');
?> ?>
<script> <script>

2
pandora_console/general/login_page.php
View File

@ -539,7 +539,7 @@ if ($login_screen == 'error_authconfig' || $login_screen == 'error_emptyconfig'
} }
ui_require_css_file('dialog'); ui_require_css_file('dialog');
ui_require_css_file('jquery-ui.min','include/styles/js/'); ui_require_css_file('jquery-ui.min', 'include/styles/js/');
ui_require_jquery_file('jquery-ui.min'); ui_require_jquery_file('jquery-ui.min');
?> ?>

19
pandora_console/general/main_menu.php
View File

@ -320,6 +320,23 @@ $(document).ready( function() {
} }
else { else {
$('div#title_menu').hide(); $('div#title_menu').hide();
if(!click_display){
$('#menu').mouseenter(function() {
handsInMenu = 1;
openTimeMenu = new Date().getTime();
$('ul.submenu').css('left', '44px');
}).mouseleave(function() {
handsInMenu = 0;
setTimeout(function() {
openedMenu = new Date().getTime() - openTimeMenu;
if(openedMenu > 1000 && handsInMenu == 0) {
$('li.menu_icon').removeClass( " no_hidden_menu");
$('li.menu_icon').find('li').removeClass( " no_hidden_menu" );
$('ul.submenu').css('left', '44px');
}
}, 2500);
});
}
} }
}); });
/* ]]> */ /* ]]> */
@ -332,7 +349,6 @@ $(document).ready( function() {
handsIn2 = 0; handsIn2 = 0;
if(!click_display){ if(!click_display){
if (autohidden_menu) {
$('.menu_icon').mouseenter(function() { $('.menu_icon').mouseenter(function() {
table_hover = $(this); table_hover = $(this);
handsIn = 1; handsIn = 1;
@ -352,7 +368,6 @@ $(document).ready( function() {
} }
}, 2500); }, 2500);
}); });
}
}else{ }else{
$(document).ready(function() { $(document).ready(function() {
if (autohidden_menu) { if (autohidden_menu) {

2
pandora_console/godmode/alerts/alert_list.builder.php
View File

@ -192,7 +192,7 @@ if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
echo '</div></form>'; echo '</div></form>';
} }
ui_require_css_file('cluetip','include/styles/js/'); ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('cluetip'); ui_require_jquery_file('cluetip');
ui_require_jquery_file('pandora.controls'); ui_require_jquery_file('pandora.controls');
ui_require_jquery_file('bgiframe'); ui_require_jquery_file('bgiframe');

2
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -836,7 +836,7 @@ if ($display_create && (check_acl($config['id_user'], 0, 'LW') || check_acl($con
echo '</div>'; echo '</div>';
} }
ui_require_css_file('cluetip','include/styles/js/'); ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('cluetip'); ui_require_jquery_file('cluetip');
ui_require_jquery_file('pandora.controls'); ui_require_jquery_file('pandora.controls');
ui_require_jquery_file('bgiframe'); ui_require_jquery_file('bgiframe');

2
pandora_console/godmode/gis_maps/configure_gis_map.php
View File

@ -629,7 +629,7 @@ echo '</form>';
<?php <?php
// -------------------------END CHUNKS--------------------------------------- // -------------------------END CHUNKS---------------------------------------
ui_require_css_file('cluetip','include/styles/js/'); ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('cluetip'); ui_require_jquery_file('cluetip');
ui_require_jquery_file('pandora.controls'); ui_require_jquery_file('pandora.controls');
ui_require_jquery_file('json'); ui_require_jquery_file('json');

28
pandora_console/godmode/groups/group_list.php
View File

@ -11,7 +11,6 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
ui_require_css_file('tree'); ui_require_css_file('tree');
ui_require_css_file('fixed-bottom-box'); ui_require_css_file('fixed-bottom-box');
@ -539,17 +538,22 @@ if ($tab == 'tree') {
$url_delete = 'index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group='.$group['id_grupo']; $url_delete = 'index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group='.$group['id_grupo'];
$table->data[$key][0] = $group['id_grupo']; $table->data[$key][0] = $group['id_grupo'];
$table->data[$key][1] = "<a href='$url'>".$group['nombre'].'</a>'; $table->data[$key][1] = "<a href='$url'>".$group['nombre'].'</a>';
$table->data[$key][2] = html_print_image( if ($group['icon'] != '') {
'images/groups_small/'.$group['icon'].'.png', $table->data[$key][2] = html_print_image(
true, 'images/groups_small/'.$group['icon'].'.png',
[ true,
'style' => '', [
'class' => 'bot', 'style' => '',
'alt' => $group['nombre'], 'class' => 'bot',
'title' => $group['nombre'], 'alt' => $group['nombre'],
false, false, false, true 'title' => $group['nombre'],
] false, false, false, true
); ]
);
} else {
$table->data[$key][2] = '';
}
// reporting_get_group_stats // reporting_get_group_stats
$table->data[$key][3] = $group['disabled'] ? __('Disabled') : __('Enabled'); $table->data[$key][3] = $group['disabled'] ? __('Disabled') : __('Enabled');

7
pandora_console/godmode/reporting/map_builder.php
View File

@ -42,6 +42,7 @@ if (!$is_metaconsole) {
$url_visual_console_favorite = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_favorite'; $url_visual_console_favorite = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_favorite';
$url_visual_console_template = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_template'; $url_visual_console_template = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_template';
$url_visual_console_template_wizard = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_wizard'; $url_visual_console_template_wizard = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_wizard';
$url_visual_console_manager = 'index.php?sec=screen&sec2=enterprise/extensions/visual_console_manager';
} }
$pure = (int) get_parameter('pure', 0); $pure = (int) get_parameter('pure', 0);
@ -70,6 +71,12 @@ if ($is_enterprise && $vconsoles_manage) {
'active' => false, 'active' => false,
'text' => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image('images/wand.png', true, ['title' => __('Visual Console Template Wizard')]).'</a>', 'text' => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image('images/wand.png', true, ['title' => __('Visual Console Template Wizard')]).'</a>',
]; ];
if ($is_metaconsole) {
$buttons['visual_console_manager'] = [
'active' => false,
'text' => '<a href="'.$url_visual_console_manager.'">'.html_print_image('images/builder.png', true, ['title' => __('Visual Console Manager')]).'</a>',
];
}
} }
if (!$is_metaconsole) { if (!$is_metaconsole) {

2
pandora_console/godmode/reporting/visual_console_builder.data.php
View File

@ -233,7 +233,7 @@ html_print_submit_button(
echo '</div>'; echo '</div>';
echo '</form>'; echo '</form>';
ui_require_css_file('color-picker','include/styles/js/'); ui_require_css_file('color-picker', 'include/styles/js/');
ui_require_jquery_file('colorpicker'); ui_require_jquery_file('colorpicker');
?> ?>

4
pandora_console/godmode/reporting/visual_console_builder.editor.php
View File

@ -168,8 +168,8 @@ echo "<div id='saving_in_progress_dialog' style='display: none; text-align: cent
echo "<div id='delete_in_progress_dialog' style='display: none; text-align: center;' title='".__('Action in progress')."'>".__('Deletion in progress').'<br />'.html_print_image('images/spinner.gif', true).'</div>'; echo "<div id='delete_in_progress_dialog' style='display: none; text-align: center;' title='".__('Action in progress')."'>".__('Deletion in progress').'<br />'.html_print_image('images/spinner.gif', true).'</div>';
// CSS // CSS
ui_require_css_file('color-picker','include/styles/js/'); ui_require_css_file('color-picker', 'include/styles/js/');
ui_require_css_file('jquery-ui.min','include/styles/js/'); ui_require_css_file('jquery-ui.min', 'include/styles/js/');
// Javascript // Javascript
ui_require_jquery_file('colorpicker'); ui_require_jquery_file('colorpicker');

2
pandora_console/godmode/reporting/visual_console_builder.elements.php
View File

@ -697,7 +697,7 @@ echo '<span id="ip_text" style="display: none;">'.__('IP').'</span>';
<textarea id="tinyMCE_editor" name="tinyMCE_editor"></textarea> <textarea id="tinyMCE_editor" name="tinyMCE_editor"></textarea>
</div> </div>
<?php <?php
ui_require_css_file('color-picker','include/styles/js/'); ui_require_css_file('color-picker', 'include/styles/js/');
ui_require_jquery_file('colorpicker'); ui_require_jquery_file('colorpicker');
ui_require_jquery_file('pandora.controls'); ui_require_jquery_file('pandora.controls');

8
pandora_console/godmode/reporting/visual_console_favorite.php
View File

@ -41,6 +41,7 @@ if (!$is_metaconsole) {
$url_visual_console_favorite = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_favorite'; $url_visual_console_favorite = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_favorite';
$url_visual_console_template = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_template'; $url_visual_console_template = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_template';
$url_visual_console_template_wizard = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_wizard'; $url_visual_console_template_wizard = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_wizard';
$url_visual_console_manager = 'index.php?sec=screen&sec2=enterprise/extensions/visual_console_manager';
} }
$buttons['visual_console'] = [ $buttons['visual_console'] = [
@ -63,6 +64,13 @@ if ($is_enterprise && $vconsoles_manage) {
'active' => false, 'active' => false,
'text' => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image('images/wand.png', true, ['title' => __('Visual Console Template Wizard')]).'</a>', 'text' => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image('images/wand.png', true, ['title' => __('Visual Console Template Wizard')]).'</a>',
]; ];
if ($is_metaconsole) {
$buttons['visual_console_manager'] = [
'active' => false,
'text' => '<a href="'.$url_visual_console_manager.'">'.html_print_image('images/builder.png', true, ['title' => __('Visual Console Manager')]).'</a>',
];
}
} }
if (!$is_metaconsole) { if (!$is_metaconsole) {

2
pandora_console/godmode/setup/setup_visuals.php
View File

@ -1234,7 +1234,7 @@ html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"'
echo '</div>'; echo '</div>';
echo '</form>'; echo '</form>';
ui_require_css_file('color-picker','include/styles/js/'); ui_require_css_file('color-picker', 'include/styles/js/');
ui_require_jquery_file('colorpicker'); ui_require_jquery_file('colorpicker');

2
pandora_console/include/config_process.php
View File

@ -20,7 +20,7 @@
/** /**
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC190207'; $build_version = 'PC190212';
$pandora_version = 'v7.0NG.731'; $pandora_version = 'v7.0NG.731';
// Do not overwrite default timezone set if defined. // Do not overwrite default timezone set if defined.

11
pandora_console/include/functions.php
View File

@ -1754,7 +1754,8 @@ function get_snmpwalk(
$quick_print=0, $quick_print=0,
$base_oid='', $base_oid='',
$snmp_port='', $snmp_port='',
$server_to_exec=0 $server_to_exec=0,
$extra_arguments=''
) { ) {
global $config; global $config;
@ -1805,15 +1806,15 @@ function get_snmpwalk(
case '3': case '3':
switch ($snmp3_security_level) { switch ($snmp3_security_level) {
case 'authNoPriv': case 'authNoPriv':
$command_str = $snmpwalk_bin.' -m ALL -Oa -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir; $command_str = $snmpwalk_bin.' -m ALL -Oa '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
break; break;
case 'noAuthNoPriv': case 'noAuthNoPriv':
$command_str = $snmpwalk_bin.' -m ALL -Oa -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -l '.escapeshellarg($snmp3_security_level).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir; $command_str = $snmpwalk_bin.' -m ALL -Oa '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -l '.escapeshellarg($snmp3_security_level).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
break; break;
default: default:
$command_str = $snmpwalk_bin.' -m ALL -Oa -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' -x '.escapeshellarg($snmp3_privacy_method).' -X '.escapeshellarg($snmp3_privacy_pass).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir; $command_str = $snmpwalk_bin.' -m ALL -Oa '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' -x '.escapeshellarg($snmp3_privacy_method).' -X '.escapeshellarg($snmp3_privacy_pass).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
break; break;
} }
break; break;
@ -1822,7 +1823,7 @@ function get_snmpwalk(
case '2c': case '2c':
case '1': case '1':
default: default:
$command_str = $snmpwalk_bin.' -m ALL -Oa -v '.escapeshellarg($snmp_version).' -c '.escapeshellarg(io_safe_output($snmp_community)).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir; $command_str = $snmpwalk_bin.' -m ALL '.$extra_arguments.' -Oa -v '.escapeshellarg($snmp_version).' -c '.escapeshellarg(io_safe_output($snmp_community)).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
break; break;
} }

55
pandora_console/include/functions_api.php
View File

@ -14609,3 +14609,58 @@ function api_get_users($thrash1, $thrash2, $other, $returnType)
} }
} }
/**
* Resets module counts and alert counts in the agents
* @param $id id of the agent you want to synchronize. Add "All" to synchronize all agents
* @param $trash1
* @param $trash2
* @param $trash3
*
* Example:
* api.php?op=set&op2=reset_agent_counts&apipass=1234&user=admin&pass=pandora&id=All
*/
function api_set_reset_agent_counts ($id, $thrash1, $thrash2, $thrash3)
{
global $config;
if (!check_acl($config['id_user'], 0, "AW")) {
returnError('forbidden', 'string');
return;
}
if ($id == '' || !$id) {
returnError('error_parameter', __('Error. Agent cannot be left blank.'));
return;
}
if ($id != "All"){
$agent = db_get_row_filter('tagente', array('id_agente' => $id));
if (empty ($agent)){
returnError('error_agent', __('This agent does not exist.'));
return;
}else {
$return = db_process_sql_update ('tagente',
array ('update_module_count' => 1, 'update_alert_count' => 1),
array('id_agente' => $id)
);
}
}
else {
$return = db_process_sql_update ('tagente',
array ('update_module_count' => 1, 'update_alert_count' => 1)
);
}
$data = __('Successfully updated module/alert count in id agent %d.', $id);
if ($id == "All")
$data = __('Successfully updated module/alert count in all agents');
if ($return === false)
returnError('error_reset_agent_counts', 'Could not be updated module/alert counts in id agent %d.', $id);
else
returnData('string', array('type' => 'string', 'data' => $data));
}

2
pandora_console/include/functions_menu.php
View File

@ -372,7 +372,7 @@ function menu_print_menu(&$menu)
} }
// Print out the first level // Print out the first level
$output .= '<li title="'.ucwords(str_replace(['oper-', 'god-'], '', $id)).'" class="'.implode(' ', $classes).' '.$seleccionado.'" id="icon_'.$id.'">'; $output .= '<li title="'.$main['text'].'" class="'.implode(' ', $classes).' '.$seleccionado.'" id="icon_'.$id.'">';
// onclick="location.href=\'index.php?sec='.$mainsec.'&amp;sec2='.$main["sec2"].($main["refr"] ? '&amp;refr='.$main["refr"] : '').'\'">'; // onclick="location.href=\'index.php?sec='.$mainsec.'&amp;sec2='.$main["sec2"].($main["refr"] ? '&amp;refr='.$main["refr"] : '').'\'">';
$length = strlen(__($main['text'])); $length = strlen(__($main['text']));
$padding_top = ( $length >= 18) ? 6 : 12; $padding_top = ( $length >= 18) ? 6 : 12;

2
pandora_console/include/functions_networkmap.php
View File

@ -25,7 +25,7 @@
require_once 'functions_agents.php'; require_once 'functions_agents.php';
require_once $config['homedir'].'/include/functions_modules.php'; require_once $config['homedir'].'/include/functions_modules.php';
require_once $config['homedir'].'/include/functions_groups.php'; require_once $config['homedir'].'/include/functions_groups.php';
ui_require_css_file('cluetip','include/styles/js/'); ui_require_css_file('cluetip', 'include/styles/js/');
// Check if a node descends from a given node // Check if a node descends from a given node

41
pandora_console/include/functions_visual_map.php
View File

@ -3897,28 +3897,25 @@ function visual_map_get_user_layouts(
return $retval; return $retval;
} }
function visual_map_translate_agent_status ($agent_status) {
function visual_map_translate_agent_status($agent_status) switch ($agent_status) {
{ case AGENT_STATUS_NORMAL:
switch ($agent_status) { case AGENT_MODULE_STATUS_NORMAL_ALERT:
case AGENT_STATUS_NORMAL: default:
default: return VISUAL_MAP_STATUS_NORMAL;
return VISUAL_MAP_STATUS_NORMAL; case AGENT_STATUS_CRITICAL:
case AGENT_MODULE_STATUS_CRITICAL_ALERT:
case AGENT_STATUS_CRITICAL: return VISUAL_MAP_STATUS_CRITICAL_BAD;
return VISUAL_MAP_STATUS_CRITICAL_BAD; case AGENT_STATUS_WARNING:
case AGENT_MODULE_STATUS_WARNING_ALERT:
case AGENT_STATUS_WARNING: return VISUAL_MAP_STATUS_WARNING;
return VISUAL_MAP_STATUS_WARNING; case AGENT_STATUS_NOT_INIT:
case AGENT_STATUS_UNKNOWN:
case AGENT_STATUS_NOT_INIT: case -1:
case AGENT_STATUS_UNKNOWN: return VISUAL_MAP_STATUS_UNKNOWN;
case -1: case AGENT_STATUS_ALERT_FIRED:
return VISUAL_MAP_STATUS_UNKNOWN; return VISUAL_MAP_STATUS_CRITICAL_ALERT;
}
case AGENT_STATUS_ALERT_FIRED:
return VISUAL_MAP_STATUS_CRITICAL_ALERT;
}
} }

2
pandora_console/include/functions_visual_map_editor.php
View File

@ -1150,7 +1150,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background)
echo '<div id="div_step_2" class="forced_title_layer" echo '<div id="div_step_2" class="forced_title_layer"
style="display: none; position: absolute; z-index: 99;">'.__('Click end point<br />of the line').'</div>'; style="display: none; position: absolute; z-index: 99;">'.__('Click end point<br />of the line').'</div>';
ui_require_css_file('color-picker','include/styles/js/'); ui_require_css_file('color-picker', 'include/styles/js/');
ui_require_jquery_file('colorpicker'); ui_require_jquery_file('colorpicker');
?> ?>

178
pandora_console/include/styles/cluster_view.css
View File

@ -1,146 +1,144 @@
/* /*
* --------------------------------------------------------------------- * ---------------------------------------------------------------------
* - CLUSTER VIEW - * - CLUSTER VIEW -
* --------------------------------------------------------------------- * ---------------------------------------------------------------------
*/ */
#main_cluster { #main_cluster {
max-width:1770px; max-width: 1770px;
margin:0 auto; margin: 0 auto;
} }
.sub_cluster_1 { .sub_cluster_1 {
width:400px; width: 400px;
float: left; float: left;
margin-left: 30px; margin-left: 30px;
margin-bottom: 25px; margin-bottom: 25px;
vertical-align: top; vertical-align: top;
border:1px solid #e7e9ea; border: 1px solid #e7e9ea;
height:150px; height: 150px;
} }
.sub_cluster_2 { .sub_cluster_2 {
width:833px; width: 833px;
float: left; float: left;
margin-left: 30px; margin-left: 30px;
margin-bottom: 25px; margin-bottom: 25px;
vertical-align: top; vertical-align: top;
border:1px solid #e7e9ea; border: 1px solid #e7e9ea;
height:150px; height: 150px;
} }
.sub_cluster_header { .sub_cluster_header {
width:100%; width: 100%;
height: 30px; height: 30px;
background-color: #373737; background-color: #373737;
color:white; color: white;
text-align:center; text-align: center;
font-size: 9pt; font-size: 9pt;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-content: center; align-content: center;
flex-direction: column; flex-direction: column;
} }
.sub_cluster_body { .sub_cluster_body {
width:100%; width: 100%;
height: 120px; height: 120px;
background-color: #f9faf9; background-color: #f9faf9;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-content: center; align-content: center;
flex-direction: column; flex-direction: column;
} }
.sub_cluster_body_3 { .sub_cluster_body_3 {
width:100%; width: 100%;
height: 120px; height: 120px;
background-color: #f9faf9; background-color: #f9faf9;
overflow-y: scroll; overflow-y: scroll;
} }
#cluster_map { #cluster_map {
border:1px solid lightgray; border: 1px solid lightgray;
width:900px; width: 900px;
height:500px; height: 500px;
float: left; float: left;
margin-bottom: 30px; margin-bottom: 30px;
} }
#cluster_status_content { #cluster_status_content {
width: 90%; width: 90%;
height:30px; height: 30px;
margin:0px auto; margin: 0px auto;
} }
#cluster_status_bar { #cluster_status_bar {
width: 85%; width: 85%;
height:100%; height: 100%;
float:left; float: left;
} }
.status_animation { .status_animation {
width: 1%; width: 1%;
height:100%; height: 100%;
left:0%; left: 0%;
background-color: red; background-color: red;
position:relative; position: relative;
} }
#cluster_status_button { #cluster_status_button {
float:left; float: left;
width:10%; width: 10%;
margin-left:5%;; margin-left: 5%;
} }
#last_contact_content{ #last_contact_content {
width: 90%; width: 90%;
height:60px; height: 60px;
margin:0px auto; margin: 0px auto;
} }
#last_contact_clock { #last_contact_clock {
width: 15%; width: 15%;
height:100%; height: 100%;
float:left; float: left;
} }
#last_contact_date { #last_contact_date {
float:left; float: left;
height:60px; height: 60px;
width:80%; width: 80%;
margin-left:5%; margin-left: 5%;
text-align:center; text-align: center;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-content: center; align-content: center;
flex-direction: column; flex-direction: column;
} }
#last_contact_date_text { #last_contact_date_text {
font-size:14pt; font-size: 14pt;
} }
.balanced_module_item { .balanced_module_item {
float:left; float: left;
margin-top: 11.5px; margin-top: 11.5px;
margin-left: 5%; margin-left: 5%;
height: 25px; height: 25px;
width:90%; width: 90%;
} }
.module_icon { .module_icon {
float:left; float: left;
width:10%; width: 10%;
} }
.modal_module_list { .modal_module_list {
float:left; float: left;
width: 90%; width: 90%;
height:100%; height: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-content: center; align-content: center;
flex-direction: column; flex-direction: column;
} }

47
pandora_console/include/styles/common.css
View File

@ -34,41 +34,48 @@ div.database_debug_title {
width: 95%; width: 95%;
} }
/* Common useful styles */ /* Common useful styles */
.invisible { .invisible {
display: none; display: none;
}
.left {
clear: left;
float: left;
}
.right {
clear: right;
float: right;
}
.clear {
clear: both;
} }
.left { clear: left; float: left;}
.right { clear: right; float: right;}
.clear { clear:both; }
.top { .top {
vertical-align: top; vertical-align: top;
margin-top: 0; margin-top: 0;
padding-top: 0; padding-top: 0;
} }
img.left { img.left {
margin-right:1em; margin-right: 1em;
margin-bottom:1.8em; margin-bottom: 1.8em;
} }
img.right { img.right {
margin-left:1em; margin-left: 1em;
margin-bottom:1.8em; margin-bottom: 1.8em;
} }
.text-right { .text-right {
text-align:right; text-align: right;
} }
.noshadow { .noshadow {
-moz-box-shadow: 0px !important; -moz-box-shadow: 0px !important;
-webkit-box-shadow: 0px !important; -webkit-box-shadow: 0px !important;
box-shadow: 0px !important; box-shadow: 0px !important;
} }
.center_align { .center_align {
text-align: center; text-align: center;
} }
.left_align { .left_align {
text-align: left; text-align: left;
} }
.right_align { .right_align {
text-align: right; text-align: right;
} }

48
pandora_console/include/styles/js/calendar.css
View File

@ -6,62 +6,62 @@
/* Calendar background */ /* Calendar background */
table.scw { table.scw {
background-color: #82b92e; background-color: #82b92e;
border: 0 !important; border: 0 !important;
border-radius: 4px; border-radius: 4px;
} }
/* Week number heading */ /* Week number heading */
td.scwWeekNumberHead { td.scwWeekNumberHead {
color: #111; color: #111;
} }
td.scwWeek { td.scwWeek {
color: #111 !important; color: #111 !important;
} }
/* Today selector */ /* Today selector */
td.scwFootDisabled { td.scwFootDisabled {
background-color: #000; background-color: #000;
color: #FFFFFF; color: #ffffff;
} }
tfoot.scwFoot { tfoot.scwFoot {
color: #111; color: #111;
} }
.scwFoot :hover{ .scwFoot :hover {
color: #3F3F3F !important; color: #3f3f3f !important;
} }
table.scwCells { table.scwCells {
background-color: #fff !important; background-color: #fff !important;
color: #3c3c3c !important; color: #3c3c3c !important;
} }
table.scwCells:hover { table.scwCells:hover {
background-color: #fff !important; background-color: #fff !important;
} }
td.scwCellsExMonth { td.scwCellsExMonth {
background-color: #eee !important; background-color: #eee !important;
color: #3c3c3c !important; color: #3c3c3c !important;
} }
td.scwCellsWeekend { td.scwCellsWeekend {
background-color: #3c3c3c !important; background-color: #3c3c3c !important;
color: #fff !important; color: #fff !important;
border: 0 !important; border: 0 !important;
} }
td.scwInputDate { td.scwInputDate {
background-color: #777 !important; background-color: #777 !important;
color: #ffffff !important; color: #ffffff !important;
border: 0 !important; border: 0 !important;
} }
td.scwFoot { td.scwFoot {
background-color: #fff !important; background-color: #fff !important;
color: #3c3c3c !important; color: #3c3c3c !important;
border: 0 !important; border: 0 !important;
} }

277
pandora_console/include/styles/js/jquery-ui_custom.css
View File

@ -1,254 +1,263 @@
@import url(calendar.css); @import url(calendar.css);
/* --- JQUERY-UI --- */ /* --- JQUERY-UI --- */
.ui-dialog .ui-dialog-titlebar { .ui-dialog .ui-dialog-titlebar {
background-color: #82b92e !important; background-color: #82b92e !important;
} }
/*center ui dialog center*/ /*center ui dialog center*/
.ui-dialog-titlebar .ui-icon-closethick { .ui-dialog-titlebar .ui-icon-closethick {
margin-top: -5px !important; margin-top: -5px !important;
} }
.ui-button-text-only .ui-button-text { .ui-button-text-only .ui-button-text {
font-family: nunito; font-family: nunito;
font-size: 9pt; font-size: 9pt;
color: #82B92E color: #82b92e;
} }
.ui-datepicker .ui-datepicker-title *, .ui-datepicker th * { .ui-datepicker .ui-datepicker-title *,
color: white; .ui-datepicker th * {
color: white;
} }
.ui-datepicker .ui-datepicker-title select, .ui-datepicker .ui-datepicker-title option { .ui-datepicker .ui-datepicker-title select,
color: #111 !important; .ui-datepicker .ui-datepicker-title option {
color: #111 !important;
} }
.ui-dialog .ui-dialog-titlebar { .ui-dialog .ui-dialog-titlebar {
display: inherit; display: inherit;
text-align: center; text-align: center;
padding: .4em 1em; padding: 0.4em 1em;
height: 30px; height: 30px;
position: relative; position: relative;
} }
.ui-dialog .ui-dialog-title { .ui-dialog .ui-dialog-title {
font-family: Nunito, sans-serif; font-family: Nunito, sans-serif;
margin: .1em 0 !important; margin: 0.1em 0 !important;
white-space: nowrap !important; white-space: nowrap !important;
width: 100% !important; width: 100% !important;
overflow: hidden !important; overflow: hidden !important;
text-overflow: ellipsis !important; text-overflow: ellipsis !important;
font-size: 11pt; font-size: 11pt;
position: relative; position: relative;
top: 5px; top: 5px;
float: none !important; float: none !important;
} }
.ui-dialog .ui-dialog-titlebar-close { .ui-dialog .ui-dialog-titlebar-close {
position: absolute !important; position: absolute !important;
right: 1em !important; right: 1em !important;
width: 21px !important; width: 21px !important;
margin: 0px 0 0 0 !important; margin: 0px 0 0 0 !important;
padding: 1px !important; padding: 1px !important;
height: 20px !important; height: 20px !important;
bottom: 30% !important; bottom: 30% !important;
top: 20% !important; top: 20% !important;
} }
.ui-dialog .ui-dialog-content { .ui-dialog .ui-dialog-content {
position: relative !important; position: relative !important;
border: 0; border: 0;
padding: .5em 1em !important; padding: 0.5em 1em !important;
background: none !important; background: none !important;
overflow: auto !important; overflow: auto !important;
margin-bottom: 1em; margin-bottom: 1em;
} }
.ui-dialog .ui-dialog-buttonpane { .ui-dialog .ui-dialog-buttonpane {
text-align: left; text-align: left;
border-width: 1px 0 0 0; border-width: 1px 0 0 0;
background-image: none; background-image: none;
margin-top: .5em; margin-top: 0.5em;
padding: .3em 1em .5em .4em; padding: 0.3em 1em 0.5em 0.4em;
} }
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
float: right; float: right;
} }
.ui-dialog .ui-dialog-buttonpane button { .ui-dialog .ui-dialog-buttonpane button {
margin: .5em 1em .5em 0 !important; margin: 0.5em 1em 0.5em 0 !important;
cursor: pointer !important; cursor: pointer !important;
background: white !important; background: white !important;
background-color: white !important; background-color: white !important;
border: 1px solid #82b92e !important; border: 1px solid #82b92e !important;
height:30px !important; height: 30px !important;
width:90px !important; width: 90px !important;
} }
.ui-widget-header .ui-icon { .ui-widget-header .ui-icon {
background-image: url(../images/ui-icons_444444_256x240.png) !important; background-image: url(../images/ui-icons_444444_256x240.png) !important;
} }
.ui-icon, .ui-widget-content .ui-icon { .ui-icon,
background-image: url(../images/ui-icons_444444_256x240.png) !important; .ui-widget-content .ui-icon {
background-image: url(../images/ui-icons_444444_256x240.png) !important;
} }
.ui-widget-content { .ui-widget-content {
background: #ffffff url(../images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; background: #ffffff url(../images/ui-bg_flat_75_ffffff_40x100.png) 50% 50%
repeat-x;
} }
.ui-state-default, .ui-state-default,
.ui-widget-content .ui-state-default, .ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default { .ui-widget-header .ui-state-default {
margin-top: 3px; margin-top: 3px;
border: 1px solid #d3d3d3 !important; border: 1px solid #d3d3d3 !important;
border-bottom:0 !important; border-bottom: 0 !important;
background: #e6e6e6 url(../images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x !important; background: #e6e6e6 url(../images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50%
font-weight: normal !important; repeat-x !important;
color: #555555 !important; font-weight: normal !important;
color: #555555 !important;
} }
.ui-corner-all, .ui-corner-all,
.ui-corner-top, .ui-corner-top,
.ui-corner-left, .ui-corner-left,
.ui-corner-tl { .ui-corner-tl {
border-top-left-radius: 0 !important; border-top-left-radius: 0 !important;
} }
.ui-corner-all, .ui-corner-all,
.ui-corner-top, .ui-corner-top,
.ui-corner-right, .ui-corner-right,
.ui-corner-tr { .ui-corner-tr {
border-top-right-radius: 0 !important; border-top-right-radius: 0 !important;
} }
.ui-corner-all, .ui-corner-all,
.ui-corner-bottom, .ui-corner-bottom,
.ui-corner-left, .ui-corner-left,
.ui-corner-bl { .ui-corner-bl {
border-bottom-left-radius: 0 !important; border-bottom-left-radius: 0 !important;
} }
.ui-corner-all, .ui-corner-all,
.ui-corner-bottom, .ui-corner-bottom,
.ui-corner-right, .ui-corner-right,
.ui-corner-br { .ui-corner-br {
border-bottom-right-radius: 0 !important; border-bottom-right-radius: 0 !important;
} }
#ui-datepicker-div { #ui-datepicker-div {
border-color: #B1B1B1; border-color: #b1b1b1;
background: #ffffff; background: #ffffff;
} }
.ui-widget-header { .ui-widget-header {
background: #B1B1B1 !important; background: #b1b1b1 !important;
color: #ffffff !important; color: #ffffff !important;
} }
.ui-datepicker-calendar th { .ui-datepicker-calendar th {
background-color: #3F3F3F; background-color: #3f3f3f;
} }
.ui-dialog .ui-widget-header { .ui-dialog .ui-widget-header {
background-color: #82b92e; background-color: #82b92e;
} }
.ui_tpicker_hour, .ui_tpicker_hour,
.ui_tpicker_minute, .ui_tpicker_minute,
.ui_tpicker_second, .ui_tpicker_second,
.ui-slider-handle { .ui-slider-handle {
border: 1px solid #AAAAAA !important; border: 1px solid #aaaaaa !important;
} }
.ui-timepicker-div dd { .ui-timepicker-div dd {
margin: 0px 15px 0px 15px ; margin: 0px 15px 0px 15px;
} }
.ui-timepicker-div .ui-datepicker-title { .ui-timepicker-div .ui-datepicker-title {
color: white; color: white;
} }
.ui-datepicker-buttonpane button { .ui-datepicker-buttonpane button {
border-color: #B1B1B1 !important; border-color: #b1b1b1 !important;
} }
.ui-datepicker-buttonpane .ui-datepicker-current { .ui-datepicker-buttonpane .ui-datepicker-current {
margin-left: 0.2em !important; margin-left: 0.2em !important;
} }
.ui-dialog .ui-widget-content { .ui-dialog .ui-widget-content {
border: 0px !important; border: 0px !important;
} }
.ui-dialog { .ui-dialog {
box-shadow: 5px 5px 19px #4e4e4e; box-shadow: 5px 5px 19px #4e4e4e;
border: 0px !important; border: 0px !important;
padding: 0 !important; padding: 0 !important;
} }
.ui-dialog-titlebar { .ui-dialog-titlebar {
border: 0px !important; border: 0px !important;
} }
.ui-dialog-titlebar .ui-icon-closethick, .ui-dialog-titlebar .ui-icon-closethick,
.ui-dialog-titlebar .ui-state-default, .ui-dialog-titlebar .ui-state-default,
.ui-dialog-titlebar .ui-state-hover, .ui-dialog-titlebar .ui-state-hover,
.ui-dialog-titlebar button { .ui-dialog-titlebar button {
background: transparent; background: transparent;
border: 0px; border: 0px;
} }
.ui-dialog-titlebar .ui-icon-closethick { .ui-dialog-titlebar .ui-icon-closethick {
background-image: url("../../../images/icono_cerrar.png") !important; background-image: url("../../../images/icono_cerrar.png") !important;
} }
.ui-dialog-title { .ui-dialog-title {
color: #ffffff; color: #ffffff;
font-size: 9pt; font-size: 9pt;
} }
.ui-widget input, .ui-widget input,
.ui-widget select, .ui-widget select,
.ui-widget textarea, .ui-widget textarea,
.ui-widget button{ .ui-widget button {
font-family: Verdana,Arial,sans-serif !important; font-family: Verdana, Arial, sans-serif !important;
} }
a.ui-button:active, .ui-button:active, a.ui-button:active,
.ui-button:active,
.ui-button.ui-state-active:hover, .ui-button.ui-state-active:hover,
.ui-state-focus .ui-widget-content, .ui-state-focus .ui-widget-content,
.ui-state-focus .ui-widget-header, .ui-state-focus .ui-widget-header,
.ui-state-focus .ui-button:hover, .ui-button:focus{ .ui-state-focus .ui-button:hover,
background: transparent !important; .ui-button:focus {
border: none !important; background: transparent !important;
border: none !important;
} }
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover{ .ui-state-hover,
border: 1px solid #999999 !important; .ui-widget-content .ui-state-hover,
border-bottom: 0 !important; .ui-widget-header .ui-state-hover {
background: #dadada url(../images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x !important; border: 1px solid #999999 !important;
border-bottom: 0 !important;
background: #dadada url(../images/ui-bg_glass_75_dadada_1x400.png) 50% 50%
repeat-x !important;
} }
.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active{ .ui-state-active,
border: 1px solid #aaaaaa !important; .ui-widget-content .ui-state-active,
border-bottom: 0 !important; .ui-widget-header .ui-state-active {
background: #ffffff url(../images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x !important; border: 1px solid #aaaaaa !important;
font-weight: normal !important; border-bottom: 0 !important;
color: #212121 !important; background: #ffffff url(../images/ui-bg_glass_65_ffffff_1x400.png) 50% 50%
repeat-x !important;
font-weight: normal !important;
color: #212121 !important;
} }
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited{ .ui-state-active a,
color: #212121 !important; .ui-state-active a:link,
.ui-state-active a:visited {
color: #212121 !important;
} }
ul.ui-front{ ul.ui-front {
z-index: 1000000 !important; z-index: 1000000 !important;
padding-right: 0px !important; padding-right: 0px !important;
} }
ul.ui-front li{ ul.ui-front li {
padding: 3px !important; padding: 3px !important;
} }
ul.ui-front li:hover{ ul.ui-front li:hover {
background-color: #e1e3e1 !important; background-color: #e1e3e1 !important;
} }
ul.ui-front li a.ui-menu-item-wrapper{ ul.ui-front li a.ui-menu-item-wrapper {
background: transparent !important; background: transparent !important;
border: none !important; border: none !important;
} }
ul.ui-front li a.ui-menu-item-wrapper span{ ul.ui-front li a.ui-menu-item-wrapper span {
padding-left: 5px !important; padding-left: 5px !important;
} }
ul.ui-front li a.ui-menu-item-wrapper:hover{ ul.ui-front li a.ui-menu-item-wrapper:hover {
text-decoration: none !important; text-decoration: none !important;
} }
input[type=submit].ui-button-dialog{ input[type="submit"].ui-button-dialog {
margin: .5em 1em .5em 0 !important; margin: 0.5em 1em 0.5em 0 !important;
cursor: pointer !important; cursor: pointer !important;
background: white !important; background: white !important;
background-color: white !important; background-color: white !important;
color: #82b92e !important; color: #82b92e !important;
text-align: center !important; text-align: center !important;
border: 1px solid #82b92e !important; border: 1px solid #82b92e !important;
height:30px !important; height: 30px !important;
width:90px !important; width: 90px !important;
} }

228
pandora_console/include/styles/js/jquery.contextMenu.css
View File

@ -13,86 +13,86 @@
*/ */
.context-menu-list { .context-menu-list {
margin:0; margin: 0;
padding:0; padding: 0;
min-width: 120px; min-width: 120px;
max-width: 250px; max-width: 250px;
display: inline-block; display: inline-block;
position: absolute; position: absolute;
list-style-type: none; list-style-type: none;
border: 1px solid #DDD; border: 1px solid #ddd;
border-radius: 4px; border-radius: 4px;
background: #EEE; background: #eee;
-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
-ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); -ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
-o-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); -o-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
font-family: Verdana, Arial, Helvetica, sans-serif; font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 11px; font-size: 11px;
text-align: left; text-align: left;
} }
.context-menu-item { .context-menu-item {
padding: 0px 2px 0px 24px; padding: 0px 2px 0px 24px;
background-color: #EEE; background-color: #eee;
position: relative; position: relative;
border-radius: 4px; border-radius: 4px;
-webkit-user-select: none; -webkit-user-select: none;
-moz-user-select: -moz-none; -moz-user-select: -moz-none;
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
padding-top: 8px; padding-top: 8px;
padding-bottom: 8px; padding-bottom: 8px;
} }
.context-menu-item span { .context-menu-item span {
padding-top: 10px; padding-top: 10px;
padding-bottom: 10px; padding-bottom: 10px;
padding-right: 10px; padding-right: 10px;
padding-left: 10px; padding-left: 10px;
} }
.context-menu-separator { .context-menu-separator {
padding-bottom:0; padding-bottom: 0;
border-bottom: 1px solid #DDD; border-bottom: 1px solid #ddd;
} }
.context-menu-item > label > input, .context-menu-item > label > input,
.context-menu-item > label > textarea { .context-menu-item > label > textarea {
-webkit-user-select: text; -webkit-user-select: text;
-moz-user-select: text; -moz-user-select: text;
-ms-user-select: text; -ms-user-select: text;
user-select: text; user-select: text;
} }
.context-menu-item.hover { .context-menu-item.hover {
cursor: pointer; cursor: pointer;
background-color: #82b92e; background-color: #82b92e;
border-radius: 4px; border-radius: 4px;
color: #fff; color: #fff;
} }
.context-menu-item.disabled { .context-menu-item.disabled {
color: #666 !important; color: #666 !important;
} }
.context-menu-input.hover, .context-menu-input.hover,
.context-menu-item.disabled.hover { .context-menu-item.disabled.hover {
cursor: default; cursor: default;
background-color: #EEE; background-color: #eee;
} }
.context-menu-submenu:after { .context-menu-submenu:after {
content: ">"; content: ">";
color: #666; color: #666;
position: absolute; position: absolute;
top: 0; top: 0;
right: 3px; right: 3px;
z-index: 1; z-index: 1;
} }
/* icons /* icons
@ -101,67 +101,111 @@
http://css-tricks.com/13224-pseudo-spriting/ to get an idea of how to implement http://css-tricks.com/13224-pseudo-spriting/ to get an idea of how to implement
.context-menu-item.icon:before {} .context-menu-item.icon:before {}
*/ */
.context-menu-item.icon { min-height: 18px; background-repeat: no-repeat; background-position: 4px 2px; } .context-menu-item.icon {
.context-menu-item.icon-edit { background-image: url(../../images/page_white_edit.png); } min-height: 18px;
.context-menu-item.icon-cut { background-image: url(../../images/cut.png); } background-repeat: no-repeat;
.context-menu-item.icon-copy { background-image: url(../../images/page_white_copy.png); } background-position: 4px 2px;
.context-menu-item.icon-paste { background-image: url(../../images/page_white_paste.png); } }
.context-menu-item.icon-delete { background-image: url(../../images/delete.png); } .context-menu-item.icon-edit {
.context-menu-item.icon-add { background-image: url(../../images/page_white_add.png); } background-image: url(../../images/page_white_edit.png);
.context-menu-item.icon-quit { background-image: url(../../images/door.png); } }
.context-menu-item.icon-refresh { background-image: url(../../images/refresh.png); } .context-menu-item.icon-cut {
.context-menu-item.icon-center { background-image: url(../../images/set_center.png); } background-image: url(../../images/cut.png);
.context-menu-item.icon-details { background-image: url(../../images/show_details.png); } }
.context-menu-item.icon-children { background-image: url(../../images/children.png); } .context-menu-item.icon-copy {
.context-menu-item.icon-cancel_set_parent { background-image: url(../../images/link_delete.png); } background-image: url(../../images/page_white_copy.png);
.context-menu-item.icon-set_parent { background-image: url(../../images/father.png); } }
.context-menu-item.icon-add_node { background-image: url(../../images/add.png); } .context-menu-item.icon-paste {
.context-menu-item.icon-refresh_holding_area { background-image: url(../../images/refresh_holding_area.png); } background-image: url(../../images/page_white_paste.png);
.context-menu-item.icon-restart_map { background-image: url(../../images/reset.png); } }
.context-menu-item.icon-interface_link_children { background-image: url(../../images/icono_link_hijo.png); } .context-menu-item.icon-delete {
.context-menu-item.icon-interface_link_parent { background-image: url(../../images/icono_link_padre.png); } background-image: url(../../images/delete.png);
.context-menu-item.icon-interface_link_cancel { background-image: url(../../images/link_abortar.png); } }
.context-menu-item.icon-add {
background-image: url(../../images/page_white_add.png);
}
.context-menu-item.icon-quit {
background-image: url(../../images/door.png);
}
.context-menu-item.icon-refresh {
background-image: url(../../images/refresh.png);
}
.context-menu-item.icon-center {
background-image: url(../../images/set_center.png);
}
.context-menu-item.icon-details {
background-image: url(../../images/show_details.png);
}
.context-menu-item.icon-children {
background-image: url(../../images/children.png);
}
.context-menu-item.icon-cancel_set_parent {
background-image: url(../../images/link_delete.png);
}
.context-menu-item.icon-set_parent {
background-image: url(../../images/father.png);
}
.context-menu-item.icon-add_node {
background-image: url(../../images/add.png);
}
.context-menu-item.icon-refresh_holding_area {
background-image: url(../../images/refresh_holding_area.png);
}
.context-menu-item.icon-restart_map {
background-image: url(../../images/reset.png);
}
.context-menu-item.icon-interface_link_children {
background-image: url(../../images/icono_link_hijo.png);
}
.context-menu-item.icon-interface_link_parent {
background-image: url(../../images/icono_link_padre.png);
}
.context-menu-item.icon-interface_link_cancel {
background-image: url(../../images/link_abortar.png);
}
/* vertically align inside labels */ /* vertically align inside labels */
.context-menu-input > label > * { vertical-align: top; } .context-menu-input > label > * {
vertical-align: top;
}
/* position checkboxes and radios as icons */ /* position checkboxes and radios as icons */
.context-menu-input > label > input[type="checkbox"], .context-menu-input > label > input[type="checkbox"],
.context-menu-input > label > input[type="radio"] { .context-menu-input > label > input[type="radio"] {
margin-left: -17px; margin-left: -17px;
} }
.context-menu-input > label > span { .context-menu-input > label > span {
margin-left: 5px; margin-left: 5px;
} }
.context-menu-input > label, .context-menu-input > label,
.context-menu-input > label > input[type="text"], .context-menu-input > label > input[type="text"],
.context-menu-input > label > textarea, .context-menu-input > label > textarea,
.context-menu-input > label > select { .context-menu-input > label > select {
display: block; display: block;
width: 100%; width: 100%;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-ms-box-sizing: border-box; -ms-box-sizing: border-box;
-o-box-sizing: border-box; -o-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.context-menu-input > label > textarea { .context-menu-input > label > textarea {
height: 100px; height: 100px;
} }
.context-menu-item > .context-menu-list { .context-menu-item > .context-menu-list {
display: none; display: none;
/* re-positioned by js */ /* re-positioned by js */
right: -5px; right: -5px;
top: 5px; top: 5px;
} }
.context-menu-item.hover > .context-menu-list { .context-menu-item.hover > .context-menu-list {
display: block; display: block;
} }
.context-menu-accesskey { .context-menu-accesskey {
text-decoration: underline; text-decoration: underline;
} }

454
pandora_console/include/styles/login.css
View File

@ -4,33 +4,33 @@
* --------------------------------------------------------------------- * ---------------------------------------------------------------------
*/ */
h1#log_title { h1#log_title {
font-size: 18px; font-size: 18px;
margin-bottom: 0px; margin-bottom: 0px;
color: #FFF !important; color: #fff !important;
width:300px; width: 300px;
} }
div#log_msg { div#log_msg {
display: none; display: none;
} }
div#error_buttons { div#error_buttons {
margin-top: 20px; margin-top: 20px;
} }
div#error_buttons a{ div#error_buttons a {
margin: 14px; margin: 14px;
} }
#login_body { #login_body {
/* Set rules to fill background */ /* Set rules to fill background */
min-height: 100%; min-height: 100%;
min-width: 1200px; min-width: 1200px;
width: 100%; width: 100%;
z-index: -9999; z-index: -9999;
position: absolute; position: absolute;
background-image: url("../../images/backgrounds/background_pandora_console_keys.jpg"); background-image: url("../../images/backgrounds/background_pandora_console_keys.jpg");
background-repeat: repeat; background-repeat: repeat;
} }
/*@media screen and (max-width: 1024px) { /* Specific to this particular image */ /*@media screen and (max-width: 1024px) { /* Specific to this particular image */
@ -65,52 +65,49 @@ div#error_buttons a{
}*/ }*/
p.log_in { p.log_in {
color: #FFF !important; color: #fff !important;
padding: 0px 10px; padding: 0px 10px;
width:300px; width: 300px;
} }
h1#log_f { h1#log_f {
color: #c00; color: #c00;
border-bottom: 1px solid #c00; border-bottom: 1px solid #c00;
padding-bottom: 3px; padding-bottom: 3px;
} }
div#error_login { div#error_login {
text-align: center; text-align: center;
margin-top: 5px; margin-top: 5px;
margin-left: 5px; margin-left: 5px;
width: 75%; width: 75%;
float: right; float: right;
text-align: left; text-align: left;
top: 100px; top: 100px;
} }
div#error_login_icon { div#error_login_icon {
margin-top: 10px; margin-top: 10px;
margin-right: 7px; margin-right: 7px;
text-align: center; text-align: center;
width: 20%; width: 20%;
float: right; float: right;
} }
div#login_f { div#login_f {
margin-top: 10px; margin-top: 10px;
margin-bottom: 25px; margin-bottom: 25px;
} }
#ver_num { #ver_num {
margin: 0px auto; margin: 0px auto;
width: 100%; width: 100%;
position: absolute; position: absolute;
bottom: 10px; bottom: 10px;
color: #FFF; color: #fff;
text-align: center; text-align: center;
} }
/* /*
* --------------------------------------------------------------------- * ---------------------------------------------------------------------
* - LOGIN PAGE - * - LOGIN PAGE -
@ -118,103 +115,103 @@ div#login_f {
*/ */
/* --- Login page - header --- */ /* --- Login page - header --- */
div#header_login{ div#header_login {
width: 100%; width: 100%;
height: 65px; height: 65px;
background-color: rgba(255, 255, 255, 0.06); background-color: rgba(255, 255, 255, 0.06);
} }
div#icon_custom_pandora{ div#icon_custom_pandora {
float: left; float: left;
margin-top: 5px; margin-top: 5px;
margin-left: 4%; margin-left: 4%;
} }
div#list_icon_docs_support{ div#list_icon_docs_support {
float: right; float: right;
margin-top: 8px; margin-top: 8px;
margin-right: 4%; margin-right: 4%;
} }
div#list_icon_docs_support ul{ div#list_icon_docs_support ul {
margin-top: 5px; margin-top: 5px;
} }
div#list_icon_docs_support ul li{ div#list_icon_docs_support ul li {
display: inline-block; display: inline-block;
color:white; color: white;
vertical-align: middle; vertical-align: middle;
margin-right: 5px; margin-right: 5px;
font-size: 10pt; font-size: 10pt;
} }
li#li_margin_left{ li#li_margin_left {
margin-left: 30px; margin-left: 30px;
} }
/* --- Login page - form --- */ /* --- Login page - form --- */
div.container_login{ div.container_login {
margin-top: 10%; margin-top: 10%;
margin-left: 5%; margin-left: 5%;
margin-right: 5%; margin-right: 5%;
} }
div.login_page { div.login_page {
width: 35%; width: 35%;
min-height: 600px; min-height: 600px;
float:left; float: left;
} }
div.login_page form { div.login_page form {
border-right:1px solid #868686; border-right: 1px solid #868686;
padding-top: 30px; padding-top: 30px;
padding-bottom: 50px; padding-bottom: 50px;
min-width: 400px; min-width: 400px;
max-height: 600px; max-height: 600px;
} }
div.login_logo_icon { div.login_logo_icon {
margin-bottom: 40px; margin-bottom: 40px;
text-align: center; text-align: center;
} }
div.login_logo_icon img{ div.login_logo_icon img {
margin: 0 auto; margin: 0 auto;
width: 150px; width: 150px;
} }
div.login_double_auth_code, div.login_double_auth_code,
div.login_nick, div.login_nick,
div.login_pass { div.login_pass {
margin: 0 auto; margin: 0 auto;
width: 70%; width: 70%;
height: 40px; height: 40px;
background-color: rgba(255, 255, 255, 0.20) !important; background-color: rgba(255, 255, 255, 0.2) !important;
margin-bottom: 25px; margin-bottom: 25px;
min-width: 260px; min-width: 260px;
} }
div.login_nick img, div.login_nick img,
div.login_pass img{ div.login_pass img {
vertical-align: middle; vertical-align: middle;
margin: 3px; margin: 3px;
} }
div.login_nick input, div.login_nick input,
div.login_pass input{ div.login_pass input {
background-color: rgba(255, 255, 255, 0.00) !important; background-color: rgba(255, 255, 255, 0) !important;
border:0px !important; border: 0px !important;
color:white !important; color: white !important;
border-radius: 0px; border-radius: 0px;
width: 89%; width: 89%;
height: 40px; height: 40px;
font-size: 9pt; font-size: 9pt;
padding: 0px !important; padding: 0px !important;
} }
div.login_nick input:focus, div.login_nick input:focus,
div.login_pass input:focus{ div.login_pass input:focus {
outline: none; outline: none;
} }
div.login_nick input:-webkit-autofill, div.login_nick input:-webkit-autofill,
@ -225,193 +222,190 @@ div.login_pass input:-webkit-autofill,
div.login_pass input:-webkit-autofill:hover, div.login_pass input:-webkit-autofill:hover,
div.login_pass input:-webkit-autofill:focus, div.login_pass input:-webkit-autofill:focus,
div.login_pass input:-webkit-autofill:active { div.login_pass input:-webkit-autofill:active {
transition: background-color 10000s ease-in-out 0s; transition: background-color 10000s ease-in-out 0s;
-webkit-box-shadow: 0 0 0px 0px transparent inset !important; -webkit-box-shadow: 0 0 0px 0px transparent inset !important;
-webkit-text-fill-color: white !important; -webkit-text-fill-color: white !important;
border:0px; border: 0px;
width: 89%; width: 89%;
} }
div.login_nick input::-webkit-input-placeholder, div.login_nick input::-webkit-input-placeholder,
div.login_pass input::-webkit-input-placeholder { div.login_pass input::-webkit-input-placeholder {
color:white; color: white;
} }
div.login_pass img, div.login_pass img,
div.login_nick img{ div.login_nick img {
width: 30px; width: 30px;
} }
div.login_pass div, div.login_pass div,
div.login_nick div{ div.login_nick div {
float: left; float: left;
width: 11%; width: 11%;
} }
div.login_button{ div.login_button {
margin: 0 auto; margin: 0 auto;
width: 70%; width: 70%;
height: 40px; height: 40px;
background-color: rgb(25, 25, 25); background-color: rgb(25, 25, 25);
border: 1px solid white; border: 1px solid white;
min-width: 260px; min-width: 260px;
} }
div.login_button input { div.login_button input {
width: 100%; width: 100%;
background-color: rgb(25, 25, 25) !important; background-color: rgb(25, 25, 25) !important;
text-align: center; text-align: center;
border:0px; border: 0px;
border-radius: 0px; border-radius: 0px;
height: 40px; height: 40px;
padding: 0px; padding: 0px;
font-size: 9pt; font-size: 9pt;
color: white; color: white;
} }
div.login_data { div.login_data {
width: 65%; width: 65%;
min-height: 600px; min-height: 600px;
float:left; float: left;
} }
div.text_banner_login{ div.text_banner_login {
width: 100%; width: 100%;
margin-bottom: 60px; margin-bottom: 60px;
color: white; color: white;
text-align: center; text-align: center;
} }
div.text_banner_login span{ div.text_banner_login span {
width: 100%; width: 100%;
} }
span.span1{ span.span1 {
font-size: 3vw; font-size: 3vw;
font-family: 'lato-thin'; font-family: "lato-thin";
color: white; color: white;
} }
span.span2{ span.span2 {
font-size: 3vw; font-size: 3vw;
font-family: 'lato-bolder'; font-family: "lato-bolder";
color: white; color: white;
} }
div.img_banner_login{ div.img_banner_login {
width: 100%; width: 100%;
text-align: center; text-align: center;
} }
div.img_banner_login img{ div.img_banner_login img {
max-width: 70%; max-width: 70%;
min-width: 70%; min-width: 70%;
max-height: 50%; max-height: 50%;
min-height: 50%; min-height: 50%;
} }
@media all and (max-width: 1200px) { @media all and (max-width: 1200px) {
span.span1{ span.span1 {
font-size: 30pt; font-size: 30pt;
} }
span.span2{ span.span2 {
font-size: 30pt; font-size: 30pt;
} }
} }
/* --- Login page - modal windows --- */ /* --- Login page - modal windows --- */
div.content_alert{ div.content_alert {
width: 98%; width: 98%;
margin-top: 20px; margin-top: 20px;
} }
div.icon_message_alert{ div.icon_message_alert {
float: left; float: left;
width: 25%; width: 25%;
text-align: center; text-align: center;
} }
div.icon_message_alert img{ div.icon_message_alert img {
width: 85px; width: 85px;
} }
div.content_message_alert{ div.content_message_alert {
width: 75%;
width: 75%; float: right;
float: right;
} }
div.text_message_alert{ div.text_message_alert {
width: 100%; width: 100%;
margin-top: 10px; margin-top: 10px;
} }
div.text_message_alert h1{ div.text_message_alert h1 {
margin: 0px; margin: 0px;
} }
div.text_message_alert p{ div.text_message_alert p {
margin: 0px; margin: 0px;
font-size: 10.3pt; font-size: 10.3pt;
line-height: 14pt; line-height: 14pt;
} }
div.button_message_alert{ div.button_message_alert {
width: 100%; width: 100%;
} }
div.button_message_alert input{ div.button_message_alert input {
float: right; float: right;
width: 87px; width: 87px;
height: 33px; height: 33px;
color: #82b92e; color: #82b92e;
border: 1px solid #82b92e; border: 1px solid #82b92e;
font-weight: bold; font-weight: bold;
margin-right: 20px; margin-right: 20px;
margin-top: 20px; margin-top: 20px;
font-size: 10pt; font-size: 10pt;
} }
div.form_message_alert{ div.form_message_alert {
width: 90%; width: 90%;
clear: both; clear: both;
padding-top: 20px; padding-top: 20px;
padding-left: 40px; padding-left: 40px;
} }
div.form_message_alert ul li{ div.form_message_alert ul li {
display: inline-block; display: inline-block;
padding: 10px; padding: 10px;
} }
div.form_message_alert ul li input{ div.form_message_alert ul li input {
border: none; border: none;
background-color: #dadada !important; background-color: #dadada !important;
border-radius: 0px; border-radius: 0px;
height: 17px; height: 17px;
width: 145px; width: 145px;
padding-left: 5px; padding-left: 5px;
} }
div.form_message_alert ul li label{ div.form_message_alert ul li label {
font-size: 10pt; font-size: 10pt;
padding-right: 20px; padding-right: 20px;
} }
div.form_message_alert h4{ div.form_message_alert h4 {
margin: 0px; margin: 0px;
margin-bottom: 10px; margin-bottom: 10px;
} }
div.button_message_alert_form input{ div.button_message_alert_form input {
float: right; float: right;
width: 87px; width: 87px;
height: 33px; height: 33px;
color: #82b92e; color: #82b92e;
border: 1px solid #82b92e; border: 1px solid #82b92e;
font-weight: bold; font-weight: bold;
font-size: 10pt; font-size: 10pt;
margin-right: 25px; margin-right: 25px;
} }

200
pandora_console/include/styles/menu.css
View File

@ -34,8 +34,8 @@
} }
.menu li a { .menu li a {
color: #FFFFFF; color: #ffffff;
text-decoration:none; text-decoration: none;
} }
li:hover ul { li:hover ul {
@ -43,10 +43,10 @@ li:hover ul {
} }
.submenu_text { .submenu_text {
padding: 10.5px; padding: 10.5px;
margin-left: 0px; margin-left: 0px;
width: 100%; width: 100%;
color: #fff; color: #fff;
} }
.menu li.subselected a { .menu li.subselected a {
@ -258,95 +258,93 @@ ul li a:hover {
} /* Hover Styles */ } /* Hover Styles */
/*li ul li a { padding: 2px 5px; } Sub Menu Styles */ /*li ul li a { padding: 2px 5px; } Sub Menu Styles */
/* /*
* --------------------------------------------------------------------- * ---------------------------------------------------------------------
* - MAIN LEFT MENU and SUBMENU - * - MAIN LEFT MENU and SUBMENU -
* --------------------------------------------------------------------- * ---------------------------------------------------------------------
*/ */
.menu li.selected { .menu li.selected {
font-weight: bold; font-weight: bold;
} }
.menu_icon{ .menu_icon {
transition-property: background-color; transition-property: background-color;
transition-duration: 0.5s; transition-duration: 0.5s;
transition-timing-function: ease-out; transition-timing-function: ease-out;
-webkit-transition-property: background-color; -webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s; -webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out; -webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color; -moz-transition-property: background-color;
-moz-transition-duration: 0.5s; -moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out; -moz-transition-timing-function: ease-out;
-o-transition-property: background-color; -o-transition-property: background-color;
-o-transition-duration: 0.5s; -o-transition-duration: 0.5s;
-o-transition-timing-function: ease-out; -o-transition-timing-function: ease-out;
} }
.menu_icon:hover{ .menu_icon:hover {
transition-property: background-color; transition-property: background-color;
transition-duration: 0.5s; transition-duration: 0.5s;
transition-timing-function: ease-out; transition-timing-function: ease-out;
-webkit-transition-property: background-color; -webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s; -webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out; -webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color; -moz-transition-property: background-color;
-moz-transition-duration: 0.5s; -moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out; -moz-transition-timing-function: ease-out;
-o-transition-property: background-color; -o-transition-property: background-color;
-o-transition-duration: 0.5s; -o-transition-duration: 0.5s;
-o-transition-timing-function: ease-out; -o-transition-timing-function: ease-out;
background-color: #585858 !important; background-color: #585858 !important;
} }
.submenu_not_selected:hover{ .submenu_not_selected:hover {
transition-property: background-color; transition-property: background-color;
transition-duration: 0.5s; transition-duration: 0.5s;
transition-timing-function: ease-out; transition-timing-function: ease-out;
-webkit-transition-property: background-color; -webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s; -webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out; -webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color; -moz-transition-property: background-color;
-moz-transition-duration: 0.5s; -moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out; -moz-transition-timing-function: ease-out;
-o-transition-property: background-color; -o-transition-property: background-color;
-o-transition-duration: 0.5s; -o-transition-duration: 0.5s;
-o-transition-timing-function: ease-out; -o-transition-timing-function: ease-out;
background-color: #585858 !important; background-color: #585858 !important;
} }
.submenu_selected:hover{ .submenu_selected:hover {
background-color: #585858 !important; background-color: #585858 !important;
} }
.sub_subMenu{ .sub_subMenu {
transition-property: background-color; transition-property: background-color;
transition-duration: 0.5s; transition-duration: 0.5s;
transition-timing-function: ease-out; transition-timing-function: ease-out;
-webkit-transition-property: background-color; -webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s; -webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out; -webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color; -moz-transition-property: background-color;
-moz-transition-duration: 0.5s; -moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out; -moz-transition-timing-function: ease-out;
-o-transition-property: background-color; -o-transition-property: background-color;
-o-transition-duration: 0.5s; -o-transition-duration: 0.5s;
} }
.sub_subMenu:hover{ .sub_subMenu:hover {
transition-property: background-color; transition-property: background-color;
transition-duration: 0.5s; transition-duration: 0.5s;
transition-timing-function: ease-out; transition-timing-function: ease-out;
-webkit-transition-property: background-color; -webkit-transition-property: background-color;
-webkit-transition-duration: 0.5s; -webkit-transition-duration: 0.5s;
-webkit-transition-timing-function: ease-out; -webkit-transition-timing-function: ease-out;
-moz-transition-property: background-color; -moz-transition-property: background-color;
-moz-transition-duration: 0.5s; -moz-transition-duration: 0.5s;
-moz-transition-timing-function: ease-out; -moz-transition-timing-function: ease-out;
-o-transition-property: background-color; -o-transition-property: background-color;
-o-transition-duration: 0.5s; -o-transition-duration: 0.5s;
background-color: #585858 !important; background-color: #585858 !important;
} }
.menu li.selected { .menu li.selected {
box-shadow: inset 4px 0 #80BA27; box-shadow: inset 4px 0 #80ba27;
} }
/* creo que no se usan /* creo que no se usan
.is_submenu2 li { .is_submenu2 li {
@ -358,35 +356,37 @@ ul li a:hover {
} }
*/ */
.operation { .operation {
background-color: #333 !important; background-color: #333 !important;
border-top-right-radius: 5px; border-top-right-radius: 5px;
border-right-style: solid; border-right-style: solid;
border-right-width: 0px; border-right-width: 0px;
} }
.operation .selected { .operation .selected {
background-color: #585858 !important; background-color: #585858 !important;
} }
.menu li, .menu .li.not_selected { .menu li,
border-radius: 0px 0px 0px 0px; .menu .li.not_selected {
display: block; border-radius: 0px 0px 0px 0px;
min-height: 35px; display: block;
border-bottom: 0px none #424242; min-height: 35px;
vertical-align: middle; border-bottom: 0px none #424242;
vertical-align: middle;
} }
.godmode, .menu_icon ul li{ .godmode,
background-color: #222; .menu_icon ul li {
background-color: #222;
} }
.operation .menu_icon ul li{ .operation .menu_icon ul li {
background-color: #333; background-color: #333;
} }
.godmode{ .godmode {
border-top: 4px solid #777 !important; border-top: 4px solid #777 !important;
padding-bottom: 4px !important; padding-bottom: 4px !important;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
border-right-style: solid; border-right-style: solid;
border-right-width: 0px; border-right-width: 0px;
} }

1961
pandora_console/include/styles/pandora.css
View File

File diff suppressed because it is too large Load Diff

2
pandora_console/install.php
View File

@ -113,7 +113,7 @@
<div style='height: 10px'> <div style='height: 10px'>
<?php <?php
$version = '7.0NG.731'; $version = '7.0NG.731';
$build = '190207'; $build = '190212';
$banner = "v$version Build $build"; $banner = "v$version Build $build";
error_reporting(0); error_reporting(0);

2
pandora_console/operation/agentes/alerts_status.php
View File

@ -634,7 +634,7 @@ echo '</div>';
enterprise_hook('close_meta_frame'); enterprise_hook('close_meta_frame');
ui_require_css_file ('cluetip','include/styles/js/'); ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('cluetip'); ui_require_jquery_file('cluetip');
?> ?>

2
pandora_console/operation/agentes/estado_monitores.php
View File

@ -323,7 +323,7 @@ ui_toggle(
} }
</script> </script>
<?php <?php
ui_require_css_file('cluetip','include/styles/js/'); ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('cluetip'); ui_require_jquery_file('cluetip');
echo "<div id='module_details_dialog' style='display: none;'></div>"; echo "<div id='module_details_dialog' style='display: none;'></div>";

2
pandora_console/operation/snmpconsole/snmp_view.php
View File

@ -681,7 +681,7 @@ if (empty($traps)) {
ui_require_css_file('pandora_enterprise', ENTERPRISE_DIR.'/include/styles/'); ui_require_css_file('pandora_enterprise', ENTERPRISE_DIR.'/include/styles/');
ui_require_css_file('pandora_dashboard', ENTERPRISE_DIR.'/include/styles/'); ui_require_css_file('pandora_dashboard', ENTERPRISE_DIR.'/include/styles/');
ui_require_css_file('cluetip','include/styles/js/'); ui_require_css_file('cluetip', 'include/styles/js/');
ui_require_jquery_file('countdown'); ui_require_jquery_file('countdown');
ui_require_javascript_file('pandora_dashboard', ENTERPRISE_DIR.'/include/javascript/'); ui_require_javascript_file('pandora_dashboard', ENTERPRISE_DIR.'/include/javascript/');

1
pandora_console/operation/tree.php
View File

@ -11,7 +11,6 @@
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
ui_require_css_file('tree'); ui_require_css_file('tree');
ui_require_css_file('fixed-bottom-box'); ui_require_css_file('fixed-bottom-box');

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.731 %define version 7.0NG.731
%define release 190207 %define release 190212
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.731 %define version 7.0NG.731
%define release 190207 %define release 190212
%define httpd_name httpd %define httpd_name httpd
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name apache2 %define httpd_name apache2

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.731-190207 Version: 7.0NG.731-190212
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.731-190207" pandora_version="7.0NG.731-190212"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -45,7 +45,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.731"; my $pandora_version = "7.0NG.731";
my $pandora_build = "190207"; my $pandora_build = "190212";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

2
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.731"; my $pandora_version = "7.0NG.731";
my $pandora_build = "190207"; my $pandora_build = "190212";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] ); our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.731 %define version 7.0NG.731
%define release 190207 %define release 190212
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.731 %define version 7.0NG.731
%define release 190207 %define release 190212
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.731" PI_VERSION="7.0NG.731"
PI_BUILD="190207" PI_BUILD="190212"
MODE=$1 MODE=$1
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then

2
pandora_server/util/pandora_db.pl
View File

@ -34,7 +34,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "7.0NG.731 PS190207"; my $version = "7.0NG.731 PS190212";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

22
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv; Encode::Locale::decode_argv;
# version: define current version # version: define current version
my $version = "7.0NG.731 PS190207"; my $version = "7.0NG.731 PS190212";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);
@ -137,6 +137,7 @@ sub help_screen{
help_screen_line('--delete_cluster_item', '<id_item>', 'Deleting cluster item'); help_screen_line('--delete_cluster_item', '<id_item>', 'Deleting cluster item');
help_screen_line('--get_cluster_status', '<id_cluster>', 'Getting cluster status'); help_screen_line('--get_cluster_status', '<id_cluster>', 'Getting cluster status');
help_screen_line('--set_disabled_and_standby', '<id_agent> <id_node> <value>', 'Overwrite and disable and standby status'); help_screen_line('--set_disabled_and_standby', '<id_agent> <id_node> <value>', 'Overwrite and disable and standby status');
help_screen_line('--reset_agent_counts', '<id_agent>', 'Resets module counts and alert counts in the agents');
print "\nMODULES:\n\n" unless $param ne ''; print "\nMODULES:\n\n" unless $param ne '';
help_screen_line('--create_data_module', "<module_name> <module_type> <agent_name> [<description> <module_group> \n\t <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> <critical_max> \n\t <history_data> <definition_file> <warning_str> <critical_str>\n\t <unknown_events> <ff_threshold> <each_ff> <ff_threshold_normal>\n\t <ff_threshold_warning> <ff_threshold_critical> <ff_timeout> <warning_inverse> <critical_inverse>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>]", 'Add data server module to agent'); help_screen_line('--create_data_module', "<module_name> <module_type> <agent_name> [<description> <module_group> \n\t <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> <critical_max> \n\t <history_data> <definition_file> <warning_str> <critical_str>\n\t <unknown_events> <ff_threshold> <each_ff> <ff_threshold_normal>\n\t <ff_threshold_warning> <ff_threshold_critical> <ff_timeout> <warning_inverse> <critical_inverse>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>]", 'Add data server module to agent');
help_screen_line('--create_web_module', "<module_name> <module_type> <agent_name> [<description> <module_group> \n\t <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> <critical_max> \n\t <history_data> <retries> <requests> <agent_browser_id> <auth_server> <auth_realm> <definition_file>\n\t <proxy_url> <proxy_auth_login> <proxy_auth_password> <warning_str> <critical_str>\n\t <unknown_events> <ff_threshold> <each_ff> <ff_threshold_normal>\n\t <ff_threshold_warning> <ff_threshold_critical> <ff_timeout> <warning_inverse> <critical_inverse>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>].\n\t The valid data types are web_data, web_proc, web_content_data or web_content_string", 'Add web server module to agent'); help_screen_line('--create_web_module', "<module_name> <module_type> <agent_name> [<description> <module_group> \n\t <min> <max> <post_process> <interval> <warning_min> <warning_max> <critical_min> <critical_max> \n\t <history_data> <retries> <requests> <agent_browser_id> <auth_server> <auth_realm> <definition_file>\n\t <proxy_url> <proxy_auth_login> <proxy_auth_password> <warning_str> <critical_str>\n\t <unknown_events> <ff_threshold> <each_ff> <ff_threshold_normal>\n\t <ff_threshold_warning> <ff_threshold_critical> <ff_timeout> <warning_inverse> <critical_inverse>\n\t <critical_instructions> <warning_instructions> <unknown_instructions>].\n\t The valid data types are web_data, web_proc, web_content_data or web_content_string", 'Add web server module to agent');
@ -6375,6 +6376,10 @@ sub pandora_manage_main ($$$) {
param_check($ltotal, 3, 1); param_check($ltotal, 3, 1);
cli_set_disabled_and_standby(); cli_set_disabled_and_standby();
} }
elsif ($param eq '--reset_agent_counts') {
param_check($ltotal, 1, 0);
cli_reset_agent_counts();
}
else { else {
print_log "[ERROR] Invalid option '$param'.\n\n"; print_log "[ERROR] Invalid option '$param'.\n\n";
$param = ''; $param = '';
@ -6978,4 +6983,17 @@ sub cli_set_disabled_and_standby() {
my $exit_code = (defined($result) && "$result" eq "1") ? "1" : "0"; my $exit_code = (defined($result) && "$result" eq "1") ? "1" : "0";
print "\n$exit_code\n"; print "\n$exit_code\n";
} }
##############################################################################
# Resets module counts and alert counts in the agents.
# Related option: --reset_agent_counts
##############################################################################
sub cli_reset_agent_counts() {
my $agent_id = @ARGV[2];
my $result = api_call(\%conf,'set', 'reset_agent_counts', $agent_id);
print "$result \n\n ";
}