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

source/webui/templates/fragments/icon-help.tpl

@@ -0,0 +1,16 @@
+<dl>
+<dt><img src="{$base_uri}images/Status_Icons/tick-circle.png" /><b>&nbsp;Resolved</b></dt>
+<dd>The service is operating normally</dd>
+</dl>
+<dl>
+<dt><img src="{$base_uri}images/Status_Icons/traffic-cone.png" /><b>&nbsp;Maintenance</b></dt>
+<dd>The service is undergoing scheduled maintenance</dd>
+</dl>
+<dl>
+<dt><img src="{$base_uri}images/Status_Icons/exclamation.png" /><b>&nbsp;Minor/Significant</b></dt>
+<dd>The service is experiencing minor issues affecting some customers or significant issues affecting many customers.</dd>
+</dl>
+<dl>
+<dt><img src="{$base_uri}images/Status_Icons/cross-circle.png" /><b>&nbsp;Major</b></dt>
+<dd>The service is experiencing a major outage affecting all customers.</dd>
+</dl>

source/webui/templates/navigation.tpl

@@ -20,10 +20,10 @@
     {else}
         <li><a href="{$base_uri}login/" title="Login">Login</a></li>
     {/if}
+    {if $requested_page == home}<li><a href='#' data-placement='below' rel='popover' data-content='{include file="fragments/icon-help.tpl"}' data-original-title='What do the status icons mean?'>Help</a></li>{/if}
 </ul>
-
 {if $authenticated}
-    <p class="pull-right">
+    <p class="pull-right" style="color:#BFBFBF;">
         Logged in as <a href="{$base_uri}usercp/">{$user->username}</a>
     </p>
 {/if}