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
a127f2d5
Commit
a127f2d5
authored
Feb 03, 2015
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed png rendering
parent
16acdfc7
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
8 additions
and
9 deletions
+8
-9
src/app/controllers/loginCtrl.js
+0
-1
src/app/features/dashboard/all.js
+0
-1
src/app/features/panel/all.js
+1
-0
src/app/features/panel/partials/panelTime.html
+0
-0
src/app/features/panel/partials/soloPanel.html
+1
-1
src/app/features/panel/soloPanelCtrl.js
+4
-4
src/app/panels/graph/module.js
+1
-1
src/app/routes/backend/all.js
+1
-1
No files found.
src/app/controllers/loginCtrl.js
View file @
a127f2d5
...
...
@@ -89,7 +89,6 @@ function (angular, config) {
backendSrv
.
post
(
'/login'
,
$scope
.
formModel
).
then
(
function
(
result
)
{
if
(
result
.
redirectUrl
)
{
console
.
log
(
result
);
window
.
location
.
href
=
result
.
redirectUrl
;
}
else
{
window
.
location
.
href
=
config
.
appSubUrl
+
'/'
;
...
...
src/app/features/dashboard/all.js
View file @
a127f2d5
...
...
@@ -9,7 +9,6 @@ define([
'./keybindings'
,
'./viewStateSrv'
,
'./playlistSrv'
,
'./soloPanelCtrl'
,
'./timeSrv'
,
'./unsavedChangesSrv'
,
],
function
()
{});
src/app/features/panel/all.js
View file @
a127f2d5
...
...
@@ -2,4 +2,5 @@ define([
'./panelMenu'
,
'./panelDirective'
,
'./panelSrv'
,
'./soloPanelCtrl'
,
],
function
()
{});
src/app/features/
dashboard
/partials/panelTime.html
→
src/app/features/
panel
/partials/panelTime.html
View file @
a127f2d5
File moved
src/app/
partials/solo-p
anel.html
→
src/app/
features/panel/partials/soloP
anel.html
View file @
a127f2d5
...
...
@@ -2,7 +2,7 @@
<div
class=
"row-fluid"
>
<div
class=
"span12"
>
<div
class=
"panel nospace"
ng-if=
"panel"
style=
"width: 100%"
>
<
grafana-panel
type=
"panel.type"
ng-cloak
></kibana-panel
>
<
panel-loader
type=
"panel.type"
ng-cloak
></panel-loader
>
</div>
</div>
</div>
src/app/features/
dashboard
/soloPanelCtrl.js
→
src/app/features/
panel
/soloPanelCtrl.js
View file @
a127f2d5
...
...
@@ -16,15 +16,15 @@ function (angular, $) {
panelId
=
parseInt
(
params
.
panelId
);
db
.
getDashboard
(
$routeParams
.
id
,
false
)
.
then
(
function
(
dashboard
Data
)
{
$scope
.
initPanelScope
(
dashboard
Data
);
.
then
(
function
(
dashboard
)
{
$scope
.
initPanelScope
(
dashboard
);
}).
then
(
null
,
function
(
error
)
{
$scope
.
appEvent
(
'alert-error'
,
[
'Load panel error'
,
error
]);
});
};
$scope
.
initPanelScope
=
function
(
dashboard
Data
)
{
$scope
.
dashboard
=
dashboardSrv
.
create
(
dashboard
Data
);
$scope
.
initPanelScope
=
function
(
dashboard
)
{
$scope
.
dashboard
=
dashboardSrv
.
create
(
dashboard
.
model
);
$scope
.
grafana
.
style
=
$scope
.
dashboard
.
style
;
$scope
.
row
=
{
height
:
$
(
window
).
height
()
+
'px'
,
...
...
src/app/panels/graph/module.js
View file @
a127f2d5
...
...
@@ -34,7 +34,7 @@ function (angular, app, $, _, kbn, moment, TimeSeries, PanelMeta) {
$scope
.
panelMeta
.
addEditorTab
(
'Axes & Grid'
,
'app/panels/graph/axisEditor.html'
);
$scope
.
panelMeta
.
addEditorTab
(
'Display Styles'
,
'app/panels/graph/styleEditor.html'
);
$scope
.
panelMeta
.
addEditorTab
(
'Time range'
,
'app/features/
dashboard
/partials/panelTime.html'
);
$scope
.
panelMeta
.
addEditorTab
(
'Time range'
,
'app/features/
panel
/partials/panelTime.html'
);
$scope
.
panelMeta
.
addExtendedMenuItem
(
'Export CSV'
,
''
,
'exportCsv()'
);
$scope
.
panelMeta
.
addExtendedMenuItem
(
'Toggle legend'
,
''
,
'toggleLegend()'
);
...
...
src/app/routes/backend/all.js
View file @
a127f2d5
...
...
@@ -67,7 +67,7 @@ define([
controller
:
'LoginCtrl'
,
})
.
when
(
'/dashboard/solo/:id/'
,
{
templateUrl
:
'app/
partials/solo-p
anel.html'
,
templateUrl
:
'app/
features/panel/partials/soloP
anel.html'
,
controller
:
'SoloPanelCtrl'
,
})
.
otherwise
({
...
...
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