Fix layout of Console view.

Per bootstrap, only .col- should be a child of .row
Also removed the sidebar in the console view, it is now part of
list mode in the console view
This commit is contained in:
Kyle Johnson 2015-02-11 08:59:58 -05:00
parent b6da855d72
commit f7798797a0
1 changed files with 28 additions and 21 deletions

View File

@ -8,14 +8,17 @@
</div> </div>
<div class="row" ng-hide="fresh"> <div class="row" ng-hide="fresh">
<div class="col-md-12">
<div class="btn-toolbar pull-right"> <div class="btn-toolbar pull-right">
<button ng-click="consoleView()" class="btn btn-default btn-lg" type="button"> <button ng-click="consoleView()" class="btn btn-default btn-lg" type="button">
<span class="glyphicon" ng-class="gridButton"></span> <span class="glyphicon" ng-class="gridButton"></span>
</button> </button>
</div> </div>
</div> </div>
</div>
<div class="row" ng-show="grid" ng-hide="fresh"> <div class="row" ng-show="grid" ng-hide="fresh">
<div class="col-md-12">
<div class="flexcontainer"> <div class="flexcontainer">
<div ng-repeat="monitor in monitors" class="monitor panel" ng-class="(monitor.alerts.zmc || monitor.alerts.zma) ? 'panel-default' : 'panel-danger'"> <div ng-repeat="monitor in monitors" class="monitor panel" ng-class="(monitor.alerts.zmc || monitor.alerts.zma) ? 'panel-default' : 'panel-danger'">
@ -32,13 +35,12 @@
</div> <!-- End .monitor --> </div> <!-- End .monitor -->
</div> <!-- End .flexcontainer --> </div> <!-- End .flexcontainer -->
</div>
</div> <!-- End .row --> </div> <!-- End .row -->
<div class="row" ng-hide="grid"> <div class="row" ng-hide="grid">
<div class="col-md-2 sidebar"><?php include("sidebar.php"); ?></div> <div class="col-md-12">
<div class="col-md-10 col-md-offset-2">
<table class="table table-striped"> <table class="table table-striped">
<tr> <tr>
@ -60,6 +62,11 @@
<td ng-bind="monitor.Zones"></td> <td ng-bind="monitor.Zones"></td>
<td><button type="button" class="btn btn-danger btn-sm" ng-click="delete($index)">{{ monitor.deleteText }}</button></td> <td><button type="button" class="btn btn-danger btn-sm" ng-click="delete($index)">{{ monitor.deleteText }}</button></td>
</tr> </tr>
<tfoot>
<tr>
<td colspan="7"><a href="?view=monitor">Add New Monitor</a></td>
</tr>
</tfoot>
</table> </table>
</div> </div>