-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'fix-column-panel' of github.com:jdve/kibana into jdve-f…
…ix-column-panel
- Loading branch information
Showing
1 changed file
with
9 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,11 @@ | ||
<div ng-controller="column" ng-init="init();"> | ||
<!-- Panels --> | ||
<div ng-repeat="(name, panel) in panel.panels" ng-hide="panel.height == '0px' || panel.hide" class="row-fluid panel" style="min-height:{{panel.height}}; position:relative"> | ||
<!-- Error Panel --> | ||
<div class="row-fluid"> | ||
<div class="span12 alert alert-error panel-error" ng-hide="!panel.error"> | ||
<a class="close" ng-click="panel.error=false">×</a> | ||
<i class="icon-exclamation-sign"></i> <strong>Oops!</strong> {{panel.error}} | ||
</div> | ||
</div> | ||
<!-- Content Panel --> | ||
<div class="row-fluid"> | ||
<kibana-panel type="panel.type"></kibana-panel> | ||
</div> | ||
<!-- All the panels in the column --> | ||
<div | ||
ng-repeat="(name, panel) in panel.panels|filter:isPanel" | ||
ng-cloak ng-hide="panel.height == '0px' || panel.hide" | ||
kibana-panel type='panel.type' | ||
class="row-fluid panel" | ||
style="min-height:{{panel.height}}; position:relative" | ||
ng-model="row.panels"> | ||
</div> | ||
</div> | ||
</div> |