diff options
author | Jason Blais <jason@spinpunch.com> | 2016-10-11 08:44:46 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-10-11 08:44:46 -0400 |
commit | fe1503d9e74cb7e8cd04aeb302747aa01745e5bb (patch) | |
tree | a05a5f7aad31157c2d19aabc8234ac9bb696d7e7 | |
parent | 7fb818d4cef09dd74f9fcfd99381a7c0e7064a56 (diff) | |
download | chat-fe1503d9e74cb7e8cd04aeb302747aa01745e5bb.tar.gz chat-fe1503d9e74cb7e8cd04aeb302747aa01745e5bb.tar.bz2 chat-fe1503d9e74cb7e8cd04aeb302747aa01745e5bb.zip |
Add text banner to SAML System Console settings (#4195)
* Update saml_settings.jsx
* Update en.json
* Text tweak
* Fix build error
* Use classnames in saml_settings.jsx to fix build errors
-rw-r--r-- | webapp/components/admin_console/saml_settings.jsx | 10 | ||||
-rw-r--r-- | webapp/i18n/en.json | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/webapp/components/admin_console/saml_settings.jsx b/webapp/components/admin_console/saml_settings.jsx index fe8acaf16..c7cd73399 100644 --- a/webapp/components/admin_console/saml_settings.jsx +++ b/webapp/components/admin_console/saml_settings.jsx @@ -292,6 +292,14 @@ export default class SamlSettings extends AdminSettings { return ( <SettingsGroup> + <div className='banner'> + <div className='banner__content'> + <FormattedMessage + id='admin.saml.bannerDesc' + defaultMessage='If a user attribute changes on the SAML 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 a SAML Identity Provider. Remote logout with SAML servers is considered in a future release.' + /> + </div> + </div> <BooleanSetting id='enable' label={ @@ -541,4 +549,4 @@ export default class SamlSettings extends AdminSettings { </SettingsGroup> ); } -}
\ No newline at end of file +} diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 8f3800470..c43503f72 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -567,6 +567,7 @@ "admin.saml.assertionConsumerServiceURLDesc": "Enter https://<your-mattermost-url>/login/sso/saml. Make sure you use HTTP or HTTPS in your URL depending on your server configuration. This field is also known as the Assertion Consumer Service URL.", "admin.saml.assertionConsumerServiceURLEx": "E.g.: \"https://<your-mattermost-url>/login/sso/saml\"", "admin.saml.assertionConsumerServiceURLTitle": "Service Provider Login URL:", + "admin.saml.bannerDesc": "If a user attribute changes on the SAML 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 a SAML Identity Provider. Remote logout with SAML servers is considered in a future release.", "admin.saml.emailAttrDesc": "The attribute in the SAML Assertion that will be used to populate the email addresses of users in Mattermost.", "admin.saml.emailAttrEx": "E.g.: \"Email\" or \"PrimaryEmail\"", "admin.saml.emailAttrTitle": "Email Attribute:", |