header logo and login logo limited for pandoraopen, module group aspect and update manager modal window. 64,63,59,48,61
modificacion de estilos de ventana modal y editor de usuarios (cherry picked from commit6f33c0eaf8) (cherry picked from commitd4ba681833)
This commit is contained in:
enriquecd
parent
d5e65c427d
commit
22a4dbe67b
|
|
@ -181,7 +181,7 @@ function mainModuleGroups() {
|
|||
$table = null;
|
||||
$table->headstyle[] = "width: 20%";
|
||||
foreach ($modelGroups as $i => $n) {
|
||||
$table->headstyle[] = "width: 7%";
|
||||
$table->headstyle[] = "min-width: 60px;max-width: 5%;text-align:center;";
|
||||
$modelGroups[$i] = ui_print_truncate_text($n, GENERIC_SIZE_TEXT, true, true, true, '…', 'color:#FFF');
|
||||
}
|
||||
|
||||
|
|
@ -278,9 +278,9 @@ function mainModuleGroups() {
|
|||
array_push($row,
|
||||
'<div
|
||||
style="background: ' . $color . ';
|
||||
height: 25px;
|
||||
height: 20px;min-width: 60px;max-width:5%;overflow:hidden;
|
||||
margin-left: auto; margin-right: auto;
|
||||
text-align: center; padding-top: 0px; font-size: 18px;">
|
||||
text-align: center; padding: 5px;padding-bottom:10px;font-size: 18px;">
|
||||
' . $alinkStart . $count . $alinkEnd . '</div>');
|
||||
}
|
||||
array_push($tableData,$row);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
<?php
|
||||
|
||||
if(!enterprise_installed()){
|
||||
$open=true;
|
||||
}
|
||||
|
||||
$tipo = $_GET['message'];
|
||||
|
||||
echo "
|
||||
|
|
@ -10,35 +14,105 @@ Community version</span>
|
|||
</div>
|
||||
|
||||
<div class='modalcontent'>
|
||||
<img class='modalcontentimg' src='".$config['homeurl']."images/icono_popup.png'>
|
||||
<img class='modalcontentimg' src='".$config['homeurl']."images/";
|
||||
|
||||
switch ($tipo) {
|
||||
case "infomodal":
|
||||
echo "icono_info.png";
|
||||
break;
|
||||
case "modulemodal":
|
||||
echo "icono_popup.png";
|
||||
break;
|
||||
case "massivemodal":
|
||||
echo "icono_popup.png";
|
||||
break;
|
||||
case "eventsmodal":
|
||||
echo "icono_popup.png";
|
||||
break;
|
||||
case "reportingmodal":
|
||||
echo "icono_popup.png";
|
||||
break;
|
||||
case "visualmodal":
|
||||
echo "icono_popup.png";
|
||||
break;
|
||||
case "updatemodal":
|
||||
echo "icono_info.png";
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
echo "'>
|
||||
<div class='modalcontenttext'>";
|
||||
|
||||
switch ($tipo) {
|
||||
case "module":
|
||||
echo __("The community version have not the ability to define your own library of local modules, or distribute it to remote agents. You need to do that changes individually on each agent, but it's possible by using external tools and space time and effort. Nor can distribute local plugins, and nor does it have access to the library of plugins enterprise to monitor applications such as Informix, Oracle, DB2, SQL Server, Exchange, WebSphere, Oracle Exadata, F5, JBoss, HyperV, VMWare, RHEV, to name a few. With the Enterprise version will have all this, and the ability to distribute and manage their own local modules to your systems, individually or through policies.
|
||||
<br><br><img style='width:105px' src='".$config['homeurl']."images/logo_oracle.png'><img style='width:105px' src='".$config['homeurl']."images/logo_citrix.png'><img style='width:105px' src='".$config['homeurl']."images/logo_sap.png'><img style='width:105px' src='".$config['homeurl']."images/logo_exchange.png'>");
|
||||
case "infomodal":
|
||||
|
||||
if($open){
|
||||
|
||||
echo
|
||||
'<p>' .
|
||||
__('The Update Manager client is included on Pandora FMS. It helps system administrators update their Pandora FMS automatically, since the Update Manager retrieves new modules, new plugins and new features (even full migrations tools for future versions) automatically.') .
|
||||
'</p>' .
|
||||
'<p>' .
|
||||
__('<b>OpenSource version updates are automated packages generated each week. This updates comes WITHOUT ANY warranty or support. If your system goes corrupt or a feature stop working properly, you will need to recover a backup by yourself.</b>') .
|
||||
'</p>' .
|
||||
'<p>' .
|
||||
__('Enterprise version comes with a different update system, with fully tested, proffessional supported packages, and our support team will be helping you in case of any problem happen. The Update Manager is another feature present in Enterprise version and missing in the OpenSource version. There are lots of advanced features ready for the enterprise on the Pandora FMS Enterprise Edition. For more information visit <a href="http://pandorafms.com">pandorafms.com</a>') .
|
||||
'</p>'
|
||||
;
|
||||
|
||||
}else{
|
||||
|
||||
echo
|
||||
'<p>' .
|
||||
__('The new <a href="http://updatemanager.sourceforge.net">Update Manager</a> client is shipped with Pandora FMS It helps system administrators to update their Pandora FMS automatically, since the Update Manager does the task of getting new modules, new plugins and new features (even full migrations tools for future versions) automatically.') .
|
||||
'</p>' .
|
||||
'<p>' .
|
||||
__('Update Manager is one of the most advanced features of Pandora FMS Enterprise version, for more information visit <a href="http://pandorafms.com">http://pandorafms.com</a>.') .
|
||||
'</p>' .
|
||||
'<p>' .
|
||||
__('Update Manager sends anonymous information about Pandora FMS usage (number of agents and modules running). To disable it, remove remote server address from Update Manager plugin setup.') .
|
||||
'</p>'
|
||||
;
|
||||
}
|
||||
|
||||
break;
|
||||
case "massive":
|
||||
case "modulemodal":
|
||||
echo __("La versión de la comunidad no permite definir su propia librería de módulos ni distribuirla a agentes remotos, solo le permite hacerlo de manera individual en cada agente usando herramientas externas. Tampoco puede distribuir plugins locales ni acceder a la librería de plugins Enterprise para monitorizar aplicaciones como VMWare, RHEV o Informix entre otras. Cambie a la versión Enterprise para administrar sus propios módulos de forma individual o mediante políticas.
|
||||
<br><br><img style='width:105px' src='".$config['homeurl']."images/logo_oracle.png'><img style='width:105px' src='".$config['homeurl']."images/logo_citrix.png'><img style='width:105px' src='".$config['homeurl']."images/logo_sap.png'><img style='width:105px' src='".$config['homeurl']."images/logo_exchange.png'><br><br><span style='font-style:italic;'>* Todos los logotipos pertenecen a marcas registradas</span>");
|
||||
break;
|
||||
case "massivemodal":
|
||||
echo __("You want to manage your monitoring homogeneously? Do you have many systems and is difficult to manage in a comprehensive manner? Would you like to deploy monitoring, alerts and even local plugins with a single click? Pandora FMS Enterprise Policies are exactly what you need, you'll save time, effort and dislikes. More information (link to pandorafms.com)");
|
||||
break;
|
||||
case "events":
|
||||
case "eventsmodal":
|
||||
echo __("Pandora FMS Enterprise has event correlation. Through correlation you can generate alerts and / or new events based on logical rules on your realtime events. This allows you to automate the troubleshooting. If you know the value of working with events, the correlation will take you to a new level.");
|
||||
break;
|
||||
case "reporting":
|
||||
case "reportingmodal":
|
||||
echo __("The reports of the Enterprise version are more powerful: it has wizards, you can schedule sending via email in PDF, and it has a template system to create reports quickly for each of your customers. It will even allow your customers generate their own reports from templates created by you. If reports are key to your business, Pandora FMS Enterprise version can be very useful for you.");
|
||||
break;
|
||||
case "visualmodal":
|
||||
echo __("These options are only effective on the Enterprise version.");
|
||||
break;
|
||||
case "updatemodal":
|
||||
echo __("WARNING: You are just one click of an automated update. This may result on a damaged system, including loss of data and operation. Check you have a recent backup. OpenSource updates are automated created packages, and there is no WARRANTY or SUPPORT. If you need professional support and warranty, please upgrade to Enterprise Version.");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
echo "
|
||||
|
||||
</div>
|
||||
<div style='float:right;width:100%;height:30px;'>
|
||||
</div>
|
||||
<div class='modalokbutton cerrar'>
|
||||
<span class='modalokbuttontext'>OK</span>
|
||||
</div>
|
||||
|
||||
<div class='modalgobutton gopandora'>
|
||||
<span class='modalokbuttontext'>Go to Enterprise version</span>
|
||||
<span class='modalokbuttontext'>About Enterprise</span>
|
||||
</div>
|
||||
";
|
||||
|
||||
|
|
|
|||
|
|
@ -369,11 +369,19 @@ config_check();
|
|||
$("#agent_access").css("display","");
|
||||
});
|
||||
|
||||
|
||||
function blinkmail(){
|
||||
$("#yougotmail").delay(100).fadeTo(300,0.2).delay(100).fadeTo(300,1, blinkmail);
|
||||
}
|
||||
function blinkalert(){
|
||||
$("#yougotalert").delay(100).fadeTo(300,0.2).delay(100).fadeTo(300,1, blinkalert);
|
||||
}
|
||||
function blinkpubli(){
|
||||
$(".publienterprise").delay(100).fadeTo(300,0.2).delay(100).fadeTo(300,1, blinkpubli);
|
||||
}
|
||||
<?php
|
||||
if ($msg_cnt > 0) {
|
||||
?>
|
||||
$("#yougotmail").pulsate ();
|
||||
blinkmail();
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
|
|
@ -382,11 +390,11 @@ config_check();
|
|||
<?php
|
||||
if ($config["alert_cnt"] > 0) {
|
||||
?>
|
||||
$("#yougotalert").pulsate ();
|
||||
blinkalert();
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
$("#publienterprise").pulsate ();
|
||||
blinkpubli();
|
||||
|
||||
<?php
|
||||
if ($_GET["refr"]) {
|
||||
|
|
|
|||
|
|
@ -150,9 +150,14 @@ $backgrounds_list_png = list_files("images/backgrounds", "png", 1, 0);
|
|||
$backgrounds_list = array_merge($backgrounds_list_jpg, $backgrounds_list_png);
|
||||
$backgrounds_list = array_merge($backgrounds_list, $backgrounds_list_gif);
|
||||
asort($backgrounds_list);
|
||||
|
||||
if(!enterprise_installed()){
|
||||
$open=true;
|
||||
}
|
||||
|
||||
$table_styles->data[$row][1] = html_print_select ($backgrounds_list,
|
||||
'login_background', $config["login_background"], '', __('Default'),
|
||||
'', true);
|
||||
'', true,false,true,'',false,'width:240px');
|
||||
$table_styles->data[$row][1] .= " " .
|
||||
html_print_button(__("View"), 'login_background_preview', false, '', 'class="sub camera"', true);
|
||||
$row++;
|
||||
|
|
@ -160,10 +165,27 @@ $row++;
|
|||
$table_styles->data[$row][0] = __('Custom logo') . ui_print_help_icon("custom_logo", true);
|
||||
$table_styles->data[$row][1] = html_print_select(
|
||||
list_files('images/custom_logo', "png", 1, 0), 'custom_logo',
|
||||
$config["custom_logo"], '', '', '', true);
|
||||
$table_styles->data[$row][1] .= " " . html_print_button(__("View"), 'custom_logo_preview', false, '', 'class="sub camera"', true);
|
||||
$config["custom_logo"], '', '', '',true,false,true,'',$open,'width:240px');
|
||||
$table_styles->data[$row][1] .= " " . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
|
||||
$row++;
|
||||
|
||||
$table_styles->data[$row][0] = __('Custom logo in login') . ui_print_help_icon("custom_logo", true);
|
||||
$table_styles->data[$row][1] = html_print_select(
|
||||
list_files('images/custom_logo_login', "png", 1, 0), 'custom_logo_login',
|
||||
$config["custom_logo_login"], '', '', '',true,false,true,'',$open,'width:240px');
|
||||
$table_styles->data[$row][1] .= " " . html_print_button(__("View"), 'custom_logo_preview_', $open, '', 'class="sub camera"', true,false,$open,'visualmodal');
|
||||
$row++;
|
||||
|
||||
|
||||
$table_styles->data[$row][0] = __('Disable Pandora FMS on graphs');
|
||||
$table_styles->data[$row][1] = __('Yes') . ' ' .
|
||||
html_print_radio_button_extended ('fixed_graph', 1, '', $config["fixed_graph"], $open, '','',true) .
|
||||
' ';
|
||||
$table_styles->data[$row][1] .= __('No') . ' ' .
|
||||
html_print_radio_button_extended ('fixed_graph', 0, '', $config["fixed_graph"], $open, '','',true, $open,'visualmodal');
|
||||
$row++;
|
||||
|
||||
|
||||
$table_styles->data[$row][0] = __('Fixed header');
|
||||
$table_styles->data[$row][1] = __('Yes') . ' ' .
|
||||
html_print_radio_button ('fixed_header', 1, '', $config["fixed_header"], true) .
|
||||
|
|
|
|||
|
|
@ -30,6 +30,10 @@ enterprise_include_once("include/functions_update_manager.php");
|
|||
|
||||
$current_package = update_manager_get_current_package();
|
||||
|
||||
if(!enterprise_installed()){
|
||||
$open=true;
|
||||
}
|
||||
|
||||
echo "<p><b>" . sprintf(__("The last version of package installed is: %d"),
|
||||
$current_package) . "</b></p>";
|
||||
|
||||
|
|
@ -59,27 +63,20 @@ if ($memory_limit < 100) {
|
|||
|
||||
|
||||
/* Translators: Do not translade Update Manager, it's the name of the program */
|
||||
ui_print_info_message(
|
||||
'<p>' .
|
||||
__('The new <a href="http://updatemanager.sourceforge.net">Update Manager</a> client is shipped with Pandora FMS It helps system administrators to update their Pandora FMS automatically, since the Update Manager does the task of getting new modules, new plugins and new features (even full migrations tools for future versions) automatically.') .
|
||||
'</p>' .
|
||||
'<p>' .
|
||||
__('Update Manager is one of the most advanced features of Pandora FMS Enterprise version, for more information visit <a href="http://pandorafms.com">http://pandorafms.com</a>.') .
|
||||
'</p>' .
|
||||
'<p>' .
|
||||
__('Update Manager sends anonymous information about Pandora FMS usage (number of agents and modules running). To disable it, remove remote server address from Update Manager plugin setup.') .
|
||||
'</p>');
|
||||
|
||||
echo "<div id='box_online' style='text-align: center;'>";
|
||||
echo "<span class='loading' style=''>";
|
||||
|
||||
|
||||
|
||||
echo "<div id='box_online' class='cargatextodialogo'>";
|
||||
echo "<span class='loading' style='font-size:18pt;'>";
|
||||
echo "<img src='images/wait.gif' />";
|
||||
echo "</span>";
|
||||
|
||||
echo "<div class='checking_package' style='width:100%; text-align: center; display: none;'>";
|
||||
echo "<div class='checking_package' style='font-size:18pt;width:100%; text-align: center; display: none;'>";
|
||||
echo __('Checking for the newest package.');
|
||||
echo "</div>";
|
||||
|
||||
echo "<div class='downloading_package' style='width:100%; text-align: center; display: none;'>";
|
||||
echo "<div class='downloading_package' style='font-size:18pt;width:100%; text-align: center; display: none;'>";
|
||||
echo __('Downloading for the newest package.');
|
||||
echo "</div>";
|
||||
|
||||
|
|
@ -87,11 +84,36 @@ echo "<div id='box_online' style='text-align: center;'>";
|
|||
|
||||
echo "<div class='progressbar' style='display: none;'><img class='progressbar_img' src='' /></div>";
|
||||
|
||||
echo "</div>";
|
||||
if($open){
|
||||
echo "<div id='updatemodal' class='publienterprise' title='Community version' style=''><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>
|
||||
";
|
||||
}
|
||||
|
||||
|
||||
$enterprise = enterprise_hook('update_manager_enterprise_main');
|
||||
if ($enterprise == ENTERPRISE_NOT_HOOK) {
|
||||
//Open view
|
||||
update_manager_main();
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
|
||||
jQuery.get ("ajax.php",
|
||||
{
|
||||
"page": "general/alert_enterprise",
|
||||
"message":"infomodal"},
|
||||
function (data, status) {
|
||||
$("#alert_messages").hide ()
|
||||
.empty ()
|
||||
.append (data)
|
||||
.show ();
|
||||
},
|
||||
"html"
|
||||
);
|
||||
|
||||
return false;
|
||||
|
||||
});
|
||||
</script>
|
||||
|
|
@ -1251,7 +1251,7 @@ div.title_line {
|
|||
padding: 0px 0px 0px 0px;
|
||||
color: #fff;
|
||||
font-size: 8.5pt;
|
||||
font-weight: bold;
|
||||
font-weight: normal;
|
||||
line-height: 20px;
|
||||
}
|
||||
#menu_tab_left .mn li a {
|
||||
|
|
@ -3461,38 +3461,67 @@ div.simple_value > a > span.text > p {
|
|||
top: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
-webkit-transform: translate(-50%, -50%);
|
||||
position:absolute;
|
||||
position:fixed;
|
||||
width:650px;
|
||||
background:white;
|
||||
}
|
||||
.modalheader{
|
||||
text-align:center;width:100%;height:37px;left:0px;background-color:#82b92e;
|
||||
text-align:center;
|
||||
width:100%;
|
||||
height:37px;
|
||||
left:0px;
|
||||
background-color:#82b92e;
|
||||
}
|
||||
.modalheadertext{
|
||||
color:white;position:relative;font-family:Nunito;font-size:13pt;top:8px;
|
||||
color:white;
|
||||
position:relative;
|
||||
font-family:Nunito;
|
||||
font-size:13pt;
|
||||
top:8px;
|
||||
}
|
||||
.modalclosex{
|
||||
cursor:pointer;display:inline;float:right;margin-right:10px;margin-top:10px;
|
||||
cursor:pointer;
|
||||
display:inline;
|
||||
float:right;
|
||||
margin-right:10px;
|
||||
margin-top:10px;
|
||||
}
|
||||
.modalcontent{
|
||||
color:black;background:white;
|
||||
color:black;
|
||||
background:white;
|
||||
}
|
||||
.modalcontentimg{
|
||||
float:left;margin-left:30px;margin-top:30px;
|
||||
float:left;
|
||||
margin-left:30px;
|
||||
margin-top:30px;
|
||||
margin-bottom:30px;
|
||||
}
|
||||
.modalcontenttext{
|
||||
float:left;text-align:justify;color:black;font-size: 9.5pt;line-height:13pt;margin-top:30px;width:430px;margin-left:30px;
|
||||
float:left;
|
||||
text-align:justify;
|
||||
color:black;
|
||||
font-size: 9.5pt;
|
||||
line-height:13pt;
|
||||
margin-top:30px;
|
||||
width:430px;
|
||||
margin-left:30px;
|
||||
}
|
||||
.modalokbutton{
|
||||
cursor:pointer;text-align:center;margin-right:45px;margin-top:30px;margin-bottom:30px;float:right;-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;border-radius: 3px;bottom:0px;width:90px;height:30px;background-color:white;border: 1px solid #82b92e;
|
||||
cursor:pointer;
|
||||
text-align:center;
|
||||
margin-right:45px;
|
||||
float:right;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
margin-bottom:30px;
|
||||
border-radius: 3px;width:90px;height:30px;background-color:white;border: 1px solid #82b92e;
|
||||
}
|
||||
.modalokbuttontext{
|
||||
color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;
|
||||
}
|
||||
.modalgobutton{
|
||||
cursor:pointer;text-align:center;margin-right:15px;margin-top:30px;margin-bottom:30px;float:right;-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;border-radius: 3px;bottom:0px;width:240px;height:30px;background-color:white;border: 1px solid #82b92e;
|
||||
cursor:pointer;text-align:center;margin-right:15px;margin-bottom:30px;float:right;-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;border-radius: 3px;width:240px;height:30px;background-color:white;border: 1px solid #82b92e;
|
||||
}
|
||||
.modalgobuttontext{
|
||||
color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;
|
||||
|
|
@ -3508,3 +3537,31 @@ color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;
|
|||
left:0px;
|
||||
top:0px;
|
||||
}
|
||||
|
||||
.textodialogo{
|
||||
max-width:60%;
|
||||
width:60%;
|
||||
min-width:60%;
|
||||
float:left;
|
||||
margin-left: 0px;
|
||||
color:#333;
|
||||
padding:20px;
|
||||
font-size:9pt;
|
||||
}
|
||||
|
||||
.cargatextodialogo{
|
||||
max-width:58.5%;
|
||||
width:58.5%;
|
||||
min-width:58.5%;
|
||||
float:left;
|
||||
margin-left: 0px;
|
||||
font-size:18pt;
|
||||
padding:20px;
|
||||
text-align:center;
|
||||
}
|
||||
|
||||
.cargatextodialogo p, .cargatextodialogo b, .cargatextodialogo a{
|
||||
font-size:18pt;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue