From 99171734294c1f551dee27c1c802b9d046563f29 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Thu, 11 Apr 2013 18:22:06 -0400
Subject: [PATCH] Rest

---
 locales/en/app.json    | 10 +++++-----
 src/app/scoring.coffee |  1 +
 views/app/avatar.html  |  8 ++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/locales/en/app.json b/locales/en/app.json
index 20fa1f5f4a..9fbc74a6a8 100644
--- a/locales/en/app.json
+++ b/locales/en/app.json
@@ -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",
diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index caad03730b..ab4b30f331 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -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
 
diff --git a/views/app/avatar.html b/views/app/avatar.html
index a83ca6ee89..930c5cdfde 100644
--- a/views/app/avatar.html
+++ b/views/app/avatar.html
@@ -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) -->