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
a15984b6
Commit
a15984b6
authored
Jan 12, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(apps): pages work
parent
4c59e48c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
19 deletions
+27
-19
pkg/api/dtos/apps.go
+8
-6
pkg/plugins/app_plugin.go
+3
-3
pkg/plugins/models.go
+2
-0
public/app/features/apps/partials/edit.html
+14
-10
No files found.
pkg/api/dtos/apps.go
View file @
a15984b6
...
...
@@ -6,12 +6,13 @@ import (
)
type
AppSettings
struct
{
Name
string
`json:"name"`
AppId
string
`json:"appId"`
Enabled
bool
`json:"enabled"`
Pinned
bool
`json:"pinned"`
Info
*
plugins
.
PluginInfo
`json:"info"`
JsonData
map
[
string
]
interface
{}
`json:"jsonData"`
Name
string
`json:"name"`
AppId
string
`json:"appId"`
Enabled
bool
`json:"enabled"`
Pinned
bool
`json:"pinned"`
Info
*
plugins
.
PluginInfo
`json:"info"`
Pages
[]
*
plugins
.
AppPluginPage
`json:"pages"`
JsonData
map
[
string
]
interface
{}
`json:"jsonData"`
}
func
NewAppSettingsDto
(
def
*
plugins
.
AppPlugin
,
data
*
models
.
AppSettings
)
*
AppSettings
{
...
...
@@ -19,6 +20,7 @@ func NewAppSettingsDto(def *plugins.AppPlugin, data *models.AppSettings) *AppSet
AppId
:
def
.
Id
,
Name
:
def
.
Name
,
Info
:
&
def
.
Info
,
Pages
:
def
.
Pages
,
}
if
data
!=
nil
{
...
...
pkg/plugins/app_plugin.go
View file @
a15984b6
...
...
@@ -7,7 +7,7 @@ import (
)
type
AppPluginPage
struct
{
Text
string
`json:"text
"`
Name
string
`json:"name
"`
Url
string
`json:"url"`
ReqRole
models
.
RoleType
`json:"reqRole"`
}
...
...
@@ -19,8 +19,8 @@ type AppPluginCss struct {
type
AppPlugin
struct
{
FrontendPluginBase
Css
*
AppPluginCss
`json:"css"`
Page
[]
*
AppPluginPage
`json:"page
"`
Css
*
AppPluginCss
`json:"css"`
Page
s
[]
*
AppPluginPage
`json:"pages
"`
Pinned
bool
`json:"-"`
Enabled
bool
`json:"-"`
...
...
pkg/plugins/models.go
View file @
a15984b6
...
...
@@ -24,6 +24,8 @@ type PluginInfo struct {
Description
string
`json:"description"`
Links
[]
PluginInfoLink
`json:"links"`
Logos
PluginLogos
`json:"logos"`
Version
string
`json:"version"`
Updated
string
`json:"updated"`
}
type
PluginInfoLink
struct
{
...
...
public/app/features/apps/partials/edit.html
View file @
a15984b6
...
...
@@ -21,9 +21,15 @@
</div>
<div
class=
"page-wide-margined"
ng-init=
"ctrl.init()"
>
<h1>
{{ctrl.appModel.name}}
</h1>
<h1>
{{ctrl.appModel.name}}
</h1>
<em>
{{ctrl.appModel.info.description}}
{{ctrl.appModel.info.description}}
<br>
<span
style=
"small"
>
Version: {{ctrl.appModel.info.version}}
Updated: {{ctrl.appModel.info.updated}}
</span>
</em>
<br><br>
...
...
@@ -42,8 +48,7 @@
Dashboards
</div>
<ul>
<li>
Test
</li>
<li>
Test2
</li>
<li><em
class=
"small"
>
None
</em></li>
</ul>
</div>
<div
class=
"simple-box-body simple-box-column"
>
...
...
@@ -52,8 +57,7 @@
Panels
</div>
<ul>
<li>
Test
</li>
<li>
Test2
</li>
<li><em
class=
"small"
>
None
</em></li>
</ul>
</div>
<div
class=
"simple-box-body simple-box-column"
>
...
...
@@ -62,8 +66,7 @@
Datasources
</div>
<ul>
<li>
Test
</li>
<li>
Test2
</li>
<li><em
class=
"small"
>
None
</em></li>
</ul>
</div>
<div
class=
"simple-box-body simple-box-column"
>
...
...
@@ -72,8 +75,9 @@
Pages
</div>
<ul>
<li>
Test
</li>
<li>
Test2
</li>
<li
ng-repeat=
"page in ctrl.appModel.pages"
>
<a
href=
"{{page.url}}"
class=
"external-link"
>
{{page.name}}
</a>
</li>
</ul>
</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