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
e4c0c39f
Commit
e4c0c39f
authored
Mar 15, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ux(): began work on updating data source list to cards view
parent
1abdd170
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
61 additions
and
6 deletions
+61
-6
pkg/api/datasources.go
+16
-3
pkg/api/dtos/models.go
+15
-0
public/app/features/plugins/partials/ds_list.html
+26
-2
public/app/features/plugins/partials/plugin_list.html
+1
-1
public/sass/components/_cards.scss
+3
-0
No files found.
pkg/api/datasources.go
View file @
e4c0c39f
package
api
import
(
"sort"
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/plugins"
//"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/middleware"
m
"github.com/grafana/grafana/pkg/models"
...
...
@@ -17,9 +20,10 @@ func GetDataSources(c *middleware.Context) {
return
}
result
:=
make
([]
*
dtos
.
DataSource
,
len
(
query
.
Result
))
for
i
,
ds
:=
range
query
.
Result
{
result
[
i
]
=
&
dtos
.
DataSource
{
result
:=
make
(
dtos
.
DataSourceList
,
0
)
for
_
,
ds
:=
range
query
.
Result
{
dsItem
:=
dtos
.
DataSource
{
Id
:
ds
.
Id
,
OrgId
:
ds
.
OrgId
,
Name
:
ds
.
Name
,
...
...
@@ -32,8 +36,17 @@ func GetDataSources(c *middleware.Context) {
BasicAuth
:
ds
.
BasicAuth
,
IsDefault
:
ds
.
IsDefault
,
}
if
plugin
,
exists
:=
plugins
.
DataSources
[
ds
.
Type
];
exists
{
dsItem
.
TypeLogoUrl
=
plugin
.
Info
.
Logos
.
Small
}
else
{
dsItem
.
TypeLogoUrl
=
"public/img/plugin-default-logo_dark.svg"
}
result
=
append
(
result
,
dsItem
)
}
sort
.
Sort
(
result
)
c
.
JSON
(
200
,
result
)
}
...
...
pkg/api/dtos/models.go
View file @
e4c0c39f
...
...
@@ -62,6 +62,7 @@ type DataSource struct {
OrgId
int64
`json:"orgId"`
Name
string
`json:"name"`
Type
string
`json:"type"`
TypeLogoUrl
string
`json:"typeLogoUrl"`
Access
m
.
DsAccess
`json:"access"`
Url
string
`json:"url"`
Password
string
`json:"password"`
...
...
@@ -75,6 +76,20 @@ type DataSource struct {
JsonData
*
simplejson
.
Json
`json:"jsonData,omitempty"`
}
type
DataSourceList
[]
DataSource
func
(
slice
DataSourceList
)
Len
()
int
{
return
len
(
slice
)
}
func
(
slice
DataSourceList
)
Less
(
i
,
j
int
)
bool
{
return
slice
[
i
]
.
Name
<
slice
[
j
]
.
Name
}
func
(
slice
DataSourceList
)
Swap
(
i
,
j
int
)
{
slice
[
i
],
slice
[
j
]
=
slice
[
j
],
slice
[
i
]
}
type
MetricQueryResultDto
struct
{
Data
[]
MetricQueryResultDataDto
`json:"data"`
}
...
...
public/app/features/plugins/partials/ds_list.html
View file @
e4c0c39f
...
...
@@ -13,7 +13,31 @@
</a>
</div>
<br>
<section
class=
"card-section"
layout-mode
>
<layout-selector></layout-selector>
<ol
class=
"card-list"
>
<li
class=
"card-item-wrapper"
ng-repeat=
"ds in ctrl.datasources"
>
<div
class=
"card-item"
>
<div
class=
"card-item-header"
>
<i
class=
"icon-gf icon-gf-{{ds.type}}"
></i>
{{ds.type}}
</div>
<div
class=
"card-item-body"
>
<a
href=
"datasources/edit/{{ds.id}}"
>
<figure
class=
"card-item-figure"
>
<img
ng-src=
"{{ds.typeLogoUrl}}"
>
</figure>
</a>
<div
class=
"card-item-details"
>
<a
class=
"card-item-name"
href=
"datasources/edit/{{ds.id}}/"
>
{{ds.name}}
</a>
<div
class=
"card-item-sub-name"
>
{{ds.url}}
</div>
</div>
</div>
</div>
</li>
</ol>
</section>
<div
ng-if=
"ctrl.datasources.length === 0"
>
<em>
No data sources defined
</em>
...
...
@@ -63,5 +87,5 @@
</tbody>
</table>
</div>
</div>
</div>
public/app/features/plugins/partials/plugin_list.html
View file @
e4c0c39f
...
...
@@ -41,7 +41,7 @@
<img
ng-src=
"{{plugin.info.logos.small}}"
>
</figure>
<div
class=
"card-item-details"
>
<div
class=
"card-item-name"
href=
"plugins/{{plugin.id}}/edit"
>
{{plugin.name}}
</div>
<div
class=
"card-item-name"
>
{{plugin.name}}
</div>
<div
class=
"card-item-sub-name"
>
By {{plugin.info.author.name}}
</div>
</div>
</div>
...
...
public/sass/components/_cards.scss
View file @
e4c0c39f
...
...
@@ -56,7 +56,10 @@
.card-item-header
{
color
:
$text-color-weak
;
text-transform
:
uppercase
;
margin-bottom
:
$spacer
;
font-size
:
$font-size-sm
;
font-weight
:
bold
;
}
.card-item-name
{
...
...
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