Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
ceaf090a
Commit
ceaf090a
authored
Jul 29, 2013
by
Rashid Khan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Brought back type dropdown in derivequeries close #212
parent
421cd5e3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
32 deletions
+11
-32
js/services.js
+1
-1
panels/derivequeries/module.html
+9
-31
panels/derivequeries/module.js
+1
-0
No files found.
js/services.js
View file @
ceaf090a
...
@@ -9,7 +9,7 @@ angular.module('kibana.services', [])
...
@@ -9,7 +9,7 @@ angular.module('kibana.services', [])
// Save a reference to this
// Save a reference to this
var
self
=
this
;
var
self
=
this
;
this
.
list
=
[];
this
.
list
=
[
'_type'
];
this
.
add_fields
=
function
(
f
)
{
this
.
add_fields
=
function
(
f
)
{
self
.
list
=
_
.
union
(
f
,
self
.
list
);
self
.
list
=
_
.
union
(
f
,
self
.
list
);
...
...
panels/derivequeries/module.html
View file @
ceaf090a
...
@@ -5,6 +5,10 @@
...
@@ -5,6 +5,10 @@
right
:
15px
;
right
:
15px
;
top
:
5px
;
top
:
5px
;
}
}
.panel-derive-field
{
text-decoration
:
underline
;
cursor
:
pointer
;
}
.panel-derive
{
.panel-derive
{
padding-right
:
35px
!important
;
padding-right
:
35px
!important
;
height
:
31px
!important
;
height
:
31px
!important
;
...
@@ -16,38 +20,12 @@
...
@@ -16,38 +20,12 @@
<span
ng-show=
'panel.spyable'
style=
"position:absolute;right:0px;top:0px"
class=
'panelextra pointer'
>
<span
ng-show=
'panel.spyable'
style=
"position:absolute;right:0px;top:0px"
class=
'panelextra pointer'
>
<i
bs-modal=
"'partials/modal.html'"
class=
"icon-eye-open"
></i>
<i
bs-modal=
"'partials/modal.html'"
class=
"icon-eye-open"
></i>
</span>
</span>
<!--
<div>
<form>
<table class="form-horizontal">
<tr>
<td><label><small>{{panel.label}}</small></label></td>
<td><label><small>Field</small></label></td>
</tr>
<tr>
<td width="97%" style="padding-right:20px">
<input bs-typeahead="panel.history" data-min-length=0 data-items=100 type="text" style="width:100%" ng-model="panel.query">
</td>
<td ng-show="panel.fields.length > 0">
<select class="input-small" ng-model="panel.field" ng-options="f for f in panel.fields"></select>
</td>
<td ng-show="panel.fields.length == 0">
<input class="input-small" ng-model="panel.field" type="text"/>
</td>
<td style="margin-left:20px" width="1%">
<button style="margin-top:0px" type="submit" class="btn btn-info" ng-click="get_data()"><i class="icon-search"></i></button>
</td>
<td width="1%">
<button style="margin-top:0px" type="submit" class="btn btn-danger" ng-click="panel.query='';get_data()"><i class="icon-ban-circle"></i></button>
</td>
<tr>
</table>
</form>
</div>
-->
<label
class=
"small"
>
Create new queries from
<strong>
{{panel.field}}
</strong>
({{panel.mode}} mode)
</label>
<label
class=
"small"
>
Create new queries from
<span
class=
"panel-derive-field"
ng-show=
"!editing"
ng-click=
"editing=true"
>
{{panel.field}}
</span>
<select
ng-show=
"editing && fields.list.length>1"
class=
"input-medium"
ng-model=
"panel.field"
ng-options=
"f for f in fields.list"
ng-change=
'editing=false'
ng-blur=
"editing=false"
></select>
<input
ng-show=
"editing && fields.list.length<2"
type=
"text"
ng-model=
"panel.field"
ng-blur=
"editing=false"
/>
({{panel.mode}} mode)
</label>
<div>
<div>
<form
class=
"form-search"
style=
"position:relative"
ng-submit=
"get_data()"
>
<form
class=
"form-search"
style=
"position:relative"
ng-submit=
"get_data()"
>
<input
class=
"search-query panel-derive input-block-level"
bs-typeahead=
"panel.history"
data-min-length=
0
data-items=
100
type=
"text"
ng-model=
"panel.query"
/>
<input
class=
"search-query panel-derive input-block-level"
bs-typeahead=
"panel.history"
data-min-length=
0
data-items=
100
type=
"text"
ng-model=
"panel.query"
/>
...
...
panels/derivequeries/module.js
View file @
ceaf090a
...
@@ -48,6 +48,7 @@ angular.module('kibana.derivequeries', [])
...
@@ -48,6 +48,7 @@ angular.module('kibana.derivequeries', [])
_
.
defaults
(
$scope
.
panel
,
_d
);
_
.
defaults
(
$scope
.
panel
,
_d
);
$scope
.
init
=
function
()
{
$scope
.
init
=
function
()
{
$scope
.
editing
=
false
;
$scope
.
panel
.
fields
=
fields
.
list
;
$scope
.
panel
.
fields
=
fields
.
list
;
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment