From 400e84d354e8ad99479158f856c9de51d11f4f65 Mon Sep 17 00:00:00 2001
From: Matthew Pattman <matthew@pattman.net>
Date: Fri, 7 Nov 2014 15:08:16 +0000
Subject: [PATCH] Corrected the format of the offline duration and added the
 column to the server list

---
 .../Module/Server/Controller/AbstractServerController.class.php | 2 +-
 src/templates/default/module/server/server/list.tpl.html        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/psm/Module/Server/Controller/AbstractServerController.class.php b/src/psm/Module/Server/Controller/AbstractServerController.class.php
index db6cc264..bf39e51f 100644
--- a/src/psm/Module/Server/Controller/AbstractServerController.class.php
+++ b/src/psm/Module/Server/Controller/AbstractServerController.class.php
@@ -101,7 +101,7 @@ abstract class AbstractServerController extends AbstractController {
 		$server['last_online']  = psm_timespan($server['last_online']);
 		$server['last_offline']  = psm_timespan($server['last_offline']);
 		if ($server['last_offline'] != psm_get_lang('system', 'never')) {
-			$server['last_offline_duration'] = "(".psm_timespan($server['last_offline_duration']).")";
+			$server['last_offline_duration'] = "(".$server['last_offline_duration'].")";
 		}
 		else {
 			$server['last_offline_duration'] = "";
diff --git a/src/templates/default/module/server/server/list.tpl.html b/src/templates/default/module/server/server/list.tpl.html
index 9427ad9f..f9ebc350 100644
--- a/src/templates/default/module/server/server/list.tpl.html
+++ b/src/templates/default/module/server/server/list.tpl.html
@@ -8,6 +8,7 @@
 			<th class="visible-desktop">{{ label_type }}</th>
 			<th class="hidden-phone">{{ label_rtime }}</th>
 			<th class="hidden-phone">{{ label_last_online }}</th>
+			<th class="hidden-phone">{{ label_last_offline }}</th>
 			<th class="hidden-phone">{{ label_monitoring }}</th>
 			<th class="hidden-phone">{{ label_action }}</th>
 		</tr>
@@ -23,6 +24,7 @@
 			<td class="nowrap visible-desktop"><div class="table-cell-title">{{ server.type }}</div></td>
 			<td class="nowrap hidden-phone"><div class="table-cell-title">{{ server.rtime }} s</div></td>
 			<td class="nowrap hidden-phone"><div class="table-cell-title">{{ server.last_online }}</div></td>
+			<td class="nowrap hidden-phone"><div class="table-cell-title">{{ server.last_offline }} {{ server.last_offline_duration }}</div></td>
 			<td class="tight hidden-phone"><div class="table-cell-title"><i class="{{ server.active_icon }}" title="{{ server.active_title }}"></i> <i class="{{ server.email_icon }}" title="{{ label_email }}"></i> <i class="{{ server.sms_icon }}" title="{{ label_sms }}"></i> <i class="{{ server.pushover_icon }}" title="Pushover"></i></div></td>
 			<td class="tight hidden-phone">
 				<div class="table-cell-title">