ben/status-board
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated linking from homepage to single status page, links to section for that date when clicked, tidied up to ui bits and bobs

Browse Source 
Signed-off-by: Nathan Booth <nath.booth@gmail.com>
This commit is contained in:
Nathan Booth
2011-12-31 11:46:47 +00:00
parent 1fe73f3426
commit d243bd65d2
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/styles/normal.css
View File

@@ -18,6 +18,10 @@ a {
color: gray;
}
.span12 a, .span11 a{
color: blue;
}
label {
margin-left: 1em;
margin-right: 1em;

2
source/webui/templates/fragments/site-status.tpl
View File

@@ -1,3 +1,3 @@
<a href="{$base_uri}status/service/{$service->id}/id/{$site->id}/{if $start}start/{$start}/{/if}{if $end}end/{$end}/{/if}" class="" rel="popover" data-content="{include file="fragments/site-status-details.tpl"}" data-original-title="{StatusBoard_Status::name($status)|escape:html}">
<a href="{$base_uri}status/service/{$service->id}/id/{$site->id}/{if $date}#{$date}{/if}" class="" rel="popover" data-content="{include file="fragments/site-status-details.tpl"}" data-original-title="{StatusBoard_Status::name($status)|escape:html}">
{include file="fragments/image-status-icon.tpl"}
</a>

3
source/webui/templates/home.tpl
View File

@@ -44,11 +44,12 @@
</td>
<td>
{$status=$site->status()}
{include file="fragments/site-status.tpl" nocache start=null end=null}
{include file="fragments/site-status.tpl" nocache date=null start=null end=null}
</td>
{foreach from=array(0,1,2,3,4,5,6) item=day}
{$start=mktime(0,0,0,date("n"),date("j")-$day)}
{$end=mktime(0,0,0,date("n"),date("j")-$day+1)}
{$date=mktime(0,0,0,date("n"),date("j")-$day)|date_format:"jM"}
{$incidentsDuring=$site->openIncidentsDuring($start, $end)}
{$statusDuring=StatusBoard_Incident::highestSeverityStatusBetween($incidentsDuring, $start, $end)}
<td>

10
source/webui/templates/incident.tpl
View File

@@ -20,8 +20,8 @@
<div class="span11 column">
<p style="padding-top:10px;"><b>Service:</b> {$service->name|escape:html}</p>
<p><b>Site:</b> {$site->name|escape:html}</p>
<p><b>Opened:</b> {$incident->start_time|date_format:'h:i:s y-m-d'}</p>
<p><b>Estimated End:</b> {$incident->estimated_end_time|date_format:'h:i:s y-m-d'}</p>
<p><b>Opened:</b> {$incident->start_time|date_format:'h:i d-M-y'}</p>
<p><b>Estimated End:</b> {ucwords(StatusBoard_DateTime::fuzzyTime($incident->estimated_end_time))}</p>
</div>
</div>
@@ -31,7 +31,7 @@
<p>The table display an audit log of changes to this incident</p>
</div><!--/New Service description-->
<div class="span11 column">
<table>
<table class="bordered-table">
<thead>
<th>Date/Time</th>
<th>Status</th>
@@ -41,8 +41,8 @@
{foreach from=$statuses item=status}
<tr>
<td>
{StatusBoard_DateTime::fuzzyTime($status->ctime)}<br />
<em>{$status->ctime|date_format:'y-m-d h:i:s'}</em>
{ucwords(StatusBoard_DateTime::fuzzyTime($status->ctime))}<br />
<em>{$status->ctime|date_format:'h:i d-M-y'}</em>
</td>
<td>{StatusBoard_Status::name($status->status)}</td>
<td>{$status->description|escape:html}</td>

11
source/webui/templates/status.tpl
View File

@@ -2,7 +2,7 @@
<div class="row">
<div class="span16"><!--name content container -->
<h1>Site Status History: {$service->name|escape:html} - {$site->name|escape:html}</h1>
<div class="rounded_content">
<div class="rounded_content" style="padding-bottom:40px">
<p>This page details the incident history for a site:</p>
{if $start && $end}
{$incidentsDuring=$site->openIncidentsDuring($start, $end)}
@@ -53,12 +53,13 @@
{$end=mktime(0,0,0,date("n"),date("j")-$day+1)}
{$incidentsDuring=$site->openIncidentsDuring($start, $end)}
{$incidentCount=count($incidentsDuring)}
<div class="row">
<div class="row" id="{$start|date_format:"dM"}" style="padding-top:40px">
<div class="span3 column"><!--New description-->
<h3 class="status">{$start|date_format:"d M Y"}</h3>
<p>{$incidentCount} {StatusBoard_Formatting::pluralise($incidentCount,'incident','incidents')}</p>
<p style="font-size:small"> Note: Click on incident number to see incident audit trail</p>
</div>
<div class="span12 column">
<div class="span12 column" style="margin-bottom:-40px">
{if $incidentsDuring}
<table class="bordered-table"><!--Services table -->
<thead>
@@ -85,7 +86,7 @@
Still Open
{/if}
</td>
{if $display_admin_links}<td><a href="{$base_uri}admin/incident/service/{$service->id}/site/{$site->id}/id/{$incident->id}/" title="Edit {$incident->reference|escape:html}">Edit Incident: {$incident->reference|escape:html}</a></td>{/if}
{if $display_admin_links}<td><button class='btn small primary' onclick="document.location.href='{$base_uri}admin/incident/service/{$service->id}/site/{$site->id}/id/{$incident->id}/';return false;">Edit</button>{/if}</td>
</tr>
{/foreach}
</tbody>
@@ -94,7 +95,7 @@
<p style="padding-top:10px;">There were no recorded incidents on this day</p>
{/if}
</div>
</div>
</div>
{/foreach}
{/if}
</div>