Fix bug: Both monitor views show in certain cases

If you switched to monitor list view, clicked on 'Add New Monitor'
and then clicked on 'Monitors' again, both the grid and list views
(montage and table) would show, instead of one or the other.
This commit is contained in:
Kyle Johnson 2015-02-18 11:36:51 -05:00
parent c4af30049e
commit 5a2e6cef81
1 changed files with 80 additions and 81 deletions

View File

@ -1,9 +1,11 @@
<h2>Monitor List</h2>
<div ng-show="fresh" class="alert alert-warning">
<div ng-show="fresh">
<div class="alert alert-warning">
<p><strong>Uh-oh!</strong> You have no monitors! Why not <a class="alert-link" href="/?view=monitor">add</a> one?</p>
</div>
</div>'
</div> <!-- End ng-show fresh -->
<div class="row" ng-hide="fresh">
<div ng-hide="fresh">
<div class="row">
<div class="col-md-1 col-md-offset-10">
<select ng-model="consoleLayout" ng-show="grid" ng-change="updateLayout()">
<option value="1">1 per row</option>
@ -27,8 +29,7 @@
</div>
</div>
<div ng-show="grid" ng-hide="fresh">
<div class="row" ng-repeat="monitors in rows">
<div ng-show="grid" class="row" ng-repeat="monitors in rows">
<div ng-repeat="monitor in monitors" class="col-md-{{columnSize}}">
<div class="monitor panel" ng-class="(monitor.alerts.zmc || monitor.alerts.zma) ? 'panel-default' : 'panel-danger'">
@ -46,8 +47,6 @@
</div> <!-- End .monitor -->
</div>
</div>
</div>
<div class="row" ng-hide="grid">
<div class="col-md-12">
@ -90,4 +89,4 @@
</div>
</div>
</div> <!-- end ng-hide fresh -->