diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-07-27 17:13:53 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-07-27 17:13:53 -0700 |
| commit | 539a05a6bdcf9b6bcf3df8f04ccdfed5dd4d4ce6 (patch) | |
| tree | b417a8e2080a0005b869353bec9081ab53f99fa4 /web | |
| parent | d24e3db020caabab319ad0938d0a567eeb153123 (diff) | |
| download | chat-539a05a6bdcf9b6bcf3df8f04ccdfed5dd4d4ce6.tar.gz chat-539a05a6bdcf9b6bcf3df8f04ccdfed5dd4d4ce6.tar.bz2 chat-539a05a6bdcf9b6bcf3df8f04ccdfed5dd4d4ce6.zip | |
Changed title of Active Devices to Active Sessions; added help text explaining Active Sessions
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/activity_log_modal.jsx | 3 | ||||
| -rw-r--r-- | web/react/components/user_settings.jsx | 2 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_activity-log.scss | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx index 7cce807a9..90f139e8b 100644 --- a/web/react/components/activity_log_modal.jsx +++ b/web/react/components/activity_log_modal.jsx @@ -102,8 +102,9 @@ module.exports = React.createClass({ <div className="modal-content"> <div className="modal-header"> <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> - <h4 className="modal-title" id="myModalLabel">Active Devices</h4> + <h4 className="modal-title" id="myModalLabel">Active Sessions</h4> </div> + <p className="session-help-text">Sessions are created when you log in with your email and password to a new browser on a device. Sessions let you use Mattermost for up to 30 days without having to log in again. If you want to log out sooner, use the "Logout" button below to end a session.</p> <div ref="modalBody" className="modal-body"> <form role="form"> { activityList } diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx index 2ac9a2371..e1ae6da52 100644 --- a/web/react/components/user_settings.jsx +++ b/web/react/components/user_settings.jsx @@ -617,7 +617,7 @@ var SecurityTab = React.createClass({ <br></br> <a data-toggle="modal" className="security-links theme" data-target="#access-history" href="#" onClick={this.handleHistoryOpen}><i className="fa fa-clock-o"></i>View Access History</a> <b> </b> - <a data-toggle="modal" className="security-links theme" data-target="#activity-log" href="#" onClick={this.handleDevicesOpen}><i className="fa fa-globe"></i>View and Logout of Active Devices</a> + <a data-toggle="modal" className="security-links theme" data-target="#activity-log" href="#" onClick={this.handleDevicesOpen}><i className="fa fa-globe"></i>View and Logout of Active Sessions</a> </div> </div> ); diff --git a/web/sass-files/sass/partials/_activity-log.scss b/web/sass-files/sass/partials/_activity-log.scss index 36eb48750..3f0c3090d 100644 --- a/web/sass-files/sass/partials/_activity-log.scss +++ b/web/sass-files/sass/partials/_activity-log.scss @@ -28,4 +28,7 @@ .report__info { color: #999; } +} +.session-help-text { + padding: 20px 20px 5px 20px; }
\ No newline at end of file |