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 
Conflicts:
	source/webui/templates/index.tpl
This commit is contained in:
Ben Roberts
2011-12-19 15:16:47 +00:00
parent a850ed911d 3972122249
commit d782249388
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/styles/normal.css
View File

@@ -108,3 +108,7 @@ div.site {
div.incident { div.incident {
margin-left: 2em; margin-left: 2em;
} }
table th, table td {
text-align: center;
}

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

@@ -3,6 +3,7 @@
<thead> <thead>
<tr> <tr>
<th>Service</th> <th>Service</th>
<th>Sites</th>
<th class="status">Current</th> <th class="status">Current</th>
{foreach from=$days key="ind" item="day"} {foreach from=$days key="ind" item="day"}
<th class="status">{$day}</th> <th class="status">{$day}</th>
@@ -16,25 +17,16 @@
<th > <th >
{$service->name} {$service->name}
</th> </th>
</tr>
{foreach from=$service->sites() item=site} {foreach from=$service->sites() item=site}
{assign var=incidents value=$site->openIncidents()} {assign var=incidents value=$site->openIncidents()}
<tr>
<td> <td>
{$site->name} {$site->name}
</td> </td>
<td> <td>
{StatusBoard_Status::name($site->status())} {StatusBoard_Status::name($site->status())}
</td> </td>
<td>good</td>
<td>good</td>
<td>good</td>
<td>good</td>
<td>good</td>
<td>good</td>
</tr>
{foreachelse} {foreachelse}
</tr>
{/foreach} {/foreach}
{/foreach} {/foreach}

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

@@ -22,7 +22,7 @@
<script type="text/javascript" src="{$base_uri}scripts/3rdparty/less-1.1.5.min.js"></script> <script type="text/javascript" src="{$base_uri}scripts/3rdparty/less-1.1.5.min.js"></script>
<script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-alerts.js"></script> <script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-alerts.js"></script>
</head> </head>
<body> <body>I can
<div class="topbar"> <div class="topbar">
<div class="topbar-inner"> <div class="topbar-inner">