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

Merge branch 'cherry-pick-6b168873' into 'pandora_6.0' 

Merge branch '52-la-ventana-de-alertas-deberia-de-ser-arrastrable-y-con-zindex-3…

See merge request !144
This commit is contained in:
vgilc 2017-02-17 10:40:34 +01:00
parent 78f46d7b85 ee0e286d9c
commit 4d6a3ee66c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,7 +193,7 @@ $table_styles->data[$row][0] = __('Custom logo in login') . ui_print_help_icon("
$row++; $row++;
$table_styles->data[$row][0] = __('Disable Pandora FMS on graphs'); $table_styles->data[$row][0] = __('Disable logo in graphs');
$table_styles->data[$row][1] = __('Yes') . ' ' . $table_styles->data[$row][1] = __('Yes') . ' ' .
html_print_radio_button_extended ('fixed_graph', 1, '', $config["fixed_graph"], $open, '','',true) . html_print_radio_button_extended ('fixed_graph', 1, '', $config["fixed_graph"], $open, '','',true) .
'  '; '  ';

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

@ -214,6 +214,9 @@ $(document).ready (function () {
} }
}); });
$("#alert_messages").draggable();
$("#alert_messages").css({'left':+parseInt(screen.width/2)-parseInt($("#alert_messages").css('width'))/2+'px'});
}); });
function forced_title_callback() { function forced_title_callback() {

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

@ -3449,13 +3449,10 @@ div.simple_value > a > span.text p
-webkit-border-bottom-left-radius: 5px; -webkit-border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;
z-index:2; z-index:3;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
-webkit-transform: translate(-50%, -50%);
position:fixed; position:fixed;
width:650px; width:650px;
top: 30%;
background:white; background:white;
} }
.modalheader{ .modalheader{