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

repair visual bugs

This commit is contained in:
enriquecd 2016-09-28 18:16:01 +02:00
parent 908bf8ee94
commit 7928125092
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -620,7 +620,7 @@ $class = 'databox filters';
<td style="">
<?php
if ($action == 'new') {
html_print_select(reports_get_report_types(false, true), 'type', $type, 'chooseType();', '', '','','','','','','','','',true,'reporting');
html_print_select(reports_get_report_types(false, true), 'type', $type, 'chooseType();', '', '','','','','','','','','',true,'reportingmodal');
}
else {
$report_type = reports_get_report_types();

18
pandora_console/include/functions_html.php
View File

@ -545,7 +545,7 @@ function html_print_select ($fields, $name, $selected = '', $script = '',
$output .= "</select>";
if ($modal){
$output .= "
<div id='publienterprise' class='".$message."' title='Community version' style='display:inline;position:relative;top:10px;left:0px;margin-top: -2px !important; margin-left: 2px !important;'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>
<div id='".$message."' class='publienterprise' title='Community version' style='display:inline;position:relative;top:10px;left:0px;margin-top: -2px !important; margin-left: 2px !important;'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>
";
}
if ($return)
@ -1268,7 +1268,7 @@ function html_print_submit_button ($label = 'OK', $name = '', $disabled = false,
*
* @return string HTML code if return parameter is true.
*/
function html_print_button ($label = 'OK', $name = '', $disabled = false, $script = '', $attributes = '', $return = false, $imageButton = false) {
function html_print_button ($label = 'OK', $name = '', $disabled = false, $script = '', $attributes = '', $return = false, $imageButton = false,$modal=false,$message='') {
$output = '';
$alt = $title = '';
@ -1281,6 +1281,12 @@ function html_print_button ($label = 'OK', $name = '', $disabled = false, $scrip
if ($disabled)
$output .= ' disabled';
$output .= ' />';
if ($modal && !enterprise_installed()){
$output .= "
<div id='".$message."' class='publienterprise' title='Community version' style='display:inline;position:relative;top:10px;left:0px;margin-top: -2px !important; margin-left: 2px !important;'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>
";
}
if ($return)
return $output;
@ -1650,7 +1656,7 @@ function html_print_table (&$table, $return = false) {
*
* @return string HTML code if return parameter is true.
*/
function html_print_radio_button_extended ($name, $value, $label, $checkedvalue, $disabled, $script, $attributes, $return = false) {
function html_print_radio_button_extended ($name, $value, $label, $checkedvalue, $disabled, $script, $attributes, $return = false,$modal=false,$message='visualmodal') {
static $idcounter = 0;
$output = '';
@ -1675,6 +1681,12 @@ function html_print_radio_button_extended ($name, $value, $label, $checkedvalue,
$output .= '<label for="'.$htmlid.'">'. $label .'</label>' . "\n";
}
if ($modal && !enterprise_installed()){
$output .= "
<div id='".$message."' class='publienterprise' title='Community version' style='display:inline;position:relative;top:10px;left:0px;margin-top: -2px !important; margin-left: 2px !important;'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>
";
}
if ($return)
return $output;

4
pandora_console/operation/agentes/estado_agente.php
View File

@ -546,7 +546,7 @@ foreach ($agents as $agent) {
if ($agent['quiet']) {
$data[0] .= html_print_image("images/dot_green.disabled.png", true, array("border" => '0', "title" => __('Quiet'), "alt" => "")) . "&nbsp;";
}
$data[0] .= ui_print_agent_name($agent["id_agente"], true, 60, 'font-size:6.5pt !important;', true);
$data[0] .= ui_print_agent_name($agent["id_agente"], true, 60, 'font-size:8pt !important;', true);
$data[0] .= '</span>';
$data[0] .= '<div class="agentleft_' . $agent["id_agente"] . '" style="visibility: hidden; clear: left;">';
$data[0] .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'">'.__('View').'</a>';
@ -560,7 +560,7 @@ foreach ($agents as $agent) {
$data[2] = ui_print_os_icon ($agent["id_os"], false, true);
$data[3] = human_time_description_raw($agent["intervalo"]);
$data[3] = '<span style="font-size:6.5pt;">'.human_time_description_raw($agent["intervalo"])."</span>";
$data[4] = ui_print_group_icon ($agent["id_grupo"], true);