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

Merge branch 'develop' of github.com:optiz0r/status-board into develop

Browse Source
This commit is contained in:
Ben Roberts
2011-12-22 19:27:43 +00:00
parent 8c9896f9b9 769f0f53e8
commit 75476698e9
4 changed files with 108 additions and 94 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

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

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

@@ -70,7 +70,7 @@
</td> </td>
<td> <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> <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'}";