IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed dashboard import view, did not hide search results

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-09-04 09:58:08 +02:00
parent dd4f27e3fa
commit 3157fc651d
3 changed files with 94 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/directives/dashEditLink.js
View File

@ -42,26 +42,23 @@ function (angular, $) {
}
}
scope.onAppEvent('hide-dash-editor', function() {
if (editorScope) {
editorScope.dismiss();
function hideEditorPane() {
if (editorScope) { editorScope.dismiss(); }
}
});
scope.onAppEvent("dashboard-loaded", hideEditorPane);
scope.onAppEvent('hide-dash-editor', hideEditorPane);
scope.onAppEvent('show-dash-editor', function(evt, payload) {
if (lastEditor === payload.src) {
editorScope.dismiss();
return;
}
hideEditorPane();
if (editorScope) {
editorScope.dismiss();
}
if (lastEditor === payload.src) { return; }
scope.exitFullscreen();
lastEditor = payload.src;
editorScope = payload.scope ? payload.scope.$new() : scope.$new();
editorScope.dismiss = function() {
editorScope.$destroy();
elem.empty();

3
src/app/directives/dashUpload.js
View File

@ -15,8 +15,9 @@ function (angular) {
var readerOnload = function() {
return function(e) {
var dashboard = JSON.parse(e.target.result);
scope.$apply(function() {
scope.emitAppEvent('setup-dashboard', dashboard);
scope.$apply();
});
};
};
for (var i = 0, f; f = files[i]; i++) {

45
src/app/partials/search.html
View File

@ -1,17 +1,5 @@
<style>
#grafana-search {
position: fixed;
right: 0;
left: 0;
top: 39px;
margin-right: auto;
margin-left: auto;
/* give it dimensions */
min-height: 10em;
width: 90%;
}
</style>
<div ng-controller="SearchCtrl" ng-init="init()">
<div ng-controller="SearchCtrl" ng-init="init()">
<div class="dashboard-editor-header">
<div class="dashboard-editor-title" style="border: 0; line-height: 41px;">
<i class="icon icon-search"></i>
@ -33,21 +21,16 @@
New
</button>
<span style="position: relative;">
<input type="text"
placeholder="search dashboards, metrics, or graphs"
xng-focus="giveSearchFocus"
ng-keydown="keyDown($event)"
ng-model="query.query" spellcheck='false'
ng-change="search()" />
<a class="search-tagview-switch" href="javascript:void(0);"
ng-class="{'active': tagsOnly}"
ng-click="showTags($event)">tags</a>
<input type="text" placeholder="search dashboards, metrics, or graphs" xng-focus="giveSearchFocus"
ng-keydown="keyDown($event)" ng-model="query.query" spellcheck='false' ng-change="search()" />
<a class="search-tagview-switch" href="javascript:void(0);" ng-class="{'active': tagsOnly}" ng-click="showTags($event)">tags</a>
</span>
</div>
</div>
</div>
<div ng-if="!showImport">
<h6 ng-hide="results.dashboards.length">No dashboards matching your query were found.</h6>
<div class="search-results-container" ng-if="tagsOnly">
<div ng-repeat="tag in results.tags" class="pointer" style="width: 180px; float: left;"
ng-class="{'selected': $index === selectedIndex }"
@ -60,8 +43,7 @@
</div>
<div class="search-results-container" ng-if="!tagsOnly">
<div class="search-result-item pointer"
bindonce ng-repeat="row in results.dashboards"
<div class="search-result-item pointer" bindonce ng-repeat="row in results.dashboards"
ng-class="{'selected': $index === selectedIndex }" ng-click="goToDashboard(row.id)">
<div class="search-result-actions small">
@ -86,20 +68,17 @@
</div>
</div>
</div>
</li>
<li ng-if="showImport" style="margin: 20px;">
<div class="editor-row">
<div class="editor-row" ng-if="showImport">
<div class="section">
<div class="editor-option">
<h5>Local File <tip>Load dashboard JSON layout from file</tip></h5>
<form>
<input type="file" id="dashupload" dash-upload /><br>
<input type="file" id="dashupload" dash-upload/><br>
</form>
</div>
</div>
</div>
</li>
</div>
</div>