codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-03-14 07:00:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update clan buttons UI

Browse source 
And remove temporary test logging.
This commit is contained in:
Matt Lott 2015-04-06 10:07:16 -07:00
parent cc7bb406ec
commit d4aa9882a9
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/templates/clans/clan-details.jade
View file

@ -29,11 +29,11 @@ block content
p
if isOwner
button.btn.btn-sm.btn-warning.delete-clan-btn Delete Clan
button.btn.btn-xs.btn-warning.delete-clan-btn Delete Clan
else if isMember
button.btn.btn-sm.btn-warning.leave-clan-btn Leave Clan
button.btn.btn-xs.btn-warning.leave-clan-btn Leave Clan
else
button.btn.btn-sm.btn-success.join-clan-btn Join Clan
button.btn.btn-lg.btn-success.join-clan-btn Join Clan
div
span.spl.spr.join-link-prompt Invite:
@ -67,4 +67,4 @@ block content
| #{memberAchievementsMap[member.id].length}
td
if isOwner && member.id !== clan.get('ownerID')
button.btn.btn-sm.btn-warning.remove-member-btn(data-id="#{member.id}") Remove Hero
button.btn.btn-xs.btn-warning.remove-member-btn(data-id="#{member.id}") Remove Hero

8
app/templates/clans/clans.jade
View file

@ -7,7 +7,7 @@ block content
p
textarea.create-clan-description(rows=2, placeholder='New clan description')
p
button.btn.btn-sm.btn-success.create-clan-btn Create New Clan
button.btn.btn-success.create-clan-btn Create New Clan
div(role='tabpanel')
ul.nav.nav-tabs(role='tablist')
@ -42,9 +42,9 @@ block content
a(href="/user/#{clan.get('ownerID')}") Anoner
td
if myClanIDs.indexOf(clan.id) < 0
button.btn.btn-sm.btn-success.join-clan-btn(data-id="#{clan.id}") Join Clan
button.btn.btn-success.join-clan-btn(data-id="#{clan.id}") Join Clan
else if clan.get('ownerID') !== me.id
button.btn.btn-sm.btn-warning.leave-clan-btn(data-id="#{clan.id}") Leave Clan
button.btn.btn-xs.btn-warning.leave-clan-btn(data-id="#{clan.id}") Leave Clan
.tab-pane#my-clans(role='tabpanel')
table.table.table-striped.table-condensed
@ -71,4 +71,4 @@ block content
a(href="/user/#{clan.get('ownerID')}") Anoner
td
if clan.get('ownerID') !== me.id
button.btn.btn-sm.btn-warning.leave-clan-btn(data-id="#{clan.id}") Leave Clan
button.btn.btn-xs.btn-warning.leave-clan-btn(data-id="#{clan.id}") Leave Clan

2
server/clans/clan_handler.coffee
View file

@ -125,8 +125,6 @@ ClanHandler = class ClanHandler extends Handler
query.push {$limit: 100}
Clan.aggregate(query).exec (err, documents) =>
return @sendDatabaseError(res, err) if err
for doc in documents
console.log doc.memberCount, doc.name
@sendSuccess(res, documents)
removeMember: (req, res, clanID, memberID) ->