Commit 79395cc6 by Torkel Ödegaard

showed editor below graph in full edit mode

parent f4ba80b7
...@@ -67,10 +67,6 @@ function (angular, config, _) { ...@@ -67,10 +67,6 @@ function (angular, config, _) {
}); });
}; };
$scope.closeFullEdit = function() {
$rootScope.$emit('fullEditMode', false);
};
$scope.isPanel = function(obj) { $scope.isPanel = function(obj) {
if(!_.isNull(obj) && !_.isUndefined(obj) && !_.isUndefined(obj.type)) { if(!_.isNull(obj) && !_.isUndefined(obj) && !_.isUndefined(obj.type)) {
return true; return true;
......
...@@ -111,4 +111,26 @@ ...@@ -111,4 +111,26 @@
<span ng-if="!panel.show_query">{{series.info.alias}}</span> <span ng-if="!panel.show_query">{{series.info.alias}}</span>
</span> </span>
</span> </span>
<div class="fluid-row panel-full-edit-mode-controls" ng-show="inEditMode" style="margin-top: 20px;">
<div ng-model="editor.index" bs-tabs>
<div ng-repeat="tab in setEditorTabs(panelMeta)" data-title="{{tab}}">
</div>
</div>
<div ng-show="editorTabs[editor.index] == 'General'">
<div ng-include src="'app/partials/panelgeneral.html'"></div>
</div>
<div ng-show="editorTabs[editor.index] == 'Panel'">
<div ng-include src="edit_path(panel.type)"></div>
</div>
<div ng-repeat="tab in panelMeta.editorTabs" ng-show="editorTabs[editor.index] == tab.title">
<div ng-include src="tab.src"></div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" ng-click="closeEditMode()">Close</button>
</div>
</div>
</div> </div>
\ No newline at end of file
...@@ -225,6 +225,10 @@ function (angular, app, $, _, kbn, moment, timeSeries, graphiteSrv) { ...@@ -225,6 +225,10 @@ function (angular, app, $, _, kbn, moment, timeSeries, graphiteSrv) {
} }
}; };
$scope.closeEditMode = function() {
$rootScope.$emit('fullEditMode', false);
};
$scope.interval_label = function(interval) { $scope.interval_label = function(interval) {
return $scope.panel.auto_int && interval === $scope.panel.interval ? interval+" (auto)" : interval; return $scope.panel.auto_int && interval === $scope.panel.interval ? interval+" (auto)" : interval;
}; };
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
<div class="section"> <div class="section">
<h5>Chart Options</h5> <h5>Chart Options</h5>
<div class="editor-option"> <div class="editor-option">
<label class="small">Bars</label><input type="checkbox" ng-model="panel.bars" ng-checked="panel.bars"> <label class="small">Bars</label><input type="checkbox" ng-model="panel.bars" ng-checked="panel.bars" ng-change="render()">
</div> </div>
<div class="editor-option"> <div class="editor-option">
<label class="small">Lines</label><input type="checkbox" ng-model="panel.lines" ng-checked="panel.lines"> <label class="small">Lines</label><input type="checkbox" ng-model="panel.lines" ng-checked="panel.lines" ng-change="render()">
</div> </div>
<div class="editor-option"> <div class="editor-option">
<label class="small">Points</label><input type="checkbox" ng-model="panel.points" ng-checked="panel.points"> <label class="small">Points</label><input type="checkbox" ng-model="panel.points" ng-checked="panel.points" ng-change="render()">
</div> </div>
<div class="editor-option"> <div class="editor-option">
<label class="small">Selectable</label><input type="checkbox" ng-model="panel.interactive" ng-checked="panel.interactive"> <label class="small">Selectable</label><input type="checkbox" ng-model="panel.interactive" ng-checked="panel.interactive">
......
...@@ -13,14 +13,6 @@ ...@@ -13,14 +13,6 @@
<div class="container-fluid main"> <div class="container-fluid main">
<div class="row-fluid"> <div class="row-fluid">
<div class="row-fluid container" style="margin-top:10px; width:98%"> <div class="row-fluid container" style="margin-top:10px; width:98%">
<!-- Full edit mode -->
<div class="row-fluid kibana-row" ng-show="fullEditMode" style="text-align: center; z-index: 1500; position: absolute; background-color: #272b30">
<h5>
Configure Panel
<i ng-click="closeFullEdit()" class="pointer icon-remove" style="position: relative; top: 0px; left: 15px;"></i>
</h5>
</div>
<div ng-show="fullEditMode" class="modal-backdrop fade in"></div> <div ng-show="fullEditMode" class="modal-backdrop fade in"></div>
<!-- Rows --> <!-- Rows -->
<div class="row-fluid kibana-row" ng-controller="RowCtrl" ng-repeat="(row_name, row) in dashboard.current.rows" ng-style="row_style(row)"> <div class="row-fluid kibana-row" ng-controller="RowCtrl" ng-repeat="(row_name, row) in dashboard.current.rows" ng-style="row_style(row)">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment