summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-03-07 17:14:15 -0500
committerChristopher Speller <crspeller@gmail.com>2016-03-07 17:14:15 -0500
commite0c08d4ed609adf3e324d07810862b6853792a94 (patch)
tree0f08f0c5089c70c6f0bacbaf6b06d7edf1f25833 /web
parent1dde831daf29497343492b2101c52b4cc1ef5aad (diff)
parent8f917a2925d9e99c5dc7710c3df7b0d5d755a0df (diff)
downloadchat-e0c08d4ed609adf3e324d07810862b6853792a94.tar.gz
chat-e0c08d4ed609adf3e324d07810862b6853792a94.tar.bz2
chat-e0c08d4ed609adf3e324d07810862b6853792a94.zip
Merge pull request #2348 from hmhealey/member
Updated Channel Members modal UI
Diffstat (limited to 'web')
-rw-r--r--web/react/components/channel_members_modal.jsx8
-rw-r--r--web/react/components/user_list_row.jsx4
-rw-r--r--web/static/i18n/en.json4
-rw-r--r--web/static/i18n/es.json3
-rw-r--r--web/static/i18n/pt.json3
5 files changed, 10 insertions, 12 deletions
diff --git a/web/react/components/channel_members_modal.jsx b/web/react/components/channel_members_modal.jsx
index 688ab7dd2..3ec93a616 100644
--- a/web/react/components/channel_members_modal.jsx
+++ b/web/react/components/channel_members_modal.jsx
@@ -44,6 +44,7 @@ export default class ChannelMembersModal extends React.Component {
}
getStateFromStores() {
const extraInfo = ChannelStore.getCurrentExtraInfo();
+ const profiles = UserStore.getActiveOnlyProfiles();
if (extraInfo.member_count !== extraInfo.members.length) {
AsyncClient.getChannelExtraInfo(this.props.channel.id, -1);
@@ -53,9 +54,8 @@ export default class ChannelMembersModal extends React.Component {
};
}
- // clone the member list since we mutate it later on
const memberList = extraInfo.members.map((member) => {
- return Object.assign({}, member);
+ return profiles[member.id];
});
function compareByUsername(a, b) {
@@ -130,8 +130,8 @@ export default class ChannelMembersModal extends React.Component {
onClick={this.handleRemove.bind(this, user)}
>
<FormattedMessage
- id='channel_members_modal.removeMember'
- defaultMessage='Remove Member'
+ id='channel_members_modal.remove'
+ defaultMessage='Remove'
/>
</button>
);
diff --git a/web/react/components/user_list_row.jsx b/web/react/components/user_list_row.jsx
index 2aeca7d47..d75078619 100644
--- a/web/react/components/user_list_row.jsx
+++ b/web/react/components/user_list_row.jsx
@@ -10,9 +10,9 @@ export default function UserListRow({user, actions}) {
let name = user.username;
if (user.nickname && nameFormat === Constants.Preferences.DISPLAY_PREFER_NICKNAME) {
- name = `${user.nickname} (${user.username})`;
+ name = `${user.nickname} (@${user.username})`;
} else if ((user.first_name || user.last_name) && (nameFormat === Constants.Preferences.DISPLAY_PREFER_NICKNAME || nameFormat === Constants.Preferences.DISPLAY_PREFER_FULL_NAME)) {
- name = `${Utils.getFullName(user)} (${user.username})`;
+ name = `${Utils.getFullName(user)} (@${user.username})`;
}
const buttons = actions.map((Action, index) => {
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 03b21e944..65d02c589 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -561,7 +561,7 @@
"channel_loader.wrote": " wrote: ",
"channel_members_modal.addNew": " Add New Members",
"channel_members_modal.close": "Close",
- "channel_members_modal.removeMember": "Remove Member",
+ "channel_members_modal.remove": "Remove",
"channel_memebers_modal.members": " Members",
"channel_modal.cancel": "Cancel",
"channel_modal.channel": "Channel",
@@ -1295,4 +1295,4 @@
"view_image_popover.download": "Download",
"view_image_popover.file": "File {count} of {total}",
"view_image_popover.publicLink": "Get Public Link"
-} \ No newline at end of file
+}
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index 77779847f..091b1e846 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -561,7 +561,6 @@
"channel_loader.wrote": " escribió: ",
"channel_members_modal.addNew": " Agregar nuevos Miembros",
"channel_members_modal.close": "Cerrar",
- "channel_members_modal.removeMember": "Elminar Miembro",
"channel_memebers_modal.members": " Miembros",
"channel_modal.cancel": "Cancelar",
"channel_modal.channel": "Canal",
@@ -1289,4 +1288,4 @@
"view_image_popover.download": "Descargar",
"view_image_popover.file": "Archivo {count} de {total}",
"view_image_popover.publicLink": "Obtener Enlace Público"
-} \ No newline at end of file
+}
diff --git a/web/static/i18n/pt.json b/web/static/i18n/pt.json
index c38ae86c6..8da6b9791 100644
--- a/web/static/i18n/pt.json
+++ b/web/static/i18n/pt.json
@@ -558,7 +558,6 @@
"channel_loader.wrote": " escreveu: ",
"channel_members_modal.addNew": " Adicionar Novos Membros",
"channel_members_modal.close": "Fechar",
- "channel_members_modal.removeMember": "Remover Membro",
"channel_memebers_modal.members": " Membros",
"channel_modal.cancel": "Cancelar",
"channel_modal.channel": "Canal",
@@ -1290,4 +1289,4 @@
"view_image_popover.download": "Download",
"view_image_popover.file": "Arquivo {count} de {total}",
"view_image_popover.publicLink": "Obter O Link Público"
-} \ No newline at end of file
+}