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

Updated styling of incident page to match others, corrected hyperlink issue on incidents from sites, reimplimented favicon

Browse Source 
Signed-off-by: Nathan Booth <nath.booth@gmail.com>
This commit is contained in:
Nathan Booth
2011-12-22 17:14:51 +00:00
parent 560b9805bb
commit 769f0f53e8
4 changed files with 109 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/images/favicon.ico Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 724 B

187
source/webui/templates/admin/incident.tpl
View File

@@ -5,99 +5,112 @@
<li class="active"><a href="#">Incident {$incident->reference|escape:html}</a></li> <li class="active"><a href="#">Incident {$incident->reference|escape:html}</a></li>
</ul> </ul>
<h1>Incident {$incident->reference|escape:html}</h1>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="span16"> <div class="span16">
<form id="admin_incident_edit" method="post" action="{$base_uri}admin/incident/service/{$service->id}/site/{$site->id}/id/{$incident->id}/do/edit/"> <h2>Incident {$incident->reference|escape:html}</h2>
<fieldset> </div>
<legend>Edit Incident</legend> </div>
<div class="rounded_content">
<div class="row">
<div class="span4 column"><!--New description-->
<h3>Edit Incident</h3>
<p>Use this form to update the existing Service</p>
</div>
<div class="span11 column">
<form id="admin_incident_edit" method="post" action="{$base_uri}admin/incident/service/{$service->id}/site/{$site->id}/id/{$incident->id}/do/edit/">
<fieldset>
<div class="clearfix">
<label for="admin_incident_edit_name">Reference</label>
<div class="text">
<input class="xlarge span5" id="admin_incident_edit_name" name="reference" type="text" value="{$incident->reference|escape:html}" />
</div>
</div><!-- /clearfix -->
<div class="clearfix"> <div class="clearfix">
<label for="admin_incident_edit_name">Reference</label> <label for="admin_incident_edit_description">Description</label>
<div class="text"> <div class="text">
<input class="xlarge span5" id="admin_incident_edit_name" name="reference" type="text" value="{$incident->reference|escape:html}" /> <textarea class="xlarge" id="admin_incident_edit_description" name="description">{$incident->description|escape:html}</textarea>
</div> </div>
</div><!-- /clearfix --> </div><!-- /clearfix -->
<div class="clearfix"> <div class="clearfix">
<label for="admin_incident_edit_description">Description</label> <label for="admin_incident_edit_estimatedendtime">Estimated End Time</label>
<div class="text"> <div class="text">
<textarea class="span12" id="admin_incident_edit_description" name="description">{$incident->description|escape:html}</textarea> <input class="xlarge span5" id="admin_incident_edit_estimatedendtime" name="estimatedendtime" type="text" value="{$incident->estimated_end_time|date_format:"r"}" />
</div> </div>
</div><!-- /clearfix --> </div><!-- /clearfix -->
<div class="clearfix"> <div class="input">
<label for="admin_incident_edit_estimatedendtime">Estimated End Time</label> <div class="clearfix">
<div class="text"> <input type="submit" class="btn primary" value="Edit Incident">&nbsp;<button type="reset" class="btn">Cancel</button>
<input class="xlarge span5" id="admin_incident_edit_estimatedendtime" name="estimatedendtime" type="text" value="{$incident->estimated_end_time|date_format:"r"}" /> </div>
</div> </div>
</div><!-- /clearfix --> </fieldset>
</form>
</div>
</div>
<div class="input"> <div class="row">
<div class="clearfix"> <div class="span4 column">
<input type="submit" class="btn primary" value="Edit Incident">&nbsp;<button type="reset" class="btn">Cancel</button> <h3>Change Status</h3>
</div> <p>Use this form to update the current status of an incident</p>
</div> </div><!--/New Service description-->
</fieldset> <div class="span11 column">
</form> <form id="admin_incident_changestatus" method="post" action="{$base_uri}admin/incident/service/{$service->id}/site/{$site->id}/id/{$incident->id}/do/change-status/">
</div><!-- /span16 --> <fieldset>
</div><!-- /row --> <p>Use this form to update the current status of an incident</p>
<div class="clearfix">
<label for="admin_incident_changestatus_status">New Status</label>
<div class="select">
<select class="xlarge span5" id="admin_incident_changestatus_status" name="status">
{foreach from=StatusBoard_Status::available() item=status}
<option value="{$status}">{StatusBoard_Status::name($status)}</option>
{/foreach}
</select>
</div>
</div><!-- /clearfix -->
<div class="row"> <div class="clearfix">
<div class="span16"> <label for="admin_incident_changestatus_description">Description</label>
<form id="admin_incident_changestatus" method="post" action="{$base_uri}admin/incident/service/{$service->id}/site/{$site->id}/id/{$incident->id}/do/change-status/"> <div class="text">
<fieldset> <textarea class="xlarge" id="admin_incident_changestatus_description" name="description"></textarea>
<legend>Change Status</legend> </div>
</div><!-- /clearfix -->
<div class="clearfix"> <div class="input">
<label for="admin_incident_changestatus_status">New Status</label> <div class="clearfix">
<div class="select"> <input type="submit" class="btn primary" value="Change Status">&nbsp;<button type="reset" class="btn">Cancel</button>
<select class="xlarge span5" id="admin_incident_changestatus_status" name="status"> </div>
{foreach from=StatusBoard_Status::available() item=status} </div>
<option value="{$status}">{StatusBoard_Status::name($status)}</option> </fieldset>
{/foreach} </form>
</select> </div><!-- /span16 -->
</div> </div><!-- /row -->
</div><!-- /clearfix --> <div class="row">
<div class="span4 column">
<div class="clearfix"> <h3>Status Changes</h3>
<label for="admin_incident_changestatus_description">Description</label> <p>The table display an audit log of changes to this incident</p>
<div class="text"> </div><!--/New Service description-->
<textarea class="span12" id="admin_incident_changestatus_description" name="description"></textarea> <div class="span11 column">
</div> <table>
</div><!-- /clearfix --> <thead>
<th>Date/Time</th>
<div class="input"> <th>Status</th>
<div class="clearfix"> <th>Description</th>
<input type="submit" class="btn primary" value="Change Status">&nbsp;<button type="reset" class="btn">Cancel</button> </thead>
</div> <tbody>
</div> {foreach from=$statuses item=status}
</fieldset> <tr>
</form> <td>
</div><!-- /span16 --> {StatusBoard_DateTime::fuzzyTime($status->ctime)}<br />
</div><!-- /row --> <em>{$status->ctime|date_format:'y-m-d h:i:s'}</em>
</div><!-- /container --> </td>
<td>{StatusBoard_Status::name($status->status)}</td>
<h2>Status Changes</h2> <td>{$status->description|escape:html}</td>
</tr>
<table> {/foreach}
<thead> </tbody>
<th>Date/Time</th> </table>
<th>Status</th> </div>
<th>Description</th> </div>
</thead>
<tbody>
{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>
</td>
<td>{StatusBoard_Status::name($status->status)}</td>
<td>{$status->description|escape:html}</td>
</tr>
{/foreach}
</tbody>
</table>

4
source/webui/templates/admin/site.tpl
View File

@@ -69,8 +69,8 @@
{StatusBoard_Status::name($incident->currentStatus())} {StatusBoard_Status::name($incident->currentStatus())}
</td> </td>
<td> <td>
<button class='btn small primary' onclick="document.location.href='{$base_uri}admin/site/service/{$service->id}/id/{$site->id}/';return false;">Edit</button> <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>
<button style="margin-left:10px" class='btn small danger' onclick="sb.admin.deleteItem('{$base_uri}admin/service/do/delete-site/id/{$service->id}/site/{$site->id}/');">Delete</button> <button style="margin-left:10px" class='btn small danger' onclick="sb.admin.deleteItem('{$base_uri}admin/incident/service/{$service->id}/site/{$site->id}/id/{$incident->id}//');">Delete</button>
</td> </td>
</tr> </tr>
{/foreach} {/foreach}

1
source/webui/templates/index.tpl
View File

@@ -5,6 +5,7 @@
<script lang="javascript"> <script lang="javascript">
</script> </script>
<link rel="stylesheet" type="text/css" href="{$base_uri}styles/normal.css" /> <link rel="stylesheet" type="text/css" href="{$base_uri}styles/normal.css" />
<link rel="shortcut icon" href="{$base_uri}images/favicon.ico" />
<script type="text/javascript"> <script type="text/javascript">
var base_uri = "{$base_uri|escape:'quote'}"; var base_uri = "{$base_uri|escape:'quote'}";