tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

#13119 load_modal oncloseescape option & remove x welcomewindow

Browse Source
This commit is contained in:
Jonathan 2024-03-25 12:20:39 +01:00
parent 6a58c74dbc
commit 1bd402d04c
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/general/header.php
View File

@ -1058,8 +1058,10 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
}) })
} }
}, },
closeOnEscape: true,
onload: () => { onload: () => {
$(document).ready(function () { $(document).ready(function () {
$(".ui-dialog-titlebar-close").hide();
var buttonpane = $("div[aria-describedby='welcome_modal_window'] .ui-dialog-buttonpane.ui-widget-content.ui-helper-clearfix"); var buttonpane = $("div[aria-describedby='welcome_modal_window'] .ui-dialog-buttonpane.ui-widget-content.ui-helper-clearfix");
$(buttonpane).append(` $(buttonpane).append(`
<div class="welcome-wizard-buttons"> <div class="welcome-wizard-buttons">

2
pandora_console/godmode/menu.php
View File

@ -804,8 +804,10 @@ $("#conf_wizard").click(function() {
}) })
} }
}, },
closeOnEscape: true,
onload: () => { onload: () => {
$(document).ready(function () { $(document).ready(function () {
$(".ui-dialog-titlebar-close").hide();
var buttonpane = $("div[aria-describedby='welcome_modal_window'] .ui-dialog-buttonpane.ui-widget-content.ui-helper-clearfix"); var buttonpane = $("div[aria-describedby='welcome_modal_window'] .ui-dialog-buttonpane.ui-widget-content.ui-helper-clearfix");
$(buttonpane).append(` $(buttonpane).append(`
<div class="welcome-wizard-buttons"> <div class="welcome-wizard-buttons">

2
pandora_console/include/class/WelcomeWindow.class.php
View File

@ -182,8 +182,10 @@ class WelcomeWindow extends Wizard
}) })
} }
}, },
closeOnEscape: true,
onload: () => { onload: () => {
$(document).ready(function () { $(document).ready(function () {
$(".ui-dialog-titlebar-close").hide();
var buttonpane = $("div[aria-describedby='welcome_modal_window'] .ui-dialog-buttonpane.ui-widget-content.ui-helper-clearfix"); var buttonpane = $("div[aria-describedby='welcome_modal_window'] .ui-dialog-buttonpane.ui-widget-content.ui-helper-clearfix");
$(buttonpane).append(` $(buttonpane).append(`
<div class="welcome-wizard-buttons"> <div class="welcome-wizard-buttons">

6
pandora_console/include/javascript/pandora_ui.js
View File

@ -449,6 +449,10 @@ function load_modal(settings) {
} }
}; };
if (settings.closeOnEscape == undefined) {
settings.closeOnEscape = true;
}
required_buttons.push({ required_buttons.push({
class: class:
"ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next", "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next",
@ -518,7 +522,7 @@ function load_modal(settings) {
collision: "fit" collision: "fit"
}, },
buttons: required_buttons, buttons: required_buttons,
closeOnEscape: true, closeOnEscape: settings.closeOnEscape,
open: function() { open: function() {
//$(".ui-dialog-titlebar-close").hide(); //$(".ui-dialog-titlebar-close").hide();
}, },