diff --git a/graylog2-web-interface/src/components/authentication/AccessTokenConfig.js b/graylog2-web-interface/src/components/authentication/AccessTokenConfig.js index 5f220def399b..554e2925a9fc 100644 --- a/graylog2-web-interface/src/components/authentication/AccessTokenConfig.js +++ b/graylog2-web-interface/src/components/authentication/AccessTokenConfig.js @@ -1,17 +1,21 @@ import React, { PropTypes } from 'react'; -import { PageHeader } from 'components/common'; +import { DocumentTitle, PageHeader } from 'components/common'; const AccessTokenConfig = React.createClass({ propTypes: { config: PropTypes.object, }, render() { - return ( - - Each user can generate access tokens to avoid having to use their main password in insecure scripts. - - There currently is no configuration available for access tokens. You can safely disable this authenticator if you do not use access tokens. - ); + return ( + + + + Each user can generate access tokens to avoid having to use their main password in insecure scripts. + + There currently is no configuration available for access tokens. You can safely disable this authenticator if you do not use access tokens. + + + ); }, }); diff --git a/graylog2-web-interface/src/components/authentication/AuthProvidersConfig.jsx b/graylog2-web-interface/src/components/authentication/AuthProvidersConfig.jsx index 9c5f9f1ddb7d..99ed263fc039 100644 --- a/graylog2-web-interface/src/components/authentication/AuthProvidersConfig.jsx +++ b/graylog2-web-interface/src/components/authentication/AuthProvidersConfig.jsx @@ -1,7 +1,7 @@ import React from 'react'; import { Row, Col, Button, Alert, Table } from 'react-bootstrap'; import BootstrapModalForm from 'components/bootstrap/BootstrapModalForm'; -import { PageHeader, IfPermitted, SortableList } from 'components/common'; +import { DocumentTitle, PageHeader, IfPermitted, SortableList } from 'components/common'; import Routes from 'routing/Routes'; import ObjectUtils from 'util/ObjectUtils'; import naturalSort from 'javascript-natural-sort'; @@ -143,61 +143,63 @@ const AuthProvidersConfig = React.createClass({ render() { return ( - - - The following authentication providers executed in order during login. Disabled providers will be - skipped.
A user is authenticated by the first matching provider, a successful match can cause a Graylog account for - this user to be created. - - - - - - - - - - - - - - - {this._summary()} - -
#ProviderDescriptionStatus
- - - - - - - -

Order

-

Use drag and drop to change the execution order of the authentication providers.

- - -

Status

-

Change the checkboxes to change the status of an authentication provider.

- + + + + The following authentication providers executed in order during login. Disabled providers will be + skipped.
A user is authenticated by the first matching provider, a successful match can cause a Graylog account for + this user to be created. + + + + +
+ - + + - {this._statusForm()} + {this._summary()}
# ProviderEnabledDescriptionStatus
- {this._noActiveRealmWarning()} - - - - + + + + + + + +

Order

+

Use drag and drop to change the execution order of the authentication providers.

+ + +

Status

+

Change the checkboxes to change the status of an authentication provider.

+ + + + + + + + + {this._statusForm()} + +
ProviderEnabled
+ {this._noActiveRealmWarning()} + + + + + ); }, }); diff --git a/graylog2-web-interface/src/components/authentication/LegacyLdapConfig.js b/graylog2-web-interface/src/components/authentication/LegacyLdapConfig.js index 39a7db8f49bd..af21c0ef937d 100644 --- a/graylog2-web-interface/src/components/authentication/LegacyLdapConfig.js +++ b/graylog2-web-interface/src/components/authentication/LegacyLdapConfig.js @@ -1,5 +1,5 @@ import React, { PropTypes } from 'react'; -import { PageHeader } from 'components/common'; +import { DocumentTitle, PageHeader } from 'components/common'; import { Button } from 'react-bootstrap'; import LdapComponent from 'components/ldap/LdapComponent'; @@ -41,16 +41,23 @@ const LegacyLdapConfig = React.createClass({ const toggleButtonText = this.state.showSettings ? 'LDAP Group Mapping' : 'LDAP Settings'; const activeComponent = this.state.showSettings ? : ; - return ( - - This page is the only resource you need to set up the Graylog LDAP integration. You can test the connection to your LDAP server and even try to log in with an LDAP account of your choice right away. - {null} + return ( + - + + + This page is the only resource you need to set up the Graylog LDAP integration. You can test the + connection to your LDAP server and even try to log in with an LDAP account of your choice right away. + + {null} + + + + + {activeComponent} - - {activeComponent} - ); + + ); }, }); diff --git a/graylog2-web-interface/src/components/authentication/MongoDbPasswordConfig.jsx b/graylog2-web-interface/src/components/authentication/MongoDbPasswordConfig.jsx index 0a7749d32989..8f9c0d7e437b 100644 --- a/graylog2-web-interface/src/components/authentication/MongoDbPasswordConfig.jsx +++ b/graylog2-web-interface/src/components/authentication/MongoDbPasswordConfig.jsx @@ -1,17 +1,21 @@ import React, { PropTypes } from 'react'; -import { PageHeader } from 'components/common'; +import { DocumentTitle, PageHeader } from 'components/common'; const MongoDbPasswordConfig = React.createClass({ propTypes: { config: PropTypes.object, }, render() { - return ( - - This authenticator uses the password stored in MongoDB to grant access to users, it usually runs last, so that other authentication sources have priority. - - If you only rely on external authentication systems, such as LDAP or Active Directory, you can disable this authenticator. It currently has no configuration options. - ); + return ( + + + + This authenticator uses the password stored in MongoDB to grant access to users, it usually runs last, so that other authentication sources have priority. + + If you only rely on external authentication systems, such as LDAP or Active Directory, you can disable this authenticator. It currently has no configuration options. + + + ); }, }); diff --git a/graylog2-web-interface/src/components/authentication/MongoDbSessionConfig.js b/graylog2-web-interface/src/components/authentication/MongoDbSessionConfig.js index 8852db442da6..48be5b79561a 100644 --- a/graylog2-web-interface/src/components/authentication/MongoDbSessionConfig.js +++ b/graylog2-web-interface/src/components/authentication/MongoDbSessionConfig.js @@ -1,17 +1,21 @@ import React, { PropTypes } from 'react'; -import { PageHeader } from 'components/common'; +import { DocumentTitle, PageHeader } from 'components/common'; const MongoDbSessionConfig = React.createClass({ propTypes: { config: PropTypes.object, }, render() { - return ( - - This authenticator uses the session supplied from the web interface to grant access to logged in users, it usually runs first. - - Since sessions are necessary to let the web interface function it cannot be disabled. - ); + return ( + + + + This authenticator uses the session supplied from the web interface to grant access to logged in users, it usually runs first. + + Since sessions are necessary to let the web interface function it cannot be disabled. + + + ); }, }); diff --git a/graylog2-web-interface/src/components/authentication/RootUserConfig.js b/graylog2-web-interface/src/components/authentication/RootUserConfig.js index c02b8c561149..8e492244febf 100644 --- a/graylog2-web-interface/src/components/authentication/RootUserConfig.js +++ b/graylog2-web-interface/src/components/authentication/RootUserConfig.js @@ -1,17 +1,21 @@ import React, { PropTypes } from 'react'; -import { PageHeader } from 'components/common'; +import { DocumentTitle, PageHeader } from 'components/common'; const RootUserConfig = React.createClass({ propTypes: { config: PropTypes.object, }, render() { - return ( - - This authenticator grants access to the admin user specified in the configuration file. - - Currently the admin user authenticator cannot be configured outside of the configuration file. It can also not be disabled at the moment. - ); + return ( + + + + This authenticator grants access to the admin user specified in the configuration file. + + Currently the admin user authenticator cannot be configured outside of the configuration file. It can also not be disabled at the moment. + + + ); }, }); diff --git a/graylog2-web-interface/src/components/common/DocumentTitle.jsx b/graylog2-web-interface/src/components/common/DocumentTitle.jsx index 16ecc32edf38..4102584ef7a8 100644 --- a/graylog2-web-interface/src/components/common/DocumentTitle.jsx +++ b/graylog2-web-interface/src/components/common/DocumentTitle.jsx @@ -10,16 +10,14 @@ const DocumentTitle = React.createClass({ }, componentDidMount() { - this.originalTitle = document.title; document.title = `${document.title} - ${this.props.title}`; }, componentWillUnmount() { - document.title = this.originalTitle; + document.title = this.defaultTitle; }, - originalTitle: undefined, - + defaultTitle: 'Graylog', render() { return this.props.children; }, diff --git a/graylog2-web-interface/src/components/gettingstarted/GettingStarted.jsx b/graylog2-web-interface/src/components/gettingstarted/GettingStarted.jsx index c57ce3bf97e7..a7d342f1d4e2 100644 --- a/graylog2-web-interface/src/components/gettingstarted/GettingStarted.jsx +++ b/graylog2-web-interface/src/components/gettingstarted/GettingStarted.jsx @@ -2,7 +2,7 @@ import React, { PropTypes } from 'react'; import { Button, Grid, Row, Col } from 'react-bootstrap'; import Qs from 'qs'; -import {Spinner} from 'components/common'; +import { Spinner } from 'components/common'; import ActionsProvider from 'injection/ActionsProvider'; const GettingStartedActions = ActionsProvider.getActions('GettingStarted'); diff --git a/graylog2-web-interface/src/components/ldap/LdapComponent.jsx b/graylog2-web-interface/src/components/ldap/LdapComponent.jsx index 52ce3a0049f4..22ae252472d6 100644 --- a/graylog2-web-interface/src/components/ldap/LdapComponent.jsx +++ b/graylog2-web-interface/src/components/ldap/LdapComponent.jsx @@ -64,7 +64,7 @@ const HelperText = { The default Graylog role determines whether a user created via Active Directory can access the entire system, or has limited access.
You can assign additional permissions by{' '} - mapping Active Directory groups to Graylog roles,{' '} + mapping Active Directory groups to Graylog roles,{' '} or you can assign additional Graylog roles to Active Directory users below. ), @@ -118,7 +118,7 @@ const HelperText = { The default Graylog role determines whether a user created via LDAP can access the entire system, or has limited access.
You can assign additional permissions by{' '} - mapping LDAP groups to Graylog roles,{' '} + mapping LDAP groups to Graylog roles,{' '} or you can assign additional Graylog roles to LDAP users below. ), diff --git a/graylog2-web-interface/src/components/ldap/LdapGroupsComponent.jsx b/graylog2-web-interface/src/components/ldap/LdapGroupsComponent.jsx index e1e9a5a7deb4..4874d4bfb3c7 100644 --- a/graylog2-web-interface/src/components/ldap/LdapGroupsComponent.jsx +++ b/graylog2-web-interface/src/components/ldap/LdapGroupsComponent.jsx @@ -95,7 +95,7 @@ const LdapGroupsComponent = React.createClass({ return (

No LDAP/Active Directory groups found. Please verify that your{' '} - LDAP group mapping{' '} + LDAP group mapping{' '} settings are correct.

); diff --git a/graylog2-web-interface/src/pages/AlertConditionsPage.jsx b/graylog2-web-interface/src/pages/AlertConditionsPage.jsx index a28334e41fca..27601c9e35ba 100644 --- a/graylog2-web-interface/src/pages/AlertConditionsPage.jsx +++ b/graylog2-web-interface/src/pages/AlertConditionsPage.jsx @@ -4,7 +4,7 @@ import { Button, Col, Row } from 'react-bootstrap'; import { LinkContainer } from 'react-router-bootstrap'; import DocumentationLink from 'components/support/DocumentationLink'; -import { PageHeader } from 'components/common'; +import { DocumentTitle, PageHeader } from 'components/common'; import { AlertConditionsComponent } from 'components/alertconditions'; import Routes from 'routing/Routes'; @@ -17,30 +17,32 @@ const AlertConditionsPage = React.createClass({ mixins: [Reflux.connect(CurrentUserStore)], render() { return ( -
- - - Alert conditions define situations that require your attention. Graylog will check those conditions - periodically and notify you when their statuses change. - - - - Read more about alerting in the . - - - - - - - - - - - - - - -
+ +
+ + + Alert conditions define situations that require your attention. Graylog will check those conditions + periodically and notify you when their statuses change. + + + + Read more about alerting in the . + + + + + + + + + + + + + + +
+ ); }, }); diff --git a/graylog2-web-interface/src/pages/AlertNotificationsPage.jsx b/graylog2-web-interface/src/pages/AlertNotificationsPage.jsx index 8fbc849b7d66..62525724e1f6 100644 --- a/graylog2-web-interface/src/pages/AlertNotificationsPage.jsx +++ b/graylog2-web-interface/src/pages/AlertNotificationsPage.jsx @@ -3,7 +3,7 @@ import Reflux from 'reflux'; import { Button, Col, Row } from 'react-bootstrap'; import { LinkContainer } from 'react-router-bootstrap'; -import { PageHeader } from 'components/common'; +import { DocumentTitle, PageHeader } from 'components/common'; import { AlertNotificationsComponent } from 'components/alertnotifications'; import Routes from 'routing/Routes'; @@ -14,34 +14,36 @@ const AlertNotificationsPage = React.createClass({ mixins: [Reflux.connect(CurrentUserStore)], render() { return ( -
- - - Notifications let you be aware of changes in your alert conditions status any time. Graylog can send - notifications directly to you or to other systems you use for that purpose. - + +
+ + + Notifications let you be aware of changes in your alert conditions status any time. Graylog can send + notifications directly to you or to other systems you use for that purpose. + - - Remember to assign the notifications to use in the alert conditions page. - + + Remember to assign the notifications to use in the alert conditions page. + - - - - -   - - - + + + + +   + + + - - - - - -
+ + + + + +
+ ); }, }); diff --git a/graylog2-web-interface/src/pages/AlertsPage.jsx b/graylog2-web-interface/src/pages/AlertsPage.jsx index 76854a130061..e7ef851bab62 100644 --- a/graylog2-web-interface/src/pages/AlertsPage.jsx +++ b/graylog2-web-interface/src/pages/AlertsPage.jsx @@ -6,7 +6,7 @@ import { LinkContainer } from 'react-router-bootstrap'; import { AlertsComponent } from 'components/alerts'; import DocumentationLink from 'components/support/DocumentationLink'; -import { PageHeader } from 'components/common'; +import { DocumentTitle, PageHeader } from 'components/common'; import Routes from 'routing/Routes'; import DocsHelper from 'util/DocsHelper'; @@ -18,34 +18,36 @@ const AlertsPage = React.createClass({ mixins: [Reflux.connect(CurrentUserStore)], render() { return ( -
- - - Alerts are triggered when conditions you define are satisfied. Graylog will automatically mark alerts as - resolved once the status of your conditions change. - - - - Read more about alerting in the . - - - - - - -   - - - - - - - - - - - -
+ +
+ + + Alerts are triggered when conditions you define are satisfied. Graylog will automatically mark alerts as + resolved once the status of your conditions change. + + + + Read more about alerting in the . + + + + + + +   + + + + + + + + + + + +
+ ); }, }); diff --git a/graylog2-web-interface/src/pages/ConfigurationsPage.jsx b/graylog2-web-interface/src/pages/ConfigurationsPage.jsx index e114c14f1ba6..9ed163847ba8 100644 --- a/graylog2-web-interface/src/pages/ConfigurationsPage.jsx +++ b/graylog2-web-interface/src/pages/ConfigurationsPage.jsx @@ -1,7 +1,7 @@ import React from 'react'; import Reflux from 'reflux'; import { Row, Col } from 'react-bootstrap'; -import { PageHeader, Spinner } from 'components/common'; +import { DocumentTitle, PageHeader, Spinner } from 'components/common'; import { PluginStore } from 'graylog-web-plugin/plugin'; import StoreProvider from 'injection/StoreProvider'; @@ -117,33 +117,35 @@ const ConfigurationsPage = React.createClass({ const pluginConfigRows = this._pluginConfigRows(); return ( - - - - You can configure system settings for different sub systems on this page. - - - - - - {searchesConfigComponent} - - - {messageProcessorsConfigComponent} - - - - {pluginConfigRows.length > 0 && - -

Plugins

-

Configuration for installed plugins.

-
-
- {pluginConfigRows} -
- - } - + + + + + You can configure system settings for different sub systems on this page. + + + + + + {searchesConfigComponent} + + + {messageProcessorsConfigComponent} + + + + {pluginConfigRows.length > 0 && + +

Plugins

+

Configuration for installed plugins.

+
+
+ {pluginConfigRows} +
+ + } + + ); }, }); diff --git a/graylog2-web-interface/src/pages/ContentPacksPage.jsx b/graylog2-web-interface/src/pages/ContentPacksPage.jsx index f7f765a4dc14..94e94bf8fb1f 100644 --- a/graylog2-web-interface/src/pages/ContentPacksPage.jsx +++ b/graylog2-web-interface/src/pages/ContentPacksPage.jsx @@ -4,39 +4,40 @@ import { LinkContainer } from 'react-router-bootstrap'; import Routes from 'routing/Routes'; -import PageHeader from 'components/common/PageHeader'; +import { DocumentTitle, PageHeader } from 'components/common'; import ConfigurationBundles from 'components/source-tagging/ConfigurationBundles'; const ContentPacksPage = React.createClass({ render() { - return ( - - - - Content packs accelerate the set up process for a specific data source. A content pack can include inputs/extractors, streams, and dashboards. - - - - Find more content packs in {' '} - the Graylog Marketplace. - - - - - - - - - - -

Select content packs

-
- -
- - - + + + + + Content packs accelerate the set up process for a specific data source. A content pack can include inputs/extractors, streams, and dashboards. + + + + Find more content packs in {' '} + the Graylog Marketplace. + + + + + + + + + + +

Select content packs

+
+ +
+ + + + ); } }); diff --git a/graylog2-web-interface/src/pages/CreateExtractorsPage.jsx b/graylog2-web-interface/src/pages/CreateExtractorsPage.jsx index 274245eb23f4..5aacbd6ba673 100644 --- a/graylog2-web-interface/src/pages/CreateExtractorsPage.jsx +++ b/graylog2-web-interface/src/pages/CreateExtractorsPage.jsx @@ -1,8 +1,7 @@ import React, {PropTypes} from 'react'; import Reflux from 'reflux'; -import Spinner from 'components/common/Spinner'; -import PageHeader from 'components/common/PageHeader'; +import { DocumentTitle, PageHeader, Spinner } from 'components/common'; import DocumentationLink from 'components/support/DocumentationLink'; import EditExtractor from 'components/extractors/EditExtractor'; @@ -66,24 +65,26 @@ const CreateExtractorsPage = React.createClass({ const exampleMessage = StringUtils.stringify(this.state.exampleMessage.fields[this.state.field]); return ( -
- New extractor for input {this.state.input.title}}> - - Extractors are applied on every message that is received by an input. Use them to extract and transform{' '} - any text data into fields that allow you easy filtering and analysis later on. - + +
+ New extractor for input {this.state.input.title}}> + + Extractors are applied on every message that is received by an input. Use them to extract and + transform any text data into fields that allow you easy filtering and analysis later on. + - - Find more information about extractors in the - {' '}. - - - -
+ + Find more information about extractors in the + {' '}. + + + +
+ ); }, }); diff --git a/graylog2-web-interface/src/pages/CreateUsersPage.jsx b/graylog2-web-interface/src/pages/CreateUsersPage.jsx index 5569e649f7e8..9d8a5382470b 100644 --- a/graylog2-web-interface/src/pages/CreateUsersPage.jsx +++ b/graylog2-web-interface/src/pages/CreateUsersPage.jsx @@ -8,8 +8,7 @@ import StoreProvider from 'injection/StoreProvider'; const RolesStore = StoreProvider.getStore('Roles'); const UsersStore = StoreProvider.getStore('Users'); -import Spinner from 'components/common/Spinner'; -import PageHeader from 'components/common/PageHeader'; +import { DocumentTitle, PageHeader, Spinner } from 'components/common'; import NewUserForm from 'components/users/NewUserForm'; const CreateUsersPage = React.createClass({ @@ -51,19 +50,21 @@ const CreateUsersPage = React.createClass({ return ; } return ( - - - - Use this page to create new Graylog users. The users and their permissions created here are not limited - to the web interface but valid and required for the REST APIs of your Graylog server nodes, too. - - - - - - - - + + + + + Use this page to create new Graylog users. The users and their permissions created here are not limited + to the web interface but valid and required for the REST APIs of your Graylog server nodes, too. + + + + + + + + + ); }, }); diff --git a/graylog2-web-interface/src/pages/DashboardsPage.jsx b/graylog2-web-interface/src/pages/DashboardsPage.jsx index 418e29e0e215..95296aa25895 100644 --- a/graylog2-web-interface/src/pages/DashboardsPage.jsx +++ b/graylog2-web-interface/src/pages/DashboardsPage.jsx @@ -1,5 +1,6 @@ import React from 'react'; import Reflux from 'reflux'; +import { DocumentTitle } from 'components/common'; import DashboardListPage from 'components/dashboard/DashboardListPage'; import StoreProvider from 'injection/StoreProvider'; const CurrentUserStore = StoreProvider.getStore('CurrentUser'); @@ -8,7 +9,9 @@ const DashboardsPage = React.createClass({ mixins: [Reflux.connect(CurrentUserStore)], render() { return ( - + + + ); } }); diff --git a/graylog2-web-interface/src/pages/EditAlertConditionPage.jsx b/graylog2-web-interface/src/pages/EditAlertConditionPage.jsx index 281bf2b3a49e..435716e7529a 100644 --- a/graylog2-web-interface/src/pages/EditAlertConditionPage.jsx +++ b/graylog2-web-interface/src/pages/EditAlertConditionPage.jsx @@ -4,7 +4,7 @@ import { Button, Col, Row } from 'react-bootstrap'; import { LinkContainer } from 'react-router-bootstrap'; import DocumentationLink from 'components/support/DocumentationLink'; -import { PageHeader, Spinner } from 'components/common'; +import { DocumentTitle, PageHeader, Spinner } from 'components/common'; import { ConditionAlertNotifications, EditAlertConditionForm } from 'components/alertconditions'; import Routes from 'routing/Routes'; @@ -49,40 +49,43 @@ const EditAlertConditionPage = React.createClass({ const stream = this.state.stream; return ( -
- Condition {condition.title || 'Untitled'}}> - - Define an alert condition and configure the way Graylog will notify you when that condition is satisfied. - - - - Are the default conditions not flexible enough? You can write your own! Read more about alerting in the{' '} - . - - - - - - -   - - - - - - - - - - - - - - - - - -
+ +
+ Condition {condition.title || 'Untitled'}}> + + Define an alert condition and configure the way Graylog will notify you when that condition is satisfied. + + + + Are the default conditions not flexible enough? You can write your own! Read more about alerting in + the{' '} + . + + + + + + +   + + + + + + + + + + + + + + + + + +
+ ); }, }); diff --git a/graylog2-web-interface/src/pages/EditExtractorsPage.jsx b/graylog2-web-interface/src/pages/EditExtractorsPage.jsx index 3f072dcd55d9..aadf356a16c9 100644 --- a/graylog2-web-interface/src/pages/EditExtractorsPage.jsx +++ b/graylog2-web-interface/src/pages/EditExtractorsPage.jsx @@ -1,8 +1,7 @@ import React, {PropTypes} from 'react'; import Reflux from 'reflux'; -import Spinner from 'components/common/Spinner'; -import PageHeader from 'components/common/PageHeader'; +import { DocumentTitle, PageHeader, Spinner } from 'components/common'; import DocumentationLink from 'components/support/DocumentationLink'; import EditExtractor from 'components/extractors/EditExtractor'; @@ -65,25 +64,27 @@ const EditExtractorsPage = React.createClass({ } return ( -
- Edit extractor {this.state.extractor.title} for input {this.state.input.title}}> - - Extractors are applied on every message that is received by an input. Use them to extract and transform{' '} - any text data into fields that allow you easy filtering and analysis later on. - + +
+ Edit extractor {this.state.extractor.title} for input {this.state.input.title}}> + + Extractors are applied on every message that is received by an input. Use them to extract and transform{' '} + any text data into fields that allow you easy filtering and analysis later on. + - - Find more information about extractors in the - {' '}. - - - -
+ + Find more information about extractors in the + {' '}. + + + +
+ ); }, }); diff --git a/graylog2-web-interface/src/pages/EditUsersPage.jsx b/graylog2-web-interface/src/pages/EditUsersPage.jsx index 34a6e042a932..0c917c24e704 100644 --- a/graylog2-web-interface/src/pages/EditUsersPage.jsx +++ b/graylog2-web-interface/src/pages/EditUsersPage.jsx @@ -5,8 +5,7 @@ import StoreProvider from 'injection/StoreProvider'; const UsersStore = StoreProvider.getStore('Users'); const StartpageStore = StoreProvider.getStore('Startpage'); -import PageHeader from 'components/common/PageHeader'; -import Spinner from 'components/common/Spinner'; +import { DocumentTitle, PageHeader, Spinner } from 'components/common'; import UserForm from 'components/users/UserForm'; import UserPreferencesButton from 'components/users/UserPreferencesButton'; @@ -60,18 +59,20 @@ const EditUsersPage = React.createClass({ : null; return ( - - Edit user {this.props.params.username}} subpage> - You can either change the details of a user here or set a new password. - {null} -
- {resetStartpageButton}{' '} - {userPreferencesButton} -
- + + + Edit user {this.props.params.username}} subpage> + You can either change the details of a user here or set a new password. + {null} +
+ {resetStartpageButton}{' '} + {userPreferencesButton} +
+ - - + + + ); }, }); diff --git a/graylog2-web-interface/src/pages/ExportContentPackPage.jsx b/graylog2-web-interface/src/pages/ExportContentPackPage.jsx index 520f5b6fdfc9..c8020a081418 100644 --- a/graylog2-web-interface/src/pages/ExportContentPackPage.jsx +++ b/graylog2-web-interface/src/pages/ExportContentPackPage.jsx @@ -18,7 +18,7 @@ import ActionsProvider from 'injection/ActionsProvider'; const InputsActions = ActionsProvider.getActions('Inputs'); const ConfigurationBundlesActions = ActionsProvider.getActions('ConfigurationBundles'); -import PageHeader from 'components/common/PageHeader'; +import { DocumentTitle, PageHeader } from 'components/common'; const ExportContentPackPage = React.createClass({ mixins: [Reflux.connect(InputsStore)], @@ -142,144 +142,146 @@ const ExportContentPackPage = React.createClass({ }, render() { return ( - - - Export your inputs, outputs, streams and dashboards as a content pack and share it with the community or other setups. - + + + + Export your inputs, outputs, streams and dashboards as a content pack and share it with the community or other setups. + - - -
-
- - - - - - The name of your configuration bundle. - -
+ + + +
+ + + + + + The name of your configuration bundle. + +
-
- - - - -