summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-09-24 12:01:50 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-09-24 12:01:50 -0400
commit6c0d094d13e73346234bd5ca52b21323893cbbe5 (patch)
tree68134ce3418dde343959658d069ef1b7ee2c33f6 /web/react/components/user_settings
parentff03c53c46a79f3d807da91c2fde07fdde041d14 (diff)
parenta59f8def8c6fa2bc87e3dc0ee9ff5a3caf157c4a (diff)
downloadchat-6c0d094d13e73346234bd5ca52b21323893cbbe5.tar.gz
chat-6c0d094d13e73346234bd5ca52b21323893cbbe5.tar.bz2
chat-6c0d094d13e73346234bd5ca52b21323893cbbe5.zip
Merge pull request #780 from hmhealey/plt258
PLT-258 Added help text to notification settings to say which browsers support them
Diffstat (limited to 'web/react/components/user_settings')
-rw-r--r--web/react/components/user_settings/user_settings_notifications.jsx6
1 files changed, 6 insertions, 0 deletions
diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx
index 8d364cde7..ba14f019f 100644
--- a/web/react/components/user_settings/user_settings_notifications.jsx
+++ b/web/react/components/user_settings/user_settings_notifications.jsx
@@ -265,9 +265,12 @@ export default class NotificationsTab extends React.Component {
e.preventDefault();
}.bind(this);
+ const extraInfo = <span>{'Desktop notifications are available on Firefox, Safari, and Chrome.'}</span>;
+
desktopSection = (
<SettingItemMax
title='Send desktop notifications'
+ extraInfo={extraInfo}
inputs={inputs}
submit={this.handleSubmit}
server_error={serverError}
@@ -343,9 +346,12 @@ export default class NotificationsTab extends React.Component {
e.preventDefault();
}.bind(this);
+ const extraInfo = <span>{'Desktop notification sounds are available on Firefox, Safari, Chrome, Internet Explorer, and Edge.'}</span>;
+
soundSection = (
<SettingItemMax
title='Desktop notification sounds'
+ extraInfo={extraInfo}
inputs={inputs}
submit={this.handleSubmit}
server_error={serverError}