This commit is contained in:
Daniel Saewitz 2013-04-11 18:22:06 -04:00
parent fa4da2a9e8
commit 9917173429
3 changed files with 14 additions and 5 deletions

View file

@ -1,6 +1,6 @@
{
"_commenttut": "TUTORIAL",
"_commenthead": "HEADER",
"Health": "Health",
"Experience": "Experience",
@ -8,7 +8,7 @@
"Settings": "Settings",
"Party": "Party",
"Logout": "Logout",
"_commentuser": "USER",
"Anonymous": "Anonymous",
"Avatar": "Avatar",
@ -37,7 +37,7 @@
"MarketContent": "Dying to get that particular pet you're after, but don't want to wait for it to drop? Buy it here!",
"Stable": "Stable",
"Tokens": "Tokens",
"_commentitems": "DROPS, ITEMS & REWARDS",
"_comment": "PET EGGS",
"WolfEgg": "Wolf Cub",
@ -63,7 +63,7 @@
"GoldenPot": "Golden",
"_comment": "GOLD REWARDS",
"_commentmain": "MAIN WINDOW",
"Habits": "Habits",
@ -94,7 +94,7 @@
"F": "F",
"S": "S",
"Todos": "Todos",
"NewTodo": "New Todo",
"NewTodo": "New Todo",
"DueDate": "Due Date",
"Remaining": "Remaining",
"Complete": "Complete",

View file

@ -258,6 +258,7 @@ updateStats = (model, newStats, batch) ->
cron = (model) ->
user = model.at '_user'
today = +new Date
return if user.get 'flags.rest'
daysPassed = helpers.daysBetween(user.get('lastCron'), today, user.get('preferences.dayStart'))
if daysPassed > 0

View file

@ -9,6 +9,7 @@
<ul class="nav nav-tabs">
<li class="active"><a data-toggle='tab' href="#profileCustomize">Avatar</a></li>
<li><a data-toggle='tab' href="#profileEdit">Profile</a></li>
<li><a data-toggle='tab' data-target="#rest">Rest</a></li>
{#if _user.flags.dropsEnabled}
<li><a data-toggle='tab' data-target="#profileInventory">Inventory</a></li>
<li><a data-toggle='tab' data-target="#profileMarket">Market</a></li>
@ -25,6 +26,10 @@
<app:avatar:profile user="{_user}" main="true" />
</div>
<div class="tab-pane" id="rest">
<app:avatar:rest />
</div>
<div class="tab-pane" id="profileInventory">
<app:avatar:inventory />
</div>
@ -214,6 +219,9 @@
</div>
<rest:>
<input type="checkbox" name="rest" checked={_user.flags.rest} >Rest</input>
<achievements:>
<!--TODO replce this in the future with HTML from BrowserQuest's index.html, which properly handles the achievements
sprite-sheets (see BQ's achievements.css, main.css) -->