IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: Configuration: Users should also use the Page component

Browse Source
This commit is contained in:
Johannes Schill 2019-01-14 16:53:26 +01:00
parent 06d8243ab5
commit b2961a4b4a
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/datasources/DataSourcesListPage.tsx
View File

@ -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}>
<>

17
public/app/features/users/UsersListPage.tsx
View File

@ -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>
);
}
}