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

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

BIN
public/images/favicon.ico Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 724 B

View File

@@ -5,15 +5,21 @@
<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">
<h2>Incident {$incident->reference|escape:html}</h2>
</div>
</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/"> <form id="admin_incident_edit" method="post" action="{$base_uri}admin/incident/service/{$service->id}/site/{$site->id}/id/{$incident->id}/do/edit/">
<fieldset> <fieldset>
<legend>Edit Incident</legend>
<div class="clearfix"> <div class="clearfix">
<label for="admin_incident_edit_name">Reference</label> <label for="admin_incident_edit_name">Reference</label>
<div class="text"> <div class="text">
@@ -24,7 +30,7 @@
<div class="clearfix"> <div class="clearfix">
<label for="admin_incident_edit_description">Description</label> <label for="admin_incident_edit_description">Description</label>
<div class="text"> <div class="text">
<textarea class="span12" id="admin_incident_edit_description" name="description">{$incident->description|escape:html}</textarea> <textarea class="xlarge" id="admin_incident_edit_description" name="description">{$incident->description|escape:html}</textarea>
</div> </div>
</div><!-- /clearfix --> </div><!-- /clearfix -->
@@ -42,15 +48,18 @@
</div> </div>
</fieldset> </fieldset>
</form> </form>
</div><!-- /span16 --> </div>
</div><!-- /row --> </div>
<div class="row"> <div class="row">
<div class="span16"> <div class="span4 column">
<h3>Change Status</h3>
<p>Use this form to update the current status of an incident</p>
</div><!--/New Service description-->
<div class="span11 column">
<form id="admin_incident_changestatus" method="post" action="{$base_uri}admin/incident/service/{$service->id}/site/{$site->id}/id/{$incident->id}/do/change-status/"> <form id="admin_incident_changestatus" method="post" action="{$base_uri}admin/incident/service/{$service->id}/site/{$site->id}/id/{$incident->id}/do/change-status/">
<fieldset> <fieldset>
<legend>Change Status</legend> <p>Use this form to update the current status of an incident</p>
<div class="clearfix"> <div class="clearfix">
<label for="admin_incident_changestatus_status">New Status</label> <label for="admin_incident_changestatus_status">New Status</label>
<div class="select"> <div class="select">
@@ -65,7 +74,7 @@
<div class="clearfix"> <div class="clearfix">
<label for="admin_incident_changestatus_description">Description</label> <label for="admin_incident_changestatus_description">Description</label>
<div class="text"> <div class="text">
<textarea class="span12" id="admin_incident_changestatus_description" name="description"></textarea> <textarea class="xlarge" id="admin_incident_changestatus_description" name="description"></textarea>
</div> </div>
</div><!-- /clearfix --> </div><!-- /clearfix -->
@@ -78,10 +87,12 @@
</form> </form>
</div><!-- /span16 --> </div><!-- /span16 -->
</div><!-- /row --> </div><!-- /row -->
</div><!-- /container --> <div class="row">
<div class="span4 column">
<h2>Status Changes</h2> <h3>Status Changes</h3>
<p>The table display an audit log of changes to this incident</p>
</div><!--/New Service description-->
<div class="span11 column">
<table> <table>
<thead> <thead>
<th>Date/Time</th> <th>Date/Time</th>
@@ -101,3 +112,5 @@
{/foreach} {/foreach}
</tbody> </tbody>
</table> </table>
</div>
</div>

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}

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'}";