diff --git a/app/styles/clans/clan-details.sass b/app/styles/clans/clan-details.sass index bd11b1454..3bb2b9f76 100644 --- a/app/styles/clans/clan-details.sass +++ b/app/styles/clans/clan-details.sass @@ -1,4 +1,11 @@ #clan-details-view - .clan-description - margin-left: 10px + .join-clan-link + width: 390px + + .join-link-prompt + font-weight: bold + + .stats-table + width: 200px + background: rgba(0, 0, 0, 0.0) diff --git a/app/templates/clans/clan-details.jade b/app/templates/clans/clan-details.jade index dbe93d02f..8a8a95bfc 100644 --- a/app/templates/clans/clan-details.jade +++ b/app/templates/clans/clan-details.jade @@ -9,23 +9,36 @@ block content each line in clan.get('description').split('\n') p= line - p - if isOwner - button.btn.btn-sm.btn-warning.delete-clan-btn Delete Clan - else if isMember - button.btn.btn-sm.btn-warning.leave-clan-btn Leave Clan - else - button.btn.btn-sm.btn-success.join-clan-btn Join Clan - + h5 Summary + table.table.table-condensed.stats-table if owner - p - span.spr Chieftain: - a(href="/user/#{clan.get('ownerID')}")= owner.get('name') + tr + td + span.spr Chieftain + td + a(href="/user/#{clan.get('ownerID')}")= owner.get('name') if stats.averageLevel - p Average level: #{stats.averageLevel} + tr + td Average Level + td= stats.averageLevel if stats.totalAchievements - p Total achievements earned: #{stats.totalAchievements} - + tr + td Achievements + td= stats.totalAchievements + + p + if isOwner + button.btn.btn-sm.btn-warning.delete-clan-btn Delete Clan + else if isMember + button.btn.btn-sm.btn-warning.leave-clan-btn Leave Clan + else + button.btn.btn-sm.btn-success.join-clan-btn Join Clan + + div + span.spl.spr.join-link-prompt Invite: + input.join-clan-link(type="text", readonly, value="#{joinClanLink}") + .small *Invite players to this Clan by sending them this link. + if members h3 Heroes (#{members.length}) table.table.table-striped.table-condensed diff --git a/app/views/clans/ClanDetailsView.coffee b/app/views/clans/ClanDetailsView.coffee index fe355e556..63423de5f 100644 --- a/app/views/clans/ClanDetailsView.coffee +++ b/app/views/clans/ClanDetailsView.coffee @@ -30,6 +30,10 @@ module.exports = class ClanDetailsView extends RootView getRenderData: -> context = super() context.clan = @clan + if application.isProduction() + context.joinClanLink = "https://codecombat.com/clans/#{@clanID}" + else + context.joinClanLink = "http://localhost:3000/clans/#{@clanID}" context.owner = @owner context.memberAchievementsMap = @memberAchievementsMap context.members = @members?.models