From 4b23aba7f8d33e596eafbf50eb91295e82a5d0c5 Mon Sep 17 00:00:00 2001
From: jsatoh <junichi@rworks.jp>
Date: Wed, 19 Oct 2011 00:21:51 +0000
Subject: [PATCH] 2011-10-19  Junichi Satoh  <junichi@rworks.jp>

	* mobile/operation/agents/monitor_status.php,
	mobile/operation/agents/tactical.php,
	mobile/operation/agents/view_alerts.php,
	mobile/operation/servers/view_servers.php: Fixed 'img' paths.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5067 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                                 | 7 +++++++
 .../mobile/operation/agents/monitor_status.php            | 4 ++--
 pandora_console/mobile/operation/agents/tactical.php      | 8 ++++----
 pandora_console/mobile/operation/agents/view_alerts.php   | 4 ++--
 pandora_console/mobile/operation/servers/view_servers.php | 6 +++---
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 52bf31d1c9..f96dae99c7 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-19  Junichi Satoh  <junichi@rworks.jp>
+
+	* mobile/operation/agents/monitor_status.php,
+	mobile/operation/agents/tactical.php,
+	mobile/operation/agents/view_alerts.php,
+	mobile/operation/servers/view_servers.php: Fixed 'img' paths.
+
 2011-10-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
 
 	* godmode/agentes/module_manager_editor_common.php: Fixed column 
diff --git a/pandora_console/mobile/operation/agents/monitor_status.php b/pandora_console/mobile/operation/agents/monitor_status.php
index add4a381b9..00f001afe5 100644
--- a/pandora_console/mobile/operation/agents/monitor_status.php
+++ b/pandora_console/mobile/operation/agents/monitor_status.php
@@ -214,7 +214,7 @@ class MonitorStatus {
 				}
 			}
 			
-			$data[] = str_replace('<img src="' , '<img width="15" height="15" src="../', $statusImg);
+			$data[] = str_replace('<img src="' , '<img width="15" height="15" src="../../', $statusImg);
 			
 			$data[] = '<a href="index.php?page=agent&id=' . $row['id_agent'] . '">' . ui_print_truncate_text($row['agent_name'], 25, true, true) . '</a>';
 			$data[] = '<a href="index.php?page=agent&action=view_module_graph&id=' . $row['id_agente_modulo'] . '">' . 
@@ -243,4 +243,4 @@ class MonitorStatus {
 		echo $pagination;
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/pandora_console/mobile/operation/agents/tactical.php b/pandora_console/mobile/operation/agents/tactical.php
index 5c886a147c..d88cc8c238 100644
--- a/pandora_console/mobile/operation/agents/tactical.php
+++ b/pandora_console/mobile/operation/agents/tactical.php
@@ -43,16 +43,16 @@ class Tactical {
 		$table->data[0][0] = "<h3 class='title_h3_server'>" . __('Status') . "</h3>" ;
 		$table->data[1][0] = '<span title="' . __('Global health') . '" alt="' . __('Global health') . '">' . __('G') . '</span> ';
 		$table->data[1][1] =
-			progress_bar($data["global_health"], 70, 8, '', 0);
+			str_replace('include', '../include', progress_bar($data["global_health"], 70, 8, '', 0));
 		$table->data[2][0] = '<span title="' . __('Monitor health') . '" alt="' . __('Monitor health') . '">' . __('M') . '</span> ';
 		$table->data[2][1] =
-			progress_bar($data["monitor_health"], 70, 8, '', 0);
+			str_replace('include', '../include', progress_bar($data["monitor_health"], 70, 8, '', 0));
 		$table->data[3][0] = '<span title="' . __('Module sanity') . '" alt="' . __('Module sanity') . '">' . __('M') . '</span> ';
 		$table->data[3][1] =
-			progress_bar($data["module_sanity"], 70, 8, '', 0);
+			str_replace('include', '../include', progress_bar($data["module_sanity"], 70, 8, '', 0));
 		$table->data[4][0] = '<span title="' . __('Alert level') . '" alt="' . __('Alert level') . '">' . __('A') . '</span> ';
 		$table->data[4][1] =
-			progress_bar($data["alert_level"], 70, 8, '', 0);
+			str_replace('include', '../include', progress_bar($data["alert_level"], 70, 8, '', 0));
 		$table->data[5][0] = $table->data[5][1] = '';
 		$table->data[6][0] = $table->data[6][1] = '';
 		$table->data[7][0] = $table->data[7][1] = '';
diff --git a/pandora_console/mobile/operation/agents/view_alerts.php b/pandora_console/mobile/operation/agents/view_alerts.php
index 0dd640861c..93926dbaee 100644
--- a/pandora_console/mobile/operation/agents/view_alerts.php
+++ b/pandora_console/mobile/operation/agents/view_alerts.php
@@ -86,7 +86,7 @@ class ViewAlerts {
 			}
 			
 			$data[] = str_replace(array('images/status_sets', '<img'), 
-				array('../images/status_sets', '<img width="15" height="15"'), ui_print_status_image($status, $title, true));
+				array('images/status_sets', '<img width="15" height="15"'), ui_print_status_image($status, $title, true));
 			
 			$table->data[] = $data;
 		}
@@ -94,4 +94,4 @@ class ViewAlerts {
 		html_print_table($table);
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/pandora_console/mobile/operation/servers/view_servers.php b/pandora_console/mobile/operation/servers/view_servers.php
index e9c52d7667..2760410550 100644
--- a/pandora_console/mobile/operation/servers/view_servers.php
+++ b/pandora_console/mobile/operation/servers/view_servers.php
@@ -53,11 +53,11 @@ class ViewServers {
 				$server_status = ui_print_status_image(STATUS_SERVER_OK, '', true);
 			}
 			$data[] = strip_tags($server["name"]);
-			$data[] = str_replace('images/', '../images/', $server['img']);
+			$data[] = str_replace('images/', '/images/', $server['img']);
 			$data[] = human_time_comparation ($server["laststart"], 'tiny');
 			$data[] = human_time_comparation ($server["keepalive"], 'tiny');
 			$data[] = str_replace(array('images/status_sets', '<img'), 
-				array('../images/status_sets', '<img width="15" height="15"'), $server_status);
+				array('/images/status_sets', '<img width="15" height="15"'), $server_status);
 //			$this->system->debug($server["name"]);
 			
 			$table->data[] = $data;
@@ -67,4 +67,4 @@ class ViewServers {
 	}
 }
 
-?>
\ No newline at end of file
+?>