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
9c0141e8
Commit
9c0141e8
authored
Nov 24, 2015
by
Joakim Lahtinen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some broken HTML.
Simplified some control flow.
parent
24b9bc1e
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
16 additions
and
26 deletions
+16
-26
public/app/core/settings.js
+1
-2
public/app/core/store.js
+1
-1
public/app/features/dashboard/dashboardSrv.js
+5
-6
public/app/features/dashboard/partials/graphiteImport.html
+1
-1
public/app/features/dashboard/unsavedChangesSrv.js
+1
-5
public/app/features/dashlinks/module.js
+1
-1
public/app/features/org/partials/orgUsers.html
+1
-1
public/app/features/panel/panel_menu.js
+1
-2
public/app/panels/text/lib/showdown.js
+2
-2
public/app/plugins/datasource/influxdb/query_builder.js
+1
-2
public/app/plugins/datasource/prometheus/datasource.js
+1
-3
No files found.
public/app/core/settings.js
View file @
9c0141e8
...
@@ -22,7 +22,6 @@ function (_) {
...
@@ -22,7 +22,6 @@ function (_) {
appSubUrl
:
""
appSubUrl
:
""
};
};
var
settings
=
_
.
extend
({},
defaults
,
options
);
return
_
.
extend
({},
defaults
,
options
);
return
settings
;
};
};
});
});
public/app/core/store.js
View file @
9c0141e8
...
@@ -12,7 +12,7 @@ define([], function() {
...
@@ -12,7 +12,7 @@ define([], function() {
if
(
def
!==
void
0
&&
!
this
.
exists
(
key
))
{
if
(
def
!==
void
0
&&
!
this
.
exists
(
key
))
{
return
def
;
return
def
;
}
}
return
window
.
localStorage
[
key
]
===
'true'
?
true
:
false
;
return
window
.
localStorage
[
key
]
===
'true'
;
},
},
exists
:
function
(
key
)
{
exists
:
function
(
key
)
{
return
window
.
localStorage
[
key
]
!==
void
0
;
return
window
.
localStorage
[
key
]
!==
void
0
;
...
...
public/app/features/dashboard/dashboardSrv.js
View file @
9c0141e8
...
@@ -26,7 +26,7 @@ function (angular, $, _, moment) {
...
@@ -26,7 +26,7 @@ function (angular, $, _, moment) {
this
.
tags
=
data
.
tags
||
[];
this
.
tags
=
data
.
tags
||
[];
this
.
style
=
data
.
style
||
"dark"
;
this
.
style
=
data
.
style
||
"dark"
;
this
.
timezone
=
data
.
timezone
||
'browser'
;
this
.
timezone
=
data
.
timezone
||
'browser'
;
this
.
editable
=
data
.
editable
===
false
?
false
:
tru
e
;
this
.
editable
=
data
.
editable
!==
fals
e
;
this
.
hideControls
=
data
.
hideControls
||
false
;
this
.
hideControls
=
data
.
hideControls
||
false
;
this
.
sharedCrosshair
=
data
.
sharedCrosshair
||
false
;
this
.
sharedCrosshair
=
data
.
sharedCrosshair
||
false
;
this
.
rows
=
data
.
rows
||
[];
this
.
rows
=
data
.
rows
||
[];
...
@@ -48,10 +48,10 @@ function (angular, $, _, moment) {
...
@@ -48,10 +48,10 @@ function (angular, $, _, moment) {
p
.
_initMeta
=
function
(
meta
)
{
p
.
_initMeta
=
function
(
meta
)
{
meta
=
meta
||
{};
meta
=
meta
||
{};
meta
.
canShare
=
meta
.
canShare
===
false
?
false
:
tru
e
;
meta
.
canShare
=
meta
.
canShare
!==
fals
e
;
meta
.
canSave
=
meta
.
canSave
===
false
?
false
:
tru
e
;
meta
.
canSave
=
meta
.
canSave
!==
fals
e
;
meta
.
canStar
=
meta
.
canStar
===
false
?
false
:
tru
e
;
meta
.
canStar
=
meta
.
canStar
!==
fals
e
;
meta
.
canEdit
=
meta
.
canEdit
===
false
?
false
:
tru
e
;
meta
.
canEdit
=
meta
.
canEdit
!==
fals
e
;
if
(
!
this
.
editable
)
{
if
(
!
this
.
editable
)
{
meta
.
canEdit
=
false
;
meta
.
canEdit
=
false
;
...
@@ -151,7 +151,6 @@ function (angular, $, _, moment) {
...
@@ -151,7 +151,6 @@ function (angular, $, _, moment) {
result
.
panel
=
panel
;
result
.
panel
=
panel
;
result
.
row
=
row
;
result
.
row
=
row
;
result
.
index
=
index
;
result
.
index
=
index
;
return
;
}
}
});
});
});
});
...
...
public/app/features/dashboard/partials/graphiteImport.html
View file @
9c0141e8
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
<td>
<td>
<button
class=
"btn btn-inverse pull-right"
ng-click=
"import(dash.name)"
>
<button
class=
"btn btn-inverse pull-right"
ng-click=
"import(dash.name)"
>
Load
Load
</
a
>
</
button
>
</td>
</td>
</tr>
</tr>
</table>
</table>
...
...
public/app/features/dashboard/unsavedChangesSrv.js
View file @
9c0141e8
...
@@ -122,11 +122,7 @@ function(angular, _) {
...
@@ -122,11 +122,7 @@ function(angular, _) {
var
currentJson
=
angular
.
toJson
(
current
);
var
currentJson
=
angular
.
toJson
(
current
);
var
originalJson
=
angular
.
toJson
(
original
);
var
originalJson
=
angular
.
toJson
(
original
);
if
(
currentJson
!==
originalJson
)
{
return
currentJson
!==
originalJson
;
return
true
;
}
return
false
;
};
};
p
.
open_modal
=
function
()
{
p
.
open_modal
=
function
()
{
...
...
public/app/features/dashlinks/module.js
View file @
9c0141e8
...
@@ -52,7 +52,7 @@ function (angular, _) {
...
@@ -52,7 +52,7 @@ function (angular, _) {
if
(
link
.
asDropdown
)
{
if
(
link
.
asDropdown
)
{
template
+=
'<ul class="dropdown-menu" role="menu">'
+
template
+=
'<ul class="dropdown-menu" role="menu">'
+
'<li ng-repeat="dash in link.searchHits"><a href="{{dash.url}}"><i class="fa fa-th-large"></i> {{dash.title}}</a></li>'
+
'<li ng-repeat="dash in link.searchHits"><a href="{{dash.url}}"><i class="fa fa-th-large"></i> {{dash.title}}</a></li>'
+
'</ul'
;
'</ul
>
'
;
}
}
elem
.
html
(
template
);
elem
.
html
(
template
);
...
...
public/app/features/org/partials/orgUsers.html
View file @
9c0141e8
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
{{invite.email}}
{{invite.email}}
<span
ng-show=
"invite.name"
style=
"padding-left: 20px"
>
{{invite.name}}
</span>
<span
ng-show=
"invite.name"
style=
"padding-left: 20px"
>
{{invite.name}}
</span>
<span
class=
"pull-right"
>
<span
class=
"pull-right"
>
<button
class=
"btn btn-inverse btn-mini "
data-clipboard-text=
"{{invite.url}}"
clipboard-button
ng-click=
"copyInviteToClipboard($event)"
<button
class=
"btn btn-inverse btn-mini "
data-clipboard-text=
"{{invite.url}}"
clipboard-button
ng-click=
"copyInviteToClipboard($event)"
>
<i
class=
"fa fa-clipboard"
></i>
Copy Invite
<i
class=
"fa fa-clipboard"
></i>
Copy Invite
</button>
</button>
...
...
public/app/features/panel/panel_menu.js
View file @
9c0141e8
...
@@ -64,8 +64,7 @@ function (angular, $, _) {
...
@@ -64,8 +64,7 @@ function (angular, $, _) {
}
}
function
getExtendedMenu
(
$scope
)
{
function
getExtendedMenu
(
$scope
)
{
var
menu
=
angular
.
copy
(
$scope
.
panelMeta
.
extendedMenu
);
return
angular
.
copy
(
$scope
.
panelMeta
.
extendedMenu
);
return
menu
;
}
}
return
{
return
{
...
...
public/app/panels/text/lib/showdown.js
View file @
9c0141e8
...
@@ -855,7 +855,7 @@ var _DoLists = function(text) {
...
@@ -855,7 +855,7 @@ var _DoLists = function(text) {
// Turn double returns into triple returns, so that we can make a
// Turn double returns into triple returns, so that we can make a
// paragraph for the last item in a list, if necessary:
// paragraph for the last item in a list, if necessary:
list
=
list
.
replace
(
/
\n{2,}
/g
,
"
\
n
\
n
\
n"
);
;
list
=
list
.
replace
(
/
\n{2,}
/g
,
"
\
n
\
n
\
n"
);
var
result
=
_ProcessListItems
(
list
);
var
result
=
_ProcessListItems
(
list
);
// Trim any trailing whitespace, to put the closing `</$list_type>`
// Trim any trailing whitespace, to put the closing `</$list_type>`
...
@@ -875,7 +875,7 @@ var _DoLists = function(text) {
...
@@ -875,7 +875,7 @@ var _DoLists = function(text) {
var
list_type
=
(
m3
.
search
(
/
[
*+-
]
/g
)
>-
1
)
?
"ul"
:
"ol"
;
var
list_type
=
(
m3
.
search
(
/
[
*+-
]
/g
)
>-
1
)
?
"ul"
:
"ol"
;
// Turn double returns into triple returns, so that we can make a
// Turn double returns into triple returns, so that we can make a
// paragraph for the last item in a list, if necessary:
// paragraph for the last item in a list, if necessary:
var
list
=
list
.
replace
(
/
\n{2,}
/g
,
"
\
n
\
n
\
n"
);
;
list
=
list
.
replace
(
/
\n{2,}
/g
,
"
\
n
\
n
\
n"
)
;
var
result
=
_ProcessListItems
(
list
);
var
result
=
_ProcessListItems
(
list
);
result
=
runup
+
"<"
+
list_type
+
">
\
n"
+
result
+
"</"
+
list_type
+
">
\
n"
;
result
=
runup
+
"<"
+
list_type
+
">
\
n"
+
result
+
"</"
+
list_type
+
">
\
n"
;
return
result
;
return
result
;
...
...
public/app/plugins/datasource/influxdb/query_builder.js
View file @
9c0141e8
...
@@ -161,8 +161,7 @@ function (_) {
...
@@ -161,8 +161,7 @@ function (_) {
};
};
p
.
_modifyRawQuery
=
function
()
{
p
.
_modifyRawQuery
=
function
()
{
var
query
=
this
.
target
.
query
.
replace
(
";"
,
""
);
return
this
.
target
.
query
.
replace
(
";"
,
""
);
return
query
;
};
};
return
InfluxQueryBuilder
;
return
InfluxQueryBuilder
;
...
...
public/app/plugins/datasource/prometheus/datasource.js
View file @
9c0141e8
...
@@ -111,11 +111,9 @@ function (angular, _, moment, dateMath) {
...
@@ -111,11 +111,9 @@ function (angular, _, moment, dateMath) {
var
url
=
'/api/v1/label/__name__/values'
;
var
url
=
'/api/v1/label/__name__/values'
;
return
this
.
_request
(
'GET'
,
url
).
then
(
function
(
result
)
{
return
this
.
_request
(
'GET'
,
url
).
then
(
function
(
result
)
{
var
suggestData
=
_
.
filter
(
result
.
data
.
data
,
function
(
metricName
)
{
return
_
.
filter
(
result
.
data
.
data
,
function
(
metricName
)
{
return
metricName
.
indexOf
(
query
)
!==
1
;
return
metricName
.
indexOf
(
query
)
!==
1
;
});
});
return
suggestData
;
});
});
};
};
...
...
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