mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-30 17:25:26 +02:00
Merge branch 'ent-12845-errores-visuales-en-nuevas-modales' into 'develop'
Ent 12845 errores visuales en nuevas modales See merge request artica/pandorafms!6913
This commit is contained in:
commit
f072936f21
@ -2542,15 +2542,12 @@ if ($drawConsoleSound === true) {
|
|||||||
$output .= '<div id="progressbar_time"></div>';
|
$output .= '<div id="progressbar_time"></div>';
|
||||||
$output .= '<div class="buttons-sound-modal">';
|
$output .= '<div class="buttons-sound-modal">';
|
||||||
$output .= '<div class="container-button-play">';
|
$output .= '<div class="container-button-play">';
|
||||||
$output .= html_print_input(
|
$output .= html_print_button(
|
||||||
[
|
__('Start'),
|
||||||
'label' => __('Start'),
|
'start-search',
|
||||||
'type' => 'button',
|
false,
|
||||||
'name' => 'start-search',
|
'',
|
||||||
'attributes' => [ 'class' => 'play secondary' ],
|
['icon' => 'play'],
|
||||||
'return' => true,
|
|
||||||
],
|
|
||||||
'div',
|
|
||||||
true
|
true
|
||||||
);
|
);
|
||||||
$output .= '</div>';
|
$output .= '</div>';
|
||||||
|
@ -1257,8 +1257,8 @@ class WelcomeWindow extends Wizard
|
|||||||
draggable: true,
|
draggable: true,
|
||||||
modal: true,
|
modal: true,
|
||||||
close: false,
|
close: false,
|
||||||
height: 375,
|
height: 400,
|
||||||
width: 480,
|
width: 500,
|
||||||
overlay: {
|
overlay: {
|
||||||
opacity: 0.5,
|
opacity: 0.5,
|
||||||
background: "black"
|
background: "black"
|
||||||
@ -1274,7 +1274,7 @@ class WelcomeWindow extends Wizard
|
|||||||
draggable: true,
|
draggable: true,
|
||||||
modal: true,
|
modal: true,
|
||||||
close: false,
|
close: false,
|
||||||
height: 265,
|
height: 300,
|
||||||
width: 480,
|
width: 480,
|
||||||
overlay: {
|
overlay: {
|
||||||
opacity: 0.5,
|
opacity: 0.5,
|
||||||
|
@ -1261,6 +1261,10 @@ function action_events_sound(mode, settings) {
|
|||||||
$("#button-start-search")
|
$("#button-start-search")
|
||||||
.removeClass("play")
|
.removeClass("play")
|
||||||
.addClass("stop");
|
.addClass("stop");
|
||||||
|
$("#button-start-search")
|
||||||
|
.find("div")
|
||||||
|
.removeClass("play")
|
||||||
|
.addClass("stop");
|
||||||
// Change value button.
|
// Change value button.
|
||||||
$("#button-start-search").val(settings.stop);
|
$("#button-start-search").val(settings.stop);
|
||||||
$("#button-start-search > span").text(settings.stop);
|
$("#button-start-search > span").text(settings.stop);
|
||||||
@ -1277,6 +1281,10 @@ function action_events_sound(mode, settings) {
|
|||||||
$("#button-start-search")
|
$("#button-start-search")
|
||||||
.removeClass("stop")
|
.removeClass("stop")
|
||||||
.addClass("play");
|
.addClass("play");
|
||||||
|
$("#button-start-search")
|
||||||
|
.find("div")
|
||||||
|
.removeClass("stop")
|
||||||
|
.addClass("play");
|
||||||
// Change value button.
|
// Change value button.
|
||||||
$("#button-start-search").val(settings.start);
|
$("#button-start-search").val(settings.start);
|
||||||
$("#button-start-search > span").text(settings.start);
|
$("#button-start-search > span").text(settings.start);
|
||||||
@ -1601,9 +1609,7 @@ $(document).ajaxSend(function(event, jqXHR, ajaxOptions) {
|
|||||||
|
|
||||||
// Add the minimize icon to the minimize button
|
// Add the minimize icon to the minimize button
|
||||||
$("<span>", {
|
$("<span>", {
|
||||||
class: "ui-button-icon ui-icon",
|
class: "ui-button-icon ui-icon"
|
||||||
style:
|
|
||||||
"background-color: rgb(51, 51, 51); -webkit-mask: url('images/arrow-down-white.png') no-repeat / contain !important;"
|
|
||||||
}).appendTo(minimizeButton);
|
}).appendTo(minimizeButton);
|
||||||
|
|
||||||
$("<span>", {
|
$("<span>", {
|
||||||
@ -1617,23 +1623,9 @@ $(document).ajaxSend(function(event, jqXHR, ajaxOptions) {
|
|||||||
class:
|
class:
|
||||||
"ui-corner-all ui-widget ui-button-icon-only ui-dialog-titlebar-disengage disengage-buttom-image",
|
"ui-corner-all ui-widget ui-button-icon-only ui-dialog-titlebar-disengage disengage-buttom-image",
|
||||||
type: "button",
|
type: "button",
|
||||||
title: "Disengage",
|
title: "Disengage"
|
||||||
style: "float: right; position:relative;"
|
|
||||||
}).insertBefore(minimizeButton);
|
}).insertBefore(minimizeButton);
|
||||||
|
|
||||||
// Add the disengage icon to the disengage button
|
|
||||||
$("<span>", {
|
|
||||||
class: "ui-button-icon ui-icon",
|
|
||||||
style:
|
|
||||||
"background-color: rgb(51, 51, 51); -webkit-mask: url('images/dashboard.menu.png') no-repeat center / contain !important;"
|
|
||||||
}).appendTo(disengageButton);
|
|
||||||
|
|
||||||
$("<span>", {
|
|
||||||
class: "ui-button-icon-space"
|
|
||||||
})
|
|
||||||
.html(" ")
|
|
||||||
.appendTo(disengageButton);
|
|
||||||
|
|
||||||
minimizeButton.click(function(e) {
|
minimizeButton.click(function(e) {
|
||||||
if ($("#minimize_arrow_event_sound").hasClass("arrow_menu_up")) {
|
if ($("#minimize_arrow_event_sound").hasClass("arrow_menu_up")) {
|
||||||
$("#minimize_arrow_event_sound").removeClass("arrow_menu_up");
|
$("#minimize_arrow_event_sound").removeClass("arrow_menu_up");
|
||||||
|
@ -585,3 +585,7 @@ div.container-filter-buttons {
|
|||||||
margin-right: 10px !important;
|
margin-right: 10px !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#button-start-search {
|
||||||
|
width: 115px;
|
||||||
|
}
|
||||||
|
@ -61,15 +61,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.ui-dialog .ui-dialog-titlebar-disengage {
|
.ui-dialog .ui-dialog-titlebar-disengage {
|
||||||
position: absolute !important;
|
|
||||||
right: 50px;
|
|
||||||
top: -3px;
|
|
||||||
width: 40px;
|
|
||||||
margin: 0px 0 0 0;
|
margin: 0px 0 0 0;
|
||||||
padding: 1px;
|
padding: 1px;
|
||||||
height: 40px;
|
height: 20px;
|
||||||
bottom: 30%;
|
bottom: 30%;
|
||||||
background-color: #fff !important;
|
background-color: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ui-dialog .ui-dialog-titlebar-disengage:hover {
|
.ui-dialog .ui-dialog-titlebar-disengage:hover {
|
||||||
|
@ -12819,9 +12819,9 @@ div.agents_custom_fields #datatables_wrapper div.bottom {
|
|||||||
|
|
||||||
.actions-sound-modal .buttons-sound-modal button.play,
|
.actions-sound-modal .buttons-sound-modal button.play,
|
||||||
.actions-sound-modal .buttons-sound-modal input[type="button"].play {
|
.actions-sound-modal .buttons-sound-modal input[type="button"].play {
|
||||||
background: url(../../images/play-white.png), transparent !important;
|
/*background: url(../../images/play-white.png), transparent !important;
|
||||||
background-repeat: no-repeat !important;
|
background-repeat: no-repeat !important;
|
||||||
background-position: 82px 14px !important;
|
background-position: 82px 14px !important;*/
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
padding-left: 20px;
|
padding-left: 20px;
|
||||||
border: 0;
|
border: 0;
|
||||||
|
@ -1,9 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Css Modal Sound events.
|
* Css Modal Sound events.
|
||||||
*/
|
*/
|
||||||
div.container-button-play > button#button-start-search {
|
|
||||||
transition: none !important;
|
|
||||||
}
|
|
||||||
.wizard {
|
.wizard {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
@ -217,9 +214,9 @@ div.container-button-play > button#button-start-search {
|
|||||||
|
|
||||||
.actions-sound-modal .buttons-sound-modal button.play,
|
.actions-sound-modal .buttons-sound-modal button.play,
|
||||||
.actions-sound-modal .buttons-sound-modal input[type="button"].play {
|
.actions-sound-modal .buttons-sound-modal input[type="button"].play {
|
||||||
background: url(../../images/play-white.png), transparent !important;
|
/*background: url(../../images/play-white.png), transparent !important;
|
||||||
background-repeat: no-repeat !important;
|
background-repeat: no-repeat !important;
|
||||||
background-position: 82px 14px !important;
|
background-position: 82px 14px !important;*/
|
||||||
color: #ffffff !important;
|
color: #ffffff !important;
|
||||||
padding-left: 20px;
|
padding-left: 20px;
|
||||||
border: 0;
|
border: 0;
|
||||||
@ -263,11 +260,6 @@ button#button-no-alerts.silence-alerts:hover {
|
|||||||
background-position: 138px 4px !important;
|
background-position: 138px 4px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.actions-sound-modal .container-button-play {
|
|
||||||
background-color: var(--primary-color);
|
|
||||||
border-radius: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.actions-sound-modal .container-button-alert.fired {
|
.actions-sound-modal .container-button-alert.fired {
|
||||||
background: #ee2132;
|
background: #ee2132;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user