From 769e9399808258cbe3272de60f7764f95edebe91 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Tue, 20 Dec 2011 19:16:51 +0000 Subject: [PATCH] Update statusboard to display live information for all days --- .../fragments/site-status-details.tpl | 10 ++++++ .../webui/templates/fragments/site-status.tpl | 20 +++++++++++ source/webui/templates/home.tpl | 36 +++++++------------ 3 files changed, 43 insertions(+), 23 deletions(-) create mode 100644 source/webui/templates/fragments/site-status-details.tpl create mode 100644 source/webui/templates/fragments/site-status.tpl diff --git a/source/webui/templates/fragments/site-status-details.tpl b/source/webui/templates/fragments/site-status-details.tpl new file mode 100644 index 0000000..87ca176 --- /dev/null +++ b/source/webui/templates/fragments/site-status-details.tpl @@ -0,0 +1,10 @@ +{StatusBoard_Status::description($status)|escape:html} + +{if $incidents} +
+ {foreach from=$incidents item=incident} +
{$incident->reference|escape:html} ({StatusBoard_Status::name($incident->currentStatus())})
+
{$incident->description|truncate|escape:html}
+ {/foreach} +
+{/if} \ No newline at end of file diff --git a/source/webui/templates/fragments/site-status.tpl b/source/webui/templates/fragments/site-status.tpl new file mode 100644 index 0000000..46164c1 --- /dev/null +++ b/source/webui/templates/fragments/site-status.tpl @@ -0,0 +1,20 @@ +{switch $status} + {case StatusBoard_Status::STATUS_Resolved} + {assign var=img_src value="{$base_uri}images/Status_Icons/tick-circle.png"} + {/case} + {case StatusBoard_Status::STATUS_Maintenance} + {assign var=img_src value="{$base_uri}images/Status_Icons/traffic-cone.png"} + {/case} + {case StatusBoard_Status::STATUS_Minor} + {assign var=img_src value="{$base_uri}images/Status_Icons/exclamation.png"} + {/case} + {case StatusBoard_Status::STATUS_Significant} + {assign var=img_src value="{$base_uri}images/Status_Icons/exclamation.png"} + {/case} + {case StatusBoard_Status::STATUS_Major} + {assign var=img_src value="{$base_uri}images/Status_Icons/cross-circle.png"} + {/case} +{/switch} + + + \ No newline at end of file diff --git a/source/webui/templates/home.tpl b/source/webui/templates/home.tpl index 08dd7c1..15d2187 100644 --- a/source/webui/templates/home.tpl +++ b/source/webui/templates/home.tpl @@ -3,7 +3,7 @@ Service - Current + Now {foreach from=$days key="ind" item="day"} {$day} {/foreach} @@ -17,34 +17,24 @@ {foreach from=$service->sites() item=site} - {assign var=incidents value=$site->openIncidents()} + {$incidents=$site->openIncidents()} {$site->name} - - - - - - - - - TODO - - - TODO - - - TODO - - - TODO - - - TODO + {$status=$site->status()} + {include nocache file="fragments/site-status.tpl" start=null end=null} + {foreach from=array(1,2,3,4,5,6) item=day} + {$start=mktime(0,0,0,date("n"),date("j")-$day-1)} + {$end=mktime(0,0,0,date("n"),date("j")-$day)} + {$incidents=$site->openIncidentsDuring($start, $end)} + {$status=StatusBoard_Incident::highestSeverityStatus($incidents)} + + {include nocache file="fragments/site-status.tpl" start=$start end=$end status=$status incidents=$incidents} + + {/foreach} {/foreach} {/foreach}