From 50aa314191efa799c7327db0cea63713343b4c60 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 24 Oct 2018 19:31:39 +0200
Subject: [PATCH 1/5] WUX-UX integration

---
 pandora_console/operation/agentes/ver_agente.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index df7a2777ff..d8521841d6 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1095,15 +1095,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){

From 85051924b7fb782e010d52cd64647084376d0e6f Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 25 Oct 2018 14:01:12 +0200
Subject: [PATCH 2/5] estilos popup

---
 pandora_console/general/alert_enterprise.php  |   8 +-
 .../include/javascript/jquery.pandora.js      | 346 ++++++++----------
 pandora_console/include/styles/pandora.css    |   5 +-
 pandora_console/operation/system_alert.php    |   8 +-
 4 files changed, 165 insertions(+), 202 deletions(-)

diff --git a/pandora_console/general/alert_enterprise.php b/pandora_console/general/alert_enterprise.php
index ea5d1d97e5..c319b3910d 100644
--- a/pandora_console/general/alert_enterprise.php
+++ b/pandora_console/general/alert_enterprise.php
@@ -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(){
diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js
index 55e1d0004f..a13ab1fb0f 100644
--- a/pandora_console/include/javascript/jquery.pandora.js
+++ b/pandora_console/include/javascript/jquery.pandora.js
@@ -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,44 @@ $(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);
+			{
+				"page": "include/ajax/config.ajax",
+				"token_name": 'visual_animation'
+			},
+			function (data, status) {
+
+				if(data){
+					jQuery.post ("ajax.php",
+						{
+							"page": "operation/system_alert"},
+							function (data, status) {
+								$("#alert_messages").toggle();
+								$("#alert_messages").empty ().append (data);
+								$("#alert_messages").css('opacity', 1);
+
 						},
 						"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"},
+				} else {				
+					jQuery.post ("ajax.php",
+					{
+						"page": "operation/system_alert"},
 						function (data, status) {
 							$("#alert_messages").hide ()
 								.empty ()
 								.append (data)
-								.show ();
+								.show ()
+								.css('opacity', 1);
 						},
 						"html"
 					);
-				return false;
-			}
+					return false;
+				}
 			},
 			"html"
 		);
@@ -106,125 +105,102 @@ $(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"
-	);
-});
-
-// 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>" );
+		$('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
+				"page": "include/ajax/config.ajax",
+			 	"token_name": 'visual_animation'
 			},
 			function (data, status) {
-				$("#alert_messages").hide ()
-					.empty ()
-					.append (data)
-					.show ();
+				if(data){
+					jQuery.post ("ajax.php",
+						{
+							"page": "general/alert_enterprise",
+							"message": elem
+						},
+						function (data, status) {
+							$("#alert_messages").toggle();
+							$("#alert_messages").empty ().append (data);
+							$("#alert_messages").css('opacity', 1);
+						},
+						"html"
+					);
+					return false;
+				} else {
+					jQuery.post ("ajax.php",
+						{
+							"page": "general/alert_enterprise",
+							"message": elem
+						},
+						function (data, status) {
+							$("#alert_messages").hide ()
+								.empty ()
+								.append (data)
+								.show ()
+								.css('opacity', 1);
+						},
+						"html"
+					);
+					return false;
+				}
 			},
 			"html"
 		);
+	});
 
-		return false;
-		}
-		},
-		"html"
-	);	
-});
+	// 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": "include/ajax/config.ajax",
+				"token_name": 'visual_animation'
+			},
+			function (data, status) {
+				if(data){
+					jQuery.post ("ajax.php",
+						{
+							"page": "general/alert_enterprise",
+							"message": elem
+						},
+						function (data, status) {
+							$("#alert_messages").toggle();
+							$("#alert_messages").empty ().append (data);
+							$("#alert_messages").css('opacity', 1);
+						},
+						"html"
+					);
+					return false;
+				} else {
+					jQuery.post ("ajax.php",
+						{
+							"page": "general/alert_enterprise",
+							"message": elem
+						},
+						function (data, status) {
+							$("#alert_messages").hide ()
+								.empty ()
+								.append (data)
+								.show ()
+								.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>" );
+		$('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",
@@ -234,12 +210,11 @@ $(document).ready (function () {
 				$("#alert_messages").hide ()
 					.empty ()
 					.append (data)
-					.show ();
-			},
-			"html"
-		);
-
-
+					.show ()
+					.css('opacity', 1);;
+				},
+				"html"
+			);
 		return false;
 	});
 
@@ -335,43 +310,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 +363,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 +454,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);
-		
-}
-
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index a09df577a1..1ee9b0526b 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -3598,6 +3598,8 @@ div.simple_value > a > span.text p
 	max-width:750px;
 	top: 20%;
 	background:white;
+	opacity: 0;
+	transition: opacity 0.5s;
 }
 .modalheader{
 	text-align:center;
@@ -3806,7 +3808,8 @@ color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;
 
 
 #opacidad{
-	opacity:0.5;
+	opacity:0;
+	transition: opacity 3s;
 	z-index:1;
 	width:100%;
 	height:100%;
diff --git a/pandora_console/operation/system_alert.php b/pandora_console/operation/system_alert.php
index 46f15ee10c..1f10a466dc 100644
--- a/pandora_console/operation/system_alert.php
+++ b/pandora_console/operation/system_alert.php
@@ -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>

From 8619adbf4c9a69108b8bd67d2113da135976bef2 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 25 Oct 2018 15:42:20 +0200
Subject: [PATCH 3/5] estilos popup

---
 .../include/javascript/jquery.pandora.js      | 138 ++++--------------
 1 file changed, 29 insertions(+), 109 deletions(-)

diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js
index a13ab1fb0f..1acad01411 100644
--- a/pandora_console/include/javascript/jquery.pandora.js
+++ b/pandora_console/include/javascript/jquery.pandora.js
@@ -65,39 +65,12 @@ $(document).ready (function () {
 
 		jQuery.post ("ajax.php",
 			{
-				"page": "include/ajax/config.ajax",
-				"token_name": 'visual_animation'
-			},
-			function (data, status) {
+				"page": "operation/system_alert"},
+				function (data, status) {
+					$("#alert_messages").toggle();
+					$("#alert_messages").empty ().append (data);
+					$("#alert_messages").css('opacity', 1);
 
-				if(data){
-					jQuery.post ("ajax.php",
-						{
-							"page": "operation/system_alert"},
-							function (data, status) {
-								$("#alert_messages").toggle();
-								$("#alert_messages").empty ().append (data);
-								$("#alert_messages").css('opacity', 1);
-
-						},
-						"html"
-					);
-					return false;
-				} else {				
-					jQuery.post ("ajax.php",
-					{
-						"page": "operation/system_alert"},
-						function (data, status) {
-							$("#alert_messages").hide ()
-								.empty ()
-								.append (data)
-								.show ()
-								.css('opacity', 1);
-						},
-						"html"
-					);
-					return false;
-				}
 			},
 			"html"
 		);
@@ -107,47 +80,20 @@ $(document).ready (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": "include/ajax/config.ajax",
-			 	"token_name": 'visual_animation'
+				"page": "general/alert_enterprise",
+				"message": elem
 			},
 			function (data, status) {
-				if(data){
-					jQuery.post ("ajax.php",
-						{
-							"page": "general/alert_enterprise",
-							"message": elem
-						},
-						function (data, status) {
-							$("#alert_messages").toggle();
-							$("#alert_messages").empty ().append (data);
-							$("#alert_messages").css('opacity', 1);
-						},
-						"html"
-					);
-					return false;
-				} else {
-					jQuery.post ("ajax.php",
-						{
-							"page": "general/alert_enterprise",
-							"message": elem
-						},
-						function (data, status) {
-							$("#alert_messages").hide ()
-								.empty ()
-								.append (data)
-								.show ()
-								.css('opacity', 1);
-						},
-						"html"
-					);
-					return false;
-				}
+				$("#alert_messages").toggle();
+				$("#alert_messages").empty ().append (data);
+				$("#alert_messages").css('opacity', 1);
 			},
 			"html"
 		);
+		return false;
 	});
 
 	// Creacion de ventana modal y botones
@@ -158,63 +104,37 @@ $(document).ready (function () {
 
 		jQuery.post ("ajax.php",
 			{
-				"page": "include/ajax/config.ajax",
-				"token_name": 'visual_animation'
+				"page": "general/alert_enterprise",
+				"message": elem
 			},
 			function (data, status) {
-				if(data){
-					jQuery.post ("ajax.php",
-						{
-							"page": "general/alert_enterprise",
-							"message": elem
-						},
-						function (data, status) {
-							$("#alert_messages").toggle();
-							$("#alert_messages").empty ().append (data);
-							$("#alert_messages").css('opacity', 1);
-						},
-						"html"
-					);
-					return false;
-				} else {
-					jQuery.post ("ajax.php",
-						{
-							"page": "general/alert_enterprise",
-							"message": elem
-						},
-						function (data, status) {
-							$("#alert_messages").hide ()
-								.empty ()
-								.append (data)
-								.show ()
-								.css('opacity', 1);
-						},
-						"html"
-					);
-					return false;
-				}
+				$("#alert_messages").toggle();
+				$("#alert_messages").empty ().append (data);
+				$("#alert_messages").css('opacity', 1);
 			},
-		"html");
+			"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": $(this).attr("id")
+				"message": elem
 			},
 			function (data, status) {
-				$("#alert_messages").hide ()
-					.empty ()
-					.append (data)
-					.show ()
-					.css('opacity', 1);;
-				},
-				"html"
-			);
+				$("#alert_messages").toggle();
+				$("#alert_messages").empty ().append (data);
+				$("#alert_messages").css('opacity', 1);
+			},
+			"html"
+		);
 		return false;
 	});
 

From 172ac187a2c46e9b773f4de90eeee5b82783ac3b Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 25 Oct 2018 15:58:06 +0200
Subject: [PATCH 4/5] estilos popup

---
 pandora_console/include/styles/pandora.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 1ee9b0526b..3f6f6c6af0 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -3600,6 +3600,7 @@ div.simple_value > a > span.text p
 	background:white;
 	opacity: 0;
 	transition: opacity 0.5s;
+	-webkit-transition: opacity 0.5s;
 }
 .modalheader{
 	text-align:center;
@@ -3810,6 +3811,7 @@ color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;
 #opacidad{
 	opacity:0;
 	transition: opacity 3s;
+	-webkit-transition: opacity 3s;
 	z-index:1;
 	width:100%;
 	height:100%;

From c06bd4207e5a202040801df9177850a8c32e5f0d Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 25 Oct 2018 16:40:45 +0200
Subject: [PATCH 5/5] estilos popup

---
 pandora_console/include/javascript/jquery.pandora.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js
index 1acad01411..7cc18ec790 100644
--- a/pandora_console/include/javascript/jquery.pandora.js
+++ b/pandora_console/include/javascript/jquery.pandora.js
@@ -67,7 +67,7 @@ $(document).ready (function () {
 			{
 				"page": "operation/system_alert"},
 				function (data, status) {
-					$("#alert_messages").toggle();
+					$("#alert_messages").show();
 					$("#alert_messages").empty ().append (data);
 					$("#alert_messages").css('opacity', 1);
 
@@ -87,7 +87,7 @@ $(document).ready (function () {
 				"message": elem
 			},
 			function (data, status) {
-				$("#alert_messages").toggle();
+				$("#alert_messages").show();
 				$("#alert_messages").empty ().append (data);
 				$("#alert_messages").css('opacity', 1);
 			},
@@ -108,7 +108,7 @@ $(document).ready (function () {
 				"message": elem
 			},
 			function (data, status) {
-				$("#alert_messages").toggle();
+				$("#alert_messages").show();
 				$("#alert_messages").empty ().append (data);
 				$("#alert_messages").css('opacity', 1);
 			},
@@ -129,7 +129,7 @@ $(document).ready (function () {
 				"message": elem
 			},
 			function (data, status) {
-				$("#alert_messages").toggle();
+				$("#alert_messages").show();
 				$("#alert_messages").empty ().append (data);
 				$("#alert_messages").css('opacity', 1);
 			},