2013-04-30 Sergio Martin <sergio.martin@artica.es>

* include/styles/pandora.css
	include/functions_groups.php: Fix a little the
	groups view style

	* operation/agentes/estado_generalagente.php: Fix the 
	layout of the agent main view table when url addres is 
	setted for bug #3609651

	* general/header.php: Remove completly the link of
	the autorefresh button from the header when is disabled
	to avoid confusing



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8085 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,17 @@
+2013-04-30  Sergio Martin <sergio.martin@artica.es>
+
+	* include/styles/pandora.css
+	include/functions_groups.php: Fix a little the
+	groups view style
+
+	* operation/agentes/estado_generalagente.php: Fix the 
+	layout of the agent main view table when url addres is 
+	setted for bug #3609651
+
+	* general/header.php: Remove completly the link of
+	the autorefresh button from the header when is disabled
+	to avoid confusing
+
 2013-04-29  Sergio Martin <sergio.martin@artica.es>
 
 	* include/styles/pandora.css

pandora_console/general/header.php

@@ -127,17 +127,21 @@ config_check();
 					$autorefresh_additional .= html_print_select ($values, 'ref', '', '', __('Select'), '0', true, false, false);
 					$autorefresh_additional .= '</span>';
 					unset ($values);
+					
+					$autorefresh_link_open_img = '<a class="white autorefresh" href="' . ui_get_url_refresh ($ignored_params) . '">'; 
+					$autorefresh_link_open_txt = '<a class="white autorefresh autorefresh_txt" href="' . ui_get_url_refresh ($ignored_params) . '">'; 
+					$autorefresh_link_close = '</a>';
 				}
 				else {
-					$autorefresh_img = html_print_image("images/header_refresh.png", true, array("class" => 'bot', "alt" => 'lightning', 'title' => __('Disabled autorefresh')));
+					$autorefresh_img = html_print_image("images/header_refresh.png", true, array("class" => 'bot autorefresh_disabled', "alt" => 'lightning', 'title' => __('Disabled autorefresh')));
 					
 					$ignored_params['refr'] = false;
+					
+					$autorefresh_link_open_img = ''; 
+					$autorefresh_link_open_txt = ''; 
+					$autorefresh_link_close = '';
 				}
 				
-				$autorefresh_link_open_img = '<a class="white autorefresh" href="' . ui_get_url_refresh ($ignored_params) . '">'; 
-				$autorefresh_link_open_txt = '<a class="white autorefresh autorefresh_txt" href="' . ui_get_url_refresh ($ignored_params) . '">'; 
-				$autorefresh_link_close = '</a>';
-				
 				$table->data[0][1] = $autorefresh_link_open_img . $autorefresh_img . $autorefresh_link_close;
 				$table->data[0][2] = $autorefresh_link_open_txt . $autorefresh_txt . $autorefresh_link_close . $autorefresh_additional;
 				//======================================================

pandora_console/include/functions_groups.php

@@ -842,7 +842,7 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
 	echo ui_print_truncate_text($group['name']);
 	echo "</a>";
 	echo "</td>";
-	echo "<td class='group_view_data $group_class'  style='text-align: center; vertica-align: middle;'>";
+	echo "<td class='group_view_data' style='text-align: center; vertica-align: middle; background-color: #d3d3d3;'>";
 	if (check_acl ($config['id_user'], $id_group, "AW")) {
 		echo '<a href="index.php?sec=estado&sec2=operation/agentes/group_view&update_netgroup='.$id_group.'">' .
 			html_print_image("images/target.png", true, array("border" => '0', "alt" => __('Force'))) . '</a>';
@@ -954,7 +954,7 @@ function groups_get_group_row($id_group, $group_all, $group, &$printed_groups) {
 	}
 	// Alerts fired
 	if ($data["monitor_alerts_fired"] > 0) {
-		echo "<td class='group_view_data_alrm $group_class' style='font-weight: bold; font-size: 18px;  text-align: center;'>";
+		echo "<td class='group_view_data_alrm $group_class last' style='font-weight: bold; font-size: 18px;  text-align: center;'>";
 		echo "<a class='group_view_data_alrm' style='font-weight: bold; font-size: 18px; text-align: center;'
 			href='index.php?sec=estado&sec2=operation/agentes/alerts_status&ag_group=$id_group&filter=fired'>";
 		echo $data["monitor_alerts_fired"];

pandora_console/include/styles/pandora.css

@@ -304,6 +304,7 @@ div#foot {
 	z-index: -999;
 	
 	background-image: url('../../images/login_background.jpg');
+	background-color: #3f3f3f;
 	background-size: cover;
 	-moz-background-size: cover;
 	-webkit-background-size: cover;
@@ -1988,6 +1989,10 @@ div#pandora_logo_header {
 	margin-top: 0px;
 }
 
+.autorefresh_disabled {
+	cursor: not-allowed !important;
+}
+
 .disabled_module {
 	color: #aaa;
 }
@@ -2485,6 +2490,10 @@ span#plugin_description {
 	border-spacing: 0px 4px;
 }
 
+.groupsview tr {
+	background-color: #666;
+}
+
 .groupsview th {
 	font-size: 12px;
 	padding: 5px;

pandora_console/operation/agentes/estado_generalagente.php

@@ -221,36 +221,33 @@ if(enterprise_installed()) {
 
 if ($config['activate_gis'] || $agent['url_address'] != '') {
 	$data = array();
-	$col = 0;
 	// Position Information
 	if ($config['activate_gis']) {
 		$dataPositionAgent = gis_get_data_last_position_agent($agent['id_agente']);
 		
-		$data[$col] = '<b>' . __('Position (Long, Lat)') . '</b>';
+		$data[0] = '<b>' . __('Position (Long, Lat)') . '</b>';
-		$col++;
 		
 		if ($dataPositionAgent === false) {
-			$data[$col] = __('There is no GIS data.');
+			$data[1] = __('There is no GIS data.');
 		}
 		else {
 			$data[$col] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;tab=gis&amp;id_agente='.$id_agente.'">';
 			if ($dataPositionAgent['description'] != "")
-				$data[$col] .= $dataPositionAgent['description'];
+				$data[1] .= $dataPositionAgent['description'];
 			else
-				$data[$col] .= $dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude'];
+				$data[1] .= $dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude'];
-			$data[$col] .= "</a>";
+			$data[1] .= "</a>";
 		}
-		$col++;
+		$table_data->data[] = $data;
 	}
 	
 	// If the url description is setted
 	if ($agent['url_address'] != '') {
-		$data[$col] = '<b>' . __('Url address') . '</b>';
+		$data = array();
-		$col++;
+		$data[0] = '<b>' . __('Url address') . '</b>';
-		$data[$col] = '<a href='.$agent["url_address"].'>' . $agent["url_address"] . '</a>';
+		$data[1] = '<a href='.$agent["url_address"].'>' . $agent["url_address"] . '</a>';
+		$table_data->data[] = $data;
 	}
-	
-	$table_data->data[] = $data;
 }
 
 // Timezone Offset