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
a4adec42
Commit
a4adec42
authored
Dec 31, 2013
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
worked on filter panel styling
parent
5995ae6f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
40 additions
and
17 deletions
+40
-17
src/app/panels/filtering/module.html
+18
-7
src/app/panels/filtering/module.js
+7
-2
src/app/partials/dashboard.html
+4
-6
src/css/bootstrap.dark.min.css
+0
-0
src/vendor/angular/angular-strap.js
+0
-1
src/vendor/bootstrap/less/grafana.less
+11
-1
No files found.
src/app/panels/filtering/module.html
View file @
a4adec42
...
...
@@ -6,9 +6,10 @@
.filter-panel-filter
{
display
:
inline-block
;
vertical-align
:
top
;
padding
:
5px
5px
0px
5
px
;
padding
:
5px
10px
0px
10
px
;
margin
:
0px
5px
;
background-color
:
#444
;
border-left
:
1px
solid
#111
;
border-right
:
1px
solid
#111
;
}
.filter-panel-filter
ul
{
margin-bottom
:
3px
;
...
...
@@ -25,7 +26,7 @@
}
.add-filter-action
{
position
:
relative
;
top
:
3
px
;
top
:
4
px
;
}
.filter-mandate
{
text-decoration
:
underline
;
...
...
@@ -50,9 +51,14 @@
<ul
class=
"unstyled"
>
<li
ng-if=
"filter.name"
class=
"dropdown"
>
{{filter.name}} :
<a
bs-dropdown=
"filter.options
"
>
'All'
<a
class=
"dropdown-toggle"
data-toggle=
"dropdown
"
>
{{filter.current.text}}
</a>
<ul
class=
"dropdown-menu"
>
<li
ng-repeat=
"option in filter.options"
>
<a
ng-click=
"filter.current = option"
>
{{option.text}}
</a>
</li>
</ul>
</li>
</ul>
</div>
...
...
@@ -60,10 +66,15 @@
<form
ng-show=
"filter.editing"
>
<ul
class=
"unstyled"
>
<li>
<strong>
name
</strong>
:
<input
type=
'text'
ng-model=
"filter.name"
>
<strong>
name
</strong>
:
<br/>
<input
type=
'text'
ng-model=
"filter.name"
>
</li>
<li>
<strong>
filter.query
</strong>
:
<input
type=
'text'
ng-model=
"filter.query"
>
<strong>
filter.query
</strong>
:
<br/>
<input
type=
'text'
ng-model=
"filter.query"
>
</li>
<li>
<strong>
Include All
</strong>
:
<input
type=
'checkbox'
ng-model=
"filter.includeAll"
>
</li>
</ul>
<div>
...
...
src/app/panels/filtering/module.js
View file @
a4adec42
...
...
@@ -38,7 +38,13 @@ function (angular, app, _) {
graphiteSrv
.
metricFindQuery
(
filter
.
query
)
.
then
(
function
(
results
)
{
filter
.
editing
=
undefined
;
filter
.
options
=
results
;
filter
.
options
=
_
.
map
(
results
,
function
(
node
)
{
return
{
text
:
node
.
text
,
value
:
node
.
text
};
});
if
(
filter
.
includeAll
)
{
filter
.
options
.
unshift
({
text
:
'All'
,
value
:
'*'
});
}
filter
.
current
=
filter
.
options
[
0
];
});
};
...
...
@@ -47,7 +53,6 @@ function (angular, app, _) {
type
:
'filter'
,
name
:
'filter name'
,
editing
:
true
,
value
:
'*'
,
query
:
'metric.path.query.*'
,
});
};
...
...
src/app/partials/dashboard.html
View file @
a4adec42
<!-- is there a better way to repeat without actually affecting the page? -->
<
nil
ng-repeat=
"pulldown in dashboard.current.pulldowns"
ng-controller=
"PulldownCtrl"
ng-show=
"pulldown.enable"
>
<
div
class=
"filter-pulldown"
ng-repeat=
"pulldown in dashboard.current.pulldowns"
ng-controller=
"PulldownCtrl"
ng-show=
"pulldown.enable"
>
<div
class=
"top-row-close pointer pull-left"
ng-click=
"toggle_pulldown(pulldown);dismiss();"
bs-tooltip=
"'Toggle '+pulldown.type"
data-placement=
"bottom"
>
<span
class=
"small"
>
{{pulldown.type}}
</span>
<i
class=
"small"
ng-class=
"{'icon-caret-left':pulldown.collapse,'icon-caret-right':!pulldown.collapse}"
></i>
<i
class=
"small icon-star"
ng-show=
"row.notice && pulldown.collapse"
></i>
<span
class=
"small"
><strong>
{{pulldown.type}}
</strong></span>
</div>
<div
class=
"top-row-open"
ng-hide=
"pulldown.collapse"
>
<kibana-simple-panel
type=
"pulldown.type"
ng-cloak
></kibana-simple-panel>
</div>
</
nil
>
<div
class=
"clearfix
bgNav"
></div>
</
div
>
<div
class=
"clearfix
"
></div>
<div
class=
"container-fluid main"
ng-class=
"{'grafana-dashboard-hide-controls': dashboard.current.hideControls}"
>
<div
class=
"row-fluid"
>
<div
class=
"row-fluid container"
style=
"margin-top:10px; width:98%"
>
...
...
src/css/bootstrap.dark.min.css
View file @
a4adec42
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/vendor/angular/angular-strap.js
View file @
a4adec42
...
...
@@ -546,7 +546,6 @@ angular.module('$strap.directives').directive('bsPopover', [
$
(
'body'
).
on
(
'keyup'
,
function
(
ev
)
{
if
(
ev
.
keyCode
===
27
)
{
$
(
'.popover.in'
).
each
(
function
()
{
debugger
;
$
(
this
).
popover
(
'hide'
);
});
}
...
...
src/vendor/bootstrap/less/grafana.less
View file @
a4adec42
...
...
@@ -30,9 +30,19 @@
}
}
.filter-pulldown {
background: #444;
overflow: hidden;
border-top: 1px solid #111;
border-bottom: 1px solid #111;
}
.top-row-open {
float: left;
padding: 0 10px;
padding: 0px;
}
.top-row-open {
background: none;
}
.panelCont {
...
...
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