From 0dfac9875ef6f5f20318a3ef542b11592da8480e Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Mon, 30 May 2016 09:59:53 -0400
Subject: Add license expiry messages (#3153)

---
 webapp/components/admin_console/banner.jsx        | 40 +++++++++++++++++++++++
 webapp/components/admin_console/ldap_settings.jsx | 37 +++++++++------------
 2 files changed, 55 insertions(+), 22 deletions(-)
 create mode 100644 webapp/components/admin_console/banner.jsx

(limited to 'webapp/components/admin_console')

diff --git a/webapp/components/admin_console/banner.jsx b/webapp/components/admin_console/banner.jsx
new file mode 100644
index 000000000..2071fff93
--- /dev/null
+++ b/webapp/components/admin_console/banner.jsx
@@ -0,0 +1,40 @@
+// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import React from 'react';
+import {FormattedMessage} from 'react-intl';
+
+export default class Banner extends React.Component {
+    render() {
+        let title = (
+            <FormattedMessage
+                id='admin.banner.heading'
+                defaultMessage='Note:'
+            />
+        );
+
+        if (this.props.title) {
+            title = this.props.title;
+        }
+
+        return (
+            <div className='banner'>
+                <div className='banner__content'>
+                    <h4 className='banner__heading'>
+                        {title}
+                    </h4>
+                    <p>
+                        {this.props.description}
+                    </p>
+                </div>
+            </div>
+        );
+    }
+}
+
+Banner.defaultProps = {
+};
+Banner.propTypes = {
+    title: React.PropTypes.node,
+    description: React.PropTypes.node.isRequired
+};
diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx
index d47a1f8c2..80c1a7867 100644
--- a/webapp/components/admin_console/ldap_settings.jsx
+++ b/webapp/components/admin_console/ldap_settings.jsx
@@ -1,17 +1,18 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import React from 'react';
-
-import * as Utils from 'utils/utils.jsx';
-
 import AdminSettings from './admin_settings.jsx';
+import Banner from './banner.jsx';
 import BooleanSetting from './boolean_setting.jsx';
 import ConnectionSecurityDropdownSetting from './connection_security_dropdown_setting.jsx';
-import {FormattedMessage} from 'react-intl';
 import SettingsGroup from './settings_group.jsx';
 import TextSetting from './text_setting.jsx';
 
+import * as Utils from 'utils/utils.jsx';
+
+import React from 'react';
+import {FormattedMessage} from 'react-intl';
+
 export default class LdapSettings extends AdminSettings {
     constructor(props) {
         super(props);
@@ -90,22 +91,14 @@ export default class LdapSettings extends AdminSettings {
 
                 }
             >
-                <div className='banner'>
-                    <div className='banner__content'>
-                        <h4 className='banner__heading'>
-                            <FormattedMessage
-                                id='admin.ldap.bannerHeading'
-                                defaultMessage='Note:'
-                            />
-                        </h4>
-                        <p>
-                            <FormattedMessage
-                                id='admin.ldap.bannerDesc'
-                                defaultMessage='If a user attribute changes on the LDAP server it will be updated the next time the user enters their credentials to log in to Mattermost. This includes if a user is made inactive or removed from an LDAP server. Synchronization with LDAP servers is planned in a future release.'
-                            />
-                        </p>
-                    </div>
-                </div>
+                <Banner
+                    description={
+                        <FormattedMessage
+                            id='admin.ldap.bannerDesc'
+                            defaultMessage='If a user attribute changes on the LDAP server it will be updated the next time the user enters their credentials to log in to Mattermost. This includes if a user is made inactive or removed from an LDAP server. Synchronization with LDAP servers is planned in a future release.'
+                        />
+                    }
+                />
                 <BooleanSetting
                     id='enable'
                     label={
@@ -412,4 +405,4 @@ export default class LdapSettings extends AdminSettings {
             </SettingsGroup>
         );
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-1-g7c22