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

Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop' 

WUX-UX integration

See merge request artica/pandorafms!1890
This commit is contained in:
vgilc 2018-10-26 14:42:23 +02:00
parent 7a4b7d4289 c06bd4207e
commit 1973a5fe54
5 changed files with 99 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/general/alert_enterprise.php
View File

@ -198,8 +198,12 @@ echo "<div class='modalgobutton gopandora'>
<script>
$(".cerrar").click(function(){
$("#alert_messages").hide();
$( "#opacidad" ).remove();
$("#alert_messages")
.css('opacity', 0)
.hide();
$( "#opacidad" )
.css('opacity', 0)
.remove();
});
$(".gopandora").click(function(){

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

@ -34,7 +34,9 @@
$(document).ready (function () {
$("a#show_messages_dialog").click (function () {
jQuery.post ("ajax.php",
{"page": "operation/messages/message_list"},
{
"page": "operation/messages/message_list"
},
function (data, status) {
$("#dialog_messages").hide ()
.empty ()
@ -49,9 +51,8 @@ $(document).ready (function () {
},
width: 700,
height: 300
})
.show ();
},
}).show ();
},
"html"
);
@ -59,46 +60,17 @@ $(document).ready (function () {
});
$("a.show_systemalert_dialog").click (function () {
$('body').append( "<div id='opacidad' style='position:fixed;background:black;z-index:1'></div>" );
$("#opacidad").css('opacity', 0.5);
jQuery.post ("ajax.php",
{"page": "include/ajax/config.ajax",
"token_name": 'visual_animation'
},
function (data, status) {
if(data){
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.001;z-index:1'></div>" );
jQuery.post ("ajax.php",
{"page": "operation/system_alert"},
function (data, status) {
$("#alert_messages").css('width','auto');
$("#alert_messages").css('height','auto');
$("#alert_messages").css('visibility','hidden');
$("#alert_messages").empty ().append (data);
$("#alert_messages").css('display','block');
setTimeout( function() {
animation_modal('alert_messages');
}, 50);
},
"html"
);
return false;
}
else{
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
jQuery.post ("ajax.php",
{"page": "operation/system_alert"},
function (data, status) {
$("#alert_messages").hide ()
.empty ()
.append (data)
.show ();
},
"html"
);
return false;
}
{
"page": "operation/system_alert"},
function (data, status) {
$("#alert_messages").show();
$("#alert_messages").empty ().append (data);
$("#alert_messages").css('opacity', 1);
},
"html"
);
@ -106,140 +78,63 @@ $(document).ready (function () {
$("a.modalpopup").click (function () {
var elem = $(this).attr("id");
jQuery.post ("ajax.php",
{"page": "include/ajax/config.ajax",
"token_name": 'visual_animation'
},
function (data, status) {
if(data){
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.001;z-index:1'></div>" );
jQuery.post ("ajax.php",
{
"page": "general/alert_enterprise",
"message": elem
},
function (data, status) {
$("#alert_messages").css('width','auto');
$("#alert_messages").css('height','auto');
$("#alert_messages").css('visibility','hidden');
$("#alert_messages").empty ().append (data);
$("#alert_messages").css('display','block');
setTimeout( function() {
animation_modal('alert_messages');
}, 50);
},
"html"
);
return false;
}
else{
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
jQuery.post ("ajax.php",
{
"page": "general/alert_enterprise",
"message": elem
},
function (data, status) {
$("#alert_messages").hide ()
.empty ()
.append (data)
.show ();
},
"html"
);
return false;
}
},
"html"
);
});
$('body').append( "<div id='opacidad' style='position:fixed;background:black;z-index:1'></div>" );
$("#opacidad").css('opacity', 0.5);
// Creacion de ventana modal y botones
$(".publienterprise").click (function () {
var elem = $(this).attr("id");
jQuery.post ("ajax.php",
{"page": "include/ajax/config.ajax",
"token_name": 'visual_animation'
},
function (data, status) {
if(data){
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.001;z-index:1'></div>" );
jQuery.post ("ajax.php",
{
"page": "general/alert_enterprise",
"message": elem
},
function (data, status) {
$("#alert_messages").css('width','auto');
$("#alert_messages").css('height','auto');
$("#alert_messages").css('visibility','hidden');
$("#alert_messages").empty ().append (data);
$("#alert_messages").css('display','block');
setTimeout( function() {
animation_modal('alert_messages');
}, 50);
},
"html"
);
return false;
}
else{
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
jQuery.post ("ajax.php",
{
"page": "general/alert_enterprise",
"message": elem
},
function (data, status) {
$("#alert_messages").hide ()
.empty ()
.append (data)
.show ();
$("#alert_messages").show();
$("#alert_messages").empty ().append (data);
$("#alert_messages").css('opacity', 1);
},
"html"
);
return false;
}
},
"html"
);
});
$(".publienterprisehide").click (function () {
$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
});
// Creacion de ventana modal y botones
$(".publienterprise").click (function () {
var elem = $(this).attr("id");
$('body').append( "<div id='opacidad' style='position:fixed;background:black;z-index:1'></div>" );
$("#opacidad").css('opacity', 0.5);
jQuery.post ("ajax.php",
{
"page": "general/alert_enterprise",
"message": $(this).attr("id")
"message": elem
},
function (data, status) {
$("#alert_messages").hide ()
.empty ()
.append (data)
.show ();
$("#alert_messages").show();
$("#alert_messages").empty ().append (data);
$("#alert_messages").css('opacity', 1);
},
"html"
);
return false;
});
$(".publienterprisehide").click (function () {
var elem = $(this).attr("id");
$('body').append( "<div id='opacidad' style='position:fixed;background:black;z-index:1'></div>" );
$("#opacidad").css('opacity', 0.5);
jQuery.post ("ajax.php",
{
"page": "general/alert_enterprise",
"message": elem
},
function (data, status) {
$("#alert_messages").show();
$("#alert_messages").empty ().append (data);
$("#alert_messages").css('opacity', 1);
},
"html"
);
return false;
});
@ -335,43 +230,36 @@ $(document).ready (function () {
forced_title_callback();
$(document).on("scroll", function(){
$(document).on("scroll", function(){
if(document.documentElement.scrollTop != 0 || document.body.scrollTop != 0){
if($('#head').css('position') =='fixed'){
if($('#menu').css('position') =='fixed'){
$('#menu').css('top','80px');
}
else{
$('#menu').css('top','60px');
}
}
else{
if($('#menu').css('position') =='fixed'){
$('#menu').css('top','20px');
}
else{
$('#menu').css('top','80px');
}
}
}
else{
$('#menu').css('top','80px');
} else {
$('#menu').css('top','60px');
}
} else {
if($('#menu').css('position') =='fixed'){
$('#menu').css('top','20px');
} else {
$('#menu').css('top','80px');
}
}
} else {
if($('#head').css('position') =='fixed'){
if($('#menu').css('position') =='fixed'){
$('#menu').css('top','80px');
}
else{
$('#menu').css('top','60px');
}
}
else{
if($('#menu').css('position') =='fixed'){
$('#menu').css('top','80px');
}
else{
$('#menu').css('top','80px');
}
$('#menu').css('top','80px');
} else {
$('#menu').css('top','60px');
}
} else {
if($('#menu').css('position') =='fixed'){
$('#menu').css('top','80px');
} else {
$('#menu').css('top','80px');
}
}
}
// if((document.documentElement.scrollTop != 0 || document.body.scrollTop != 0) && $('#menu').css('position') =='fixed'){
@ -395,13 +283,16 @@ $(document).ready (function () {
// $('#menu').css('top','60px');
// }
// }
});
});
$("#alert_messages").draggable();
$("#alert_messages").css({'left':+parseInt(screen.width/2)-parseInt($("#alert_messages").css('width'))/2+'px'});
$("#alert_messages").draggable();
$("#alert_messages").css({'left':+parseInt(screen.width/2)-parseInt($("#alert_messages").css('width'))/2+'px'});
});
function forced_title_callback() {
// Forced title code
$('body').on('mouseenter', '.forced_title', function() {
@ -483,22 +374,3 @@ function forced_title_callback() {
});
}
function animation_modal(id){
var animation_width = $("#"+id).css('width');
var animation_height = $("#"+id).css('height');
var posanimation_left = parseInt($('#'+id).css('left'));
var preanimation_left = parseInt($('#'+id).css('left'))+parseInt($('#'+id).css('left'))/2;
$('#'+id).css({'width':'100px','height':'60px'});
$("#alert_messages").css('visibility','visible');
$('#'+id).css('left',+preanimation_left+'px');
$('#'+id).css('opacity',0);
$('#opacidad').animate({'opacity':0.8},2000);
$("#"+id)
.animate({'width': animation_width,'left':posanimation_left+'px','opacity':1},1000)
.animate({'height': animation_height},1000);
}

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

@ -3638,6 +3638,9 @@ div.simple_value > a > span.text p
max-width:750px;
top: 20%;
background:white;
opacity: 0;
transition: opacity 0.5s;
-webkit-transition: opacity 0.5s;
}
.modalheader{
text-align:center;
@ -3846,7 +3849,9 @@ color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;
#opacidad{
opacity:0.5;
opacity:0;
transition: opacity 3s;
-webkit-transition: opacity 3s;
z-index:1;
width:100%;
height:100%;

9
pandora_console/operation/agentes/ver_agente.php
View File

@ -1104,15 +1104,6 @@ $policyTab = enterprise_hook('policy_tab');
if ($policyTab == -1)
$policyTab = "";
/* UX Console */
enterprise_include_once('/include/functions_ux_console.php');
$active_ux = enterprise_hook('get_ux_transactions', array($id_agente));
if(!empty($active_ux)){
$ux_console_tab = enterprise_hook('ux_console_tab');
if ($ux_console_tab == -1)
$ux_console_tab = "";
}
/* WUX Console */
$modules_wux = enterprise_hook('get_wux_modules' , array($id_agente));
if($modules_wux){

8
pandora_console/operation/system_alert.php
View File

@ -32,8 +32,12 @@ echo "<div class='modalokbutton cerrar' style='margin-top: 10px'>
<script>
$(".cerrar").click(function(){
$("#alert_messages").hide();
$( "#opacidad" ).remove();
$("#alert_messages")
.css('opacity', 0)
.hide();
$( "#opacidad" )
.css('opacity', 0)
.remove();
});
</script>