Merge branch '1877-Cluster-Nuevo-diseño-del-cluster-view' into 'develop'

Change cluster view design - #1877

See merge request artica/pandorafms!1301

pandora_console/include/ajax/module.php

@@ -781,6 +781,7 @@ if ($list_modules) {
 	$table->head[6] = __('Thresholds');
 	$table->head[7] = __('Data');
 	$table->head[8] = __('Graph');
+	$table->headstyle[8] = 'min-width: 60px';
 	$table->head[9] = __('Last contact') . ' ' .
 		'<a href="' . $url . '&sort_field=last_contact&amp;sort=up&refr=&filter_monitors=1&status_filter_monitor=' .$status_filter_monitor.' &status_text_monitor='. $status_text_monitor.'&status_module_group= '.$status_module_group.'">' . html_print_image("images/sort_up.png", true, array("style" => $selectLastContactUp, "alt" => "up")) . '</a>' .
 		'<a href="' . $url . '&sort_field=last_contact&amp;sort=down&refr=&filter_monitors=1&status_filter_monitor=' .$status_filter_monitor.' &status_text_monitor='. $status_text_monitor.'&status_module_group= '.$status_module_group.'">' . html_print_image("images/sort_down.png", true, array("style" => $selectLastContactDown, "alt" => "down")) . '</a>';

pandora_console/include/styles/pandora.css

@@ -4375,8 +4375,6 @@ div#footer_help{
 .route {
 	fill: none;
 	transition: all 2s ease-in-out;
-<<<<<<< HEAD
-=======
 }
 
 .limit_scroll{
@@ -4470,5 +4468,155 @@ form ul.form_flex li ul li{
 
 .modal_module_list:hover{
 	cursor: pointer;
->>>>>>> develop
+
+}
+
+#main_cluster {
+	max-width:1770px;
+	margin:0 auto;
+}
+
+.sub_cluster_1 {
+	width:400px;
+	float: left;
+	margin-left: 30px;
+	margin-bottom: 25px;
+	vertical-align: top;
+	border:1px solid #e7e9ea;
+	height:150px;
+	
+}
+
+.sub_cluster_2 {
+	width:833px;
+	float: left;
+	margin-left: 30px;
+	margin-bottom: 25px;
+	vertical-align: top;
+	border:1px solid #e7e9ea;
+	height:150px;
+}
+
+.sub_cluster_header {
+	width:100%;
+	height: 30px;
+	background-color: #373737;
+	color:white;
+	text-align:center;
+	font-size: 9pt;
+	display: flex;
+  justify-content: center;
+  align-content: center;
+  flex-direction: column;
+}
+
+.sub_cluster_body {
+	width:100%;
+	height: 120px;
+	background-color: #f9faf9;
+	display: flex;
+  justify-content: center;
+  align-content: center;
+  flex-direction: column;
+}
+
+.sub_cluster_body_3 {
+	width:100%;
+	height: 120px;
+	background-color: #f9faf9;
+	overflow-y: scroll;
+}
+
+#cluster_map {
+	border:1px solid lightgray;
+	width:900px;
+	height:500px;
+	float: left;
+	margin-bottom: 30px;
+}
+
+#cluster_status_content {
+	width: 90%;
+	height:30px;
+	margin:0px auto;
+}
+
+#cluster_status_bar {
+	width: 85%;
+	height:100%;
+	float:left;
+	
+}
+
+.status_animation {
+	width: 1%;
+	height:100%;
+	left:0%;
+	background-color: red;
+	position:relative;
+}
+
+#cluster_status_button {
+	float:left;
+	width:10%;
+	margin-left:5%;;
+}
+
+#last_contact_content{
+	width: 90%;
+	height:60px;
+	margin:0px auto;
+}
+
+
+
+#last_contact_clock {
+	width: 15%;
+	height:100%;
+	float:left;
+	
+}
+
+#last_contact_date {
+	float:left;
+	height:60px;
+	width:80%;
+	margin-left:5%;
+	text-align:center;
+	display: flex;
+  justify-content: center;
+  align-content: center;
+  flex-direction: column;
+}
+
+#last_contact_date_text {
+	font-size:14pt;
+}
+
+
+.balanced_module_item {
+	float:left;
+	margin-top: 11.5px;
+	margin-left: 5%;
+	height: 25px;
+	width:90%;
+}
+
+.module_icon {
+	float:left;
+	width:10%;
+}
+
+.modal_module_list {
+	float:left;
+	width: 90%;
+	height:100%;
+	display: flex;
+  justify-content: center;
+  align-content: center;
+  flex-direction: column;
+}
+
+.events_bar {
+	margin:0 auto;
 }