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
9ac1f6b2
Commit
9ac1f6b2
authored
Aug 16, 2014
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/move_stuff' into pro
parents
dac49542
5846c710
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
32 additions
and
33 deletions
+32
-33
src/app/components/kbn.js
+1
-1
src/app/controllers/all.js
+2
-2
src/app/controllers/dashboardCtrl.js
+1
-1
src/app/controllers/dashboardNavCtrl.js
+1
-1
src/app/partials/dashboard.html
+2
-9
src/app/partials/dashboard_topnav.html
+25
-19
No files found.
src/app/components/kbn.js
View file @
9ac1f6b2
...
...
@@ -526,7 +526,7 @@ function($, _, moment) {
};
default
:
return
function
(
val
,
axis
)
{
return
kbn
.
noneFormat
(
val
,
axis
?
axis
.
tickDecimals
:
decimals
);
return
kbn
.
noneFormat
(
val
,
axis
?
axis
.
tickDecimals
:
null
);
};
}
};
...
...
src/app/controllers/all.js
View file @
9ac1f6b2
define
([
'./grafanaCtrl'
,
'./dash'
,
'./dash
Loader
'
,
'./dash
boardCtrl
'
,
'./dash
boardNavCtrl
'
,
'./row'
,
'./submenuCtrl'
,
'./pulldown'
,
...
...
src/app/controllers/dash.js
→
src/app/controllers/dash
boardCtrl
.js
View file @
9ac1f6b2
...
...
@@ -10,7 +10,7 @@ function (angular, $, config, _) {
var
module
=
angular
.
module
(
'grafana.controllers'
);
module
.
controller
(
'DashCtrl'
,
function
(
module
.
controller
(
'Dash
board
Ctrl'
,
function
(
$scope
,
$rootScope
,
dashboardKeybindings
,
filterSrv
,
dashboardSrv
,
dashboardViewStateSrv
,
panelMoveSrv
,
timer
)
{
...
...
src/app/controllers/dash
Loader
.js
→
src/app/controllers/dash
boardNavCtrl
.js
View file @
9ac1f6b2
...
...
@@ -10,7 +10,7 @@ function (angular, _, moment, config) {
var
module
=
angular
.
module
(
'grafana.controllers'
);
module
.
controller
(
'
dashLoader'
,
function
(
$scope
,
$rootScope
,
$http
,
alertSrv
,
$location
,
playlistSrv
,
datasourceSrv
)
{
module
.
controller
(
'
DashboardNavCtrl'
,
function
(
$scope
,
$rootScope
,
alertSrv
,
$location
,
playlistSrv
,
datasourceSrv
)
{
$scope
.
init
=
function
()
{
$scope
.
db
=
datasourceSrv
.
getGrafanaDB
();
...
...
src/app/partials/dashboard.html
View file @
9ac1f6b2
<div
ng-controller=
"DashCtrl"
body-class
ng-class=
"{'dashboard-fullscreen': dashboardViewState.fullscreen}"
>
<div
ng-controller=
"Dash
board
Ctrl"
body-class
ng-class=
"{'dashboard-fullscreen': dashboardViewState.fullscreen}"
>
<div
class=
"navbar navbar-static-top"
>
<div
class=
"navbar-inner"
>
<div
class=
"container-fluid"
>
<span
class=
"brand"
><img
src=
"img/small.png"
bs-tooltip=
"'Grafana'"
data-placement=
"bottom"
>
{{dashboard.title}}
</span>
<ul
class=
"nav pull-right"
ng-controller=
'dashLoader'
ng-init=
"init()"
ng-include=
"'app/partials/dashLoader.html'"
>
</ul>
</div>
</div>
<div
ng-include=
"'app/partials/dashboard_topnav.html'"
>
</div>
<div
class=
"submenu-controls"
>
...
...
src/app/partials/dash
Loader
.html
→
src/app/partials/dash
board_topnav
.html
View file @
9ac1f6b2
<
style
>
.noarrow
>
a
:after
{
display
:
none
!important
;
}
</style
>
<
div
class=
"navbar navbar-static-top"
>
<div
class=
"navbar-inner"
>
<div
class=
"container-fluid"
>
<span
class=
"brand"
><img
src=
"img/small.png"
bs-tooltip=
"'Grafana'"
data-placement=
"bottom"
>
{{dashboard.title}}
</span>
<ul
class=
"nav pull-right"
ng-controller=
'DashboardNavCtrl'
ng-init=
"init()"
>
<li
ng-show=
"dashboardViewState.fullscreen"
>
<li
ng-show=
"dashboardViewState.fullscreen"
>
<a
ng-click=
"exitFullscreen()"
>
Back to dashboard
</a>
</li>
</li>
<li
class=
"grafana-menu-zoom-out"
>
<li
class=
"grafana-menu-zoom-out"
>
<a
class=
'small'
ng-click=
'zoom(2)'
>
Zoom Out
</a>
</li>
</li>
<li
ng-repeat=
"pulldown in dashboard.nav"
ng-controller=
"PulldownCtrl"
ng-show=
"pulldown.enable"
>
<li
ng-repeat=
"pulldown in dashboard.nav"
ng-controller=
"PulldownCtrl"
ng-show=
"pulldown.enable"
>
<grafana-simple-panel
type=
"pulldown.type"
ng-cloak
>
</grafana-simple-panel>
</li>
</li>
<li
class=
"dropdown grafana-menu-save"
>
<li
class=
"dropdown grafana-menu-save"
>
<a
href=
"#"
bs-tooltip=
"'Save'"
data-placement=
"bottom"
class=
"dropdown-toggle"
data-toggle=
"dropdown"
ng-click=
"openSaveDropdown()"
>
<i
class=
'icon-save'
></i>
</a>
...
...
@@ -55,17 +55,23 @@
</a>
</li>
</ul>
</li>
</li>
<li
class=
"dropdown grafana-menu-load"
ng-controller=
"SearchCtrl"
ng-init=
"init()"
ng-include=
"'app/partials/search.html'"
>
</li>
<li
class=
"dropdown grafana-menu-load"
ng-controller=
"SearchCtrl"
ng-init=
"init()"
ng-include=
"'app/partials/search.html'"
>
</li>
<li
class=
"grafana-menu-home"
><a
bs-tooltip=
"'Goto saved default'"
data-placement=
"bottom"
href=
'#/'
><i
class=
'icon-home'
></i></a></li>
<li
class=
"grafana-menu-home"
><a
bs-tooltip=
"'Goto saved default'"
data-placement=
"bottom"
href=
'#/'
><i
class=
'icon-home'
></i></a></li>
<li
class=
"grafana-menu-edit"
ng-show=
"dashboard.editable"
bs-tooltip=
"'Configure dashboard'"
data-placement=
"bottom"
><a
class=
"link"
config-modal=
"app/partials/dasheditor.html"
><i
class=
'icon-cog pointer'
></i></a></li>
<li
class=
"grafana-menu-edit"
ng-show=
"dashboard.editable"
bs-tooltip=
"'Configure dashboard'"
data-placement=
"bottom"
><a
class=
"link"
config-modal=
"app/partials/dasheditor.html"
><i
class=
'icon-cog pointer'
></i></a></li>
<li
class=
"grafana-menu-stop-playlist hide"
>
<li
class=
"grafana-menu-stop-playlist hide"
>
<a
class=
'small'
ng-click=
'stopPlaylist(2)'
>
Stop playlist
</a>
</li>
</li>
</ul>
</div>
</div>
</div>
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