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

Fixed a bug: show popup double authentication 

Former-commit-id: a5a7d6f2cf2f3b90a277ccf9f4f042c1ab3be48d
This commit is contained in:
Tatiana Llorente 2019-03-21 15:58:10 +01:00
parent 5d409cd778
commit b8f1b5f6a1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/javascript/jquery.timezone-picker.js
View File

@ -43,7 +43,7 @@
maxDelta: 6, maxDelta: 6,
interval: 50 interval: 50
}, },
zoomWheelEnabled: true zoomWheelEnabled: false
}), }),
new OpenLayers.Control.Zoom(), new OpenLayers.Control.Zoom(),
new OpenLayers.Control.ZoomBox() new OpenLayers.Control.ZoomBox()

9
pandora_console/operation/users/user_edit.php
View File

@ -345,13 +345,12 @@ $double_auth_enabled = (bool) db_get_value('id', 'tuser_double_auth', 'id_user',
if ($config['double_auth_enabled']) { if ($config['double_auth_enabled']) {
$double_authentication = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Double authentication').'</p>'; $double_authentication = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Double authentication').'</p>';
$double_authentication .= html_print_checkbox_switch('double_auth', 1, $double_auth_enabled, true); $double_authentication .= html_print_checkbox_switch('double_auth', 1, $double_auth_enabled, true);
// Dialog.
$double_authentication .= '<div id="dialog-double_auth" style="display:none"><div id="dialog-double_auth-container"></div></div>';
} }
if ($double_auth_enabled) { if ($double_auth_enabled) {
$double_authentication .= html_print_button(__('Show information'), 'show_info', false, 'javascript:show_double_auth_info();', '', true); $double_authentication .= html_print_button(__('Show information'), 'show_info', false, 'javascript:show_double_auth_info();', '', true);
// Dialog.
$double_authentication .= '<div id="dialog-double_auth" style="display:none"><div id="dialog-double_auth-container"></div></div>';
$double_authentication .= '</div>';
} }
if (isset($double_authentication)) { if (isset($double_authentication)) {
@ -675,6 +674,10 @@ if (!defined('METACONSOLE')) {
a.olControlZoomOut { a.olControlZoomOut {
border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;
} }
/* Overlay the popup on the map */
.ui-dialog.ui-corner-all.ui-widget.ui-widget-content.ui-front.ui-draggable.ui-resizable{
z-index:9999 !important;
}
</style> </style>
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">