modification of modal window styles and editor users

(cherry picked from commit 6f33c0eaf8)

pandora_console/general/alert_enterprise.php

@@ -2,11 +2,21 @@
 
 $tipo = $_GET['message'];
 
-echo "<div class='info_box' style='padding-top:20px;padding-bottom:20px;'><span style='padding:20px;'>";
+echo "
+<div class='modalheader'>
+<span class='modalheadertext'>
+Community version</span>
+<img class='modalclosex cerrar' src='".$config['homeurl']."images/icono_cerrar.png'>
+</div>
+
+<div class='modalcontent'>
+<img class='modalcontentimg' src='".$config['homeurl']."images/icono_popup.png'>
+<div class='modalcontenttext'>";
 
 switch ($tipo) {
     case "module":
-      echo __("The community version have not the ability to define your own library of local modules, or distribute it to remote agents. You need to do that changes individually on each agent, but it's possible by using external tools and space time and effort. Nor can distribute local plugins, and nor does it have access to the library of plugins enterprise to monitor applications such as Informix, Oracle, DB2, SQL Server, Exchange, WebSphere, Oracle Exadata, F5, JBoss, HyperV, VMWare, RHEV, to name a few. With the Enterprise version will have all this, and the ability to distribute and manage their own local modules to your systems, individually or through policies.");
+      echo __("The community version have not the ability to define your own library of local modules, or distribute it to remote agents. You need to do that changes individually on each agent, but it's possible by using external tools and space time and effort. Nor can distribute local plugins, and nor does it have access to the library of plugins enterprise to monitor applications such as Informix, Oracle, DB2, SQL Server, Exchange, WebSphere, Oracle Exadata, F5, JBoss, HyperV, VMWare, RHEV, to name a few. With the Enterprise version will have all this, and the ability to distribute and manage their own local modules to your systems, individually or through policies.
+      <br><br><img style='width:105px' src='".$config['homeurl']."images/logo_oracle.png'><img style='width:105px' src='".$config['homeurl']."images/logo_citrix.png'><img style='width:105px' src='".$config['homeurl']."images/logo_sap.png'><img style='width:105px' src='".$config['homeurl']."images/logo_exchange.png'>");
       break;
     case "massive":
       echo __("You want to manage your monitoring homogeneously? Do you have many systems and is difficult to manage in a comprehensive manner? Would you like to deploy monitoring, alerts and even local plugins with a single click? Pandora FMS Enterprise Policies are exactly what you need, you'll save time, effort and dislikes. More information (link to pandorafms.com)");
@@ -21,19 +31,28 @@ switch ($tipo) {
     break;
 }
 
-echo "</span></div>";
+echo "
+</div>
+<div class='modalokbutton cerrar'>
+<span class='modalokbuttontext'>OK</span>
+</div>
 
-
+<div class='modalgobutton gopandora'>
-echo "<button id='cerrar' onclick='ocultar();'>OK</button>";
+<span class='modalokbuttontext'>Go to Enterprise version</span>
+</div>
+";
 
 ?>
 
 <script>
 
-function ocultar(){
+$(".cerrar").click(function(){
-$("#alert_messages" ).dialog('close');
+  $("#alert_messages").hide();
+  $( "#opacidad" ).remove();
+});
 
-
+$(".gopandora").click(function(){
-}
+  window.open('https://pandorafms.com/es/software-de-monitorizacion-pandorafms/','_blank');
+});
 
 </script>

pandora_console/include/javascript/jquery.pandora.js

@@ -59,24 +59,13 @@ $(document).ready (function () {
 	});
 
 	$("a.show_systemalert_dialog").click (function () {
+		$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
 			jQuery.get ("ajax.php",
 			{"page": "operation/system_alert"},
 				function (data, status) {
 					$("#alert_messages").hide ()
 						.empty ()
 						.append (data)
-					.dialog ({
-						title: $("a#show_systemalert_dialog").attr ("title"),
-						resizable: true,
-						draggable: true,
-						modal: true,
-						overlay: {
-							opacity: 0.5,
-							background: "black"
-						},
-						width: 700,
-						height: 300
-					})
 						.show ();
 				},
 				"html"
@@ -84,8 +73,10 @@ $(document).ready (function () {
 		return false;
 	});
 
+// Creacion de ventana modal y botones
 
 	$("#publienterprise").click (function () {
+		$('body').append( "<div id='opacidad' style='position:fixed;background:black;opacity:0.6;z-index:1'></div>" );
 		jQuery.get ("ajax.php",
 			{
 		"page": "general/alert_enterprise",
@@ -94,24 +85,18 @@ $(document).ready (function () {
 				$("#alert_messages").hide ()
 					.empty ()
 					.append (data)
-					.dialog ({
-						title: $("#publienterprise").attr ("title"),
-						resizable: true,
-						draggable: true,
-						modal: true,
-						open: function (event, ui) {
-    				$(this).css({'overflow': 'hidden','text-align': 'center','padding-right':'25px','padding-bottom':'25px'}); //this line does the actual hiding
-  					},
-						overlay: {
-							opacity: 0.5,
-							background: "black"
-						},
-						width: 600
-					})
 					.show ();
 			},
 			"html"
 		);
+
+
+
+		return false;
+	});
+
+
+
 		return false;
 	});
 

pandora_console/include/styles/pandora.css

@@ -3154,6 +3154,145 @@ table#policy_modules td * {
 	}
 }
 
+<<<<<<< HEAD
+=======
+/*
+ * ---------------------------------------------------------------------
+ * - Styles for the new networkmap                                     -
+ * ---------------------------------------------------------------------
+ */
+ .zoom_controller {
+	width: 30px;
+	height: 210px;
+	background: blue;
+	border-radius: 15px;
+
+	top: 50px;
+	left: 10px;
+	position: absolute;
+}
+
+
+
+.vertical_range {
+	padding: 0;
+	-webkit-transform: rotate(270deg);
+	   -moz-transform: rotate(270deg);
+			transform: rotate(270deg);
+	width: 200px;
+	height: 20px;
+	position: relative;
+	background: transparent !important;
+	border: 0px !important;
+}
+
+.vertical_range {
+	left: -92px;
+	top: 93px;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0)
+{
+	/* Only for chrome */
+
+	.vertical_range {
+		left: -87px;
+		top: 93px;
+	}
+}
+
+.home_zoom {
+	top: 310px;
+	left: 10px;
+
+	display: table-cell;
+	position: absolute;
+	font-weight: bolder;
+	font-size: 20px;
+	background: blue;
+	color: white;
+	border-radius: 15px;
+	width: 30px;
+	height: 30px;
+	cursor:pointer;
+	text-align: center;
+	vertical-align: middle;
+}
+
+.zoom_in {
+	top: 10px;
+	left: 10px;
+
+	display: table-cell;
+	position: absolute;
+	font-weight: bolder;
+	font-size: 20px;
+	background: blue;
+	color: white;
+	border-radius: 15px;
+	width: 30px;
+	height: 30px;
+	cursor:pointer;
+	text-align: center;
+	vertical-align: middle;
+}
+
+.zoom_out {
+	top: 270px;
+	left: 10px;
+
+	display: table-cell;
+	position: absolute;
+	font-weight: bolder;
+	font-size: 20px;
+	background: blue;
+	color: white;
+	border-radius: 15px;
+	width: 30px;
+	height: 30px;
+	cursor:pointer;
+	text-align: center;
+	vertical-align: middle;
+}
+
+.title_bar {
+	border-bottom: 1px solid black;
+}
+.title_bar .title {
+	font-weight: bolder;
+}
+
+.title_bar .open_click {
+	float: right;
+	display: table-cell;
+	font-weight: bolder;
+	font-size: 20px;
+	background: blue none repeat scroll 0% 0%;
+	color: white;
+	width: 17px;
+	height: 17px;
+	cursor: pointer;
+	text-align: center;
+	vertical-align: middle;
+	margin: 1px;
+}
+
+.title_bar .close_click {
+	float: right;
+	display: table-cell;
+	font-weight: bolder;
+	font-size: 20px;
+	background: blue none repeat scroll 0% 0%;
+	color: white;
+	width: 17px;
+	height: 17px;
+	cursor: pointer;
+	text-align: center;
+	vertical-align: middle;
+	margin: 1px;
+}
+
+>>>>>>> 6f33c0e... modificacion de estilos de ventana modal y editor de usuarios
 /* Visual map */
 div#vc-controls {
 	position: fixed;
@@ -3314,3 +3453,61 @@ div.simple_value > a > span.text > p {
 .unicode{
 	font-family: unicodeFont;
 }
+
+#alert_messages{
+	-moz-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;
+	border-bottom-right-radius: 5px;
+	border-bottom-left-radius: 5px;
+	z-index:2;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%, -50%);
+	-webkit-transform: translate(-50%, -50%);
+	position:absolute;
+	width:650px;
+	background:white;
+}
+.modalheader{
+	text-align:center;width:100%;height:37px;left:0px;background-color:#82b92e;
+}
+.modalheadertext{
+	color:white;position:relative;font-family:Nunito;font-size:13pt;top:8px;
+}
+.modalclosex{
+	cursor:pointer;display:inline;float:right;margin-right:10px;margin-top:10px;
+}
+.modalcontent{
+	color:black;background:white;
+}
+.modalcontentimg{
+	float:left;margin-left:30px;margin-top:30px;
+}
+.modalcontenttext{
+	float:left;text-align:justify;color:black;font-size: 9.5pt;line-height:13pt;margin-top:30px;width:430px;margin-left:30px;
+}
+.modalokbutton{
+	cursor:pointer;text-align:center;margin-right:45px;margin-top:30px;margin-bottom:30px;float:right;-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;border-radius: 3px;bottom:0px;width:90px;height:30px;background-color:white;border: 1px solid #82b92e;
+}
+.modalokbuttontext{
+	color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;
+}
+.modalgobutton{
+	cursor:pointer;text-align:center;margin-right:15px;margin-top:30px;margin-bottom:30px;float:right;-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;border-radius: 3px;bottom:0px;width:240px;height:30px;background-color:white;border: 1px solid #82b92e;
+}
+.modalgobuttontext{
+color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;	
+}
+
+
+#opacidad{
+	opacity:0.5;
+	z-index:1;
+	width:100%;
+	height:100%;
+	position:absolute;
+	left:0px;
+	top:0px;
+}

pandora_console/operation/system_alert.php

@@ -2,6 +2,23 @@
 
 // TODO: Poner esto resizable y dragable: http://jqueryui.com/demos/dialog
 
-echo get_pandora_error_for_header();
+echo "
+<div class='modalheader'>
+<span class='modalheadertext'>Community version</span>
+<img class='modalclosex cerrar' src='".$config['homeurl']."/images/icono_cerrar.png'>
+</div>".get_pandora_error_for_header()."
+
+<div class='modalokbutton cerrar'>
+<span class='modalokbuttontext close'>OK</span>
+</div>";
 
 ?>
+
+<script>
+
+$(".cerrar").click(function(){
+  $("#alert_messages").hide();
+  $( "#opacidad" ).remove();
+});
+
+</script>

pandora_console/operation/users/user_edit.php

@@ -201,8 +201,9 @@ if (defined('METACONSOLE')) {
 	$table->head_colspan[0] = 5;
 	$table->headstyle[0] = 'text-align: center';
 }
-$table->style[0] = 'width: 500px;';
+$table->style[0] = 'min-width: 500px;width: 500px;';
-$table->style[2] = 'width: 200px;';
+$table->style[1] = 'min-width: 500px;width: 500px;';
+$table->style[2] = 'min-width: 200px;width: 200px;';
 
 $data = array();
 $data[0] = '<b>' . __('User ID') . '</b>';
@@ -443,7 +444,7 @@ $select_out = html_print_select ($autorefresh_list_out, 'autorefresh_list_out[]'
 $arrows = " ";
 $select_in = html_print_select ($autorefresh_list, 'autorefresh_list[]', '', '', '', '', true, true, true, '', false, 'width:200px');
 
-$table_ichanges = '<table>
+$table_ichanges = '<table style="position:relative;left:160px;">
 		<tr>
 			<td>' . __('Full list of pages') . '</td>
 			<td></td>