summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/admin_console.jsx
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-06-05 12:49:38 -0400
committerGitHub <noreply@github.com>2017-06-05 12:49:38 -0400
commitabd0466a42d6b9897ba9e3bcb373b41974e9c46f (patch)
treeaee90a2041d243ed4094b7180db0642f73b57e82 /webapp/components/admin_console/admin_console.jsx
parent0f3bd85b8dddc6805e260a9d19cadcc603a12e17 (diff)
downloadchat-abd0466a42d6b9897ba9e3bcb373b41974e9c46f.tar.gz
chat-abd0466a42d6b9897ba9e3bcb373b41974e9c46f.tar.bz2
chat-abd0466a42d6b9897ba9e3bcb373b41974e9c46f.zip
PLT-3466 E10: Add announcement bar feature (#6509)
* E10 - Add announcement bar feature * Updates per feedback * Add component tests and snapshots * Update snapshots * Updating color picker UI (#6543) * Add class to body tag when banner is not dismissable and clean up localstorage items when banner changes * Fixing links (#6544) * Updating UI for fixed error bar (#6552) * Truncating text on fixed banner (#6561) * Plt 3466 - Error bar link states (#6577) * Updating error bar hover state * Updating error bar link states
Diffstat (limited to 'webapp/components/admin_console/admin_console.jsx')
-rw-r--r--webapp/components/admin_console/admin_console.jsx9
1 files changed, 4 insertions, 5 deletions
diff --git a/webapp/components/admin_console/admin_console.jsx b/webapp/components/admin_console/admin_console.jsx
index 80d9bfed9..b8250bab2 100644
--- a/webapp/components/admin_console/admin_console.jsx
+++ b/webapp/components/admin_console/admin_console.jsx
@@ -1,12 +1,11 @@
-import PropTypes from 'prop-types';
-
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
import React from 'react';
+import PropTypes from 'prop-types';
import 'bootstrap';
-import ErrorBar from 'components/error_bar.jsx';
+import AnnouncementBar from 'components/announcement_bar';
import AdminStore from 'stores/admin_store.jsx';
import * as AsyncClient from 'utils/async_client.jsx';
@@ -52,7 +51,7 @@ export default class AdminConsole extends React.Component {
if (config && Object.keys(config).length === 0 && config.constructor === 'Object') {
return (
<div className='admin-console__wrapper'>
- <ErrorBar/>
+ <AnnouncementBar/>
<div className='admin-console'/>
</div>
);
@@ -64,7 +63,7 @@ export default class AdminConsole extends React.Component {
});
return (
<div className='admin-console__wrapper'>
- <ErrorBar/>
+ <AnnouncementBar/>
<div className='admin-console'>
<AdminSidebar/>
{children}