diff --git a/app/styles/clans/clan-details.sass b/app/styles/clans/clan-details.sass index 15bbda173..770cf3641 100644 --- a/app/styles/clans/clan-details.sass +++ b/app/styles/clans/clan-details.sass @@ -38,6 +38,9 @@ margin: 0px 2px vertical-align: middle + td.hero-icon-cell + display: table-cell + .level-cell width: 50px text-align: center @@ -167,6 +170,10 @@ td.code-language-cell width: 30px + vertical-align: middle + + .code-language-cell + vertical-align: middle span.code-language-cell background: transparent url(/images/common/code_languages/javascript_small.png) @@ -175,3 +182,6 @@ width: 30px height: 30px margin: 0px 2px + + .remove-member-cell + vertical-align: middle diff --git a/app/templates/clans/clan-details.jade b/app/templates/clans/clan-details.jade index e57b58c64..ab1548311 100644 --- a/app/templates/clans/clan-details.jade +++ b/app/templates/clans/clan-details.jade @@ -195,12 +195,12 @@ block content thead tr th - th - td.name-cell(data-i18n="clans.name") Name + th + th.name-cell(data-i18n="clans.name") Name th.level-cell(data-i18n="resources.level") Level th.achievements-cell(data-i18n="play.achievements") Achievements th.latest-achievement-cell(data-i18n="clans.latest_achievement") Latest Achievement - th + th.remove-member-cell tbody each member in members tr @@ -218,6 +218,6 @@ block content td.latest-achievement-cell if memberAchievementsMap && memberAchievementsMap[member.id] && memberAchievementsMap[member.id].length span= memberAchievementsMap[member.id][0].get('achievementName') - td + td.remove-member-cell if isOwner && member.id !== clan.get('ownerID') button.btn.btn-xs.btn-warning.remove-member-btn(data-id="#{member.id}", data-i18n="clans.rem_hero") Remove Hero diff --git a/server/clans/clan_handler.coffee b/server/clans/clan_handler.coffee index d95e3902f..58c4a7ec6 100644 --- a/server/clans/clan_handler.coffee +++ b/server/clans/clan_handler.coffee @@ -116,7 +116,7 @@ ClanHandler = class ClanHandler extends Handler return @sendDatabaseError(res, err) if err return @sendNotFoundError(res) unless clan memberIDs = clan.get('members') ? [] - User.find {_id: {$in: memberIDs}}, 'name nameLower points', {sort: {nameLower: 1}}, (err, users) => + User.find {_id: {$in: memberIDs}}, 'name nameLower points heroConfig.thangType', {sort: {nameLower: 1}}, (err, users) => return @sendDatabaseError(res, err) if err cleandocs = (UserHandler.formatEntity(req, doc) for doc in users) @sendSuccess(res, cleandocs)