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
b2961a4b
Commit
b2961a4b
authored
Jan 14, 2019
by
Johannes Schill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: Configuration: Users should also use the Page component
parent
06d8243a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
9 deletions
+10
-9
public/app/features/datasources/DataSourcesListPage.tsx
+1
-1
public/app/features/users/UsersListPage.tsx
+9
-8
No files found.
public/app/features/datasources/DataSourcesListPage.tsx
View file @
b2961a4b
...
...
@@ -66,7 +66,7 @@ export class DataSourcesListPage extends PureComponent<Props> {
};
return
(
<
Page
title=
"Data Sources"
>
<
Page
title=
"
Configuration:
Data Sources"
>
<
Page
.
Header
model=
{
navModel
}
/>
<
Page
.
Contents
isLoading=
{
!
hasFetched
}
>
<>
...
...
public/app/features/users/UsersListPage.tsx
View file @
b2961a4b
...
...
@@ -2,8 +2,7 @@ import React, { PureComponent } from 'react';
import
{
hot
}
from
'react-hot-loader'
;
import
{
connect
}
from
'react-redux'
;
import
Remarkable
from
'remarkable'
;
import
PageHeader
from
'app/core/components/PageHeader/PageHeader'
;
import
PageLoader
from
'app/core/components/PageLoader/PageLoader'
;
import
Page
from
'app/core/components/Page/Page'
;
import
UsersActionBar
from
'./UsersActionBar'
;
import
UsersTable
from
'./UsersTable'
;
import
InviteesTable
from
'./InviteesTable'
;
...
...
@@ -105,16 +104,18 @@ export class UsersListPage extends PureComponent<Props, State> {
const
externalUserMngInfoHtml
=
this
.
externalUserMngInfoHtml
;
return
(
<
div
>
<
PageHeader
model=
{
navModel
}
/>
<
div
className=
"page-container page-body"
>
<
Page
title=
"Configuration: Users"
>
<
Page
.
Header
model=
{
navModel
}
/>
<
Page
.
Contents
isLoading=
{
!
hasFetched
}
>
<>
<
UsersActionBar
onShowInvites=
{
this
.
onShowInvites
}
showInvites=
{
this
.
state
.
showInvites
}
/>
{
externalUserMngInfoHtml
&&
(
<
div
className=
"grafana-info-box"
dangerouslySetInnerHTML=
{
{
__html
:
externalUserMngInfoHtml
}
}
/>
)
}
{
hasFetched
?
this
.
renderTable
()
:
<
PageLoader
pageName=
"Users"
/>
}
</
div
>
</
div
>
{
hasFetched
&&
this
.
renderTable
()
}
</>
</
Page
.
Contents
>
</
Page
>
);
}
}
...
...
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