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-20 00:44:31 +00:00
parent 06325759b4 c0571fb1d5
commit 519b7effd2
5 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/webui/pages/home.php
View File

@@ -7,5 +7,6 @@ for ($i = 1; $i <= 6; ++$i){
} }
$this->smarty->assign('days', $tbl_header_date); $this->smarty->assign('days', $tbl_header_date);
$this->smarty->assign('services', $services); $this->smarty->assign('services', $services);
$this->smarty->assign('requested_page', $this->page);
?> ?>

1
source/webui/pages/navigation.php
View File

@@ -12,5 +12,4 @@ if ($auth->isAuthenticated()) {
$this->smarty->assign('authenticated', $authenticated); $this->smarty->assign('authenticated', $authenticated);
$this->smarty->assign('auth', $auth); $this->smarty->assign('auth', $auth);
$this->smarty->assign('user', $user); $this->smarty->assign('user', $user);
?> ?>

1
source/webui/pages/usercp.php
View File

@@ -43,5 +43,6 @@ if ($request->exists('do')) {
$this->smarty->assign('activity', $activity); $this->smarty->assign('activity', $activity);
$this->smarty->assign('successes', $successes); $this->smarty->assign('successes', $successes);
$this->smarty->assign('errors', $errors); $this->smarty->assign('errors', $errors);
$this->smarty->assign('requested_page', $this->page);
?> ?>

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

@@ -23,10 +23,12 @@
{$site->name} {$site->name}
</td> </td>
<td> <td>
<a href="#" class="" rel="popover" data-content="{StatusBoard_Status::name($site->status())}" data-original-title="No Issues"><img src={$base_uri}images/Status_Icons/tick-circle.png></img></a> <a href="#" class="" rel="popover" data-content="{StatusBoard_Status::description($site->status())}" data-original-title="{StatusBoard_Status::name($site->status())}"><img src={$base_uri}images/Status_Icons/tick-circle.png></img></a>
</td> </td>
<td> <td>
<!-- example, remove when dynamically generated -->
<a href="#" class="" rel="popover" data-content="Brief disruption to service due to supplier fault" data-original-title="Incident:123456"><img src={$base_uri}images/Status_Icons/exclamation.png></img></a> <a href="#" class="" rel="popover" data-content="Brief disruption to service due to supplier fault" data-original-title="Incident:123456"><img src={$base_uri}images/Status_Icons/exclamation.png></img></a>
<!-- /example, remove when dynamically generated -->
</td> </td>
<td> <td>
TODO TODO

14
source/webui/templates/navigation.tpl
View File

@@ -1,11 +1,21 @@
<a class="brand" href="{$base_uri}home/">StatusBoard</a> <a class="brand" href="{$base_uri}home/">StatusBoard</a>
<ul class="nav"> <ul class="nav">
<li class="active"><a href="{$base_uri}home/" title="Home">Home</a></li> {if $requested_page == home}
<li class="active">
{else}
<li>
{/if}
<a href="{$base_uri}home/" title="Home">Home</a></li>
{if $authenticated} {if $authenticated}
{if $auth->isAdministrator()} {if $auth->isAdministrator()}
<li><a href="{$base_uri}admin/" title="Admin">Admin</a></li> {if $requested_page == admin}
<li class="active">
{else}
<li>
{/if}
<a href="{$base_uri}admin/" title="Admin">Admin</a></li>
{/if} {/if}
<li><a href="{$base_uri}logout/" title="Logout">Logout</a></li> <li><a href="{$base_uri}logout/" title="Logout">Logout</a></li>
{else} {else}