move disconnect button to nav-header

moved disconnect button to nav-header
fix navbar (responsive again)
replace custon classes with bootstap classes
This commit is contained in:
alexfriesen
2017-04-21 15:45:55 +02:00
parent a02a57bf99
commit 39960aa897
3 changed files with 28 additions and 15 deletions
+26 -15
View File
@@ -15,43 +15,57 @@
<nav class="navbar navbar-default" ng-controller="ServerInfoController" ng-show="Connected">
<div class="container">
<div class="navbar-header">
<a class="navbar-brand" href="#">{{info.Hostname}}</a>
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-header" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">{{info.Hostname}}</a>
</div>
<div class="collapse navbar-collapse" id="navbar-collapse-header">
<ul class="nav navbar-nav">
<li>
<div class="navbar-info" title="Uptime">
<p class="navbar-text" title="Uptime">
<span class="glyphicon glyphicon-time"></span>
{{info.Uptime|SecondsToDuration}}
</div>
</p>
</li>
<li>
<div class="navbar-info" title="Map Name">
<p class="navbar-text" title="Map Name">
<span class="glyphicon glyphicon-globe"></span>
{{info.Map}}
</div>
</p>
</li>
<li>
<div class="navbar-info" title="Current Players/Maximum Players">
<p class="navbar-text" title="Current Players/Maximum Players">
<span class="glyphicon glyphicon-user"></span>
{{info.Players|number}}/{{info.MaxPlayers|number}}
</div>
</p>
</li>
<li>
<div class="navbar-info" title="Framerate">
<p class="navbar-text" title="Framerate">
<span class="glyphicon glyphicon-hourglass"></span>
{{info.Framerate|number}}fps
</div>
</p>
</li>
<li>
<div class="navbar-info" title="Entity Count">
<p class="navbar-text" title="Entity Count">
<span class="glyphicon glyphicon-oil"></span>
{{info.EntityCount|number}}
</div>
</p>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li>
<button class="btn btn-danger navbar-btn" type="button" ng-click="Disconnect()">Disconnect</button>
</li>
</ul>
</div>
</div>
</nav>
@@ -65,9 +79,6 @@
<li ng-repeat="page in pages" ng-class="{'active' : $route.current.Title == page.Title }">
<a href="#{{Nav( page.originalPath )}}">{{page.Title}}</a>
</li>
<li>
<a href="#" ng-click="Disconnect()">Disconnect</a>
</li>
</ul>
</div>
+1
View File
@@ -1,4 +1,5 @@
function RconService() {
var ConnectionStatus = {
'CONNECTING': 0,
'OPEN': 1,
+1
View File
@@ -118,6 +118,7 @@ a:hover
color: #fff;
}
.navbar-default .navbar-nav > li > .navbar-text,
.navbar-default .navbar-nav > li > a, .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus
{
color: #fff;