summaryrefslogtreecommitdiffstats
path: root/web/react/components
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-06-25 10:59:59 -0400
committerCorey Hulen <corey@hulen.com>2015-06-25 10:59:59 -0400
commitbfe8d13cd15d7e4ba7da76d3b202109d2a4b7847 (patch)
tree98a29435366d23f4464e58ee59c1631fbfe0a72e /web/react/components
parent39e5f7913ddd5a496ad36560f17fa2b3b475fad0 (diff)
parente22c89ad6b3711e56d8b3b43060123a62114c51a (diff)
downloadchat-bfe8d13cd15d7e4ba7da76d3b202109d2a4b7847.tar.gz
chat-bfe8d13cd15d7e4ba7da76d3b202109d2a4b7847.tar.bz2
chat-bfe8d13cd15d7e4ba7da76d3b202109d2a4b7847.zip
Merge pull request #26 from rgarmsen2295/mm-454
MM-454
Diffstat (limited to 'web/react/components')
-rw-r--r--web/react/components/channel_header.jsx2
-rw-r--r--web/react/components/navbar.jsx2
2 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 006c168ba..ade58a10a 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -201,7 +201,7 @@ module.exports = React.createClass({
</a>
<ul className="dropdown-menu" role="menu" aria-labelledby="channel_header_dropdown">
<li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_info" data-channelid={this.state.channel.id} href="#">View Info</a></li>
- <li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_invite" href="#">Invite Members</a></li>
+ <li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_invite" href="#">Add Members</a></li>
{ isAdmin ?
<li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_members" href="#">Manage Members</a></li>
: ""
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index 3821c2772..35f7d9044 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -301,7 +301,7 @@ module.exports = React.createClass({
<span className="glyphicon glyphicon-chevron-down header-dropdown__icon"></span>
</a>
<ul className="dropdown-menu" role="menu" aria-labelledby="channel_header_dropdown">
- <li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_invite" href="#">Invite Members</a></li>
+ <li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_invite" href="#">Add Members</a></li>
{ isAdmin ?
<li role="presentation"><a role="menuitem" data-toggle="modal" data-target="#channel_members" href="#">Manage Members</a></li>
: ""