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

change default custom logo and fix module search view bug data column

This commit is contained in:
enriquecd 2016-10-04 15:28:12 +02:00
parent c8fe3b9268
commit a8c583cbe5
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pandora_console/images/custom_logo/pandora_logo_head_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
pandora_console/images/custom_logo/pandora_logo_head_4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

6
pandora_console/include/functions_config.php
View File

@ -1046,12 +1046,8 @@ function config_process_config () {
if (!isset ($config["custom_logo"])) {
if(enterprise_installed()){
config_update_value ('custom_logo', 'pandora_logo_head_4.png');
}
else{
config_update_value ('custom_logo', 'pandora_logo_head_3.png');
}
}
if (!isset ($config["custom_logo_login"])) {
config_update_value ('custom_logo_login', 'login_logo.png');

2
pandora_console/include/javascript/jquery.pandora.js
View File

@ -76,7 +76,7 @@ $(document).ready (function () {
// Creacion de ventana modal y botones
$(".publienterprise").click (function () {
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
$('body').append( "<div id='opacidad'></div>" );
jQuery.get ("ajax.php",
{
"page": "general/alert_enterprise",

16
pandora_console/operation/search_modules.php
View File

@ -105,15 +105,15 @@ else {
}
elseif ($status_sql['estado'] == 0) {
$statusCell = ui_print_status_image(STATUS_MODULE_OK,
__('NORMAL') . ": " . $module["datos"], true);
__('NORMAL') . ": " . modules_get_last_value($module["id_agente_modulo"]), true);
}
elseif ($status_sql['estado'] == 1) {
$statusCell = ui_print_status_image(STATUS_MODULE_CRITICAL,
__('CRITICAL') . ": " . $module["datos"], true);
__('CRITICAL') . ": " . modules_get_last_value($module["id_agente_modulo"]), true);
}
elseif ($status_sql['estado'] == 2) {
$statusCell = ui_print_status_image(STATUS_MODULE_WARNING,
__('WARNING') . ": " . $module["datos"], true);
__('WARNING') . ": " . modules_get_last_value($module["id_agente_modulo"]), true);
}
else {
$last_status = modules_get_agentmodule_last_status($module['id_agente_modulo']);
@ -122,21 +122,21 @@ else {
$statusCell = ui_print_status_image(
STATUS_MODULE_OK,
__('UNKNOWN') . " - " . __('Last status') .
" " . __('NORMAL') .": " . $module["datos"],
" " . __('NORMAL') .": " . modules_get_last_value($module["id_agente_modulo"]),
true);
break;
case 1:
$statusCell = ui_print_status_image(
STATUS_MODULE_CRITICAL,
__('UNKNOWN') . " - " . __('Last status') .
" " . __('CRITICAL') . ": " . $module["datos"],
" " . __('CRITICAL') . ": " . modules_get_last_value($module["id_agente_modulo"]),
true);
break;
case 2:
$statusCell = ui_print_status_image(
STATUS_MODULE_WARNING,
__('UNKNOWN') . " - " . __('Last status') .
" " . __('WARNING') . ": " . $module["datos"],
" " . __('WARNING') . ": " . modules_get_last_value($module["id_agente_modulo"]),
true);
break;
}
@ -176,8 +176,8 @@ else {
array("border" => "0", "alt" => "")) . "</a>";
}
if (is_numeric($module["datos"])) {
$dataCell = format_numeric($module["datos"]);
if (is_numeric(modules_get_last_value($module["id_agente_modulo"]))) {
$dataCell = format_numeric(modules_get_last_value($module["id_agente_modulo"]));
}
else {
$dataCell = ui_print_module_string_value(