From bee5d53457594ace747d1061abd6d71632e64b7c Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Wed, 1 Jul 2015 15:16:17 -0700 Subject: [PATCH] Fix clan details html indentation And reorder progress key. --- app/templates/clans/clan-details.jade | 146 +++++++++++++------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/app/templates/clans/clan-details.jade b/app/templates/clans/clan-details.jade index 3905ff19e..a19a0e5f2 100644 --- a/app/templates/clans/clan-details.jade +++ b/app/templates/clans/clan-details.jade @@ -86,89 +86,89 @@ block content th(data-i18n="resources.hero") Hero th span.progress-header(data-i18n="clans.progress") Progress - span.progress-key(data-i18n="clans.not_started_1") not started - span.progress-key.progress-key-started(data-i18n="clans.started_1") started span.progress-key.progress-key-complete(data-i18n="clans.complete_1") complete + span.progress-key.progress-key-started(data-i18n="clans.started_1") started + span.progress-key(data-i18n="clans.not_started_1") not started input.expand-progress-checkbox(type='checkbox') span.spl.expand-progress-label(data-i18n="clans.exp_levels") Expand levels tbody each member in members tr - td - div - span.hero-icon-cell - span.spr.player-hero-icon(data-memberid="#{member.id}") - span.code-language-cell - if memberLanguageMap && memberLanguageMap[member.id] - span.code-language-cell(style="background-image: url(/images/common/code_languages/#{memberLanguageMap[member.id]}_small.png)", title=memberLanguageMap[member.id]) - div - a(href="/user/#{member.id}")= member.get('name') || 'Anoner' - div Level #{member.level()} - 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 - td.progress-cell + td + div + span.hero-icon-cell + span.spr.player-hero-icon(data-memberid="#{member.id}") + span.code-language-cell + if memberLanguageMap && memberLanguageMap[member.id] + span.code-language-cell(style="background-image: url(/images/common/code_languages/#{memberLanguageMap[member.id]}_small.png)", title=memberLanguageMap[member.id]) + div + a(href="/user/#{member.id}")= member.get('name') || 'Anoner' + div Level #{member.level()} + 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 + td.progress-cell - each campaign in campaignLevelProgressions - if lastUserCampaignLevelMap[member.id] && lastUserCampaignLevelMap[member.id][campaign.ID] - div.level-progression-campaign= campaign.name - - var i = 0 + each campaign in campaignLevelProgressions + if lastUserCampaignLevelMap[member.id] && lastUserCampaignLevelMap[member.id][campaign.ID] + div.level-progression-campaign= campaign.name + - var i = 0 - each level in campaign.levels - - i++ - - var state = null, levelInfo = null - if memberLevelStateMap[member.id][level.slug] - - levelInfo = memberLevelStateMap[member.id][level.slug].levelInfo - - state = memberLevelStateMap[member.id][level.slug].state - if state === 'complete' - span.progress-level-cell.progress-level-cell-complete(data-level-info=levelInfo) #{i} - if showExpandedProgress || i === 1 || i === lastUserCampaignLevelMap[member.id][campaign.ID].index + 1 - span.spl #{level.name} - .level-popup-container - h3 #{i}. #{levelInfo.level} - p + each level in campaign.levels + - i++ + - var state = null, levelInfo = null + if memberLevelStateMap[member.id][level.slug] + - levelInfo = memberLevelStateMap[member.id][level.slug].levelInfo + - state = memberLevelStateMap[member.id][level.slug].state + if state === 'complete' + span.progress-level-cell.progress-level-cell-complete(data-level-info=levelInfo) #{i} + if showExpandedProgress || i === 1 || i === lastUserCampaignLevelMap[member.id][campaign.ID].index + 1 + span.spl #{level.name} + .level-popup-container + h3 #{i}. #{levelInfo.level} + p + div + span(data-i18n="choose_hero.status") Status + span.spr : + span(data-i18n="clans.complete_2") Complete + div + span(data-i18n="clans.playtime") Playtime + span : #{levelInfo.playtime}s + div + span(data-i18n="clans.last_played") Last played + span : #{levelInfo.changed} + if isOwner || me.isAdmin() + strong(data-i18n="clans.view_solution") Click to view solution. + else if state === 'started' + span.progress-level-cell.progress-level-cell-started(data-level-info=levelInfo) #{i} + if showExpandedProgress || i === 1 || i === lastUserCampaignLevelMap[member.id][campaign.ID].index + 1 + span.spl #{level.name} + .level-popup-container + h3 #{i}. #{level.name} + p + div + span(data-i18n="choose_hero.status") Status + span.spr : + span(data-i18n="clans.started_2") Started + div + span(data-i18n="clans.playtime") Playtime + span : #{levelInfo.playtime}s + div + span(data-i18n="clans.last_played") Last played + span : #{levelInfo.changed} + if isOwner || me.isAdmin() + strong(data-i18n="clans.view_solution") Click to view solution. + else + span.progress-level-cell.level-progression-level-not-started #{i} + if showExpandedProgress || i === 1 || i === lastUserCampaignLevelMap[member.id][campaign.ID].index + 1 + span.spl #{level.name} + .level-popup-container + h3 #{i}. #{level.name} div span(data-i18n="choose_hero.status") Status - span.spr : - span(data-i18n="clans.complete_2") Complete - div - span(data-i18n="clans.playtime") Playtime - span : #{levelInfo.playtime}s - div - span(data-i18n="clans.last_played") Last played - span : #{levelInfo.changed} - if isOwner || me.isAdmin() - strong(data-i18n="clans.view_solution") Click to view solution. - else if state === 'started' - span.progress-level-cell.progress-level-cell-started(data-level-info=levelInfo) #{i} - if showExpandedProgress || i === 1 || i === lastUserCampaignLevelMap[member.id][campaign.ID].index + 1 - span.spl #{level.name} - .level-popup-container - h3 #{i}. #{level.name} - p - div - span(data-i18n="choose_hero.status") Status - span.spr : - span(data-i18n="clans.started_2") Started - div - span(data-i18n="clans.playtime") Playtime - span : #{levelInfo.playtime}s - div - span(data-i18n="clans.last_played") Last played - span : #{levelInfo.changed} - if isOwner || me.isAdmin() - strong(data-i18n="clans.view_solution") Click to view solution. - else - span.progress-level-cell.level-progression-level-not-started #{i} - if showExpandedProgress || i === 1 || i === lastUserCampaignLevelMap[member.id][campaign.ID].index + 1 - span.spl #{level.name} - .level-popup-container - h3 #{i}. #{level.name} - div - span(data-i18n="choose_hero.status") Status - span.spr : - span(data-i18n="clans.not_started_2") Not Started - if lastUserCampaignLevelMap[member.id][campaign.ID].levelSlug === level.slug - - break + span.spr : + span(data-i18n="clans.not_started_2") Not Started + if lastUserCampaignLevelMap[member.id][campaign.ID].levelSlug === level.slug + - break //- Basic dashboard else