Skip to content

Commit

Permalink
Merge branch 'fix-column-panel' of github.com:jdve/kibana into jdve-f…
Browse files Browse the repository at this point in the history
…ix-column-panel
  • Loading branch information
Rashid Khan committed May 12, 2014
2 parents 0e58c6f + 7fabb23 commit 1e12961
Showing 1 changed file with 9 additions and 14 deletions.
23 changes: 9 additions & 14 deletions src/app/panels/column/module.html
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">&times;</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>

0 comments on commit 1e12961

Please sign in to comment.