removed comments from testing.

This commit is contained in:
Nick Gordon 2013-11-23 11:14:16 -08:00
parent 52145a479e
commit 4453ac9fb8
6 changed files with 0 additions and 34 deletions

View file

@ -12,7 +12,6 @@
a.pull-right(ng-click='delete(tag,$index)')
i.icon-trash
a(ng-hide='_editing', ng-click='toggleFilter(tag)')
// tested - working
i.icon-bullhorn(bo-if="tag.challenge")
| {{tag.name}}
li

View file

@ -9,7 +9,6 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
// ------ Information -------
.modal(style='position: relative;top: auto;left: auto;right: auto;margin: 0 auto 20px;z-index: 1;max-width: 100%;')
.modal-header(bindonce='group')
// tested - needs to be dynamic
span(ng-if='group.leader == user.id')
button.btn.btn-primary.pull-right(ng-click='save(group)', ng-show='group._editing') Save
button.btn.btn-default.pull-right(ng-click='group._editing = true', ng-hide='group._editing') Edit Group
@ -49,10 +48,8 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank'
a(ng-click='removeMember(group, member, true)')
i.icon-ban-circle(tooltip='Boot Member')
a
// tested - needs to be dynamic
span(ng-class='{"badge badge-info": group.leader==member._id}', ng-click='clickMember(member._id, true)')
| {{member.profile.name}}
// tested - needs to be dynamic
tr(ng-if='group.memberCount > group.members.length')
td.
<span class='badge'>{{group.memberCount - group.members.length}} more members</span>

View file

@ -3,21 +3,15 @@ div(ng-controller='MemberModalCtrl')
.modal-header(bindonce='profile')
h3
span {{profile.profile.name}}
// tested - working, but needs to be dynamic
span(ng-if='profile.contributor.level') - {{contribText(profile.contributor, profile.backer)}}
.modal-body(bindonce='profile')
.row-fluid
.span6
// tested - working, but needs to be dynamic
img(ng-show='profile.profile.imageUrl', ng-src='{{profile.profile.imageUrl}}')
// tested - working, but needs to be dynamic
markdown(ng-show='profile.profile.blurb', ng-model='profile.profile.blurb')
// tested - working, but needs to be dynamic
ul.muted.unstyled(ng-if='profile.auth.timestamps', style='margin-top:10px;')
li {{profile._id}}
// tested - working, but needs to be dynamic
li(ng-show='profile.auth.timestamps.created') - Member since {{timestamp(profile.auth.timestamps.created)}} -
// tested - working, but needs to be dynamic
li(ng-show='profile.auth.timestamps.loggedin') - Last logged in {{timestamp(profile.auth.timestamps.loggedin)}} -
h3 Stats
include ../profiles/stats

View file

@ -30,7 +30,6 @@
Has contributed to HabitRPG (code, design, pixel art, legal advice, docs, etc). Want this badge? Fix a bug :)
hr
// tested - working, but needs to be dynamic
div(ng-if='profile.backer.tier')
.achievement.achievement-heart
h5 Kickstarter Backer - ${{profile.backer.tier}} Tier
@ -38,27 +37,21 @@
hr
div(ng-if='profile.achievements.streak || user._id == profile._id')
// tested - working, but needs to be dynamic
.achievement.achievement-thermometer(ng-show='profile.achievements.streak')
// tested - working, but needs to be dynamic
div(ng-class='{muted: !profile.achievements.streak}')
h5 {{profile.achievements.streak || 0 }} Streak Achievement(s)
small Has performed {{profile.achievements.streak || 0 }} 21-day streaks on Dailies
hr
div(ng-if='profile.achievements.ultimateGear || user._id == profile._id')
// tested - working, but needs to be dynamic
.achievement.achievement-armor(ng-show='profile.achievements.ultimateGear')
// tested - working, but needs to be dynamic
div(ng-class='{muted: !profile.achievements.ultimateGear}')
h5 Ultimate Gear
small Has upgraded to the maximum weapon and armor set
hr
div(ng-if='profile.achievements.beastMaster || user._id == profile._id')
// tested - working, but needs to be dynamic
.achievement.achievement-rat(ng-show='profile.achievements.beastMaster')
// tested - working, but needs to be dynamic
div(ng-class='{muted: !profile.achievements.beastMaster}')
h5 Beast Master
small Has found all 90 pets (insanely difficult, give this user props!)
@ -86,7 +79,6 @@
div(ng-if='profile.achievements.challenges || user._id == profile._id')
// This is a very strange icon to use. revisit
.achievement.achievement-karaoke(ng-show='profile.achievements.challenges')
// tested - working, but needs to be dynamic
div(ng-class='{muted: !profile.achievements.challenges}')
h5 Was the winner in the following challenges
ul

View file

@ -3,12 +3,10 @@
// started to get unwieldy
script(id='templates/habitrpg-tasks.html', type="text/ng-template")
.grid
// tested - working
.module(bindonce='lists', ng-repeat='list in lists', bo-class='{"rewards-module": list.type==="reward"}')
.task-column(class='{{list.type}}s')
// Todos export/graph options
// tested - working
span.option-box.pull-right(bo-if='main && list.type=="todo"')
a.option-action(ng-show='obj.history.todos', ng-click='toggleChart("todos")', tooltip='Progress')
i.icon-signal
@ -18,7 +16,6 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
// <a href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}" rel=tooltip title="Google Calendar"><i class=icon-calendar></i></a>
// Gold & Gems
// tested - working
span.option-box.pull-right.wallet(bo-if='main && list.type=="reward"')
.money
| {{gold(user.stats.gp)}}
@ -31,7 +28,6 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
h2.task-column_title {{list.header}}
// Todo Chart
// tested - working
.todos-chart(bo-if='list.type == "todo"', ng-show='charts.todos')
// Add New
@ -49,7 +45,6 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
include ./task
// Static Rewards
// tested - working
ul.items(bo-if='main && list.type=="reward" && user.flags.itemsEnabled')
li.task.reward-item(ng-hide='item.hide', ng-repeat='item in itemStore')
// right-hand side control buttons
@ -58,22 +53,18 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
i.icon-comment
//left-hand size commands
.task-controls
// tested - working
a.task-action-btn.btn-reroll(bo-if='item.type=="reroll"', ng-click='modals.reroll = true')
i.icon-repeat
// tested - working
a.money.btn-buy.item-btn(bo-if='item.type!="reroll"', ng-click='buy(item.type)')
span.reward-cost {{item.value}}
span.shop_gold
// main content
// tested - working
span(bo-class='{"shop_{{item.classes}} shop-sprite item-img": true}')
p.task-text {{item.text}}
br
// Ads
// tested - working
div(bo-if='main && !user.purchased.ads && list.type!="reward"')
span.pull-right
a(ng-click='modals.buyGems=true', tooltip=env.t('removeAds'))
@ -82,7 +73,6 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
ins.adsbygoogle(ng-init='initAds()', style='display: inline-block; width: 234px; height: 60px;', data-ad-client='ca-pub-3242350243827794', data-ad-slot='9529624576')
// Todo Tabs
// tested - working
div(bo-if='main && list.type=="todo"', bo-class='{"tabbable tabs-below": list.type=="todo"}')
button.task-action-btn.tile.spacious.bright(ng-show='list.showCompleted', ng-click='clearCompleted()') Clear Completed
// remaining/completed tabs

View file

@ -3,7 +3,6 @@ li(bindonce='list', ng-repeat='task in obj[list.type+"s"]', class='task {{taskCl
.task-meta-controls
// Due Date
// tested - working, but should be dynamic for when users update the date.
span.task-date(ng-if='task.type=="todo" && task.date')
| {{task.date}}
// Streak
@ -44,7 +43,6 @@ li(bindonce='list', ng-repeat='task in obj[list.type+"s"]', class='task {{taskCl
.task-controls.task-primary
// Habits
// tested - working
span(bo-if='task.type=="habit"')
// score() is overridden in challengesCtrl to do nothing
a.task-action-btn(ng-if='task.up', ng-click='score(task,"up")') +
@ -57,7 +55,6 @@ li(bindonce='list', ng-repeat='task in obj[list.type+"s"]', class='task {{taskCl
span.shop_gold
// Daily & Todos
// tested - working
span.task-checker.action-yesno(bo-if='task.type=="daily" || task.type=="todo"')
input.visuallyhidden.focusable(ng-if='$state.includes("tasks")', id='box-{{obj._id}}_{{task.id}}', type='checkbox', ng-model='task.completed', ng-change='changeCheck(task)')
input.visuallyhidden.focusable(ng-if='!$state.includes("tasks")', id='box-{{obj._id}}_{{task.id}}', type='checkbox')
@ -117,7 +114,6 @@ li(bindonce='list', ng-repeat='task in obj[list.type+"s"]', class='task {{taskCl
label(for='{{obj._id}}_{{task.id}}-option-minus')
// if Daily, calendar
// tested - working
fieldset(bo-if='task.type=="daily"', class="option-group")
legend.option-title Repeat
.task-controls.tile-group.repeat-days
@ -149,7 +145,6 @@ li(bindonce='list', ng-repeat='task in obj[list.type+"s"]', class='task {{taskCl
| {{tag.name}}
// Advanced Options
// tested - working
span(bo-if='task.type!="reward"')
p.option-title.mega(ng-click='task._advanced = !task._advanced') Advanced Options
fieldset.option-group.advanced-option(ng-class="{visuallyhidden: !task._advanced}")
@ -162,7 +157,6 @@ li(bindonce='list', ng-repeat='task in obj[list.type+"s"]', class='task {{taskCl
button.task-action-btn.tile(type='button', ng-class='{active: task.priority=="!!"}', ng-click='task.challenge.id || (task.priority="!!")') Medium
button.task-action-btn.tile(type='button', ng-class='{active: task.priority=="!!!"}', ng-click='task.challenge.id || (task.priority="!!!")') Hard
//span(ng-if='task.type=="daily" && !task.challenge.id')
// tested - not working... wtf? changing to ng-if
span(ng-if='task.type=="daily"')
legend.option-title Restore Streak
input.option-content(type='number', ng-model='task.streak')