From 897cd3f2bb77523fb262c401c0c60e88d0704553 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Wed, 20 Feb 2013 13:35:21 -0500
Subject: [PATCH 001/220] wip

---
 package.json           |  3 +-
 src/server/api.coffee  | 27 ++++++++++++
 test/api.mocha.coffee  | 92 ++++++++++++++++++++++++++++++++++++++++
 test/user.mocha.coffee | 96 +++++++++++++++++++++---------------------
 4 files changed, 169 insertions(+), 49 deletions(-)
 create mode 100644 test/api.mocha.coffee

diff --git a/package.json b/package.json
index 965ee1113e..9ead9904f8 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,8 @@
     "nconf": "*",
     "icalendar": "git://github.com/lefnire/node-icalendar#master",
     "nodetime": "*",
-    "resolve": "~0.2.3"
+    "resolve": "~0.2.3",
+    "request": "~2.14.0"
   },
   "private": true,
   "subdomain": "habitrpg",
diff --git a/src/server/api.coffee b/src/server/api.coffee
index f394945f09..50208154d8 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -13,6 +13,33 @@ icalendar = require('icalendar')
   curl -X POST -H "Content-Type:application/json" -d '{"apiToken":"{TOKEN}"}' localhost:3000/v1/users/{UID}/tasks/productivity/up
 ###
 
+router.get '/users/:uid/tasks', (req, res) ->
+  {uid, taskId, direction} = req.params
+  {apiToken, title, service, icon} = req.body
+  console.log {params:req.params, body:req.body} if process.env.NODE_ENV == 'development'
+
+  # Send error responses for improper API call
+  return res.send(500, 'request body "apiToken" required') unless apiToken
+  return res.send(500, ':uid required') unless uid
+
+  model = req.getModel()
+  req._isServer = true
+  model.fetch model.query('users').withIdAndToken(uid, apiToken), (err, result) ->
+    return res.send(500, err) if err
+    user = result.at(0)
+    userObj = user.get()
+    if _.isEmpty(userObj)
+      return res.send(500, "User with uid=#{uid}, token=#{apiToken} not found. Make sure you're not using your username, but your User Id")
+
+    model.ref('_user', user)
+
+    # Create task if doesn't exist
+    # TODO add service & icon to task
+    unless model.get("_user.tasks")
+      model.refList "_habitList", "_user.tasks", "_user.habitIds"
+      return res.json model.get '_habitList'
+
+
 router.post '/users/:uid/tasks/:taskId/:direction', (req, res) ->
   {uid, taskId, direction} = req.params
   {apiToken, title, service, icon} = req.body
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
new file mode 100644
index 0000000000..95cbe7472b
--- /dev/null
+++ b/test/api.mocha.coffee
@@ -0,0 +1,92 @@
+assert = require 'assert'
+{BrowserModel: Model} = require 'racer/test/util/model'
+derby = require 'derby'
+_ = require 'underscore'
+moment = require 'moment'
+request = require 'request'
+
+# Custom modules
+scoring = require '../src/app/scoring'
+character = require '../src/app/character'
+
+###### Helpers & Variables ######
+
+model = null
+uuid = null
+taskPath = null
+baseURL = 'http://localhost:3000'
+
+## Helper which clones the content at a path so tests can compare before/after values
+# Otherwise, using model.get(path) will give the same object before as after
+pathSnapshots = (paths) ->
+  if _.isString(paths)
+    return clone(model.get(paths))
+  _.map paths, (path) -> clone(model.get(path))
+statsTask = -> pathSnapshots(['_user.stats', taskPath]) # quick snapshot of user.stats & task
+
+cleanUserObj = ->
+  userObj = character.newUserObject()
+  userObj.tasks = {}
+  userObj.habitIds = []
+  userObj.dailyIds = []
+  userObj.todoIds = []
+  userObj.rewardIds = []
+  return userObj
+resetUser = -> model.set '_user', cleanUserObj()
+
+freshTask = (taskObj) ->
+  resetUser()
+  # create a test task
+  uuid = derby.uuid()
+  taskPath = "_user.tasks.#{uuid}"
+  {type} = taskObj
+  model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
+  [taskObj.id, taskObj.value] = [uuid, 0]
+  model.at("_#{type}List").push taskObj
+
+###
+Helper function to determine if stats updates are numerically correct based on scoring
+@direction: 'up' or 'down'
+@options: The user stats modifiers and times to run, defaults to {times:1, modifiers:{lvl:1, weapon:0, armor:0}}
+###
+modificationsLookup = (direction, options = {}) ->
+  merged = _.defaults options, {times:1, lvl:1, weapon:0, armor:0}
+  {times, lvl, armor, weapon}  = merged
+  userObj = cleanUserObj()
+  value = 0
+  _.times times, (n) ->
+    delta = scoring.taskDeltaFormula(value, direction)
+    value += delta
+    if direction=='up'
+      gain = scoring.expModifier(delta, options)
+      userObj.stats.exp += gain
+      userObj.stats.money += gain
+    else
+      loss = scoring.hpModifier(delta, options)
+      userObj.stats.hp += loss
+  return {user:userObj, value:value}
+
+###### Specs ######
+
+describe 'API', ->
+  model = null
+
+  before ->
+    model = new Model
+    model.set '_user', character.newUserObject()
+    scoring.setModel model
+
+  it '/v1/:uid/tasks returns correct user defaults', (done) ->
+    user = model.get '_user'
+
+    request "#{baseURL}/#{user.id}/tasks", (err, res, body) ->
+      assert.ok !err
+      tasks = []
+
+      ['habit','daily'].map (type) ->
+        model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
+        tasks.concat model.get "_#{type}List"
+
+      console.log 'hi', tasks
+      assert.ok _.isEqual tasks, body
+      done()
diff --git a/test/user.mocha.coffee b/test/user.mocha.coffee
index 33b1917014..3f4cc1ec5c 100644
--- a/test/user.mocha.coffee
+++ b/test/user.mocha.coffee
@@ -8,7 +8,7 @@ moment = require 'moment'
 # Custom modules
 scoring = require '../src/app/scoring'
 schema = require '../src/app/schema'
-  
+
 ###### Helpers & Variables ######
 
 model = null
@@ -19,11 +19,11 @@ taskPath = null
 # Otherwise, using model.get(path) will give the same object before as after
 pathSnapshots = (paths) ->
   if _.isString(paths)
-    return clone(model.get(paths)) 
+    return clone(model.get(paths))
   _.map paths, (path) -> clone(model.get(path))
 statsTask = -> pathSnapshots(['_user.stats', taskPath]) # quick snapshot of user.stats & task
 
-cleanUserObj = -> 
+cleanUserObj = ->
   userObj = schema.newUserObject()
   userObj.tasks = {}
   userObj.habitIds = []
@@ -42,14 +42,14 @@ freshTask = (taskObj) ->
   model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
   [taskObj.id, taskObj.value] = [uuid, 0]
   model.at("_#{type}List").push taskObj
-  
+
 ###
 Helper function to determine if stats updates are numerically correct based on scoring
 @direction: 'up' or 'down'
-@options: The user stats modifiers and times to run, defaults to {times:1, modifiers:{lvl:1, weapon:0, armor:0}} 
+@options: The user stats modifiers and times to run, defaults to {times:1, modifiers:{lvl:1, weapon:0, armor:0}}
 ###
 modificationsLookup = (direction, options = {}) ->
-  merged = _.defaults options, {times:1, lvl:1, weapon:0, armor:0} 
+  merged = _.defaults options, {times:1, lvl:1, weapon:0, armor:0}
   {times, lvl, armor, weapon}  = merged
   userObj = cleanUserObj()
   value = 0
@@ -64,12 +64,12 @@ modificationsLookup = (direction, options = {}) ->
       loss = scoring.hpModifier(delta, options)
       userObj.stats.hp += loss
   return {user:userObj, value:value}
-  
-###### Specs ###### 
+
+###### Specs ######
 
 describe 'User', ->
   model = null
-  
+
   before ->
     model = new Model
     model.set '_user', schema.newUserObject()
@@ -85,23 +85,23 @@ describe 'User', ->
     expect(_.size(user.dailyIds)).to.eql 3
     expect(_.size(user.todoIds)).to.eql 1
     expect(_.size(user.rewardIds)).to.eql 2
-  
-  ##### Habits #####  
+
+  ##### Habits #####
   describe 'Tasks', ->
-    
-    beforeEach -> 
+
+    beforeEach ->
       resetUser()
-    
+
     describe 'Habits', ->
-      
-      beforeEach -> 
+
+      beforeEach ->
         freshTask {type: 'habit', text: 'Habit', up: true, down: true}
-      
+
       it 'created the habit', ->
         task = model.get(taskPath)
         expect(task.text).to.eql 'Habit'
         expect(task.value).to.eql 0
-        
+
       it 'test a few scoring numbers (this will change if constants / formulae change)', ->
         {user} = modificationsLookup('down')
         expect(user.stats.hp).to.eql 49
@@ -113,10 +113,10 @@ describe 'User', ->
         expect(user.stats.money).to.eql 1
         {user} = modificationsLookup('up', {times:5})
         expect(user.stats.exp).to.be.within(4,5)
-        
+
       it 'made proper modifications when down-scored', ->
         ## Trial 1
-        
+
         shouldBe = modificationsLookup('down')
         scoring.score(uuid,'down')
         [stats, task] = statsTask()
@@ -130,14 +130,14 @@ describe 'User', ->
         [stats, task] = statsTask()
         expect(stats.hp).to.be.eql shouldBe.user.stats.hp
         expect(task.value).to.eql  shouldBe.value
-        
+
       it 'made proper modifications when up-scored', ->
         # Up-score the habit
         [statsBefore, taskBefore] = statsTask()
         scoring.score(uuid, 'up')
         [statsAfter, taskAfter] = statsTask()
-        
-        # User should have gained Exp, GP 
+
+        # User should have gained Exp, GP
         expect(statsAfter.exp).to.be.greaterThan statsBefore.exp
         expect(statsAfter.money).to.be.greaterThan statsBefore.money
         # HP should not change
@@ -145,9 +145,9 @@ describe 'User', ->
         # Task should have lost value
         expect(taskBefore.value).to.eql 0
         expect(taskAfter.value).to.be.greaterThan taskBefore.value
-        
+
         ## Trial 2
-        taskBefore = pathSnapshots(taskPath)        
+        taskBefore = pathSnapshots(taskPath)
         scoring.score(uuid, 'up')
         taskAfter = pathSnapshots(taskPath)
         # Should have lost in value
@@ -155,54 +155,54 @@ describe 'User', ->
         # And lost more than trial 1
         diff = Math.abs(taskAfter.value) - Math.abs(taskBefore.value)
         expect(diff).to.be.lessThan 1
-        
-      it 'makes history entry for habit'      
+
+      it 'makes history entry for habit'
       it 'makes proper modifications each time when clicking + / - in rapid succession'
       # saw an issue here once, so test that it wasn't a fluke
-     
+
       it 'should not modify certain attributes given certain conditions'
         # non up+down habits
         # what else?
-        
+
       it 'should show "undo" notification if user unchecks completed daily'
-      
-      
-      describe 'Lvl & Items', ->  
-      
-        beforeEach -> 
+
+
+      describe 'Lvl & Items', ->
+
+        beforeEach ->
           freshTask {type: 'habit', text: 'Habit', up: true, down: true}
-              
+
         it 'modified damage based on lvl & armor'
         it 'modified exp/gp based on lvl & weapon'
         it 'always decreases hp with damage, regardless of stats/items'
         it 'always increases exp/gp with gain, regardless of stats/items'
-      
+
     describe 'Dailies', ->
-      
+
       beforeEach ->
         freshTask {type: 'daily', text: 'Daily', completed: false}
-        
+
       it 'created the daily', ->
         task = model.get(taskPath)
         expect(task.text).to.eql 'Daily'
         expect(task.value).to.eql 0
-        
+
       it 'does proper calculations when daily is complete'
       it 'calculates dailys properly when they have repeat dates'
-      
+
       runCron = (times, pass=1) ->
         # Set lastCron to days ago
           today = new moment()
           ago = new moment().subtract('days',times)
           model.set '_user.lastCron', ago.toDate()
           # Run run
-          scoring.cron() 
+          scoring.cron()
           [stats, task] = statsTask()
-          
+
           # Should have updated cron to today
           lastCron = moment(model.get('_user.lastCron'))
           expect(today.diff(lastCron, 'days')).to.eql 0
-          
+
           shouldBe = modificationsLookup('down', {times:times*pass})
           # Should have updated points properly
           expect(Math.round(stats.hp)).to.be.eql Math.round(shouldBe.user.stats.hp)
@@ -215,10 +215,10 @@ describe 'User', ->
         runCron(5)
         runCron(5, 2)
 
-         
+
       #TODO clicking repeat dates on newly-created item doesn't refresh until you refresh the page
       #TODO dates on dailies is having issues, possibility: date cusps? my saturday exempts were set to exempt at 8pm friday
-    
+
     describe 'Todos', ->
       describe 'Cron', ->
         it 'calls cron asyncronously'
@@ -230,11 +230,11 @@ describe 'User', ->
         # stop passing in tallyFor, let moment().sod().toDate() be handled in scoring.score()
         it 'should defer saving user modifications until, save as aggregate values'
         # pass in commit parameter to scoring func, if true save right away, otherwise return aggregated array so can save in the end (so total hp loss, etc)
-    
+
     describe 'Rewards', ->
-      
+
   #### Require.js stuff, might be necessary to place in casper.coffee
   it "doesn't setup dependent functions until their modules are loaded, require.js callback"
-  # sortable, stripe, etc 
+  # sortable, stripe, etc
 
 #TODO refactor as user->habits, user->dailys, user->todos, user->rewards
\ No newline at end of file

From f75e3662b9a358af4bb76eb59011bfbbd99b8335 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Wed, 20 Feb 2013 20:04:09 -0500
Subject: [PATCH 002/220] wi[

---
 .gitignore                   |  3 +-
 package.json                 |  3 +-
 src/server/api.coffee        | 78 +++++++-----------------------------
 src/server/deprecated.coffee | 72 +++++++++++++++++++++++++++++++++
 src/server/index.coffee      |  2 +-
 src/server/store.coffee      | 14 +++----
 test/api.mocha.coffee        | 41 +++++++++++--------
 7 files changed, 124 insertions(+), 89 deletions(-)

diff --git a/.gitignore b/.gitignore
index f54c5f2a27..77291d9d0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ node_modules
 #lib/
 *.swp
 .idea*
-config.json
\ No newline at end of file
+config.json
+test/config.json
\ No newline at end of file
diff --git a/package.json b/package.json
index 9ead9904f8..bc501098c9 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,8 @@
     "icalendar": "git://github.com/lefnire/node-icalendar#master",
     "nodetime": "*",
     "resolve": "~0.2.3",
-    "request": "~2.14.0"
+    "request": "~2.14.0",
+    "querystring": "~0.1.0"
   },
   "private": true,
   "subdomain": "habitrpg",
diff --git a/src/server/api.coffee b/src/server/api.coffee
index 50208154d8..b142ec09b3 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -5,6 +5,9 @@ scoring = require '../app/scoring'
 _ = require 'underscore'
 icalendar = require('icalendar')
 
+NO_TOKEN_OR_UID = err: "You must include a token and uid (user id) in your request"
+NO_USER_FOUND = err: "No user found."
+
 # ---------- /v1 API ------------
 # Every url added beneath router is prefaced by /v1
 
@@ -13,75 +16,24 @@ icalendar = require('icalendar')
   curl -X POST -H "Content-Type:application/json" -d '{"apiToken":"{TOKEN}"}' localhost:3000/v1/users/{UID}/tasks/productivity/up
 ###
 
-router.get '/users/:uid/tasks', (req, res) ->
-  {uid, taskId, direction} = req.params
-  {apiToken, title, service, icon} = req.body
-  console.log {params:req.params, body:req.body} if process.env.NODE_ENV == 'development'
+router.get '/status', (req, res) ->
+  res.json
+    status: 'up'
 
-  # Send error responses for improper API call
-  return res.send(500, 'request body "apiToken" required') unless apiToken
-  return res.send(500, ':uid required') unless uid
+router.get '/user', (req, res) ->
+  { uid, token } = req.query
+  return res.json 500, NO_TOKEN_OR_UID unless uid || token
 
   model = req.getModel()
-  req._isServer = true
-  model.fetch model.query('users').withIdAndToken(uid, apiToken), (err, result) ->
-    return res.send(500, err) if err
-    user = result.at(0)
-    userObj = user.get()
-    if _.isEmpty(userObj)
-      return res.send(500, "User with uid=#{uid}, token=#{apiToken} not found. Make sure you're not using your username, but your User Id")
+  query = model.query('users').withIdAndToken(uid, token)
 
-    model.ref('_user', user)
+  model.fetch query, (err, user) ->
+    return res.json 500, err: err if err
+    return res.json 500, err: NO_USER_FOUND unless user
 
-    # Create task if doesn't exist
-    # TODO add service & icon to task
-    unless model.get("_user.tasks")
-      model.refList "_habitList", "_user.tasks", "_user.habitIds"
-      return res.json model.get '_habitList'
+    res.json user
 
-
-router.post '/users/:uid/tasks/:taskId/:direction', (req, res) ->
-  {uid, taskId, direction} = req.params
-  {apiToken, title, service, icon} = req.body
-  console.log {params:req.params, body:req.body} if process.env.NODE_ENV == 'development'
-
-  # Send error responses for improper API call
-  return res.send(500, 'request body "apiToken" required') unless apiToken
-  return res.send(500, ':uid required') unless uid
-  return res.send(500, ':taskId required') unless taskId
-  return res.send(500, ":direction must be 'up' or 'down'") unless direction in ['up','down']
-
-  model = req.getModel()
-  req._isServer = true
-  model.fetch model.query('users').withIdAndToken(uid, apiToken), (err, result) ->
-    return res.send(500, err) if err
-    user = result.at(0)
-    userObj = user.get()
-    if _.isEmpty(userObj)
-      return res.send(500, "User with uid=#{uid}, token=#{apiToken} not found. Make sure you're not using your username, but your User Id")
-
-    model.ref('_user', user)
-
-    # Create task if doesn't exist
-    # TODO add service & icon to task
-    unless model.get("_user.tasks.#{taskId}")
-      model.refList "_habitList", "_user.tasks", "_user.habitIds"
-      model.at('_habitList').push
-        id: taskId
-        type: 'habit'
-        text: (title || taskId)
-        value: 0
-        up: true
-        down: true
-        notes: "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task."
-
-    scoring.setModel(model)
-    delta = scoring.score(taskId, direction)
-    result = model.get ('_user.stats')
-    result.delta = delta
-    res.send(result)
-
-router.get '/users/:uid/calendar.ics', (req, res) ->
+router.get '/user/calendar.ics', (req, res) ->
   #return next() #disable for now
   {uid} = req.params
   {apiToken} = req.query
diff --git a/src/server/deprecated.coffee b/src/server/deprecated.coffee
index e8a5fb7340..44ae3d392c 100644
--- a/src/server/deprecated.coffee
+++ b/src/server/deprecated.coffee
@@ -1,6 +1,10 @@
 express = require 'express'
 router = new express.Router()
 
+scoring = require '../app/scoring'
+_ = require 'underscore'
+icalendar = require('icalendar')
+
 # ---------- Deprecated Paths ------------
 
 deprecatedMessage = 'This API is no longer supported, see https://github.com/lefnire/habitrpg/wiki/API for new protocol'
@@ -9,4 +13,72 @@ router.get '/:uid/up/:score?', (req, res) -> res.send(500, deprecatedMessage)
 router.get '/:uid/down/:score?', (req, res) -> res.send(500, deprecatedMessage)
 router.post '/users/:uid/tasks/:taskId/:direction', (req, res) -> res.send(500, deprecatedMessage)
 
+router.post '/v1/users/:uid/tasks/:taskId/:direction', (req, res) ->
+  {uid, taskId, direction} = req.params
+  {apiToken, title, service, icon} = req.body
+  console.log {params:req.params, body:req.body} if process.env.NODE_ENV == 'development'
+
+  # Send error responses for improper API call
+  return res.send(500, 'request body "apiToken" required') unless apiToken
+  return res.send(500, ':uid required') unless uid
+  return res.send(500, ':taskId required') unless taskId
+  return res.send(500, ":direction must be 'up' or 'down'") unless direction in ['up','down']
+
+  model = req.getModel()
+  req._isServer = true
+  model.fetch model.query('users').withIdAndToken(uid, apiToken), (err, result) ->
+    return res.send(500, err) if err
+    user = result.at(0)
+    userObj = user.get()
+    if _.isEmpty(userObj)
+      return res.send(500, "User with uid=#{uid}, token=#{apiToken} not found. Make sure you're not using your username, but your User Id")
+
+    model.ref('_user', user)
+
+    # Create task if doesn't exist
+    # TODO add service & icon to task
+    unless model.get("_user.tasks.#{taskId}")
+      model.refList "_habitList", "_user.tasks", "_user.habitIds"
+      model.at('_habitList').push
+        id: taskId
+        type: 'habit'
+        text: (title || taskId)
+        value: 0
+        up: true
+        down: true
+        notes: "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task."
+
+    scoring.setModel(model)
+    delta = scoring.score(taskId, direction)
+    result = model.get ('_user.stats')
+    result.delta = delta
+    res.send(result)
+
+router.get '/v1/users/:uid/calendar.ics', (req, res) ->
+  #return next() #disable for now
+  {uid} = req.params
+  {apiToken} = req.query
+
+  model = req.getModel()
+  query = model.query('users').withIdAndToken(uid, apiToken)
+  query.fetch (err, result) ->
+    return res.send(500, err) if err
+    tasks = result.at(0).get('tasks')
+    #      tasks = result[0].tasks
+    tasksWithDates = _.filter tasks, (task) -> !!task.date
+    return res.send(500, "No events found") if _.isEmpty(tasksWithDates)
+
+    ical = new icalendar.iCalendar()
+    ical.addProperty('NAME', 'HabitRPG')
+    _.each tasksWithDates, (task) ->
+      event = new icalendar.VEvent(task.id);
+      event.setSummary(task.text);
+      d = new Date(task.date)
+      d.date_only = true
+      event.setDate d
+      ical.addComponent event
+    res.type('text/calendar')
+    formattedIcal = ical.toString().replace(/DTSTART\:/g, 'DTSTART;VALUE=DATE:')
+    res.send(200, formattedIcal)
+
 module.exports = router
diff --git a/src/server/index.coffee b/src/server/index.coffee
index 8a1b29826b..21b9a69d4a 100644
--- a/src/server/index.coffee
+++ b/src/server/index.coffee
@@ -107,7 +107,7 @@ mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, ->
     .use(auth.middleware(strategies, options))
     # Creates an express middleware from the app's routes
     .use(app.router())
-    .use('/v1', require('./api').middleware)
+    .use('/api/v1', require('./api').middleware)
     .use(require('./static').middleware)
     .use(require('./deprecated').middleware)
     .use(expressApp.router)
diff --git a/src/server/store.coffee b/src/server/store.coffee
index 38476d72cc..1edada5125 100644
--- a/src/server/store.coffee
+++ b/src/server/store.coffee
@@ -53,14 +53,14 @@ userAccess = (store) ->
   Get user with API token
 ###
 REST = (store) ->
-  store.query.expose "users", "withIdAndToken", (id, apiToken) ->
-    @where("id").equals(id)
-      .where('apiToken').equals(apiToken)
-      .limit(1)
+  store.query.expose "users", "withIdAndToken", (uid, token) ->
+    @where('id').equals(uid)
+      .where('apiToken').equals(token)
+      .one
 
-  store.queryAccess "users", "withIdAndToken", (id, apiToken, accept, err) ->
-    return accept(true) unless @session?.userId # https://github.com/codeparty/racer/issues/37
-    accept(true) # only user has id & token
+  store.queryAccess "users", "withIdAndToken", (id, token, accept, err) ->
+    return accept(true) if id && token
+    accept(false) # only user has id & token
 
 
 ###
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 95cbe7472b..ec3d5ca243 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -4,17 +4,22 @@ derby = require 'derby'
 _ = require 'underscore'
 moment = require 'moment'
 request = require 'request'
+qs = require 'querystring'
 
 # Custom modules
 scoring = require '../src/app/scoring'
 character = require '../src/app/character'
+config = require './config'
 
 ###### Helpers & Variables ######
 
 model = null
 uuid = null
 taskPath = null
-baseURL = 'http://localhost:3000'
+baseURL = 'http://localhost:3000/api/v1'
+UID_AND_TOKEN =
+  uid: config.uid
+  token: config.token
 
 ## Helper which clones the content at a path so tests can compare before/after values
 # Otherwise, using model.get(path) will give the same object before as after
@@ -71,22 +76,26 @@ modificationsLookup = (direction, options = {}) ->
 describe 'API', ->
   model = null
 
-  before ->
-    model = new Model
-    model.set '_user', character.newUserObject()
-    scoring.setModel model
+  describe 'Without token or user id', ->
 
-  it '/v1/:uid/tasks returns correct user defaults', (done) ->
-    user = model.get '_user'
+    it '/api/v1/user', (done) ->
+      request.get { uri: "#{baseURL}/user" }, (err, res, body) ->
+        console.log "#{baseURL}/user", body
+        assert.ok !err
+        assert.equal res.statusCode, 500
+        assert.ok body.err
+        done()
 
-    request "#{baseURL}/#{user.id}/tasks", (err, res, body) ->
-      assert.ok !err
-      tasks = []
+  describe 'With token and user id', ->
+    before ->
+      model = new Model
+      model.set '_user', character.newUserObject()
+      scoring.setModel model
 
-      ['habit','daily'].map (type) ->
-        model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
-        tasks.concat model.get "_#{type}List"
+    it '/api/v1/user', (done) ->
+      user = model.get '_user'
 
-      console.log 'hi', tasks
-      assert.ok _.isEqual tasks, body
-      done()
+      request.get { uri: "#{baseURL}/user?#{qs.stringify(UID_AND_TOKEN)}" }, (err, res, body) ->
+        assert.ok !err
+        assert.equal res.statusCode, 200
+        done()

From b92145f5a339146b9bbeb7aa3835420f07791040 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Wed, 20 Feb 2013 20:07:05 -0500
Subject: [PATCH 003/220] wip

---
 src/server/api.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index b142ec09b3..8d2d8e4875 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -29,7 +29,7 @@ router.get '/user', (req, res) ->
 
   model.fetch query, (err, user) ->
     return res.json 500, err: err if err
-    return res.json 500, err: NO_USER_FOUND unless user
+    return res.json 500, NO_USER_FOUND if !user || _.isEmpty(user)
 
     res.json user
 

From ddff29ccf0d02899dce24b3afa75891e8820d3b2 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Thu, 21 Feb 2013 14:18:53 -0500
Subject: [PATCH 004/220] wip

---
 package.json                 |  4 +-
 server.js                    |  4 +-
 src/app/character.coffee     | 80 ++++++++++++++++++------------------
 src/server/api.coffee        |  8 ++--
 src/server/deprecated.coffee | 25 +++++++++++
 src/server/index.coffee      |  8 ++--
 src/server/middleware.coffee |  3 +-
 src/server/store.coffee      |  8 ++--
 test/api.mocha.coffee        | 67 ++++++++++++++++++++++--------
 test/request/local.coffee    | 25 +++++++++++
 test/request/request.coffee  | 74 +++++++++++++++++++++++++++++++++
 11 files changed, 234 insertions(+), 72 deletions(-)
 create mode 100644 test/request/local.coffee
 create mode 100644 test/request/request.coffee

diff --git a/package.json b/package.json
index bc501098c9..fb07f0753a 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,9 @@
     "nodetime": "*",
     "resolve": "~0.2.3",
     "request": "~2.14.0",
-    "querystring": "~0.1.0"
+    "querystring": "~0.1.0",
+    "nock": "~0.15.2",
+    "superagent": "~0.12.4"
   },
   "private": true,
   "subdomain": "habitrpg",
diff --git a/server.js b/server.js
index 5709a5db48..50493a836c 100644
--- a/server.js
+++ b/server.js
@@ -67,7 +67,9 @@ process.on('uncaughtException', function (error) {
 });
 
 require('coffee-script') // remove intermediate compilation requirement
-require('./src/server').listen(process.env.PORT || 3000, process.env.IP || '0.0.0.0');
+module.exports = server = require('./src/server')
+
+server.listen(process.env.PORT || 3000, process.env.IP || '0.0.0.0');
 
 // Note: removed "up" module, which is default for development (but interferes with and production + PaaS)
 // Restore to 5310bb0 if I want it back (see https://github.com/codeparty/derby/issues/165#issuecomment-10405693)
diff --git a/src/app/character.coffee b/src/app/character.coffee
index 901e3cb518..16d1c40fc5 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -137,7 +137,7 @@ module.exports.updateUser = (model) ->
   batch = new BatchUpdate(model)
   user = batch.user
   obj = batch.obj()
-  tasks = obj.tasks
+  tasks = obj?.tasks
 
   # Remove corrupted tasks
   _.each tasks, (task, key) ->
@@ -172,49 +172,49 @@ module.exports.BatchUpdate = BatchUpdate = (model) ->
   updates = {}
 
   {
-  user: user
+    user: user
 
-  obj: ->
-    obj ?= model.get 'users.'+user.get('id')
-    return obj
+    obj: ->
+      obj ?= model.get 'users.'+user.get('id')
+      return obj
 
-  startTransaction: ->
-    # start a batch transaction - nothing between now and @commit() will be set immediately
-    transactionInProgress = true
-    model._dontPersist = true
-    @obj()
+    startTransaction: ->
+      # start a batch transaction - nothing between now and @commit() will be set immediately
+      transactionInProgress = true
+      model._dontPersist = true
+      @obj()
 
-  ###
-    Handles updating the user model. If this is an en-mass operation (eg, server cron), changes are queued
-    but not actually set to the model. It also modifies userObj in case you need to access properties manually later.
-    If transaction not in progress, it just runs standard model.set()
-  ###
-  set: (path, val) ->
-    updates[path] = val if transactionInProgress
-    user.set(path, val)
+    ###
+      Handles updating the user model. If this is an en-mass operation (eg, server cron), changes are queued
+      but not actually set to the model. It also modifies userObj in case you need to access properties manually later.
+      If transaction not in progress, it just runs standard model.set()
+    ###
+    set: (path, val) ->
+      updates[path] = val if transactionInProgress
+      user.set(path, val)
 
-  ###
-    Hack to get around dom bindings being lost if parent objects are replaced whole-sale
-    eg, user.set('stats', {hp:50, exp:10...}) will break dom bindings, but user.set('stats.hp',50) is ok
-  ###
-  setStats: (stats) ->
-    stats ?= obj.stats
-    that = @
-    _.each Object.keys(stats), (key) -> that.set "stats.#{key}", stats[key]
+    ###
+      Hack to get around dom bindings being lost if parent objects are replaced whole-sale
+      eg, user.set('stats', {hp:50, exp:10...}) will break dom bindings, but user.set('stats.hp',50) is ok
+    ###
+    setStats: (stats) ->
+      stats ?= obj.stats
+      that = @
+      _.each Object.keys(stats), (key) -> that.set "stats.#{key}", stats[key]
 
-#    queue: (path, val) ->
-#      # Special function for setting object properties by string dot-notation. See http://stackoverflow.com/a/6394168/362790
-#      arr = path.split('.')
-#      arr.reduce (curr, next, index) ->
-#         if (arr.length - 1) == index
-#           curr[next] = val
-#         curr[next]
-#      , obj
+  #    queue: (path, val) ->
+  #      # Special function for setting object properties by string dot-notation. See http://stackoverflow.com/a/6394168/362790
+  #      arr = path.split('.')
+  #      arr.reduce (curr, next, index) ->
+  #         if (arr.length - 1) == index
+  #           curr[next] = val
+  #         curr[next]
+  #      , obj
 
-  commit: ->
-    model._dontPersist = false
-    # some hackery in our own branched racer-db-mongo, see findAndModify of lefnire/racer-db-mongo#habitrpg index.js
-    user.set "update__", updates
-    transactionInProgress = false
-    updates = {}
+    commit: ->
+      model._dontPersist = false
+      # some hackery in our own branched racer-db-mongo, see findAndModify of lefnire/racer-db-mongo#habitrpg index.js
+      user.set "update__", updates
+      transactionInProgress = false
+      updates = {}
   }
diff --git a/src/server/api.coffee b/src/server/api.coffee
index 8d2d8e4875..37da942522 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -21,17 +21,19 @@ router.get '/status', (req, res) ->
     status: 'up'
 
 router.get '/user', (req, res) ->
+  console.log 'hi'
   { uid, token } = req.query
   return res.json 500, NO_TOKEN_OR_UID unless uid || token
 
   model = req.getModel()
   query = model.query('users').withIdAndToken(uid, token)
 
-  model.fetch query, (err, user) ->
+  query.fetch (err, user) ->
+    self = user.get()
     return res.json 500, err: err if err
-    return res.json 500, NO_USER_FOUND if !user || _.isEmpty(user)
+    return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
 
-    res.json user
+    res.json self
 
 router.get '/user/calendar.ics', (req, res) ->
   #return next() #disable for now
diff --git a/src/server/deprecated.coffee b/src/server/deprecated.coffee
index 44ae3d392c..8e497764ef 100644
--- a/src/server/deprecated.coffee
+++ b/src/server/deprecated.coffee
@@ -13,6 +13,31 @@ router.get '/:uid/up/:score?', (req, res) -> res.send(500, deprecatedMessage)
 router.get '/:uid/down/:score?', (req, res) -> res.send(500, deprecatedMessage)
 router.post '/users/:uid/tasks/:taskId/:direction', (req, res) -> res.send(500, deprecatedMessage)
 
+router.get '/v1/users/:uid/tasks/:taskId/:direction', (req, res) ->
+  {uid, taskId, direction} = req.params
+  {apiToken} = req.query
+  {title, service, icon} = req.body
+  console.log {params:req.params, body:req.body} if process.env.NODE_ENV == 'development'
+
+  # Send error responses for improper API call
+  return res.send(500, 'request body "apiToken" required') unless apiToken
+  return res.send(500, ':uid required') unless uid
+  return res.send(500, ':taskId required') unless taskId
+  return res.send(500, ":direction must be 'up' or 'down'") unless direction in ['up','down']
+
+  model = req.getModel()
+  req._isServer = true
+  model.fetch model.query('users').withIdAndToken(uid, apiToken), (err, result) ->
+    return res.send(500, err) if err
+    user = result.at(0)
+    userObj = user.get()
+    if _.isEmpty(userObj)
+      return res.send(500, "User with uid=#{uid}, token=#{apiToken} not found. Make sure you're not using your username, but your User Id")
+
+    model.ref('_user', user)
+
+    res.send(user)
+
 router.post '/v1/users/:uid/tasks/:taskId/:direction', (req, res) ->
   {uid, taskId, direction} = req.params
   {apiToken, title, service, icon} = req.body
diff --git a/src/server/index.coffee b/src/server/index.coffee
index 54e2be229f..ab304c3c72 100644
--- a/src/server/index.coffee
+++ b/src/server/index.coffee
@@ -17,9 +17,9 @@ middleware = require './middleware'
 racer.io.set('transports', ['xhr-polling'])
 racer.ioClient.set('reconnection limit', 300000) # max reconect timeout to 5 minutes
 racer.set('bundleTimeout', 40000)
-#unless process.env.NODE_ENV == 'production'
-#  racer.use(racer.logPlugin)
-#  derby.use(derby.logPlugin)
+unless process.env.NODE_ENV == 'production'
+  racer.use(racer.logPlugin)
+  derby.use(derby.logPlugin)
 
 ## SERVER CONFIGURATION ##
 
@@ -28,7 +28,7 @@ server = http.createServer expressApp
 module.exports = server
 
 derby.use require('racer-db-mongo')
-store = derby.createStore
+module.exports.habitStore = store = derby.createStore
   db: {type: 'Mongo', uri: process.env.NODE_DB_URI, safe:true}
   listen: server
 
diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee
index 44f53b90d0..d74eb1953e 100644
--- a/src/server/middleware.coffee
+++ b/src/server/middleware.coffee
@@ -1,7 +1,6 @@
 module.exports.splash = (req, res, next) ->
   # This was an API call, not a page load
-  return next() if req.is('json')
-
+  return next() if /^\/api/.test req.path
   if !req.session.userId? and !req.query?.play?
     res.redirect('/splash.html')
   else
diff --git a/src/server/store.coffee b/src/server/store.coffee
index 1edada5125..0a10b1b7e8 100644
--- a/src/server/store.coffee
+++ b/src/server/store.coffee
@@ -54,12 +54,12 @@ userAccess = (store) ->
 ###
 REST = (store) ->
   store.query.expose "users", "withIdAndToken", (uid, token) ->
-    @where('id').equals(uid)
+    @byId(uid)
       .where('apiToken').equals(token)
       .one
 
-  store.queryAccess "users", "withIdAndToken", (id, token, accept, err) ->
-    return accept(true) if id && token
+  store.queryAccess "users", "withIdAndToken", (uid, token, accept, err) ->
+    return accept(true) if uid && token
     accept(false) # only user has id & token
 
 
@@ -90,4 +90,4 @@ partySystem = (store) ->
 
   store.writeAccess "*", "parties.*", ->
     accept = arguments[arguments.length-2]
-    accept(true)
\ No newline at end of file
+    accept(true)
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index ec3d5ca243..7da76094b5 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -1,11 +1,16 @@
 assert = require 'assert'
 {BrowserModel: Model} = require 'racer/test/util/model'
 derby = require 'derby'
+racer = require 'racer'
 _ = require 'underscore'
 moment = require 'moment'
-request = require 'request'
+request = require 'superagent'
 qs = require 'querystring'
 
+app = require '../server'
+
+store = app.habitStore
+
 # Custom modules
 scoring = require '../src/app/scoring'
 character = require '../src/app/character'
@@ -75,27 +80,55 @@ modificationsLookup = (direction, options = {}) ->
 
 describe 'API', ->
   model = null
+  user = null
+  params = null
 
   describe 'Without token or user id', ->
 
     it '/api/v1/user', (done) ->
-      request.get { uri: "#{baseURL}/user" }, (err, res, body) ->
-        console.log "#{baseURL}/user", body
-        assert.ok !err
-        assert.equal res.statusCode, 500
-        assert.ok body.err
-        done()
+      request(app)
+        .get("/api/v1/user")
+        .set('Accept', 'application/json')
+        .on('error', (err) ->
+          console.log 'err', err
+        )
+        .end (res) ->
+          assert.equal res.statusCode, 500
+          assert.ok JSON.parse(res.text).err
+          done()
 
   describe 'With token and user id', ->
-    before ->
-      model = new Model
-      model.set '_user', character.newUserObject()
-      scoring.setModel model
+    before (done) ->
+      model = store.createModel()
+      store.flush()
+
+      uid = model.id()
+      user = character.newUserObject()
+      user.apiToken = derby.uuid()
+      model.set "users.#{uid}", user
+      user = model.get("users.#{uid}")
+
+      params =
+        uid: user.id
+        token: user.apiToken
+
+      done()
+
+    after (done) ->
+      store.flush done
 
     it '/api/v1/user', (done) ->
-      user = model.get '_user'
-
-      request.get { uri: "#{baseURL}/user?#{qs.stringify(UID_AND_TOKEN)}" }, (err, res, body) ->
-        assert.ok !err
-        assert.equal res.statusCode, 200
-        done()
+      console.log params
+      request(app)
+        .get("/api/v1/user")
+        .set('Accept', 'application/json')
+        .query(params)
+        .on('error', (err) ->
+          console.log 'err', err
+        )
+        .end (res) ->
+          console.log 'test', res.body
+          assert.ok !res.body.err
+          assert.equal res.statusCode, 200
+          assert.ok res.body
+          done()
diff --git a/test/request/local.coffee b/test/request/local.coffee
new file mode 100644
index 0000000000..1431d12cd5
--- /dev/null
+++ b/test/request/local.coffee
@@ -0,0 +1,25 @@
+Request = require './request'
+qs = require 'querystring'
+
+makeUrl = (path, params) ->
+  if typeof params is "object"
+    params = qs.stringify(params)
+  else
+    params = ''
+  return "http://localhost:3000/#{path}?#{params}"
+
+# url, params (optional), callback
+get = (obj, callback) ->
+  obj.params ||= {}
+  obj.path ||= ''
+
+  requestUrl = makeUrl obj.path, obj.params
+
+  request = new Request requestUrl
+
+  request.done (res) ->
+    callback null, JSON.parse(res)
+
+  request.fire()
+
+module.exports = { get }
diff --git a/test/request/request.coffee b/test/request/request.coffee
new file mode 100644
index 0000000000..5eadd9178b
--- /dev/null
+++ b/test/request/request.coffee
@@ -0,0 +1,74 @@
+http = require 'http'
+
+# ### Request
+#
+# The Request class is just a wrapper
+# around the `http.request` function,
+# providing a cleaner and more reusable
+# interface.
+#
+# `constructor(options)`
+#
+# `options` can be anything `http.request` takes.
+#
+# Callbacks can be queued up by calling `request.done`
+# and passing it a callback function to be invoked when the
+# http request has completed
+#
+# Example:
+#
+# callback = (json) ->
+#   doSomethingWithJSON( json )
+#
+# request = new Request('http://api.phish.net/api.js?')
+# request.done (response) ->
+#   callback JSON.parse(response)[0]
+#
+# request.fire(data) # data refers to the post data
+#
+class Request
+  constructor: (@options) ->
+    @callbacks = {}
+
+  fire: (data) ->
+    request = http.request(@options, @_handler)
+    request.on 'error', (err) =>
+      for callback in @callbacks['fail']
+        callback(err)
+
+    # Send data with request
+    if data
+      request.write data
+
+    request.end()
+
+    this
+
+  done: (callback) ->
+    push.call(this, 'done', callback)
+
+    this
+
+  fail: (callback) ->
+    push.call(this, 'fail', callback)
+
+    this
+
+  ###########
+  # PRIVATE #
+  ###########
+
+  _handler: (response) =>
+    data = ''
+    response.on 'data', (chunk) ->
+      data += chunk
+    response.on 'end', =>
+      for callback in @callbacks['done']
+        callback(data)
+
+
+  push = (type, callback) ->
+    @callbacks[type] ?= []
+    @callbacks[type].push callback
+
+module.exports = Request

From 08d57e32ffbadd4ba1638e0c6f1e4ca89cfef511 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Thu, 21 Feb 2013 20:17:23 -0500
Subject: [PATCH 005/220] wip

---
 src/server/api.coffee   | 10 +++++++---
 src/server/store.coffee |  2 +-
 test/api.mocha.coffee   | 27 +++++++++++----------------
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 37da942522..808c25f32d 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -21,19 +21,23 @@ router.get '/status', (req, res) ->
     status: 'up'
 
 router.get '/user', (req, res) ->
-  console.log 'hi'
-  { uid, token } = req.query
+  console.log 'hi', { uid, token } = req.query
   return res.json 500, NO_TOKEN_OR_UID unless uid || token
 
   model = req.getModel()
   query = model.query('users').withIdAndToken(uid, token)
 
   query.fetch (err, user) ->
+    throw err if err
+    console.log user.at(0).get()
     self = user.get()
+    console.log self
     return res.json 500, err: err if err
     return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
 
-    res.json self
+    return res.json self
+  res.json {err: 'Something went wrong'}
+
 
 router.get '/user/calendar.ics', (req, res) ->
   #return next() #disable for now
diff --git a/src/server/store.coffee b/src/server/store.coffee
index 0a10b1b7e8..41ec5dd9ad 100644
--- a/src/server/store.coffee
+++ b/src/server/store.coffee
@@ -56,7 +56,7 @@ REST = (store) ->
   store.query.expose "users", "withIdAndToken", (uid, token) ->
     @byId(uid)
       .where('apiToken').equals(token)
-      .one
+      .limit(1)
 
   store.queryAccess "users", "withIdAndToken", (uid, token, accept, err) ->
     return accept(true) if uid && token
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 7da76094b5..4e73aeb3f6 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -7,9 +7,12 @@ moment = require 'moment'
 request = require 'superagent'
 qs = require 'querystring'
 
-app = require '../server'
+racer.use require 'racer-db-mongo'
 
-store = app.habitStore
+store = racer.createStore
+  db:
+    type: 'Mongo'
+    uri: process.env.NODE_DB_URI
 
 # Custom modules
 scoring = require '../src/app/scoring'
@@ -86,12 +89,8 @@ describe 'API', ->
   describe 'Without token or user id', ->
 
     it '/api/v1/user', (done) ->
-      request(app)
-        .get("/api/v1/user")
+      request.get("#{baseURL}/user")
         .set('Accept', 'application/json')
-        .on('error', (err) ->
-          console.log 'err', err
-        )
         .end (res) ->
           assert.equal res.statusCode, 500
           assert.ok JSON.parse(res.text).err
@@ -100,9 +99,9 @@ describe 'API', ->
   describe 'With token and user id', ->
     before (done) ->
       model = store.createModel()
-      store.flush()
+      #store.flush()
 
-      uid = model.id()
+      model.set '_userId', uid = model.id()
       user = character.newUserObject()
       user.apiToken = derby.uuid()
       model.set "users.#{uid}", user
@@ -114,20 +113,16 @@ describe 'API', ->
 
       done()
 
-    after (done) ->
-      store.flush done
-
     it '/api/v1/user', (done) ->
-      console.log params
-      request(app)
-        .get("/api/v1/user")
+      console.log "#{baseURL}/user?#{qs.stringify(params)}"
+      request.get("#{baseURL}/user")
         .set('Accept', 'application/json')
         .query(params)
         .on('error', (err) ->
           console.log 'err', err
         )
         .end (res) ->
-          console.log 'test', res.body
+          console.log res.body
           assert.ok !res.body.err
           assert.equal res.statusCode, 200
           assert.ok res.body

From b8d43fabcc2e863dc8a2f81a16400b0ebce4773c Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Thu, 21 Feb 2013 20:38:12 -0500
Subject: [PATCH 006/220] wip

---
 src/server/api.coffee   | 20 ++++++++++++++++----
 src/server/store.coffee |  2 ++
 test/api.mocha.coffee   | 30 +++++++++++++++++++++++-------
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 808c25f32d..c2a227d346 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -28,16 +28,28 @@ router.get '/user', (req, res) ->
   query = model.query('users').withIdAndToken(uid, token)
 
   query.fetch (err, user) ->
-    throw err if err
-    console.log user.at(0).get()
-    self = user.get()
-    console.log self
     return res.json 500, err: err if err
+    self = user.at(0).get()
+    console.log self
     return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
 
     return res.json self
   res.json {err: 'Something went wrong'}
 
+router.post '/task', (req, res) ->
+  { uid, token } = req.body
+  return res.json 500, NO_TOKEN_OR_UID unless uid || token
+
+  model = req.getModel()
+  query = model.query('users').withIdAndToken(uid, token)
+
+  query.fetch (err, user) ->
+    return res.json 500, err: err if err
+    self = user.at(0).get()
+    return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
+
+    return res.json self
+  res.json {err: 'Something went wrong'}
 
 router.get '/user/calendar.ics', (req, res) ->
   #return next() #disable for now
diff --git a/src/server/store.coffee b/src/server/store.coffee
index 41ec5dd9ad..0dc2af090e 100644
--- a/src/server/store.coffee
+++ b/src/server/store.coffee
@@ -62,6 +62,8 @@ REST = (store) ->
     return accept(true) if uid && token
     accept(false) # only user has id & token
 
+  #store.query.expose
+
 
 ###
   Party permissions
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 4e73aeb3f6..7a0b769529 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -110,20 +110,36 @@ describe 'API', ->
       params =
         uid: user.id
         token: user.apiToken
+      setTimeout ->
+        done()
+      , 800
 
-      done()
-
-    it '/api/v1/user', (done) ->
+    ###
+    test '/api/v1/user', (done) ->
       console.log "#{baseURL}/user?#{qs.stringify(params)}"
-      request.get("#{baseURL}/user")
+      _.defer ->
+        request.get("#{baseURL}/user")
+          .set('Accept', 'application/json')
+          .query(params)
+          .on('error', (err) ->
+            console.log 'err', err
+          )
+          .end (res) ->
+            assert.ok !res.body.err
+            assert.equal res.statusCode, 200
+            assert.ok res.body.tasks
+            done()
+    ###
+    it '/api/v1/task', (done) ->
+      request.post("#{baseURL}/task")
         .set('Accept', 'application/json')
-        .query(params)
+        .send(params)
         .on('error', (err) ->
           console.log 'err', err
         )
         .end (res) ->
-          console.log res.body
+          #console.log 'task', res.body
           assert.ok !res.body.err
           assert.equal res.statusCode, 200
-          assert.ok res.body
+          assert.ok res.body.tasks
           done()

From 9f044d2cf4f2003be5f8ce073236e51fbc7f70f4 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Fri, 22 Feb 2013 13:54:35 -0500
Subject: [PATCH 007/220] tests

---
 test/api.mocha.coffee | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 7a0b769529..14d17ec457 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -110,9 +110,7 @@ describe 'API', ->
       params =
         uid: user.id
         token: user.apiToken
-      setTimeout ->
-        done()
-      , 800
+      done()
 
     ###
     test '/api/v1/user', (done) ->

From 55afba34ae56be12815c72fac6e5c0edf4b24d25 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Fri, 22 Feb 2013 13:55:09 -0500
Subject: [PATCH 008/220] Nothing went wrong

---
 src/server/api.coffee | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index c2a227d346..95cd0ddf79 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -34,7 +34,6 @@ router.get '/user', (req, res) ->
     return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
 
     return res.json self
-  res.json {err: 'Something went wrong'}
 
 router.post '/task', (req, res) ->
   { uid, token } = req.body
@@ -49,7 +48,6 @@ router.post '/task', (req, res) ->
     return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
 
     return res.json self
-  res.json {err: 'Something went wrong'}
 
 router.get '/user/calendar.ics', (req, res) ->
   #return next() #disable for now

From e557bf89a74b23b3ade79c06b995c1a056dd9d31 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Fri, 22 Feb 2013 13:56:24 -0500
Subject: [PATCH 009/220] Status test

---
 test/api.mocha.coffee | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 14d17ec457..a346c06370 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -88,6 +88,14 @@ describe 'API', ->
 
   describe 'Without token or user id', ->
 
+    it '/api/v1/status', (done) ->
+      request.get("#{baseURL}/status")
+        .set('Accept', 'application/json')
+        .end (res) ->
+          assert.equal res.statusCode, 200
+          assert.equal res.body.status, 'up'
+          done()
+
     it '/api/v1/user', (done) ->
       request.get("#{baseURL}/user")
         .set('Accept', 'application/json')

From 32323a39afbab009b5615d72236fc1dd1ac21aa8 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Fri, 22 Feb 2013 22:11:46 -0500
Subject: [PATCH 010/220] wip

---
 server.js             |  6 ++----
 src/server/api.coffee | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/server.js b/server.js
index 50493a836c..7aae084865 100644
--- a/server.js
+++ b/server.js
@@ -1,10 +1,8 @@
 // Load nconf and define default configuration values if config.json or ENV vars are not found
 var conf = require('nconf');
 conf.argv().env().file({ file: __dirname + "/config.json" }).defaults({
-   'PORT': 3000,
-   'IP': '0.0.0.0',
-   'BASE_URL': 'http://localhost',
-   'NODE_ENV': 'development'
+   'PORT': process.env.PORT,
+   'IP': process.env.IP
 });
 
 // Override normal ENV values with nconf ENV values (ENV values are used the same way without nconf)
diff --git a/src/server/api.coffee b/src/server/api.coffee
index 95cd0ddf79..7bbc457611 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -3,7 +3,10 @@ router = new express.Router()
 
 scoring = require '../app/scoring'
 _ = require 'underscore'
-icalendar = require('icalendar')
+validator = require 'validator'
+check = validator.check
+snaitize = validator.sanitize
+icalendar = require 'icalendar'
 
 NO_TOKEN_OR_UID = err: "You must include a token and uid (user id) in your request"
 NO_USER_FOUND = err: "No user found."
@@ -35,8 +38,9 @@ router.get '/user', (req, res) ->
 
     return res.json self
 
-router.post '/task', (req, res) ->
+router.post '/user/tasks', (req, res) ->
   { uid, token } = req.body
+  task = { title, text, type, value, note } = req.body
   return res.json 500, NO_TOKEN_OR_UID unless uid || token
 
   model = req.getModel()
@@ -46,6 +50,13 @@ router.post '/task', (req, res) ->
     return res.json 500, err: err if err
     self = user.at(0).get()
     return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
+    return res.json 500, err: "type must be habit, todo, daily, reward" unless check(type).is /habit|todo|daily|reward/
+    return res.json 500, err: "must have a title" unless check(title).notEmpty()
+    return res.json 500, err: "must have text" unless check(text).notEmpty()
+    value ||= 0
+    
+    model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
+    model.push "_#{type}List", task
 
     return res.json self
 

From 4358455ef237d2a99699c159485fe7550905b882 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Fri, 22 Feb 2013 22:24:21 -0500
Subject: [PATCH 011/220] update

---
 src/server/api.coffee |  4 ++--
 test/api.mocha.coffee | 29 ++++++++++++++---------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 7bbc457611..979e1ead6b 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -54,11 +54,11 @@ router.post '/user/tasks', (req, res) ->
     return res.json 500, err: "must have a title" unless check(title).notEmpty()
     return res.json 500, err: "must have text" unless check(text).notEmpty()
     value ||= 0
-    
+
     model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
     model.push "_#{type}List", task
 
-    return res.json self
+    return res.json task
 
 router.get '/user/calendar.ics', (req, res) ->
   #return next() #disable for now
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index a346c06370..3936315482 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -120,22 +120,21 @@ describe 'API', ->
         token: user.apiToken
       done()
 
-    ###
-    test '/api/v1/user', (done) ->
+    it '/api/v1/user', (done) ->
       console.log "#{baseURL}/user?#{qs.stringify(params)}"
-      _.defer ->
-        request.get("#{baseURL}/user")
-          .set('Accept', 'application/json')
-          .query(params)
-          .on('error', (err) ->
-            console.log 'err', err
-          )
-          .end (res) ->
-            assert.ok !res.body.err
-            assert.equal res.statusCode, 200
-            assert.ok res.body.tasks
-            done()
-    ###
+      request.get("#{baseURL}/user")
+        .set('Accept', 'application/json')
+        .query(params)
+        .on('error', (err) ->
+          console.log 'err', err
+        )
+        .end (res) ->
+          assert.ok !res.body.err
+          assert.equal res.statusCode, 200
+          assert.ok res.body
+          console.log res.body
+          done()
+
     it '/api/v1/task', (done) ->
       request.post("#{baseURL}/task")
         .set('Accept', 'application/json')

From 02569c2dfa663c47441ae8a1af41dd92a50e8c06 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Fri, 22 Feb 2013 22:30:28 -0500
Subject: [PATCH 012/220] Fix errors

---
 package.json                 |  3 ++-
 src/server/middleware.coffee | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index d2b409f62d..4f5e2c3e1d 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,8 @@
     "querystring": "~0.1.0",
     "superagent": "~0.12.4",
     "resolve": "~0.2.3",
-    "browserify": "1.17.3"
+    "browserify": "1.17.3",
+    "validator": "~0.4.24"
   },
   "private": true,
   "subdomain": "habitrpg",
diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee
index 6fa8210a1d..e2183f2ea9 100644
--- a/src/server/middleware.coffee
+++ b/src/server/middleware.coffee
@@ -1,17 +1,17 @@
 module.exports.splash = (req, res, next) ->
   # This was an API call, not a page load
-return next() if /^\/(api)|(v1)/.test req.path
+  return next() if /^\/(api)|(v1)/.test req.path
 
-unless req.query?.play? or req.getModel().get('_userId')
-  res.redirect('/splash.html')
-else
-  next()
+  unless req.query?.play? or req.getModel().get('_userId')
+    res.redirect('/splash.html')
+  else
+    next()
 
 module.exports.view = (req, res, next) ->
-    model = req.getModel()
-    _view = model.get('_view') || {}
-    ## Set _mobileDevice to true or false so view can exclude portions from mobile device
-    _view.mobileDevice = /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header 'User-Agent')
-    _view.nodeEnv = process.env.NODE_ENV
-    model.set '_view', _view
-    next()
+  model = req.getModel()
+  _view = model.get('_view') || {}
+  ## Set _mobileDevice to true or false so view can exclude portions from mobile device
+  _view.mobileDevice = /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header 'User-Agent')
+  _view.nodeEnv = process.env.NODE_ENV
+  model.set '_view', _view
+  next()

From 177c7e4f170e656bdf222433bad09c3987cb0b78 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Sat, 23 Feb 2013 03:20:16 -0500
Subject: [PATCH 013/220] Working again

---
 package.json                 |  5 ++---
 server.js                    |  6 ++++--
 src/server/api.coffee        | 12 ++++++------
 src/server/index.coffee      |  3 ++-
 src/server/middleware.coffee |  3 ---
 test/api.mocha.coffee        | 28 ++++++++++++++++------------
 6 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index 4f5e2c3e1d..1c8fa39a9d 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "./server.js",
   "dependencies": {
     "derby": "git://github.com/lefnire/derby#habitrpg",
-    "racer": "git://github.com/lefnire/racer#habitrpg",
+    "racer": "git://github.com/switz/racer#master",
     "racer-db-mongo": "git://github.com/lefnire/racer-db-mongo#habitrpg",
     "derby-ui-boot": "git://github.com/codeparty/derby-ui-boot#master",
     "derby-auth": "git://github.com/lefnire/derby-auth#master",
@@ -27,8 +27,7 @@
     "querystring": "~0.1.0",
     "superagent": "~0.12.4",
     "resolve": "~0.2.3",
-    "browserify": "1.17.3",
-    "validator": "~0.4.24"
+    "browserify": "1.17.3"
   },
   "private": true,
   "subdomain": "habitrpg",
diff --git a/server.js b/server.js
index c19fa948ec..98b139b185 100644
--- a/server.js
+++ b/server.js
@@ -1,8 +1,8 @@
 // Load nconf and define default configuration values if config.json or ENV vars are not found
 var conf = require('nconf');
 conf.argv().env().file({ file: __dirname + "/config.json" }).defaults({
-   'PORT': process.env.PORT,
-   'IP': process.env.IP
+   'PORT': 3000,
+   'IP': '0.0.0.0'
 });
 
 // Override normal ENV values with nconf ENV values (ENV values are used the same way without nconf)
@@ -59,6 +59,8 @@ process.on('uncaughtException', function (error) {
 require('coffee-script') // remove intermediate compilation requirement
 module.exports = server = require('./src/server')
 
+Error.stackTraceLimit = Infinity;
+
 server.listen(process.env.PORT || 3000, process.env.IP || '0.0.0.0');
 
 // Note: removed "up" module, which is default for development (but interferes with and production + PaaS)
diff --git a/src/server/api.coffee b/src/server/api.coffee
index 262712e193..8d9db75b52 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -3,7 +3,7 @@ router = new express.Router()
 
 scoring = require '../app/scoring'
 _ = require 'underscore'
-validator = require 'validator'
+validator = require 'derby-auth/node_modules/validator'
 check = validator.check
 snaitize = validator.sanitize
 icalendar = require 'icalendar'
@@ -24,7 +24,7 @@ router.get '/status', (req, res) ->
     status: 'up'
 
 router.get '/user', (req, res) ->
-  console.log 'hi', { uid, token } = req.query
+  { uid, token } = req.query
   return res.json 500, NO_TOKEN_OR_UID unless uid || token
 
   model = req.getModel()
@@ -33,12 +33,11 @@ router.get '/user', (req, res) ->
   query.fetch (err, user) ->
     return res.json 500, err: err if err
     self = user.at(0).get()
-    console.log self
     return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
 
     return res.json self
 
-router.post '/user/tasks', (req, res) ->
+router.post '/user/task', (req, res) ->
   { uid, token } = req.body
   task = { title, text, type, value, note } = req.body
   return res.json 500, NO_TOKEN_OR_UID unless uid || token
@@ -50,15 +49,16 @@ router.post '/user/tasks', (req, res) ->
     return res.json 500, err: err if err
     self = user.at(0).get()
     return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
-    return res.json 500, err: "type must be habit, todo, daily, reward" unless check(type).is /habit|todo|daily|reward/
+    return res.json 500, err: "type must be habit, todo, daily, reward" unless /habit|todo|daily|reward/.test type
     return res.json 500, err: "must have a title" unless check(title).notEmpty()
     return res.json 500, err: "must have text" unless check(text).notEmpty()
     value ||= 0
 
+    #model.ref '_user', user
     model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
     model.push "_#{type}List", task
 
-    return res.json task
+    return res.json 201, task
 
 router.get '/users/:uid/calendar.ics', (req, res) ->
   #return next() #disable for now
diff --git a/src/server/index.coffee b/src/server/index.coffee
index aaaabe8f00..c760e9628e 100644
--- a/src/server/index.coffee
+++ b/src/server/index.coffee
@@ -71,6 +71,8 @@ mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, ->
     )
     # Adds req.getModel method
     .use(store.modelMiddleware())
+    # API should be hit before all other routes
+    .use('/api/v1', require('./api').middleware)
     # Show splash page for newcomers
     .use(middleware.splash)
     .use(priv.middleware)
@@ -78,7 +80,6 @@ mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, ->
     .use(auth.middleware(strategies, options))
     # Creates an express middleware from the app's routes
     .use(app.router())
-    .use('/api/v1', require('./api').middleware)
     .use(require('./static').middleware)
     .use(require('./deprecated').middleware)
     .use(expressApp.router)
diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee
index e2183f2ea9..9ad133788d 100644
--- a/src/server/middleware.coffee
+++ b/src/server/middleware.coffee
@@ -1,7 +1,4 @@
 module.exports.splash = (req, res, next) ->
-  # This was an API call, not a page load
-  return next() if /^\/(api)|(v1)/.test req.path
-
   unless req.query?.play? or req.getModel().get('_userId')
     res.redirect('/splash.html')
   else
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 3936315482..33a7148068 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -113,13 +113,18 @@ describe 'API', ->
       user = character.newUserObject()
       user.apiToken = derby.uuid()
       model.set "users.#{uid}", user
-      user = model.get("users.#{uid}")
+      user = model.at("users.#{uid}")
+      currentUser = user.get()
 
       params =
-        uid: user.id
-        token: user.apiToken
+        uid: currentUser.id
+        token: currentUser.apiToken
+        title: 'Title'
+        text: 'Text'
+        type: 'habit'
       done()
 
+    ###
     it '/api/v1/user', (done) ->
       console.log "#{baseURL}/user?#{qs.stringify(params)}"
       request.get("#{baseURL}/user")
@@ -133,18 +138,17 @@ describe 'API', ->
           assert.equal res.statusCode, 200
           assert.ok res.body
           console.log res.body
-          done()
+         done()
+    ###
 
-    it '/api/v1/task', (done) ->
-      request.post("#{baseURL}/task")
+    it '/api/v1/user/task', (done) ->
+      request.post("#{baseURL}/user/task")
         .set('Accept', 'application/json')
         .send(params)
-        .on('error', (err) ->
-          console.log 'err', err
-        )
         .end (res) ->
-          #console.log 'task', res.body
+          currentUser = user.get()
           assert.ok !res.body.err
-          assert.equal res.statusCode, 200
-          assert.ok res.body.tasks
+          assert.equal res.statusCode, 201
+          assert.ok res.body.id
+          assert.ok currentUser.tasks[res.body.id]
           done()

From bddd0bd148e0900d958fafe2e7bfdb52094f38ee Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Sat, 23 Feb 2013 04:45:00 -0500
Subject: [PATCH 014/220] wip

---
 package.json            |  3 ++-
 src/server/api.coffee   |  2 +-
 src/server/store.coffee |  7 ++++++-
 test/api.mocha.coffee   | 21 ++++++++++++---------
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 1c8fa39a9d..467223683a 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,8 @@
     "querystring": "~0.1.0",
     "superagent": "~0.12.4",
     "resolve": "~0.2.3",
-    "browserify": "1.17.3"
+    "browserify": "1.17.3",
+    "expect.js": "~0.2.0"
   },
   "private": true,
   "subdomain": "habitrpg",
diff --git a/src/server/api.coffee b/src/server/api.coffee
index 8d9db75b52..d1280731a5 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -54,7 +54,7 @@ router.post '/user/task', (req, res) ->
     return res.json 500, err: "must have text" unless check(text).notEmpty()
     value ||= 0
 
-    #model.ref '_user', user
+    model.ref '_user', user.at(0)
     model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
     model.push "_#{type}List", task
 
diff --git a/src/server/store.coffee b/src/server/store.coffee
index cebd70e5cd..4d71f36262 100644
--- a/src/server/store.coffee
+++ b/src/server/store.coffee
@@ -28,7 +28,12 @@ userAccess = (store) ->
   store.writeAccess "*", "users.*", -> # captures, value, accept, err ->
     accept = arguments[arguments.length-2]
     err = arguments[arguments.length - 1]
-#    return err(derbyAuth.SESSION_INVALIDATED_ERROR) if derbyAuth.bustedSession(@)
+    # return err(derbyAuth.SESSION_INVALIDATED_ERROR) if derbyAuth.bustedSession(@)
+
+    # TEMPORARY token check to allow api
+    # Must fix before release
+    return accept(true)
+
     return accept(false) if derbyAuth.bustedSession(@)
 
     captures = arguments[0].split('.')
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 33a7148068..f3499740df 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -1,4 +1,4 @@
-assert = require 'assert'
+expect = require 'expect.js'
 {BrowserModel: Model} = require 'racer/test/util/model'
 derby = require 'derby'
 racer = require 'racer'
@@ -92,16 +92,16 @@ describe 'API', ->
       request.get("#{baseURL}/status")
         .set('Accept', 'application/json')
         .end (res) ->
-          assert.equal res.statusCode, 200
-          assert.equal res.body.status, 'up'
+          expect(res.statusCode).to.be 200
+          expect(res.body.status).to.be 'up'
           done()
 
     it '/api/v1/user', (done) ->
       request.get("#{baseURL}/user")
         .set('Accept', 'application/json')
         .end (res) ->
-          assert.equal res.statusCode, 500
-          assert.ok JSON.parse(res.text).err
+          expect(res.statusCode).to.be 500
+          expect(res.body.err).to.be 'You must include a token and uid (user id) in your request'
           done()
 
   describe 'With token and user id', ->
@@ -114,6 +114,7 @@ describe 'API', ->
       user.apiToken = derby.uuid()
       model.set "users.#{uid}", user
       user = model.at("users.#{uid}")
+      user.set 'tasks', {}
       currentUser = user.get()
 
       params =
@@ -147,8 +148,10 @@ describe 'API', ->
         .send(params)
         .end (res) ->
           currentUser = user.get()
-          assert.ok !res.body.err
-          assert.equal res.statusCode, 201
-          assert.ok res.body.id
-          assert.ok currentUser.tasks[res.body.id]
+          expect(currentUser).to.eql res.body
+          expect(res.body.err).to.be.empty()
+          expect(res.statusCode).to.be 201
+          expect(res.body.id).not.to.be.empty()
+          # Ensure that user owns the newly created object
+          #expect(currentUser.tasks[res.body.id]).to.be.an('object')
           done()

From faa94b3692560f2574e7b74d48828dce191e9dfc Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Sun, 24 Feb 2013 23:00:22 -0500
Subject: [PATCH 015/220] Almost perfect

---
 src/server/api.coffee | 69 +++++++++++++++++++++++++------------------
 test/api.mocha.coffee | 58 +++++++++++++++++++++---------------
 2 files changed, 75 insertions(+), 52 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index d1280731a5..cdf5ce1bda 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -19,46 +19,57 @@ NO_USER_FOUND = err: "No user found."
   curl -X POST -H "Content-Type:application/json" -d '{"apiToken":"{TOKEN}"}' localhost:3000/v1/users/{UID}/tasks/productivity/up
 ###
 
+auth = (req, res, next) ->
+  express.basicAuth((uid, token, callback) ->
+    return res.json 500, NO_TOKEN_OR_UID unless uid || token
+
+    model = req.getModel()
+    query = model.query('users').withIdAndToken(uid, token)
+
+    query.fetch (err, user) ->
+      return callback err if err
+      callback null, user.at(0)
+  )(req, res, next)
+
 router.get '/status', (req, res) ->
-  res.json
-    status: 'up'
+  res.json status: 'up'
 
-router.get '/user', (req, res) ->
-  { uid, token } = req.query
-  return res.json 500, NO_TOKEN_OR_UID unless uid || token
+router.get '/user', auth, (req, res) ->
+  self = req.user.get()
+  return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
 
-  model = req.getModel()
-  query = model.query('users').withIdAndToken(uid, token)
+  return res.json self
 
-  query.fetch (err, user) ->
-    return res.json 500, err: err if err
-    self = user.at(0).get()
-    return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
-
-    return res.json self
-
-router.post '/user/task', (req, res) ->
-  { uid, token } = req.body
+router.post '/user/task', auth, (req, res) ->
   task = { title, text, type, value, note } = req.body
-  return res.json 500, NO_TOKEN_OR_UID unless uid || token
+  return res.json 500, err: "type must be habit, todo, daily, or reward" unless /habit|todo|daily|reward/.test type
+  return res.json 500, err: "must have a title" unless check(title).notEmpty()
+  return res.json 500, err: "must have text" unless check(text).notEmpty()
+
+  self = req.user.get()
+  return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
+
+  value ||= 0
 
   model = req.getModel()
-  query = model.query('users').withIdAndToken(uid, token)
+  model.ref '_user', req.user
+  model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
+  model.at("_#{type}List").push task
 
-  query.fetch (err, user) ->
-    return res.json 500, err: err if err
-    self = user.at(0).get()
-    return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
-    return res.json 500, err: "type must be habit, todo, daily, reward" unless /habit|todo|daily|reward/.test type
-    return res.json 500, err: "must have a title" unless check(title).notEmpty()
-    return res.json 500, err: "must have text" unless check(text).notEmpty()
-    value ||= 0
+  return res.json 201, task
 
-    model.ref '_user', user.at(0)
+router.get '/user/tasks', auth, (req, res) ->
+  self = req.user.get()
+  return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
+
+  model = req.getModel()
+  model.ref '_user', req.user
+  tasks = []
+  for type in ['habit','todo','daily','reward']
     model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
-    model.push "_#{type}List", task
+    tasks = tasks.concat model.get("_#{type}List")
 
-    return res.json 201, task
+  return res.json 200, tasks
 
 router.get '/users/:uid/calendar.ics', (req, res) ->
   #return next() #disable for now
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index f3499740df..3b5d658636 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -82,10 +82,6 @@ modificationsLookup = (direction, options = {}) ->
 ###### Specs ######
 
 describe 'API', ->
-  model = null
-  user = null
-  params = null
-
   describe 'Without token or user id', ->
 
     it '/api/v1/status', (done) ->
@@ -105,6 +101,11 @@ describe 'API', ->
           done()
 
   describe 'With token and user id', ->
+    params = null
+    currentUser = null
+    user = null
+    model = null
+
     before (done) ->
       model = store.createModel()
       #store.flush()
@@ -114,9 +115,7 @@ describe 'API', ->
       user.apiToken = derby.uuid()
       model.set "users.#{uid}", user
       user = model.at("users.#{uid}")
-      user.set 'tasks', {}
       currentUser = user.get()
-
       params =
         uid: currentUser.id
         token: currentUser.apiToken
@@ -125,33 +124,46 @@ describe 'API', ->
         type: 'habit'
       done()
 
-    ###
-    it '/api/v1/user', (done) ->
-      console.log "#{baseURL}/user?#{qs.stringify(params)}"
+    beforeEach ->
+      currentUser = user.get()
+
+    it 'GET /api/v1/user', (done) ->
       request.get("#{baseURL}/user")
         .set('Accept', 'application/json')
-        .query(params)
-        .on('error', (err) ->
-          console.log 'err', err
-        )
+        .auth(params.uid, params.token)
         .end (res) ->
-          assert.ok !res.body.err
-          assert.equal res.statusCode, 200
-          assert.ok res.body
-          console.log res.body
-         done()
-    ###
+          expect(res.body.err).to.be undefined
+          expect(res.statusCode).to.be 200
+          expect(res.body.id).not.to.be.empty()
+          expect(res.body).to.eql(currentUser)
+          done()
 
-    it '/api/v1/user/task', (done) ->
+    it 'POST /api/v1/user/task', (done) ->
       request.post("#{baseURL}/user/task")
         .set('Accept', 'application/json')
+        .auth(params.uid, params.token)
         .send(params)
         .end (res) ->
-          currentUser = user.get()
-          expect(currentUser).to.eql res.body
-          expect(res.body.err).to.be.empty()
+          expect(res.body.err).to.be undefined
           expect(res.statusCode).to.be 201
           expect(res.body.id).not.to.be.empty()
           # Ensure that user owns the newly created object
           #expect(currentUser.tasks[res.body.id]).to.be.an('object')
           done()
+
+    it 'GET /api/v1/user/tasks', (done) ->
+      request.get("#{baseURL}/user/tasks")
+        .set('Accept', 'application/json')
+        .auth(params.uid, params.token)
+        .end (res) ->
+          expect(res.body.err).to.be undefined
+          expect(res.statusCode).to.be 200
+          model.set '_user', user.get()
+          tasks = []
+          for type in ['habit','todo','daily','reward']
+            model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
+            tasks = tasks.concat model.get("_#{type}List")
+          # Ensure that user owns the tasks
+          console.log _.difference(_.pluck(res.body,'id'), _.pluck(tasks,'id'))
+          expect(res.body.length).to.equal tasks.length
+          done()

From bfd30cd4b72d2e6f64a5505cff5d94a49a0aadef Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Mon, 25 Feb 2013 00:24:11 -0500
Subject: [PATCH 016/220] wip

---
 src/server/api.coffee |  3 ++-
 test/api.mocha.coffee | 21 +++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index cdf5ce1bda..f974d71bca 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -28,7 +28,8 @@ auth = (req, res, next) ->
 
     query.fetch (err, user) ->
       return callback err if err
-      callback null, user.at(0)
+      user = user.at(0)
+      callback null, user
   )(req, res, next)
 
 router.get '/status', (req, res) ->
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 3b5d658636..694a41578d 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -106,9 +106,9 @@ describe 'API', ->
     user = null
     model = null
 
-    before (done) ->
-      model = store.createModel()
+    before ->
       #store.flush()
+      model = store.createModel()
 
       model.set '_userId', uid = model.id()
       user = character.newUserObject()
@@ -117,12 +117,9 @@ describe 'API', ->
       user = model.at("users.#{uid}")
       currentUser = user.get()
       params =
-        uid: currentUser.id
-        token: currentUser.apiToken
         title: 'Title'
         text: 'Text'
         type: 'habit'
-      done()
 
     beforeEach ->
       currentUser = user.get()
@@ -130,7 +127,7 @@ describe 'API', ->
     it 'GET /api/v1/user', (done) ->
       request.get("#{baseURL}/user")
         .set('Accept', 'application/json')
-        .auth(params.uid, params.token)
+        .auth(currentUser.id, currentUser.apiToken)
         .end (res) ->
           expect(res.body.err).to.be undefined
           expect(res.statusCode).to.be 200
@@ -141,24 +138,28 @@ describe 'API', ->
     it 'POST /api/v1/user/task', (done) ->
       request.post("#{baseURL}/user/task")
         .set('Accept', 'application/json')
-        .auth(params.uid, params.token)
+        .auth(currentUser.id, currentUser.apiToken)
         .send(params)
         .end (res) ->
           expect(res.body.err).to.be undefined
+          console.log res.body
           expect(res.statusCode).to.be 201
           expect(res.body.id).not.to.be.empty()
           # Ensure that user owns the newly created object
-          #expect(currentUser.tasks[res.body.id]).to.be.an('object')
+          console.log _.size(user.get().tasks)
+          expect(user.get().tasks[res.body.id]).to.be.an('object')
           done()
 
     it 'GET /api/v1/user/tasks', (done) ->
       request.get("#{baseURL}/user/tasks")
         .set('Accept', 'application/json')
-        .auth(params.uid, params.token)
+        .auth(currentUser.id, currentUser.apiToken)
         .end (res) ->
           expect(res.body.err).to.be undefined
           expect(res.statusCode).to.be 200
-          model.set '_user', user.get()
+          currentUser = user.get()
+          console.log _.size(currentUser.tasks)
+          model.ref '_user', user
           tasks = []
           for type in ['habit','todo','daily','reward']
             model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"

From 1be9fb97fec7f4323395bdca069320ac0d3f6189 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Mon, 25 Feb 2013 02:43:50 -0500
Subject: [PATCH 017/220] Use headers instead of auth

---
 src/server/api.coffee | 18 +++++++++---------
 test/api.mocha.coffee | 36 ++++++++++++++++++++++++++++++------
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index f974d71bca..d7bf239475 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -20,17 +20,17 @@ NO_USER_FOUND = err: "No user found."
 ###
 
 auth = (req, res, next) ->
-  express.basicAuth((uid, token, callback) ->
-    return res.json 500, NO_TOKEN_OR_UID unless uid || token
+  uid = req.headers['x-api-user']
+  token = req.headers['x-api-key']
+  return res.json 500, NO_TOKEN_OR_UID unless uid || token
 
-    model = req.getModel()
-    query = model.query('users').withIdAndToken(uid, token)
+  model = req.getModel()
+  query = model.query('users').withIdAndToken(uid, token)
 
-    query.fetch (err, user) ->
-      return callback err if err
-      user = user.at(0)
-      callback null, user
-  )(req, res, next)
+  query.fetch (err, user) ->
+    return res.json err: err if err
+    req.user = user.at(0)
+    next()
 
 router.get '/status', (req, res) ->
   res.json status: 'up'
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 694a41578d..077a7df450 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -7,6 +7,25 @@ moment = require 'moment'
 request = require 'superagent'
 qs = require 'querystring'
 
+## monkey-patch expect.js for better diffs on mocha
+## see: https://github.com/LearnBoost/expect.js/pull/34
+
+origBe = expect.Assertion::be
+expect.Assertion::be = expect.Assertion::equal = (obj) ->
+  @_expected = obj
+  origBe.call this, obj
+
+expect.Assertion::assert = (truth, msg, error) ->
+  msg = (if @flags.not then error else msg)
+  ok = (if @flags.not then not truth else truth)
+  unless ok
+    err = new Error(msg.call(this))
+    if "_expected" of this
+      err.expected = @_expected
+      err.actual = @obj
+    throw err
+  @and = new expect.Assertion(@obj)
+
 racer.use require 'racer-db-mongo'
 
 store = racer.createStore
@@ -127,7 +146,8 @@ describe 'API', ->
     it 'GET /api/v1/user', (done) ->
       request.get("#{baseURL}/user")
         .set('Accept', 'application/json')
-        .auth(currentUser.id, currentUser.apiToken)
+        .set('X-API-User', currentUser.id)
+        .set('X-API-Key', currentUser.apiToken)
         .end (res) ->
           expect(res.body.err).to.be undefined
           expect(res.statusCode).to.be 200
@@ -138,11 +158,11 @@ describe 'API', ->
     it 'POST /api/v1/user/task', (done) ->
       request.post("#{baseURL}/user/task")
         .set('Accept', 'application/json')
-        .auth(currentUser.id, currentUser.apiToken)
+        .set('X-API-User', currentUser.id)
+        .set('X-API-Key', currentUser.apiToken)
         .send(params)
         .end (res) ->
           expect(res.body.err).to.be undefined
-          console.log res.body
           expect(res.statusCode).to.be 201
           expect(res.body.id).not.to.be.empty()
           # Ensure that user owns the newly created object
@@ -153,7 +173,8 @@ describe 'API', ->
     it 'GET /api/v1/user/tasks', (done) ->
       request.get("#{baseURL}/user/tasks")
         .set('Accept', 'application/json')
-        .auth(currentUser.id, currentUser.apiToken)
+        .set('X-API-User', currentUser.id)
+        .set('X-API-Key', currentUser.apiToken)
         .end (res) ->
           expect(res.body.err).to.be undefined
           expect(res.statusCode).to.be 200
@@ -166,5 +187,8 @@ describe 'API', ->
             tasks = tasks.concat model.get("_#{type}List")
           # Ensure that user owns the tasks
           console.log _.difference(_.pluck(res.body,'id'), _.pluck(tasks,'id'))
-          expect(res.body.length).to.equal tasks.length
-          done()
+          #expect(res.body.length).to.equal tasks.length
+          setTimeout ->
+            console.log 'hi', _.size(user.get().tasks)
+            done()
+          , 1100

From 7ce767781662e4b5611e6f1ee33056f9c369a43e Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Mon, 25 Feb 2013 02:44:57 -0500
Subject: [PATCH 018/220] Cleanup

---
 test/api.mocha.coffee | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 077a7df450..42387f2217 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -187,8 +187,5 @@ describe 'API', ->
             tasks = tasks.concat model.get("_#{type}List")
           # Ensure that user owns the tasks
           console.log _.difference(_.pluck(res.body,'id'), _.pluck(tasks,'id'))
-          #expect(res.body.length).to.equal tasks.length
-          setTimeout ->
-            console.log 'hi', _.size(user.get().tasks)
-            done()
-          , 1100
+          expect(res.body.length).to.equal tasks.length
+          done()

From e4f42270726f5f147f7df9c4496cd28de035d8cb Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Mon, 25 Feb 2013 14:32:46 -0500
Subject: [PATCH 019/220] Cleanup

---
 src/server/api.coffee | 5 ++---
 test/api.mocha.coffee | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index d7bf239475..e6aa77476d 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -11,12 +11,11 @@ icalendar = require 'icalendar'
 NO_TOKEN_OR_UID = err: "You must include a token and uid (user id) in your request"
 NO_USER_FOUND = err: "No user found."
 
-# ---------- /v1 API ------------
-# Every url added beneath router is prefaced by /v1
+# ---------- /api/v1 API ------------
+# Every url added beneath router is prefaced by /api/v1
 
 ###
   v1 API. Requires user-id and apiToken, task-id, direction. Test with:
-  curl -X POST -H "Content-Type:application/json" -d '{"apiToken":"{TOKEN}"}' localhost:3000/v1/users/{UID}/tasks/productivity/up
 ###
 
 auth = (req, res, next) ->
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 42387f2217..d9d6e95a67 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -186,6 +186,7 @@ describe 'API', ->
             model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
             tasks = tasks.concat model.get("_#{type}List")
           # Ensure that user owns the tasks
-          console.log _.difference(_.pluck(res.body,'id'), _.pluck(tasks,'id'))
           expect(res.body.length).to.equal tasks.length
+          # Ensure that the two sets are equal
+          expect(_.difference(_.pluck(res.body,'id'), _.pluck(tasks,'id')).length).to.equal 0
           done()

From f9f57a6b91ffb736f9b2ba16d8ae5aba8c3f7287 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Tue, 26 Feb 2013 02:36:51 -0500
Subject: [PATCH 020/220] Cleanup and more checks

---
 server.js                   |  4 +-
 src/server/api.coffee       | 26 +++++++++----
 test/api.mocha.coffee       | 26 ++++++++++++-
 test/request/local.coffee   | 25 -------------
 test/request/request.coffee | 74 -------------------------------------
 5 files changed, 46 insertions(+), 109 deletions(-)
 delete mode 100644 test/request/local.coffee
 delete mode 100644 test/request/request.coffee

diff --git a/server.js b/server.js
index 98b139b185..d7fc162cf7 100644
--- a/server.js
+++ b/server.js
@@ -19,7 +19,7 @@ process.env.SMTP_PASS = conf.get("SMTP_PASS");
 process.env.SMTP_SERVICE = conf.get("SMTP_SERVICE");
 process.env.STRIPE_API_KEY = conf.get("STRIPE_API_KEY");
 process.env.STRIPE_PUB_KEY = conf.get("STRIPE_PUB_KEY");
-
+/*
 process.on('uncaughtException', function (error) {
 
     function sendEmail(mailData) {
@@ -55,7 +55,7 @@ process.on('uncaughtException', function (error) {
     });
     console.log(error.stack);
 });
-
+*/
 require('coffee-script') // remove intermediate compilation requirement
 module.exports = server = require('./src/server')
 
diff --git a/src/server/api.coffee b/src/server/api.coffee
index e6aa77476d..88bf0cae77 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -15,7 +15,9 @@ NO_USER_FOUND = err: "No user found."
 # Every url added beneath router is prefaced by /api/v1
 
 ###
-  v1 API. Requires user-id and apiToken, task-id, direction. Test with:
+  v1 API. Requires api-v1-user (user id) and api-v1-key (api key) headers, Test with:
+  $ cd node_modules/racer && npm install && cd ../..
+  $ mocha test/api.mocha.coffee
 ###
 
 auth = (req, res, next) ->
@@ -28,26 +30,36 @@ auth = (req, res, next) ->
 
   query.fetch (err, user) ->
     return res.json err: err if err
-    req.user = user.at(0)
+    user = user.at(0)
+    req.user = user
+    req.userObj = user.get()
+    return res.json 500, NO_USER_FOUND if !req.userObj || _.isEmpty(req.userObj)
     next()
 
 router.get '/status', (req, res) ->
   res.json status: 'up'
 
 router.get '/user', auth, (req, res) ->
-  self = req.user.get()
-  return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
+  self = req.userObj
+
+  delete self[val] for val in ['tasks', 'apiToken', 'flags', 'lastCron']
 
   return res.json self
 
+router.get '/task/:id', auth, (req, res) ->
+  task = req.user.get("tasks.#{req.params.id}")
+  console.log task
+  return res.json 500, err: "No task found." if !task || _.isEmpty(task)
+
+  return res.json 200, task
+
 router.post '/user/task', auth, (req, res) ->
   task = { title, text, type, value, note } = req.body
   return res.json 500, err: "type must be habit, todo, daily, or reward" unless /habit|todo|daily|reward/.test type
   return res.json 500, err: "must have a title" unless check(title).notEmpty()
   return res.json 500, err: "must have text" unless check(text).notEmpty()
 
-  self = req.user.get()
-  return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
+  self = req.userObj
 
   value ||= 0
 
@@ -59,7 +71,7 @@ router.post '/user/task', auth, (req, res) ->
   return res.json 201, task
 
 router.get '/user/tasks', auth, (req, res) ->
-  self = req.user.get()
+  self = req.userObj
   return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
 
   model = req.getModel()
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index d9d6e95a67..fc9a403e24 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -101,6 +101,7 @@ modificationsLookup = (direction, options = {}) ->
 ###### Specs ######
 
 describe 'API', ->
+
   describe 'Without token or user id', ->
 
     it '/api/v1/status', (done) ->
@@ -124,6 +125,7 @@ describe 'API', ->
     currentUser = null
     user = null
     model = null
+    uid = null
 
     before ->
       #store.flush()
@@ -141,6 +143,7 @@ describe 'API', ->
         type: 'habit'
 
     beforeEach ->
+      model = store.createModel()
       currentUser = user.get()
 
     it 'GET /api/v1/user', (done) ->
@@ -152,9 +155,28 @@ describe 'API', ->
           expect(res.body.err).to.be undefined
           expect(res.statusCode).to.be 200
           expect(res.body.id).not.to.be.empty()
+          model.set '_user', currentUser
+          ###
+          currentUser.tasks = []
+          for type in ['habit','todo','daily','reward']
+            model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
+            currentUser.tasks = currentUser.tasks.concat model.get("_#{type}List")
+          ###
           expect(res.body).to.eql(currentUser)
           done()
 
+    it 'GET /api/v1/task/:id', (done) ->
+      tid = _.values(currentUser.tasks)[0].id
+      request.post("#{baseURL}/task/#{tid}")
+        .set('Accept', 'application/json')
+        .set('X-API-User', currentUser.id)
+        .set('X-API-Key', currentUser.apiToken)
+        .end (res) ->
+          expect(res.body.err).to.be undefined
+          expect(res.statusCode).to.be 200
+          expect(res.body).to.eql currentUser.tasks[tid]
+          done()
+
     it 'POST /api/v1/user/task', (done) ->
       request.post("#{baseURL}/user/task")
         .set('Accept', 'application/json')
@@ -166,7 +188,7 @@ describe 'API', ->
           expect(res.statusCode).to.be 201
           expect(res.body.id).not.to.be.empty()
           # Ensure that user owns the newly created object
-          console.log _.size(user.get().tasks)
+          console.log 'test', _.size(user.get().tasks)
           expect(user.get().tasks[res.body.id]).to.be.an('object')
           done()
 
@@ -180,6 +202,8 @@ describe 'API', ->
           expect(res.statusCode).to.be 200
           currentUser = user.get()
           console.log _.size(currentUser.tasks)
+          console.log uid
+          console.log 'hellomate', model.get("users.#{uid}")
           model.ref '_user', user
           tasks = []
           for type in ['habit','todo','daily','reward']
diff --git a/test/request/local.coffee b/test/request/local.coffee
deleted file mode 100644
index 1431d12cd5..0000000000
--- a/test/request/local.coffee
+++ /dev/null
@@ -1,25 +0,0 @@
-Request = require './request'
-qs = require 'querystring'
-
-makeUrl = (path, params) ->
-  if typeof params is "object"
-    params = qs.stringify(params)
-  else
-    params = ''
-  return "http://localhost:3000/#{path}?#{params}"
-
-# url, params (optional), callback
-get = (obj, callback) ->
-  obj.params ||= {}
-  obj.path ||= ''
-
-  requestUrl = makeUrl obj.path, obj.params
-
-  request = new Request requestUrl
-
-  request.done (res) ->
-    callback null, JSON.parse(res)
-
-  request.fire()
-
-module.exports = { get }
diff --git a/test/request/request.coffee b/test/request/request.coffee
deleted file mode 100644
index 5eadd9178b..0000000000
--- a/test/request/request.coffee
+++ /dev/null
@@ -1,74 +0,0 @@
-http = require 'http'
-
-# ### Request
-#
-# The Request class is just a wrapper
-# around the `http.request` function,
-# providing a cleaner and more reusable
-# interface.
-#
-# `constructor(options)`
-#
-# `options` can be anything `http.request` takes.
-#
-# Callbacks can be queued up by calling `request.done`
-# and passing it a callback function to be invoked when the
-# http request has completed
-#
-# Example:
-#
-# callback = (json) ->
-#   doSomethingWithJSON( json )
-#
-# request = new Request('http://api.phish.net/api.js?')
-# request.done (response) ->
-#   callback JSON.parse(response)[0]
-#
-# request.fire(data) # data refers to the post data
-#
-class Request
-  constructor: (@options) ->
-    @callbacks = {}
-
-  fire: (data) ->
-    request = http.request(@options, @_handler)
-    request.on 'error', (err) =>
-      for callback in @callbacks['fail']
-        callback(err)
-
-    # Send data with request
-    if data
-      request.write data
-
-    request.end()
-
-    this
-
-  done: (callback) ->
-    push.call(this, 'done', callback)
-
-    this
-
-  fail: (callback) ->
-    push.call(this, 'fail', callback)
-
-    this
-
-  ###########
-  # PRIVATE #
-  ###########
-
-  _handler: (response) =>
-    data = ''
-    response.on 'data', (chunk) ->
-      data += chunk
-    response.on 'end', =>
-      for callback in @callbacks['done']
-        callback(data)
-
-
-  push = (type, callback) ->
-    @callbacks[type] ?= []
-    @callbacks[type].push callback
-
-module.exports = Request

From 17a5040b3b7567df06b8738f9ce753fb03c6760e Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Tue, 26 Feb 2013 02:55:33 -0500
Subject: [PATCH 021/220] Server runs inline with tests

---
 test/api.mocha.coffee | 15 +++++++++++++--
 test/mocha.opts       |  3 ++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index fc9a403e24..f0c86f6825 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -6,6 +6,7 @@ _ = require 'underscore'
 moment = require 'moment'
 request = require 'superagent'
 qs = require 'querystring'
+require 'coffee-script'
 
 ## monkey-patch expect.js for better diffs on mocha
 ## see: https://github.com/LearnBoost/expect.js/pull/34
@@ -101,6 +102,12 @@ modificationsLookup = (direction, options = {}) ->
 ###### Specs ######
 
 describe 'API', ->
+  before (done) ->
+    server = require '../src/server'
+    server.listen '3000', '0.0.0.0'
+    server.on 'listening', (data) ->
+      # Crappy hack to let server start before tests run
+      setTimeout done, 2000
 
   describe 'Without token or user id', ->
 
@@ -143,7 +150,6 @@ describe 'API', ->
         type: 'habit'
 
     beforeEach ->
-      model = store.createModel()
       currentUser = user.get()
 
     it 'GET /api/v1/user', (done) ->
@@ -198,12 +204,17 @@ describe 'API', ->
         .set('X-API-User', currentUser.id)
         .set('X-API-Key', currentUser.apiToken)
         .end (res) ->
+          store = racer.createStore
+            db:
+              type: 'Mongo'
+              uri: process.env.NODE_DB_URI
+          model = store.createModel()
           expect(res.body.err).to.be undefined
           expect(res.statusCode).to.be 200
           currentUser = user.get()
           console.log _.size(currentUser.tasks)
           console.log uid
-          console.log 'hellomate', model.get("users.#{uid}")
+          console.log 'hellomate', user.get()
           model.ref '_user', user
           tasks = []
           for type in ['habit','todo','daily','reward']
diff --git a/test/mocha.opts b/test/mocha.opts
index d6ef947989..74e33e85ea 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,6 +1,7 @@
 --colors
 --reporter spec
---timeout 1200
+--timeout 2500
+--ignore-leaks
 --growl
 --debug
 --compilers coffee:coffee-script

From 52c54444530bfaa8b1dc38a72652093291788bef Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Tue, 26 Feb 2013 02:56:47 -0500
Subject: [PATCH 022/220] Remove second store

---
 test/api.mocha.coffee | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index f0c86f6825..2d965c48db 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -44,7 +44,7 @@ config = require './config'
 model = null
 uuid = null
 taskPath = null
-baseURL = 'http://localhost:3000/api/v1'
+baseURL = 'http://localhost:1337/api/v1'
 UID_AND_TOKEN =
   uid: config.uid
   token: config.token
@@ -104,7 +104,7 @@ modificationsLookup = (direction, options = {}) ->
 describe 'API', ->
   before (done) ->
     server = require '../src/server'
-    server.listen '3000', '0.0.0.0'
+    server.listen '1337', '0.0.0.0'
     server.on 'listening', (data) ->
       # Crappy hack to let server start before tests run
       setTimeout done, 2000
@@ -204,11 +204,6 @@ describe 'API', ->
         .set('X-API-User', currentUser.id)
         .set('X-API-Key', currentUser.apiToken)
         .end (res) ->
-          store = racer.createStore
-            db:
-              type: 'Mongo'
-              uri: process.env.NODE_DB_URI
-          model = store.createModel()
           expect(res.body.err).to.be undefined
           expect(res.statusCode).to.be 200
           currentUser = user.get()

From 07648cd60b65181862e1251ba13aba6847c6391a Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Tue, 26 Feb 2013 03:48:10 -0500
Subject: [PATCH 023/220] all tests passing - woo

---
 src/server/api.coffee |  3 +-
 test/api.mocha.coffee | 90 +++++++++++++++++++++----------------------
 2 files changed, 44 insertions(+), 49 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 88bf0cae77..6ad138ffea 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -47,8 +47,7 @@ router.get '/user', auth, (req, res) ->
   return res.json self
 
 router.get '/task/:id', auth, (req, res) ->
-  task = req.user.get("tasks.#{req.params.id}")
-  console.log task
+  task = req.userObj.tasks[req.params.id]
   return res.json 500, err: "No task found." if !task || _.isEmpty(task)
 
   return res.json 200, task
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 2d965c48db..f9844d4de6 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -26,14 +26,14 @@ expect.Assertion::assert = (truth, msg, error) ->
       err.actual = @obj
     throw err
   @and = new expect.Assertion(@obj)
-
+###
 racer.use require 'racer-db-mongo'
 
 store = racer.createStore
   db:
     type: 'Mongo'
     uri: process.env.NODE_DB_URI
-
+###
 # Custom modules
 scoring = require '../src/app/scoring'
 character = require '../src/app/character'
@@ -45,9 +45,6 @@ model = null
 uuid = null
 taskPath = null
 baseURL = 'http://localhost:1337/api/v1'
-UID_AND_TOKEN =
-  uid: config.uid
-  token: config.token
 
 ## Helper which clones the content at a path so tests can compare before/after values
 # Otherwise, using model.get(path) will give the same object before as after
@@ -102,10 +99,23 @@ modificationsLookup = (direction, options = {}) ->
 ###### Specs ######
 
 describe 'API', ->
+  server = null
+  store = null
+  model = null
+  user = null
+  uid = null
+
   before (done) ->
     server = require '../src/server'
     server.listen '1337', '0.0.0.0'
     server.on 'listening', (data) ->
+      store = server.habitStore
+      #store.flush()
+      model = store.createModel()
+      model.set '_userId', uid = model.id()
+      user = character.newUserObject()
+      user.apiToken = derby.uuid()
+      model.set "users.#{uid}", user
       # Crappy hack to let server start before tests run
       setTimeout done, 2000
 
@@ -130,18 +140,8 @@ describe 'API', ->
   describe 'With token and user id', ->
     params = null
     currentUser = null
-    user = null
-    model = null
-    uid = null
 
     before ->
-      #store.flush()
-      model = store.createModel()
-
-      model.set '_userId', uid = model.id()
-      user = character.newUserObject()
-      user.apiToken = derby.uuid()
-      model.set "users.#{uid}", user
       user = model.at("users.#{uid}")
       currentUser = user.get()
       params =
@@ -161,19 +161,15 @@ describe 'API', ->
           expect(res.body.err).to.be undefined
           expect(res.statusCode).to.be 200
           expect(res.body.id).not.to.be.empty()
-          model.set '_user', currentUser
-          ###
-          currentUser.tasks = []
-          for type in ['habit','todo','daily','reward']
-            model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
-            currentUser.tasks = currentUser.tasks.concat model.get("_#{type}List")
-          ###
-          expect(res.body).to.eql(currentUser)
+          self = _.clone(currentUser)
+          delete self[val] for val in ['tasks', 'apiToken', 'flags', 'lastCron']
+
+          expect(res.body).to.eql self
           done()
 
     it 'GET /api/v1/task/:id', (done) ->
       tid = _.values(currentUser.tasks)[0].id
-      request.post("#{baseURL}/task/#{tid}")
+      request.get("#{baseURL}/task/#{tid}")
         .set('Accept', 'application/json')
         .set('X-API-User', currentUser.id)
         .set('X-API-Key', currentUser.apiToken)
@@ -190,13 +186,14 @@ describe 'API', ->
         .set('X-API-Key', currentUser.apiToken)
         .send(params)
         .end (res) ->
-          expect(res.body.err).to.be undefined
-          expect(res.statusCode).to.be 201
-          expect(res.body.id).not.to.be.empty()
-          # Ensure that user owns the newly created object
-          console.log 'test', _.size(user.get().tasks)
-          expect(user.get().tasks[res.body.id]).to.be.an('object')
-          done()
+          query = model.query('users').withIdAndToken(currentUser.id, currentUser.apiToken)
+          query.fetch (err, user) ->
+            expect(res.body.err).to.be undefined
+            expect(res.statusCode).to.be 201
+            expect(res.body.id).not.to.be.empty()
+            # Ensure that user owns the newly created object
+            expect(user.at(0).get().tasks[res.body.id]).to.be.an('object')
+            done()
 
     it 'GET /api/v1/user/tasks', (done) ->
       request.get("#{baseURL}/user/tasks")
@@ -204,19 +201,18 @@ describe 'API', ->
         .set('X-API-User', currentUser.id)
         .set('X-API-Key', currentUser.apiToken)
         .end (res) ->
-          expect(res.body.err).to.be undefined
-          expect(res.statusCode).to.be 200
-          currentUser = user.get()
-          console.log _.size(currentUser.tasks)
-          console.log uid
-          console.log 'hellomate', user.get()
-          model.ref '_user', user
-          tasks = []
-          for type in ['habit','todo','daily','reward']
-            model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
-            tasks = tasks.concat model.get("_#{type}List")
-          # Ensure that user owns the tasks
-          expect(res.body.length).to.equal tasks.length
-          # Ensure that the two sets are equal
-          expect(_.difference(_.pluck(res.body,'id'), _.pluck(tasks,'id')).length).to.equal 0
-          done()
+          query = model.query('users').withIdAndToken(currentUser.id, currentUser.apiToken)
+          query.fetch (err, user) ->
+            expect(res.body.err).to.be undefined
+            expect(res.statusCode).to.be 200
+            currentUser = user.at(0).get()
+            model.ref '_user', user.at(0)
+            tasks = []
+            for type in ['habit','todo','daily','reward']
+              model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
+              tasks = tasks.concat model.get("_#{type}List")
+            # Ensure that user owns the tasks
+            expect(res.body.length).to.equal tasks.length
+            # Ensure that the two sets are equal
+            expect(_.difference(_.pluck(res.body,'id'), _.pluck(tasks,'id')).length).to.equal 0
+            done()

From c38f215db5ab2ce46020c5399ddc03f2f9092ed6 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Tue, 26 Feb 2013 16:44:26 -0500
Subject: [PATCH 024/220] Add type parameter to /user/tasks

---
 .gitignore            |   1 -
 package.json          |   3 +-
 server.js             |  10 +----
 src/server/api.coffee |  38 +++++++++-------
 test/api.mocha.coffee | 100 ++++++++++--------------------------------
 test/mocha.opts       |   2 +-
 6 files changed, 50 insertions(+), 104 deletions(-)

diff --git a/.gitignore b/.gitignore
index 77291d9d0f..029b274b27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@ node_modules
 *.swp
 .idea*
 config.json
-test/config.json
\ No newline at end of file
diff --git a/package.json b/package.json
index 08d33fc7ab..a5ab0f7bbe 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "./server.js",
   "dependencies": {
     "derby": "git://github.com/lefnire/derby#habitrpg",
-    "racer": "git://github.com/switz/racer#master",
+    "racer": "git://github.com/lefnire/racer#habitrpg",
     "racer-db-mongo": "git://github.com/lefnire/racer-db-mongo#habitrpg",
     "derby-ui-boot": "git://github.com/codeparty/derby-ui-boot#master",
     "derby-auth": "git://github.com/lefnire/derby-auth#master",
@@ -24,7 +24,6 @@
     "nconf": "*",
     "icalendar": "git://github.com/lefnire/node-icalendar#master",
     "nodetime": "*",
-    "querystring": "~0.1.0",
     "superagent": "~0.12.4",
     "resolve": "~0.2.3",
     "browserify": "1.17.3",
diff --git a/server.js b/server.js
index a95b925c12..f9d64274a7 100644
--- a/server.js
+++ b/server.js
@@ -20,8 +20,6 @@ process.env.SMTP_SERVICE = conf.get("SMTP_SERVICE");
 process.env.STRIPE_API_KEY = conf.get("STRIPE_API_KEY");
 process.env.STRIPE_PUB_KEY = conf.get("STRIPE_PUB_KEY");
 
-/*
-
 var agent;
 if (process.env.NODE_ENV === 'development') {
     // Follow these instructions for profiling / debugging leaks
@@ -68,13 +66,9 @@ process.on('uncaughtException', function (error) {
     });
     console.log(error.stack);
 });
-*/
+
 require('coffee-script') // remove intermediate compilation requirement
-module.exports = server = require('./src/server')
-
-Error.stackTraceLimit = Infinity;
-
-server.listen(process.env.PORT || 3000, process.env.IP || '0.0.0.0');
+require('./src/server').listen(process.env.PORT || 3000, process.env.IP || '0.0.0.0');
 
 // Note: removed "up" module, which is default for development (but interferes with and production + PaaS)
 // Restore to 5310bb0 if I want it back (see https://github.com/codeparty/derby/issues/165#issuecomment-10405693)
diff --git a/src/server/api.coffee b/src/server/api.coffee
index 65c48a7d21..fba15fc09f 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -5,7 +5,7 @@ scoring = require '../app/scoring'
 _ = require 'underscore'
 validator = require 'derby-auth/node_modules/validator'
 check = validator.check
-snaitize = validator.sanitize
+sanitize = validator.sanitize
 icalendar = require 'icalendar'
 
 NO_TOKEN_OR_UID = err: "You must include a token and uid (user id) in your request"
@@ -23,7 +23,7 @@ NO_USER_FOUND = err: "No user found."
 auth = (req, res, next) ->
   uid = req.headers['x-api-user']
   token = req.headers['x-api-key']
-  return res.json 500, NO_TOKEN_OR_UID unless uid || token
+  return res.json 401, NO_TOKEN_OR_UID unless uid || token
 
   model = req.getModel()
   query = model.query('users').withIdAndToken(uid, token)
@@ -33,7 +33,7 @@ auth = (req, res, next) ->
     user = user.at(0)
     req.user = user
     req.userObj = user.get()
-    return res.json 500, NO_USER_FOUND if !req.userObj || _.isEmpty(req.userObj)
+    return res.json 401, NO_USER_FOUND if !req.userObj || _.isEmpty(req.userObj)
     next()
 
 router.get '/status', (req, res) ->
@@ -48,27 +48,30 @@ router.get '/user', auth, (req, res) ->
 
 router.get '/task/:id', auth, (req, res) ->
   task = req.userObj.tasks[req.params.id]
-  return res.json 500, err: "No task found." if !task || _.isEmpty(task)
+  return res.json 400, err: "No task found." if !task || _.isEmpty(task)
 
   res.json 200, task
 
 router.put '/task/:id', auth, (req, res) ->
   task = req.userObj.tasks[req.params.id]
-  return res.json 500, err: "No task found." if !task || _.isEmpty(task)
+  return res.json 400, err: "No task found." if !task || _.isEmpty(task)
 
-  task.title = req.body.title if req.body.title
-  task.text = req.body.text if req.body.text
-  task.type = req.body.type if req.body.type
+  title = sanitize(req.body.title).xss()
+  text = sanitize(req.body.text).xss()
+
+  task.title = title if title
+  task.text = text if text
+  #task.type = req.body.type if /^(habit|todo|daily|reward)$/.test req.body.type
 
   req.user.set "tasks.#{task.id}", task
 
-  res.send task
+  res.json 200, task
 
 router.post '/user/task', auth, (req, res) ->
   task = { title, text, type, value, note } = req.body
-  return res.json 500, err: "type must be habit, todo, daily, or reward" unless /habit|todo|daily|reward/.test type
-  return res.json 500, err: "must have a title" unless check(title).notEmpty()
-  return res.json 500, err: "must have text" unless check(text).notEmpty()
+  return res.json 400, err: "type must be habit, todo, daily, or reward" unless /^habit|todo|daily|reward$/.test type
+  return res.json 400, err: "must have a title" unless check(title).notEmpty()
+  return res.json 400, err: "must have text" unless check(text).notEmpty()
 
   self = req.userObj
 
@@ -83,12 +86,15 @@ router.post '/user/task', auth, (req, res) ->
 
 router.get '/user/tasks', auth, (req, res) ->
   self = req.userObj
-  return res.json 500, NO_USER_FOUND if !self || _.isEmpty(self)
+  return res.json 400, NO_USER_FOUND if !self || _.isEmpty(self)
 
   model = req.getModel()
   model.ref '_user', req.user
   tasks = []
-  for type in ['habit','todo','daily','reward']
+  types = ['habit','todo','daily','reward']
+  if /^habit|todo|daily|reward$/.test req.query.type
+    types = [req.query.type]
+  for type in types
     model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
     tasks = tasks.concat model.get("_#{type}List")
 
@@ -102,11 +108,11 @@ router.get '/users/:uid/calendar.ics', (req, res) ->
   model = req.getModel()
   query = model.query('users').withIdAndToken(uid, apiToken)
   query.fetch (err, result) ->
-    return res.send(500, err) if err
+    return res.send(400, err) if err
     tasks = result.at(0).get('tasks')
     #      tasks = result[0].tasks
     tasksWithDates = _.filter tasks, (task) -> !!task.date
-    return res.send(500, "No events found") if _.isEmpty(tasksWithDates)
+    return res.send(400, "No events found") if _.isEmpty(tasksWithDates)
 
     ical = new icalendar.iCalendar()
     ical.addProperty('NAME', 'HabitRPG')
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index e520688d24..1195eb1f2e 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -1,11 +1,6 @@
-expect = require 'expect.js'
-{BrowserModel: Model} = require 'racer/test/util/model'
-derby = require 'derby'
-racer = require 'racer'
 _ = require 'underscore'
-moment = require 'moment'
 request = require 'superagent'
-qs = require 'querystring'
+expect = require 'expect.js'
 require 'coffee-script'
 
 ## monkey-patch expect.js for better diffs on mocha
@@ -16,24 +11,6 @@ expect.Assertion::be = expect.Assertion::equal = (obj) ->
   @_expected = obj
   origBe.call this, obj
 
-expect.Assertion::assert = (truth, msg, error) ->
-  msg = (if @flags.not then error else msg)
-  ok = (if @flags.not then not truth else truth)
-  unless ok
-    err = new Error(msg.call(this))
-    if "_expected" of this
-      err.expected = @_expected
-      err.actual = @obj
-    throw err
-  @and = new expect.Assertion(@obj)
-###
-racer.use require 'racer-db-mongo'
-
-store = racer.createStore
-  db:
-    type: 'Mongo'
-    uri: process.env.NODE_DB_URI
-###
 # Custom modules
 scoring = require '../src/app/scoring'
 character = require '../src/app/character'
@@ -46,56 +23,6 @@ uuid = null
 taskPath = null
 baseURL = 'http://localhost:1337/api/v1'
 
-## Helper which clones the content at a path so tests can compare before/after values
-# Otherwise, using model.get(path) will give the same object before as after
-pathSnapshots = (paths) ->
-  if _.isString(paths)
-    return clone(model.get(paths))
-  _.map paths, (path) -> clone(model.get(path))
-statsTask = -> pathSnapshots(['_user.stats', taskPath]) # quick snapshot of user.stats & task
-
-cleanUserObj = ->
-  userObj = character.newUserObject()
-  userObj.tasks = {}
-  userObj.habitIds = []
-  userObj.dailyIds = []
-  userObj.todoIds = []
-  userObj.rewardIds = []
-  return userObj
-resetUser = -> model.set '_user', cleanUserObj()
-
-freshTask = (taskObj) ->
-  resetUser()
-  # create a test task
-  uuid = derby.uuid()
-  taskPath = "_user.tasks.#{uuid}"
-  {type} = taskObj
-  model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
-  [taskObj.id, taskObj.value] = [uuid, 0]
-  model.at("_#{type}List").push taskObj
-
-###
-Helper function to determine if stats updates are numerically correct based on scoring
-@direction: 'up' or 'down'
-@options: The user stats modifiers and times to run, defaults to {times:1, modifiers:{lvl:1, weapon:0, armor:0}}
-###
-modificationsLookup = (direction, options = {}) ->
-  merged = _.defaults options, {times:1, lvl:1, weapon:0, armor:0}
-  {times, lvl, armor, weapon}  = merged
-  userObj = cleanUserObj()
-  value = 0
-  _.times times, (n) ->
-    delta = scoring.taskDeltaFormula(value, direction)
-    value += delta
-    if direction=='up'
-      gain = scoring.expModifier(delta, options)
-      userObj.stats.exp += gain
-      userObj.stats.money += gain
-    else
-      loss = scoring.hpModifier(delta, options)
-      userObj.stats.hp += loss
-  return {user:userObj, value:value}
-
 ###### Specs ######
 
 describe 'API', ->
@@ -114,7 +41,7 @@ describe 'API', ->
       model = store.createModel()
       model.set '_userId', uid = model.id()
       user = character.newUserObject()
-      user.apiToken = derby.uuid()
+      user.apiToken = model.id()
       model.set "users.#{uid}", user
       # Crappy hack to let server start before tests run
       setTimeout done, 2000
@@ -133,7 +60,7 @@ describe 'API', ->
       request.get("#{baseURL}/user")
         .set('Accept', 'application/json')
         .end (res) ->
-          expect(res.statusCode).to.be 500
+          expect(res.statusCode).to.be 401
           expect(res.body.err).to.be 'You must include a token and uid (user id) in your request'
           done()
 
@@ -230,3 +157,24 @@ describe 'API', ->
             # Ensure that the two sets are equal
             expect(_.difference(_.pluck(res.body,'id'), _.pluck(tasks,'id')).length).to.equal 0
             done()
+
+    it 'GET /api/v1/user/tasks (todos)', (done) ->
+      request.get("#{baseURL}/user/tasks")
+        .set('Accept', 'application/json')
+        .set('X-API-User', currentUser.id)
+        .set('X-API-Key', currentUser.apiToken)
+        .query(type:'todo')
+        .end (res) ->
+          query = model.query('users').withIdAndToken(currentUser.id, currentUser.apiToken)
+          query.fetch (err, user) ->
+            expect(res.body.err).to.be undefined
+            expect(res.statusCode).to.be 200
+            currentUser = user.at(0).get()
+            model.ref '_user', user.at(0)
+            model.refList "_todoList", "_user.tasks", "_user.todoIds"
+            tasks = model.get("_todoList")
+            # Ensure that user owns the tasks
+            expect(res.body.length).to.equal tasks.length
+            # Ensure that the two sets are equal
+            expect(_.difference(_.pluck(res.body,'id'), _.pluck(tasks,'id')).length).to.equal 0
+            done()
diff --git a/test/mocha.opts b/test/mocha.opts
index 74e33e85ea..72889931b5 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,6 +1,6 @@
 --colors
 --reporter spec
---timeout 2500
+--timeout 2800
 --ignore-leaks
 --growl
 --debug

From 624d3360db2baa95025eb68231ed87f2c04601f2 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Tue, 26 Feb 2013 19:27:57 -0500
Subject: [PATCH 025/220] Cleanup pull request diff

---
 server.js               | 5 +++--
 src/server/index.coffee | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server.js b/server.js
index f9d64274a7..b9950075fe 100644
--- a/server.js
+++ b/server.js
@@ -1,8 +1,9 @@
 // Load nconf and define default configuration values if config.json or ENV vars are not found
 var conf = require('nconf');
 conf.argv().env().file({ file: __dirname + "/config.json" }).defaults({
-   'PORT': 3000,
-   'IP': '0.0.0.0'
+   'IP': '0.0.0.0',
+   'BASE_URL': 'http://localhost',
+   'NODE_ENV': 'development'
 });
 
 // Override normal ENV values with nconf ENV values (ENV values are used the same way without nconf)
diff --git a/src/server/index.coffee b/src/server/index.coffee
index 01488aca35..673f54ae75 100644
--- a/src/server/index.coffee
+++ b/src/server/index.coffee
@@ -17,9 +17,9 @@ middleware = require './middleware'
 racer.io.set('transports', ['xhr-polling'])
 racer.ioClient.set('reconnection limit', 300000) # max reconect timeout to 5 minutes
 racer.set('bundleTimeout', 40000)
-unless process.env.NODE_ENV == 'production'
-  racer.use(racer.logPlugin)
-  derby.use(derby.logPlugin)
+#unless process.env.NODE_ENV == 'production'
+#  racer.use(racer.logPlugin)
+#  derby.use(derby.logPlugin)
 
 # Infinite stack trace
 Error.stackTraceLimit = Infinity if process.env.NODE_ENV is 'development'

From 0aedef12e2675e592660c4883eeeb2250a6e7c37 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Tue, 26 Feb 2013 19:30:08 -0500
Subject: [PATCH 026/220] More cleanup

---
 server.js                |  1 +
 src/app/character.coffee | 80 ++++++++++++++++++++--------------------
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/server.js b/server.js
index b9950075fe..51db9480cf 100644
--- a/server.js
+++ b/server.js
@@ -1,6 +1,7 @@
 // Load nconf and define default configuration values if config.json or ENV vars are not found
 var conf = require('nconf');
 conf.argv().env().file({ file: __dirname + "/config.json" }).defaults({
+   'PORT': 3000,
    'IP': '0.0.0.0',
    'BASE_URL': 'http://localhost',
    'NODE_ENV': 'development'
diff --git a/src/app/character.coffee b/src/app/character.coffee
index 16d1c40fc5..901e3cb518 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -137,7 +137,7 @@ module.exports.updateUser = (model) ->
   batch = new BatchUpdate(model)
   user = batch.user
   obj = batch.obj()
-  tasks = obj?.tasks
+  tasks = obj.tasks
 
   # Remove corrupted tasks
   _.each tasks, (task, key) ->
@@ -172,49 +172,49 @@ module.exports.BatchUpdate = BatchUpdate = (model) ->
   updates = {}
 
   {
-    user: user
+  user: user
 
-    obj: ->
-      obj ?= model.get 'users.'+user.get('id')
-      return obj
+  obj: ->
+    obj ?= model.get 'users.'+user.get('id')
+    return obj
 
-    startTransaction: ->
-      # start a batch transaction - nothing between now and @commit() will be set immediately
-      transactionInProgress = true
-      model._dontPersist = true
-      @obj()
+  startTransaction: ->
+    # start a batch transaction - nothing between now and @commit() will be set immediately
+    transactionInProgress = true
+    model._dontPersist = true
+    @obj()
 
-    ###
-      Handles updating the user model. If this is an en-mass operation (eg, server cron), changes are queued
-      but not actually set to the model. It also modifies userObj in case you need to access properties manually later.
-      If transaction not in progress, it just runs standard model.set()
-    ###
-    set: (path, val) ->
-      updates[path] = val if transactionInProgress
-      user.set(path, val)
+  ###
+    Handles updating the user model. If this is an en-mass operation (eg, server cron), changes are queued
+    but not actually set to the model. It also modifies userObj in case you need to access properties manually later.
+    If transaction not in progress, it just runs standard model.set()
+  ###
+  set: (path, val) ->
+    updates[path] = val if transactionInProgress
+    user.set(path, val)
 
-    ###
-      Hack to get around dom bindings being lost if parent objects are replaced whole-sale
-      eg, user.set('stats', {hp:50, exp:10...}) will break dom bindings, but user.set('stats.hp',50) is ok
-    ###
-    setStats: (stats) ->
-      stats ?= obj.stats
-      that = @
-      _.each Object.keys(stats), (key) -> that.set "stats.#{key}", stats[key]
+  ###
+    Hack to get around dom bindings being lost if parent objects are replaced whole-sale
+    eg, user.set('stats', {hp:50, exp:10...}) will break dom bindings, but user.set('stats.hp',50) is ok
+  ###
+  setStats: (stats) ->
+    stats ?= obj.stats
+    that = @
+    _.each Object.keys(stats), (key) -> that.set "stats.#{key}", stats[key]
 
-  #    queue: (path, val) ->
-  #      # Special function for setting object properties by string dot-notation. See http://stackoverflow.com/a/6394168/362790
-  #      arr = path.split('.')
-  #      arr.reduce (curr, next, index) ->
-  #         if (arr.length - 1) == index
-  #           curr[next] = val
-  #         curr[next]
-  #      , obj
+#    queue: (path, val) ->
+#      # Special function for setting object properties by string dot-notation. See http://stackoverflow.com/a/6394168/362790
+#      arr = path.split('.')
+#      arr.reduce (curr, next, index) ->
+#         if (arr.length - 1) == index
+#           curr[next] = val
+#         curr[next]
+#      , obj
 
-    commit: ->
-      model._dontPersist = false
-      # some hackery in our own branched racer-db-mongo, see findAndModify of lefnire/racer-db-mongo#habitrpg index.js
-      user.set "update__", updates
-      transactionInProgress = false
-      updates = {}
+  commit: ->
+    model._dontPersist = false
+    # some hackery in our own branched racer-db-mongo, see findAndModify of lefnire/racer-db-mongo#habitrpg index.js
+    user.set "update__", updates
+    transactionInProgress = false
+    updates = {}
   }

From 8ba137d3ce5d2ac2e5f60d8286fbe53f5d456063 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Wed, 27 Feb 2013 16:58:57 -0500
Subject: [PATCH 027/220] Remove config and scoring

---
 package.json          | 3 ++-
 test/api.mocha.coffee | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index a5ab0f7bbe..83fce307e2 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "npm": "1.1.x"
   },
   "scripts": {
-    "start": "server.js"
+    "start": "server.js",
+    "test": "mocha test/api.mocha.coffee"
   }
 }
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 2b1931fcce..03c4779f21 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -12,9 +12,7 @@ expect.Assertion::be = expect.Assertion::equal = (obj) ->
   origBe.call this, obj
 
 # Custom modules
-scoring = require '../src/app/scoring'
 character = require '../src/app/character'
-config = require './config'
 
 ###### Helpers & Variables ######
 

From ab52c59ee46885387e2375948f8199dd0205085f Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Wed, 27 Feb 2013 17:06:39 -0500
Subject: [PATCH 028/220] pin coffeescript

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 83fce307e2..f3f52343c6 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "stripe": "*",
     "async": "*",
     "lodash": "*",
-    "coffee-script": "*",
+    "coffee-script": "1.4.x",
     "underscore": "*",
     "mongoskin": "*",
     "nconf": "*",

From 4b2b0281ee2323f19d8dadac8c9340d72f1445e3 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Wed, 27 Feb 2013 17:06:47 -0500
Subject: [PATCH 029/220] add nconf to test

---
 test/api.mocha.coffee | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 03c4779f21..ac5bedddc9 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -3,6 +3,29 @@ request = require 'superagent'
 expect = require 'expect.js'
 require 'coffee-script'
 
+conf = require("nconf")
+conf.argv().env().file(file: __dirname + "/config.json").defaults
+  PORT: 3000
+  IP: "0.0.0.0"
+  BASE_URL: "http://localhost"
+  NODE_ENV: "development"
+
+
+# Override normal ENV values with nconf ENV values (ENV values are used the same way without nconf)
+process.env.IP = conf.get("IP")
+process.env.PORT = conf.get("PORT")
+process.env.BASE_URL = conf.get("BASE_URL")
+process.env.FACEBOOK_KEY = conf.get("FACEBOOK_KEY")
+process.env.FACEBOOK_SECRET = conf.get("FACEBOOK_SECRET")
+process.env.NODE_DB_URI = conf.get("NODE_DB_URI")
+process.env.NODE_ENV = conf.get("NODE_ENV")
+process.env.SESSION_SECRET = conf.get("SESSION_SECRET")
+process.env.SMTP_USER = conf.get("SMTP_USER")
+process.env.SMTP_PASS = conf.get("SMTP_PASS")
+process.env.SMTP_SERVICE = conf.get("SMTP_SERVICE")
+process.env.STRIPE_API_KEY = conf.get("STRIPE_API_KEY")
+process.env.STRIPE_PUB_KEY = conf.get("STRIPE_PUB_KEY")
+
 ## monkey-patch expect.js for better diffs on mocha
 ## see: https://github.com/LearnBoost/expect.js/pull/34
 

From 9c6e061e8dd6eacdd194767cfd07b42a2d0d7272 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Wed, 27 Feb 2013 17:10:20 -0500
Subject: [PATCH 030/220] return all objects on user API call

---
 src/server/api.coffee | 2 +-
 test/api.mocha.coffee | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index c20e0d9582..c98384f47b 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -41,7 +41,7 @@ router.get '/status', (req, res) ->
 router.get '/user', auth, (req, res) ->
   self = req.userObj
 
-  delete self[val] for val in ['tasks', 'apiToken', 'flags', 'lastCron']
+  delete self.apiToken
 
   res.json self
 
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index ac5bedddc9..969eb168f6 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -110,7 +110,7 @@ describe 'API', ->
           expect(res.statusCode).to.be 200
           expect(res.body.id).not.to.be.empty()
           self = _.clone(currentUser)
-          delete self[val] for val in ['tasks', 'apiToken', 'flags', 'lastCron']
+          delete self.apiToken
 
           expect(res.body).to.eql self
           done()

From b1c770c0f9d655ba2774675c463806460aeb7069 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Thu, 28 Feb 2013 10:59:39 -0500
Subject: [PATCH 031/220] decrease "reset" button size

---
 views/app/settings.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/app/settings.html b/views/app/settings.html
index 753e3aaa6c..0bba816477 100644
--- a/views/app/settings.html
+++ b/views/app/settings.html
@@ -28,7 +28,7 @@
             <p>This is highly discouraged because you'll lose historical data, which is useful for graphing your progress over time. However, some people find it useful in the beginning after playing with the app for a while.</p>
             <@footer>
                 <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-                <button data-dismiss="modal" x-bind=click:reset class="btn btn-danger btn-large">Reset</button>
+                <button data-dismiss="modal" x-bind=click:reset class="btn btn-danger">Reset</button>
             </@footer>
         </app:modals:modal>
 

From afe95975e1c31a4eb1b94c2a19b3c92c8575f745 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Thu, 28 Feb 2013 18:03:35 -0500
Subject: [PATCH 032/220] fix up deprecated to work again (order of middleware)

---
 src/server/deprecated.coffee | 35 +++++------------------------------
 src/server/index.coffee      |  2 +-
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/src/server/deprecated.coffee b/src/server/deprecated.coffee
index 8e497764ef..d4e5d3b694 100644
--- a/src/server/deprecated.coffee
+++ b/src/server/deprecated.coffee
@@ -13,31 +13,6 @@ router.get '/:uid/up/:score?', (req, res) -> res.send(500, deprecatedMessage)
 router.get '/:uid/down/:score?', (req, res) -> res.send(500, deprecatedMessage)
 router.post '/users/:uid/tasks/:taskId/:direction', (req, res) -> res.send(500, deprecatedMessage)
 
-router.get '/v1/users/:uid/tasks/:taskId/:direction', (req, res) ->
-  {uid, taskId, direction} = req.params
-  {apiToken} = req.query
-  {title, service, icon} = req.body
-  console.log {params:req.params, body:req.body} if process.env.NODE_ENV == 'development'
-
-  # Send error responses for improper API call
-  return res.send(500, 'request body "apiToken" required') unless apiToken
-  return res.send(500, ':uid required') unless uid
-  return res.send(500, ':taskId required') unless taskId
-  return res.send(500, ":direction must be 'up' or 'down'") unless direction in ['up','down']
-
-  model = req.getModel()
-  req._isServer = true
-  model.fetch model.query('users').withIdAndToken(uid, apiToken), (err, result) ->
-    return res.send(500, err) if err
-    user = result.at(0)
-    userObj = user.get()
-    if _.isEmpty(userObj)
-      return res.send(500, "User with uid=#{uid}, token=#{apiToken} not found. Make sure you're not using your username, but your User Id")
-
-    model.ref('_user', user)
-
-    res.send(user)
-
 router.post '/v1/users/:uid/tasks/:taskId/:direction', (req, res) ->
   {uid, taskId, direction} = req.params
   {apiToken, title, service, icon} = req.body
@@ -50,15 +25,15 @@ router.post '/v1/users/:uid/tasks/:taskId/:direction', (req, res) ->
   return res.send(500, ":direction must be 'up' or 'down'") unless direction in ['up','down']
 
   model = req.getModel()
-  req._isServer = true
   model.fetch model.query('users').withIdAndToken(uid, apiToken), (err, result) ->
     return res.send(500, err) if err
-    user = result.at(0)
+    user = result
     userObj = user.get()
     if _.isEmpty(userObj)
       return res.send(500, "User with uid=#{uid}, token=#{apiToken} not found. Make sure you're not using your username, but your User Id")
 
     model.ref('_user', user)
+    req._isServer = true
 
     # Create task if doesn't exist
     # TODO add service & icon to task
@@ -73,8 +48,8 @@ router.post '/v1/users/:uid/tasks/:taskId/:direction', (req, res) ->
         down: true
         notes: "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task."
 
-    scoring.setModel(model)
-    delta = scoring.score(taskId, direction)
+    score = new scoring.Scoring(model)
+    delta = score.score(taskId, direction)
     result = model.get ('_user.stats')
     result.delta = delta
     res.send(result)
@@ -88,7 +63,7 @@ router.get '/v1/users/:uid/calendar.ics', (req, res) ->
   query = model.query('users').withIdAndToken(uid, apiToken)
   query.fetch (err, result) ->
     return res.send(500, err) if err
-    tasks = result.at(0).get('tasks')
+    tasks = result.get('tasks')
     #      tasks = result[0].tasks
     tasksWithDates = _.filter tasks, (task) -> !!task.date
     return res.send(500, "No events found") if _.isEmpty(tasksWithDates)
diff --git a/src/server/index.coffee b/src/server/index.coffee
index 673f54ae75..41b447f677 100644
--- a/src/server/index.coffee
+++ b/src/server/index.coffee
@@ -76,6 +76,7 @@ mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, ->
     .use(store.modelMiddleware())
     # API should be hit before all other routes
     .use('/api/v1', require('./api').middleware)
+    .use(require('./deprecated').middleware)
     # Show splash page for newcomers
     .use(middleware.splash)
     .use(priv.middleware)
@@ -84,7 +85,6 @@ mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, ->
     # Creates an express middleware from the app's routes
     .use(app.router())
     .use(require('./static').middleware)
-    .use(require('./deprecated').middleware)
     .use(expressApp.router)
     .use(serverError(root))
 

From 2a49b640239a987faaa5e8958e9e11e612b9c4ab Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Thu, 28 Feb 2013 23:09:12 +0000
Subject: [PATCH 033/220] Better notifications

---
 src/app/browser.coffee | 34 ++++++++++++++++++++++------------
 styles/app/alerts.styl | 15 +++++++++++----
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index 2830fefd48..5becd6bcc0 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -6,7 +6,7 @@ module.exports.restoreRefs = restoreRefs = (model) ->
   model.fn '_tnl', '_user.stats.lvl', (lvl) ->
     # see https://github.com/lefnire/habitrpg/issues/4
     # also update in scoring.coffee. TODO create a function accessible in both locations
-    (lvl*100)/5
+    10*Math.pow(lvl,2)+(lvl*10)+80
 
   #refLists
   _.each ['habit', 'daily', 'todo', 'reward'], (type) ->
@@ -193,20 +193,30 @@ setupGrowlNotifications = (model) ->
     num = captures - args
     rounded = Math.abs(num.toFixed(1))
     if num < 0
-      statsNotification "<i class='icon-heart'></i> -#{rounded} HP", 'hp' # lost hp from purchase
+      statsNotification "<i class='icon-heart'></i> - #{rounded} HP", 'hp' # lost hp from purchase
+    else if num > 0
+      statsNotification "<i class='icon-heart'></i> + #{rounded} HP", 'hp' # gained hp from potion/level? 
+  
+  user.on 'set', 'stats.exp', (captures, args) ->
+    num = captures - args
+    rounded = Math.abs(num.toFixed(1))
+    if num < 0
+      statsNotification "<i class='icon-star'></i> - #{rounded} XP", 'xp'
+    else if num > 0
+      statsNotification "<i class='icon-star'></i> + #{rounded} XP", 'xp'
 
   user.on 'set', 'stats.gp', (captures, args) ->
     num = captures - args
-    rounded = Math.abs(num.toFixed(1))
-    # made purchase
-    if num < 0
-      # FIXME use 'warning' when unchecking an accidently completed daily/todo, and notify of exp too
-      statsNotification "<i class='icon-star'></i> -#{rounded} GP", 'gp'
-      # gained gp (and thereby exp)
-    else if num > 0
-      num = Math.abs(num)
-      statsNotification "<i class='icon-star'></i> +#{rounded} XP", 'xp'
-      statsNotification "<i class='icon-gp'></i> +#{rounded} GP", 'gp'
+    absolute = Math.abs(num)
+    gold = Math.floor(absolute)
+    silver = Math.floor((absolute-gold)*100)
+    sign = if num < 0 then '-' else '+'
+    if gold and silver > 0
+      statsNotification "#{sign} #{gold} <i class='icon-gold'></i> #{silver} <i class='icon-silver'></i>", 'gp'
+    else if gold > 0
+      statsNotification "#{sign} #{gold} <i class='icon-gold'></i>", 'gp'
+    else if silver > 0
+      statsNotification "#{sign} #{silver} <i class='icon-silver'></i>", 'gp'
 
   user.on 'set', 'stats.lvl', (captures, args) ->
     if captures > args
diff --git a/styles/app/alerts.styl b/styles/app/alerts.styl
index 8ecbd0e45e..38e411f480 100644
--- a/styles/app/alerts.styl
+++ b/styles/app/alerts.styl
@@ -34,9 +34,16 @@ borderDarken = 20%
 
 // alert icons
 
-.icon-gp
-  background: url("img/sprites/shop_sprites.png") no-repeat
-  background-size: 400px
-  background-position: -386px 0
+.icon-gold
+  background: url("img/coin_single_gold.png") no-repeat
+  background-position: center center
+  background-size: 18px
+  width: 14px
+  height: 14px
+
+.icon-silver
+  background: url("img/coin_single_silver.png") no-repeat
+  background-position: center center
+  background-size: 18px
   width: 14px
   height: 14px
\ No newline at end of file

From 3017f5a592d96c6617a5196b001b9e4077f2ea01 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Thu, 28 Feb 2013 18:24:14 -0500
Subject: [PATCH 034/220] small test tweaks

---
 test/api.mocha.coffee          | 19 +++----------------
 test/casper/rest.casper.coffee |  2 +-
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 969eb168f6..f1a7abec1e 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -4,27 +4,14 @@ expect = require 'expect.js'
 require 'coffee-script'
 
 conf = require("nconf")
-conf.argv().env().file(file: __dirname + "/config.json").defaults
-  PORT: 3000
-  IP: "0.0.0.0"
-  BASE_URL: "http://localhost"
-  NODE_ENV: "development"
-
+conf.argv().env().file({file: __dirname + '../config.json'}).defaults
 
 # Override normal ENV values with nconf ENV values (ENV values are used the same way without nconf)
-process.env.IP = conf.get("IP")
-process.env.PORT = conf.get("PORT")
+#FIXME can't get nconf file above to load...
 process.env.BASE_URL = conf.get("BASE_URL")
 process.env.FACEBOOK_KEY = conf.get("FACEBOOK_KEY")
 process.env.FACEBOOK_SECRET = conf.get("FACEBOOK_SECRET")
-process.env.NODE_DB_URI = conf.get("NODE_DB_URI")
-process.env.NODE_ENV = conf.get("NODE_ENV")
-process.env.SESSION_SECRET = conf.get("SESSION_SECRET")
-process.env.SMTP_USER = conf.get("SMTP_USER")
-process.env.SMTP_PASS = conf.get("SMTP_PASS")
-process.env.SMTP_SERVICE = conf.get("SMTP_SERVICE")
-process.env.STRIPE_API_KEY = conf.get("STRIPE_API_KEY")
-process.env.STRIPE_PUB_KEY = conf.get("STRIPE_PUB_KEY")
+process.env.NODE_DB_URI = 'mongodb://localhost/habirpg'
 
 ## monkey-patch expect.js for better diffs on mocha
 ## see: https://github.com/LearnBoost/expect.js/pull/34
diff --git a/test/casper/rest.casper.coffee b/test/casper/rest.casper.coffee
index 18aaf3afde..767d93489e 100644
--- a/test/casper/rest.casper.coffee
+++ b/test/casper/rest.casper.coffee
@@ -12,8 +12,8 @@ casper.start "#{url}/?play=1", ->
   @fill 'form#derby-auth-register',
     username: user1.id
     email: "{user1.id}@gmail.com"
-    'email-confirmation': "{user1.id}@gmail.com"
     password: 'habitrpg123'
+    'password-confirmation': "habitrpg123"
   , true
 casper.thenOpen "#{url}/logout"
 casper.thenOpen "#{url}/?play=1", ->

From 4597cba8139864809d0814bd4fbd334a5a1d883b Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Thu, 28 Feb 2013 23:42:38 +0000
Subject: [PATCH 035/220] Changes to XP and GP gain

---
 src/app/scoring.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index 4f1b78db70..ea8ab4b1fb 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -142,8 +142,8 @@ module.exports.Scoring = (model) ->
 
     addPoints = ->
       modified = expModifier(delta)
-      exp += modified
-      gp += modified
+      exp += modified*10
+      gp += delta
 
     subtractPoints = ->
       modified = hpModifier(delta)

From 6fe375114c4b5e49c49d1a0e91f22fabc10dfae2 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Thu, 28 Feb 2013 20:00:08 -0500
Subject: [PATCH 036/220] set req._isServer=true for API calls, use that as
 access check

---
 src/server/api.coffee   | 1 +
 src/server/store.coffee | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index c98384f47b..09824e294c 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -33,6 +33,7 @@ auth = (req, res, next) ->
     req.user = user
     req.userObj = user.get()
     return res.json 401, NO_USER_FOUND if !req.userObj || _.isEmpty(req.userObj)
+    req._isServer = true
     next()
 
 router.get '/status', (req, res) ->
diff --git a/src/server/store.coffee b/src/server/store.coffee
index 659d890685..ac4ab491af 100644
--- a/src/server/store.coffee
+++ b/src/server/store.coffee
@@ -30,9 +30,7 @@ userAccess = (store) ->
     err = arguments[arguments.length - 1]
     # return err(derbyAuth.SESSION_INVALIDATED_ERROR) if derbyAuth.bustedSession(@)
 
-    # TEMPORARY token check to allow api
-    # Must fix before release
-    return accept(true)
+    return accept(true) if derbyAuth.isServer(@)
 
     return accept(false) if derbyAuth.bustedSession(@)
 
@@ -45,8 +43,7 @@ userAccess = (store) ->
       return accept(true)
 
     # Same session (user.id = this.session.userId)
-    if (uid is @session.userId) or derbyAuth.isServer(@)
-      return accept(true)
+    return accept(true) if uid is @session.userId
 
     accept(false)
 

From 26de70c17c34c16742d80562d82d2a53533ddd78 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Thu, 28 Feb 2013 20:42:52 -0500
Subject: [PATCH 037/220] temporary set session so we can save new user in
 tests

---
 test/api.mocha.coffee | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index f1a7abec1e..145542a525 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -50,7 +50,9 @@ describe 'API', ->
       model.set '_userId', uid = model.id()
       user = character.newUserObject()
       user.apiToken = model.id()
+      model.session = {userId:uid}
       model.set "users.#{uid}", user
+      delete model.session
       # Crappy hack to let server start before tests run
       setTimeout done, 2000
 

From c080ddc6832cad40e252497b421bacc4e268a5c5 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Fri, 1 Mar 2013 05:16:55 -0500
Subject: [PATCH 038/220] Separate out logic for tasks plus specs

---
 src/server/api.coffee | 55 ++++++++++++++++++++++++++-----------------
 test/api.mocha.coffee | 47 ++++++++++++++++++++++++++++++++++--
 2 files changed, 78 insertions(+), 24 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 09824e294c..3672799667 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -40,11 +40,11 @@ router.get '/status', (req, res) ->
   res.json status: 'up'
 
 router.get '/user', auth, (req, res) ->
-  self = req.userObj
+  user = req.userObj
 
-  delete self.apiToken
+  delete user.apiToken
 
-  res.json self
+  res.json user
 
 router.get '/task/:id', auth, (req, res) ->
   task = req.userObj.tasks[req.params.id]
@@ -52,30 +52,41 @@ router.get '/task/:id', auth, (req, res) ->
 
   res.json 200, task
 
-router.put '/task/:id', auth, (req, res) ->
-  task = req.userObj.tasks[req.params.id]
-  return res.json 400, err: "No task found." if !task || _.isEmpty(task)
+validateTask = (req, res, next) ->
+  task = {}
+  # If we're updating, get the task from the user
+  if req.method is 'PUT'
+    task = req.userObj?.tasks[req.params.id]
+    return res.json 400, err: "No task found." if !task || _.isEmpty(task)
 
-  title = sanitize(req.body.title).xss()
-  text = sanitize(req.body.text).xss()
+  newTask = { type, text, notes, value, up, down, completed } = req.body
 
-  task.title = title if title
-  task.text = text if text
-  #task.type = req.body.type if /^(habit|todo|daily|reward)$/.test req.body.type
+  text = sanitize(text).xss()
+  notes = sanitize(notes).xss()
+  value = sanitize(value).toInt()
 
-  req.user.set "tasks.#{task.id}", task
+  switch type
+    when 'habit'
+      newTask.up = true unless typeof up is 'boolean'
+      newTask.down = true unless typeof down is 'boolean'
+    when 'daily', 'todo'
+      newTask.completed = false unless typeof completed is 'boolean'
 
-  res.json 200, task
+  _.extend task, newTask
+  req.task = task
+  next()
 
-router.post '/user/task', auth, (req, res) ->
-  task = { title, text, type, value, note } = req.body
-  return res.json 400, err: "type must be habit, todo, daily, or reward" unless /^habit|todo|daily|reward$/.test type
-  return res.json 400, err: "must have a title" unless check(title).notEmpty()
-  return res.json 400, err: "must have text" unless check(text).notEmpty()
+router.put '/task/:id', auth, validateTask, (req, res) ->
+  req.user.set "tasks.#{req.task.id}", req.task
 
-  self = req.userObj
+  res.json 200, req.task
 
-  value ||= 0
+router.post '/user/task', auth, validateTask, (req, res) ->
+  task = req.task
+  type = task.type
+
+  unless /^habit|todo|daily|reward$/.test type
+    return res.json 400, err: 'type must be habit, todo, daily, or reward'
 
   model = req.getModel()
   model.ref '_user', req.user
@@ -85,8 +96,8 @@ router.post '/user/task', auth, (req, res) ->
   res.json 201, task
 
 router.get '/user/tasks', auth, (req, res) ->
-  self = req.userObj
-  return res.json 400, NO_USER_FOUND if !self || _.isEmpty(self)
+  user = req.userObj
+  return res.json 400, NO_USER_FOUND if !user || _.isEmpty(user)
 
   model = req.getModel()
   model.ref '_user', req.user
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 145542a525..229603a815 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -132,18 +132,61 @@ describe 'API', ->
             expect(user.get().tasks[res.body.id]).to.be.an('object')
             done()
 
+    it 'POST /api/v1/user/task (without type)', (done) ->
+      request.post("#{baseURL}/user/task")
+        .set('Accept', 'application/json')
+        .set('X-API-User', currentUser.id)
+        .set('X-API-Key', currentUser.apiToken)
+        .send({})
+        .end (res) ->
+          query = model.query('users').withIdAndToken(currentUser.id, currentUser.apiToken)
+          query.fetch (err, user) ->
+            expect(res.body.err).to.be 'type must be habit, todo, daily, or reward'
+            expect(res.statusCode).to.be 400
+            done()
+
+    it 'POST /api/v1/user/task (only type)', (done) ->
+      request.post("#{baseURL}/user/task")
+        .set('Accept', 'application/json')
+        .set('X-API-User', currentUser.id)
+        .set('X-API-Key', currentUser.apiToken)
+        .send(type: 'habit')
+        .end (res) ->
+          query = model.query('users').withIdAndToken(currentUser.id, currentUser.apiToken)
+          query.fetch (err, user) ->
+            expect(res.body.err).to.be undefined
+            expect(res.statusCode).to.be 201
+            expect(res.body.id).not.to.be.empty()
+            # Ensure that user owns the newly created object
+            expect(user.get().tasks[res.body.id]).to.be.an('object')
+            done()
+
     it 'PUT /api/v1/task/:id', (done) ->
       tid = _.pluck(currentUser.tasks, 'id')[0]
       request.put("#{baseURL}/task/#{tid}")
         .set('Accept', 'application/json')
         .set('X-API-User', currentUser.id)
         .set('X-API-Key', currentUser.apiToken)
-        .send(title: 'a new title',text: 'hi')
+        .send(text: 'bye')
+        .end (res) ->
+          expect(res.body.err).to.be undefined
+          expect(res.statusCode).to.be 200
+          currentUser.tasks[tid].text = 'bye'
+          expect(res.body).to.eql currentUser.tasks[tid]
+          done()
+
+    it 'PUT /api/v1/task/:id (update notes)', (done) ->
+      tid = _.pluck(currentUser.tasks, 'id')[0]
+      request.put("#{baseURL}/task/#{tid}")
+        .set('Accept', 'application/json')
+        .set('X-API-User', currentUser.id)
+        .set('X-API-Key', currentUser.apiToken)
+        .send(text: 'hi',notes:'foobar matey')
         .end (res) ->
           expect(res.body.err).to.be undefined
           expect(res.statusCode).to.be 200
-          currentUser.tasks[tid].title = 'a new title'
           currentUser.tasks[tid].text = 'hi'
+          currentUser.tasks[tid].notes = 'foobar matey'
           expect(res.body).to.eql currentUser.tasks[tid]
           done()
 

From 4e6c741594a6347bd2b5425138154abdd4de0b13 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Fri, 1 Mar 2013 05:48:49 -0500
Subject: [PATCH 039/220] Shouldn't update type in task PUT

---
 src/server/api.coffee | 13 ++++++++-----
 test/api.mocha.coffee | 17 ++++++++++++++++-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 3672799667..1234f0cebb 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -54,12 +54,18 @@ router.get '/task/:id', auth, (req, res) ->
 
 validateTask = (req, res, next) ->
   task = {}
+  newTask = { type, text, notes, value, up, down, completed } = req.body
+
   # If we're updating, get the task from the user
   if req.method is 'PUT'
     task = req.userObj?.tasks[req.params.id]
     return res.json 400, err: "No task found." if !task || _.isEmpty(task)
-
-  newTask = { type, text, notes, value, up, down, completed } = req.body
+    # Strip for now
+    type = undefined
+    delete newTask.type
+  else if req.method is 'POST'
+    unless /^habit|todo|daily|reward$/.test type
+      return res.json 400, err: 'type must be habit, todo, daily, or reward'
 
   text = sanitize(text).xss()
   notes = sanitize(notes).xss()
@@ -85,9 +91,6 @@ router.post '/user/task', auth, validateTask, (req, res) ->
   task = req.task
   type = task.type
 
-  unless /^habit|todo|daily|reward$/.test type
-    return res.json 400, err: 'type must be habit, todo, daily, or reward'
-
   model = req.getModel()
   model.ref '_user', req.user
   model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 229603a815..1d02e9e593 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -175,8 +175,23 @@ describe 'API', ->
           expect(res.body).to.eql currentUser.tasks[tid]
           done()
 
+    it 'PUT /api/v1/task/:id (shouldnt update type)', (done) ->
+      tid = _.pluck(currentUser.tasks, 'id')[1]
+      type = if currentUser.tasks[tid].type is 'habit' then 'daily' else 'habit'
+      request.put("#{baseURL}/task/#{tid}")
+        .set('Accept', 'application/json')
+        .set('X-API-User', currentUser.id)
+        .set('X-API-Key', currentUser.apiToken)
+        .send(type: type, text: 'fishman')
+        .end (res) ->
+          expect(res.body.err).to.be undefined
+          expect(res.statusCode).to.be 200
+          currentUser.tasks[tid].text = 'fishman'
+          expect(res.body).to.eql currentUser.tasks[tid]
+          done()
+
     it 'PUT /api/v1/task/:id (update notes)', (done) ->
-      tid = _.pluck(currentUser.tasks, 'id')[0]
+      tid = _.pluck(currentUser.tasks, 'id')[2]
       request.put("#{baseURL}/task/#{tid}")
         .set('Accept', 'application/json')
         .set('X-API-User', currentUser.id)

From 33b529731cab908c5c8e6f589f6f553f0bfbb25c Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Fri, 1 Mar 2013 06:03:05 -0500
Subject: [PATCH 040/220] Remove extra query

---
 test/api.mocha.coffee | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 1d02e9e593..6dcbdaa2df 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -139,11 +139,9 @@ describe 'API', ->
         .set('X-API-Key', currentUser.apiToken)
         .send({})
         .end (res) ->
-          query = model.query('users').withIdAndToken(currentUser.id, currentUser.apiToken)
-          query.fetch (err, user) ->
-            expect(res.body.err).to.be 'type must be habit, todo, daily, or reward'
-            expect(res.statusCode).to.be 400
-            done()
+          expect(res.body.err).to.be 'type must be habit, todo, daily, or reward'
+          expect(res.statusCode).to.be 400
+          done()
 
     it 'POST /api/v1/user/task (only type)', (done) ->
       request.post("#{baseURL}/user/task")

From 5ce5152757e12184e9d7c11d893db3601f2a119a Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Fri, 1 Mar 2013 06:11:32 -0500
Subject: [PATCH 041/220] More secure regex type check

---
 src/server/api.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 1234f0cebb..7ad2e2330d 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -64,7 +64,7 @@ validateTask = (req, res, next) ->
     type = undefined
     delete newTask.type
   else if req.method is 'POST'
-    unless /^habit|todo|daily|reward$/.test type
+    unless /^(habit|todo|daily|reward)$/.test type
       return res.json 400, err: 'type must be habit, todo, daily, or reward'
 
   text = sanitize(text).xss()
@@ -106,7 +106,7 @@ router.get '/user/tasks', auth, (req, res) ->
   model.ref '_user', req.user
   tasks = []
   types = ['habit','todo','daily','reward']
-  if /^habit|todo|daily|reward$/.test req.query.type
+  if /^(habit|todo|daily|reward)$/.test req.query.type
     types = [req.query.type]
   for type in types
     model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"

From 4377ff918a2ac0fa0ae2b32155872d8e571d380a Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Fri, 1 Mar 2013 15:11:35 -0500
Subject: [PATCH 042/220] Prepend /user to the /task/:id routes

---
 src/server/api.coffee | 10 +++++-----
 test/api.mocha.coffee | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 7ad2e2330d..287b354f5d 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -20,6 +20,9 @@ NO_USER_FOUND = err: "No user found."
   $ mocha test/api.mocha.coffee
 ###
 
+router.get '/status', (req, res) ->
+  res.json status: 'up'
+
 auth = (req, res, next) ->
   uid = req.headers['x-api-user']
   token = req.headers['x-api-key']
@@ -36,9 +39,6 @@ auth = (req, res, next) ->
     req._isServer = true
     next()
 
-router.get '/status', (req, res) ->
-  res.json status: 'up'
-
 router.get '/user', auth, (req, res) ->
   user = req.userObj
 
@@ -46,7 +46,7 @@ router.get '/user', auth, (req, res) ->
 
   res.json user
 
-router.get '/task/:id', auth, (req, res) ->
+router.get '/user/task/:id', auth, (req, res) ->
   task = req.userObj.tasks[req.params.id]
   return res.json 400, err: "No task found." if !task || _.isEmpty(task)
 
@@ -82,7 +82,7 @@ validateTask = (req, res, next) ->
   req.task = task
   next()
 
-router.put '/task/:id', auth, validateTask, (req, res) ->
+router.put '/user/task/:id', auth, validateTask, (req, res) ->
   req.user.set "tasks.#{req.task.id}", req.task
 
   res.json 200, req.task
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 6dcbdaa2df..6d82d71516 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -104,9 +104,9 @@ describe 'API', ->
           expect(res.body).to.eql self
           done()
 
-    it 'GET /api/v1/task/:id', (done) ->
+    it 'GET /api/v1/user/task/:id', (done) ->
       tid = _.pluck(currentUser.tasks, 'id')[0]
-      request.get("#{baseURL}/task/#{tid}")
+      request.get("#{baseURL}/user/task/#{tid}")
         .set('Accept', 'application/json')
         .set('X-API-User', currentUser.id)
         .set('X-API-Key', currentUser.apiToken)
@@ -159,9 +159,9 @@ describe 'API', ->
             expect(user.get().tasks[res.body.id]).to.be.an('object')
             done()
 
-    it 'PUT /api/v1/task/:id', (done) ->
+    it 'PUT /api/v1/user/task/:id', (done) ->
       tid = _.pluck(currentUser.tasks, 'id')[0]
-      request.put("#{baseURL}/task/#{tid}")
+      request.put("#{baseURL}/user/task/#{tid}")
         .set('Accept', 'application/json')
         .set('X-API-User', currentUser.id)
         .set('X-API-Key', currentUser.apiToken)
@@ -173,10 +173,10 @@ describe 'API', ->
           expect(res.body).to.eql currentUser.tasks[tid]
           done()
 
-    it 'PUT /api/v1/task/:id (shouldnt update type)', (done) ->
+    it 'PUT /api/v1/user/task/:id (shouldnt update type)', (done) ->
       tid = _.pluck(currentUser.tasks, 'id')[1]
       type = if currentUser.tasks[tid].type is 'habit' then 'daily' else 'habit'
-      request.put("#{baseURL}/task/#{tid}")
+      request.put("#{baseURL}/user/task/#{tid}")
         .set('Accept', 'application/json')
         .set('X-API-User', currentUser.id)
         .set('X-API-Key', currentUser.apiToken)
@@ -188,9 +188,9 @@ describe 'API', ->
           expect(res.body).to.eql currentUser.tasks[tid]
           done()
 
-    it 'PUT /api/v1/task/:id (update notes)', (done) ->
+    it 'PUT /api/v1/user/task/:id (update notes)', (done) ->
       tid = _.pluck(currentUser.tasks, 'id')[2]
-      request.put("#{baseURL}/task/#{tid}")
+      request.put("#{baseURL}/user/task/#{tid}")
         .set('Accept', 'application/json')
         .set('X-API-User', currentUser.id)
         .set('X-API-Key', currentUser.apiToken)

From bc76aee85e736739551e412bc90360090cfab7ab Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Fri, 1 Mar 2013 15:13:53 -0500
Subject: [PATCH 043/220] Remove nodetime

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index f3f52343c6..a80458cca0 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
     "mongoskin": "*",
     "nconf": "*",
     "icalendar": "git://github.com/lefnire/node-icalendar#master",
-    "nodetime": "*",
     "superagent": "~0.12.4",
     "resolve": "~0.2.3",
     "browserify": "1.17.3",

From 74e531bee52e666dbe3edb26320d390af4d8a58c Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 1 Mar 2013 16:22:24 -0500
Subject: [PATCH 044/220] add changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000..1333ed77b7
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1 @@
+TODO

From ba8cf7742af882f563e87c08056da79bdfabc880 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 1 Mar 2013 18:02:53 -0500
Subject: [PATCH 045/220] sortable cleanup

---
 src/app/browser.coffee | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index 2830fefd48..7cfdb67d59 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -81,10 +81,7 @@ loadJavaScripts = (model) ->
 ###
 setupSortable = (model) ->
   unless (model.get('_view.mobileDevice') == true) #don't do sortable on mobile
-    # Make the lists draggable using jQuery UI
-    # Note, have to setup helper function here and call it for each type later
-    # due to variable binding of "type"
-    setupSortable = (type) ->
+    _.each ['habit', 'daily', 'todo', 'reward'], (type) ->
       $("ul.#{type}s").sortable
         dropOnEmpty: false
         cursor: "move"
@@ -102,7 +99,6 @@ setupSortable = (model) ->
           # Also, note that refList index arguments can either be an index
           # or the item's id property
           model.at("_#{type}List").pass(ignore: domId).move {id}, to
-    _.each ['habit', 'daily', 'todo', 'reward'], (type) -> setupSortable(type)
 
 setupTooltips = (model) ->
   $('[rel=tooltip]').tooltip()

From 7fc1de01e61631492fac7e5f360961a1cd9fa9bb Mon Sep 17 00:00:00 2001
From: Tobias Leugger <leugger.tobias@web.de>
Date: Sat, 2 Mar 2013 00:27:59 +0100
Subject: [PATCH 046/220] Small improvement of the error-alert styling

---
 views/app/alerts.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/app/alerts.html b/views/app/alerts.html
index c76e61c010..bf10bd2bf0 100644
--- a/views/app/alerts.html
+++ b/views/app/alerts.html
@@ -1,6 +1,6 @@
 <alerts:>
     {#if _flash.error}
-        <ul class="alert alert-error">
+        <ul class="unstyled alert alert-error">
             {#each _flash.error as :error}<li>{:error}</li>{/}
         </ul>
     {/}
\ No newline at end of file

From 08839278b38f0e29cc293c1f656aaae58a1993cc Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Sat, 2 Mar 2013 18:23:43 +0000
Subject: [PATCH 047/220] Notification and Algorithim changes

---
 src/app/algos.coffee     | 50 ++++++++++++++++++++++++++++
 src/app/browser.coffee   | 22 ++++++++-----
 src/app/character.coffee |  1 +
 src/app/helpers.coffee   |  3 ++
 src/app/items.coffee     | 50 ++++++++++++++--------------
 src/app/scoring.coffee   | 70 +++++++++++-----------------------------
 views/app/header.html    |  2 +-
 7 files changed, 112 insertions(+), 86 deletions(-)
 create mode 100644 src/app/algos.coffee

diff --git a/src/app/algos.coffee b/src/app/algos.coffee
new file mode 100644
index 0000000000..69ab9b4e93
--- /dev/null
+++ b/src/app/algos.coffee
@@ -0,0 +1,50 @@
+
+MODIFIER = .02
+
+module.exports.tnl = (level) ->
+	return (Math.pow(level,2)*10)+(level*10)+80
+
+###
+  Calculates Exp modificaiton based on level and weapon strength
+  {value} task.value for exp gain
+  {weaponStrength) weapon strength 
+  {level} current user level
+###
+module.exports.expModifier = (value, weaponStrength, level) ->
+	levelModifier = (level-1) * MODIFIER
+	weaponModifier = weaponStrength / 100
+	strength = 1 + weaponModifier + levelModifier
+	return value * strength
+
+###
+  Calculates HP modification based on level and armor defence
+  {value} task.value for hp loss
+  {armorDefense} defense from armor
+  {helmDefense} defense from helm 
+  {level} current user level
+###
+module.exports.hpModifier = (value, armorDefense, helmDefense, shieldDefense, level) ->
+	levelModifier = (level-1) * MODIFIER
+	armorModifier = (armorDefense + helmDefense + shieldDefense) / 100
+	defense = 1 - levelModifier + armorModifier
+	return value * defense
+
+###
+  Future use
+###
+module.exports.gpModifier = (value, modifier) ->
+	return value * modifier
+
+###
+  Calculates the next task.value based on direction
+  Uses a capped inverse log y=.9^x, y>= -5
+  {currentValue} the current value of the task
+  {direction} up or down
+###
+module.exports.taskDeltaFormula = (currentValue, direction) ->
+	sign = if (direction is 'up') then 1 else -1
+	delta = Math.pow(0.9,currentValue) * sign
+	if delta < -5 then delta = -5
+	console.log("CurrentValue: " + currentValue + " delta: " + delta)
+	#delta = if (currentValue < 0) then (( -0.1 * currentValue + 1 ) * sign) else (( Math.pow(0.9,currentValue) ) * sign)
+	return delta
\ No newline at end of file
diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index 5becd6bcc0..63e6994d58 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -1,11 +1,13 @@
 _ = require 'underscore'
 moment = require 'moment'
+#algos = require './algos'
 
 module.exports.restoreRefs = restoreRefs = (model) ->
   # tnl function
   model.fn '_tnl', '_user.stats.lvl', (lvl) ->
     # see https://github.com/lefnire/habitrpg/issues/4
     # also update in scoring.coffee. TODO create a function accessible in both locations
+    #TODO find a method of calling algos.tnl()
     10*Math.pow(lvl,2)+(lvl*10)+80
 
   #refLists
@@ -85,7 +87,9 @@ setupSortable = (model) ->
     # Note, have to setup helper function here and call it for each type later
     # due to variable binding of "type"
     setupSortable = (type) ->
-      $("ul.#{type}s").sortable
+      for key, value of type
+        parsedType = value
+      $("ul.#{parsedType}s").sortable
         dropOnEmpty: false
         cursor: "move"
         items: "li"
@@ -191,19 +195,21 @@ setupGrowlNotifications = (model) ->
   # Setup listeners which trigger notifications
   user.on 'set', 'stats.hp', (captures, args) ->
     num = captures - args
+    console.log("hp = " + num)
     rounded = Math.abs(num.toFixed(1))
     if num < 0
       statsNotification "<i class='icon-heart'></i> - #{rounded} HP", 'hp' # lost hp from purchase
     else if num > 0
       statsNotification "<i class='icon-heart'></i> + #{rounded} HP", 'hp' # gained hp from potion/level? 
   
-  user.on 'set', 'stats.exp', (captures, args) ->
-    num = captures - args
-    rounded = Math.abs(num.toFixed(1))
-    if num < 0
-      statsNotification "<i class='icon-star'></i> - #{rounded} XP", 'xp'
-    else if num > 0
-      statsNotification "<i class='icon-star'></i> + #{rounded} XP", 'xp'
+  user.on 'set', 'stats.exp', (captures, args, isLocal, silent) ->
+    if not silent
+      num = captures - args
+      rounded = Math.abs(num.toFixed(1))
+      if num < 0
+        statsNotification "<i class='icon-star'></i> - #{rounded} XP", 'xp'
+      else if num > 0
+        statsNotification "<i class='icon-star'></i> + #{rounded} XP", 'xp'
 
   user.on 'set', 'stats.gp', (captures, args) ->
     num = captures - args
diff --git a/src/app/character.coffee b/src/app/character.coffee
index 07b0996dcb..de1b280c2d 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -221,6 +221,7 @@ module.exports.BatchUpdate = BatchUpdate = (model) ->
   commit: ->
     model._dontPersist = false
     # some hackery in our own branched racer-db-mongo, see findAndModify of lefnire/racer-db-mongo#habitrpg index.js
+    # pass true if we have levelled to supress xp notification
     user.set "update__", updates
     transactionInProgress = false
     updates = {}
diff --git a/src/app/helpers.coffee b/src/app/helpers.coffee
index 38733f11d5..5c2cccaa15 100644
--- a/src/app/helpers.coffee
+++ b/src/app/helpers.coffee
@@ -14,6 +14,9 @@ module.exports.viewHelpers = (view) ->
       
   view.fn "round", (num) ->
     Math.round num
+
+  view.fn "floor", (num) ->
+    Math.floor num
     
   view.fn "lt", (a, b) ->
     a < b
diff --git a/src/app/items.coffee b/src/app/items.coffee
index 911458e60c..a9ca688f52 100644
--- a/src/app/items.coffee
+++ b/src/app/items.coffee
@@ -2,37 +2,37 @@ _ = require 'underscore'
 
 items = module.exports.items =
   weapon: [
-    {index: 0, text: "Training Sword", classes: "weapon_0", notes:'Training weapon.', modifier: 0.00, value:0}
-    {index: 1, text: "Sword", classes:'weapon_1', notes:'Increases experience gain by 3%.', modifier: 0.03, value:20}
-    {index: 2, text: "Axe", classes:'weapon_2', notes:'Increases experience gain by 6%.', modifier: 0.06, value:30}
-    {index: 3, text: "Morningstar", classes:'weapon_3', notes:'Increases experience gain by 9%.', modifier: 0.09, value:45}
-    {index: 4, text: "Blue Sword", classes:'weapon_4', notes:'Increases experience gain by 12%.', modifier: 0.12, value:65}
-    {index: 5, text: "Red Sword", classes:'weapon_5', notes:'Increases experience gain by 15%.', modifier: 0.15, value:90}
-    {index: 6, text: "Golden Sword", classes:'weapon_6', notes:'Increases experience gain by 18%.', modifier: 0.18, value:120}
+    {index: 0, text: "Training Sword", classes: "weapon_0", notes:'Training weapon.', strength: 0, value:0}
+    {index: 1, text: "Sword", classes:'weapon_1', notes:'Increases experience gain by 3%.', strength: 3, value:20}
+    {index: 2, text: "Axe", classes:'weapon_2', notes:'Increases experience gain by 6%.', strength: 6, value:30}
+    {index: 3, text: "Morningstar", classes:'weapon_3', notes:'Increases experience gain by 9%.', strength: 9, value:45}
+    {index: 4, text: "Blue Sword", classes:'weapon_4', notes:'Increases experience gain by 12%.', strength: 12, value:65}
+    {index: 5, text: "Red Sword", classes:'weapon_5', notes:'Increases experience gain by 15%.', strength: 15, value:90}
+    {index: 6, text: "Golden Sword", classes:'weapon_6', notes:'Increases experience gain by 18%.', strength: 18, value:120}
   ]
   armor: [
-    {index: 0, text: "Cloth Armor", classes: 'armor_0', notes:'Training armor.', modifier: 0.00, value:0}
-    {index: 1, text: "Leather Armor", classes: 'armor_1', notes:'Decreases HP loss by 4%.', modifier: 0.04, value:30}
-    {index: 2, text: "Chain Mail", classes: 'armor_2', notes:'Decreases HP loss by 6%.', modifier: 0.06, value:45}
-    {index: 3, text: "Plate Mail", classes: 'armor_3', notes:'Decreases HP loss by 7%.', modifier: 0.07, value:65}
-    {index: 4, text: "Red Armor", classes: 'armor_4', notes:'Decreases HP loss by 8%.', modifier: 0.08, value:90}
-    {index: 5, text: "Golden Armor", classes: 'armor_5', notes:'Decreases HP loss by 10%.', modifier: 0.1, value:120}
+    {index: 0, text: "Cloth Armor", classes: 'armor_0', notes:'Training armor.', defense: 0, value:0}
+    {index: 1, text: "Leather Armor", classes: 'armor_1', notes:'Decreases HP loss by 4%.', defense: 4, value:30}
+    {index: 2, text: "Chain Mail", classes: 'armor_2', notes:'Decreases HP loss by 6%.', defense: 6, value:45}
+    {index: 3, text: "Plate Mail", classes: 'armor_3', notes:'Decreases HP loss by 7%.', defense: 7, value:65}
+    {index: 4, text: "Red Armor", classes: 'armor_4', notes:'Decreases HP loss by 8%.', defense: 8, value:90}
+    {index: 5, text: "Golden Armor", classes: 'armor_5', notes:'Decreases HP loss by 10%.', defense: 10, value:120}
   ]
   head: [
-    {index: 0, text: "No Helm", classes: 'head_0', notes:'Training helm.', modifier: 0.00, value:0}
-    {index: 1, text: "Leather Helm", classes: 'head_1', notes:'Decreases HP loss by 2%.', modifier: 0.02, value:15}
-    {index: 2, text: "Chain Coif", classes: 'head_2', notes:'Decreases HP loss by 3%.', modifier: 0.03, value:25}
-    {index: 3, text: "Plate Helm", classes: 'head_3', notes:'Decreases HP loss by 4%.', modifier: 0.04, value:45}
-    {index: 4, text: "Red Helm", classes: 'head_4', notes:'Decreases HP loss by 5%.', modifier: 0.05, value:60}
-    {index: 5, text: "Golden Helm", classes: 'head_5', notes:'Decreases HP loss by 6%.', modifier: 0.06, value:80}
+    {index: 0, text: "No Helm", classes: 'head_0', notes:'Training helm.', defense: 0, value:0}
+    {index: 1, text: "Leather Helm", classes: 'head_1', notes:'Decreases HP loss by 2%.', defense: 2, value:15}
+    {index: 2, text: "Chain Coif", classes: 'head_2', notes:'Decreases HP loss by 3%.', defense: 3, value:25}
+    {index: 3, text: "Plate Helm", classes: 'head_3', notes:'Decreases HP loss by 4%.', defense: 4, value:45}
+    {index: 4, text: "Red Helm", classes: 'head_4', notes:'Decreases HP loss by 5%.', defense: 5, value:60}
+    {index: 5, text: "Golden Helm", classes: 'head_5', notes:'Decreases HP loss by 6%.', defense: 6, value:80}
   ]
   shield: [
-    {index: 0, text: "No Shield", classes: 'shield_0', notes:'No Shield.', modifier: 0.00, value:0}
-    {index: 1, text: "Wooden Shield", classes: 'shield_1', notes:'Decreases HP loss by 3%', modifier: 0.03, value:20}
-    {index: 2, text: "Buckler", classes: 'shield_2', notes:'Decreases HP loss by 4%.', modifier: 0.04, value:35}
-    {index: 3, text: "Enforced Shield", classes: 'shield_3', notes:'Decreases HP loss by 5%.', modifier: 0.05, value:55}
-    {index: 4, text: "Red Shield", classes: 'shield_4', notes:'Decreases HP loss by 7%.', modifier: 0.07, value:70}
-    {index: 5, text: "Golden Shield", classes: 'shield_5', notes:'Decreases HP loss by 8%.', modifier: 0.08, value:90}
+    {index: 0, text: "No Shield", classes: 'shield_0', notes:'No Shield.', defense: 0, value:0}
+    {index: 1, text: "Wooden Shield", classes: 'shield_1', notes:'Decreases HP loss by 3%', defense: 3, value:20}
+    {index: 2, text: "Buckler", classes: 'shield_2', notes:'Decreases HP loss by 4%.', defense: 4, value:35}
+    {index: 3, text: "Enforced Shield", classes: 'shield_3', notes:'Decreases HP loss by 5%.', defense: 5, value:55}
+    {index: 4, text: "Red Shield", classes: 'shield_4', notes:'Decreases HP loss by 7%.', defense: 7, value:70}
+    {index: 5, text: "Golden Shield", classes: 'shield_5', notes:'Decreases HP loss by 8%.', defense: 8, value:90}
   ]
   potion: {type: 'potion', text: "Potion", notes: "Recover 15 HP", value: 25, classes: 'potion'}
   reroll: {type: 'reroll', text: "Re-Roll", classes: 'reroll', notes: "Resets your tasks. When you're struggling and everything's red, use for a clean slate.", value:0 }
diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index ea8ab4b1fb..9abe1fc3ff 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -5,53 +5,12 @@ helpers = require './helpers'
 browser = require './browser'
 character = require './character'
 items = require './items'
+algos = require './algos'
 
 module.exports.Scoring = (model) ->
-
-  MODIFIER = .02 # each new level, armor, weapon add 2% modifier (this mechanism will change)
+  MODIFIER = algos.MODIFIER # each new level, armor, weapon add 2% modifier (this mechanism will change)
   user = model.at '_user'
 
-  ###
-    Calculates Exp & GP modification based on weapon & lvl
-    {value} task.value for gain
-    {modifiers} may manually pass in stats as {weapon, exp}. This is used for testing
-  ###
-  expModifier = (value, modifiers = {}) ->
-    weapon = modifiers.weapon || user.get('items.weapon')
-    lvl = modifiers.lvl || user.get('stats.lvl')
-    dmg = items.items.weapon[weapon].modifier # each new weapon increases exp gain
-    dmg += (lvl-1) * MODIFIER # same for lvls
-    modified = value + (value * dmg)
-    return modified
-
-  ###
-    Calculates HP-loss modification based on armor & lvl
-    {value} task.value which is hurting us
-    {modifiers} may manually pass in modifier as {armor, lvl}. This is used for testing
-  ###
-  hpModifier = (value, modifiers = {}) ->
-    armor = modifiers.armor || user.get('items.armor')
-    head = modifiers.head || user.get('items.head')
-    shield = modifiers.shield || user.get('items.shield')
-    lvl = modifiers.lvl || user.get('stats.lvl')
-    ac = items.items.armor[armor].modifier + items.items.head[head].modifier + items.items.shield[shield].modifier # each new armor decreases HP loss
-    ac += (lvl-1) * MODIFIER # same for lvls
-    modified = value - (value * ac)
-    return modified
-
-  ###
-    Calculates the next task.value based on direction
-    For negative values, use a line: something like y=-.1x+1
-    For positibe values, taper off with inverse log: y=.9^x
-    Would love to use inverse log for the whole thing, but after 13 fails it hits infinity. Revisit this formula later
-    {currentValue} the current value of the task, determines it's next value
-    {direction} 'up' or 'down'
-  ###
-  taskDeltaFormula = (currentValue, direction) ->
-    sign = if (direction == "up") then 1 else -1
-    delta = if (currentValue < 0) then (( -0.1 * currentValue + 1 ) * sign) else (( Math.pow(0.9,currentValue) ) * sign)
-    return delta
-
   ###
     Updates user stats with new stats. Handles death, leveling up, etc
     {stats} new stats
@@ -75,12 +34,15 @@ module.exports.Scoring = (model) ->
     if newStats.exp?
       # level up & carry-over exp
       tnl = model.get '_tnl'
+      silent = false
       if newStats.exp >= tnl
+        silent = true
         newStats.exp -= tnl
         obj.stats.lvl++
         obj.stats.hp = 50
 
       obj.stats.exp = newStats.exp
+      user.pass(silent:true).set('stats.exp', obj.stats.exp) if silent
 
       # Set flags when they unlock features
       if !obj.flags.customizationsNotification and (obj.stats.exp > 10 or obj.stats.lvl > 1)
@@ -107,7 +69,6 @@ module.exports.Scoring = (model) ->
   # {times} # times to call score on this task (1 unless cron, usually)
   # {update} if we're running updates en-mass (eg, cron on server) pass in userObj
   score = (taskId, direction, times, batch, cron) ->
-
     commit = false
     unless batch?
       commit = true
@@ -136,17 +97,23 @@ module.exports.Scoring = (model) ->
         # Each iteration calculate the delta (nextDelta), which is then accumulated in delta
         # (aka, the total delta). This weirdness won't be necessary when calculating mathematically
         # rather than iteratively
-        nextDelta = taskDeltaFormula(value, direction)
+        nextDelta = algos.taskDeltaFormula(value, direction)
         value += nextDelta if adjustvalue
         delta += nextDelta
 
     addPoints = ->
-      modified = expModifier(delta)
+      level = user.get('stats.lvl')
+      weaponStrength = items.items.weapon[user.get('items.weapon')].strength
+      modified = algos.expModifier(delta,weaponStrength,level)
       exp += modified*10
       gp += delta
 
     subtractPoints = ->
-      modified = hpModifier(delta)
+      level = user.get('stats.lvl')
+      armorDefense = items.items.armor[user.get('items.armor')].defense
+      helmDefense = items.items.head[user.get('items.head')].defense
+      shieldDefense = items.items.shield[user.get('items.shield')].defense
+      modified = algos.hpModifier(delta,armorDefense,helmDefense,shieldDefense,level)
       hp += modified
 
     switch type
@@ -249,7 +216,7 @@ module.exports.Scoring = (model) ->
       lvl = 0 #iterator
       while lvl < (obj.stats.lvl-1)
         lvl++
-        expTally += (lvl*100)/5
+        expTally += algos.tnl(lvl)
       obj.history.exp.push  { date: today, value: expTally }
 
       # Set the new user specs, and animate HP loss
@@ -262,12 +229,11 @@ module.exports.Scoring = (model) ->
 
 
   return {
-    MODIFIER: MODIFIER
     score: score
     cron: cron
 
     # testing stuff
-    expModifier: expModifier
-    hpModifier: hpModifier
-    taskDeltaFormula: taskDeltaFormula
+    expModifier: algos.expModifier
+    hpModifier: algos.hpModifier
+    taskDeltaFormula: algos.taskDeltaFormula
   }
diff --git a/views/app/header.html b/views/app/header.html
index f3bc5f3c3a..2491090dae 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -29,7 +29,7 @@
                   {#if _user.history.exp}
                     <a x-bind=click:toggleChart data-toggle-id="exp-chart" data-history-path="_user.history.exp" rel=tooltip title="Progress"><i class=icon-signal></i></a>&nbsp;
                   {/}
-                  <i class=icon-star></i> {round(_user.stats.exp)} / {_tnl}
+                  <i class=icon-star></i> {floor(_user.stats.exp)} / {_tnl}
                 </span>
                 </div>
                 <div id="exp-chart" style="display:none;"></div>

From 9283b8adb4141ec4b106ecfff5018b9ce39d5320 Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Sat, 2 Mar 2013 20:02:57 +0000
Subject: [PATCH 048/220] Add death notification and algorithm fixes

---
 src/app/algos.coffee   |  14 +++--
 src/app/browser.coffee |  11 ++--
 src/app/debug.coffee   |   9 +++
 src/app/items.coffee   |   2 +-
 src/app/scoring.coffee | 123 ++++++++++++++++++++++-------------------
 styles/app/alerts.styl |  14 +++++
 6 files changed, 104 insertions(+), 69 deletions(-)

diff --git a/src/app/algos.coffee b/src/app/algos.coffee
index 69ab9b4e93..205842d178 100644
--- a/src/app/algos.coffee
+++ b/src/app/algos.coffee
@@ -37,14 +37,18 @@ module.exports.gpModifier = (value, modifier) ->
 
 ###
   Calculates the next task.value based on direction
-  Uses a capped inverse log y=.9^x, y>= -5
+  Uses a capped inverse log y=.95^x, y>= -5
   {currentValue} the current value of the task
   {direction} up or down
 ###
 module.exports.taskDeltaFormula = (currentValue, direction) ->
-	sign = if (direction is 'up') then 1 else -1
-	delta = Math.pow(0.9,currentValue) * sign
-	if delta < -5 then delta = -5
-	console.log("CurrentValue: " + currentValue + " delta: " + delta)
+	if direction is 'up'
+		delta = Math.max(Math.pow(0.95,currentValue),0.25)
+	else
+		delta = -Math.min(Math.pow(0.95,currentValue),5)
+	#sign = if (direction is 'up') then 1 else -1
+	#delta = Math.pow(0.95,currentValue) * sign
+	#if delta < -5 then delta = -5
+	#console.log("CurrentValue: " + currentValue + " delta: " + delta)
 	#delta = if (currentValue < 0) then (( -0.1 * currentValue + 1 ) * sign) else (( Math.pow(0.9,currentValue) ) * sign)
 	return delta
\ No newline at end of file
diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index 63e6994d58..4f7b4168bf 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -184,7 +184,7 @@ setupGrowlNotifications = (model) ->
     return if user.get('stats.lvl') == 0
     $.bootstrapGrowl html,
       ele: '#notification-area',
-      type: type # (null, 'info', 'error', 'success', 'gp', 'xp', 'hp', 'lvl')
+      type: type # (null, 'info', 'error', 'success', 'gp', 'xp', 'hp', 'lvl','death')
       top_offset: 20
       align: 'right' # ('left', 'right', or 'center')
       width: 250 # (integer, or 'auto')
@@ -195,7 +195,6 @@ setupGrowlNotifications = (model) ->
   # Setup listeners which trigger notifications
   user.on 'set', 'stats.hp', (captures, args) ->
     num = captures - args
-    console.log("hp = " + num)
     rounded = Math.abs(num.toFixed(1))
     if num < 0
       statsNotification "<i class='icon-heart'></i> - #{rounded} HP", 'hp' # lost hp from purchase
@@ -203,10 +202,9 @@ setupGrowlNotifications = (model) ->
       statsNotification "<i class='icon-heart'></i> + #{rounded} HP", 'hp' # gained hp from potion/level? 
   
   user.on 'set', 'stats.exp', (captures, args, isLocal, silent) ->
-    if not silent
       num = captures - args
       rounded = Math.abs(num.toFixed(1))
-      if num < 0
+      if num < 0 and not silent
         statsNotification "<i class='icon-star'></i> - #{rounded} XP", 'xp'
       else if num > 0
         statsNotification "<i class='icon-star'></i> + #{rounded} XP", 'xp'
@@ -226,4 +224,7 @@ setupGrowlNotifications = (model) ->
 
   user.on 'set', 'stats.lvl', (captures, args) ->
     if captures > args
-      statsNotification('<i class="icon-chevron-up"></i> Level Up!', 'lvl')
\ No newline at end of file
+      if captures is 1 and args is 0
+        statsNotification '<i class="icon-death"></i> You died!', 'death' 
+      else 
+        statsNotification '<i class="icon-chevron-up"></i> Level Up!', 'lvl'
\ No newline at end of file
diff --git a/src/app/debug.coffee b/src/app/debug.coffee
index 25cb833b8f..24195797bb 100644
--- a/src/app/debug.coffee
+++ b/src/app/debug.coffee
@@ -11,3 +11,12 @@ module.exports.app = (appExports, model) ->
   appExports.cheat = ->
     user.incr 'stats.exp', 20
     user.incr 'stats.gp', 1000
+
+  appExports.reset = ->
+  	user.set 'stats.exp', 0
+  	user.set 'stats.lvl', 0
+  	user.set 'stats.gp', 0
+  	user.set 'items.weapon', 0
+  	user.set 'items.armor', 0
+  	user.set 'items.head', 0
+  	user.set 'items.shield', 0
\ No newline at end of file
diff --git a/src/app/items.coffee b/src/app/items.coffee
index a9ca688f52..58799b1d1c 100644
--- a/src/app/items.coffee
+++ b/src/app/items.coffee
@@ -169,7 +169,7 @@ module.exports.app = (appExports, model) ->
     return unless captures == true
     html = """
            <div class='item-store-popover'>
-           <img src='/vendor/BrowserQuest/client/img/1chest.png' />
+           <img src='/vendor/BrowserQuest/client/img/1/chest.png' />
            Congratulations, you have unlocked the Item Store! You can now buy weapons, armor, potions, etc. Read each item's comment for more information.
            <a href='#' onClick="$('ul.items').popover('hide');return false;">[Close]</a>
            </div>
diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index 9abe1fc3ff..a25bc8d34e 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -11,59 +11,6 @@ module.exports.Scoring = (model) ->
   MODIFIER = algos.MODIFIER # each new level, armor, weapon add 2% modifier (this mechanism will change)
   user = model.at '_user'
 
-  ###
-    Updates user stats with new stats. Handles death, leveling up, etc
-    {stats} new stats
-    {update} if aggregated changes, pass in userObj as update. otherwise commits will be made immediately
-  ###
-  updateStats = (newStats, batch) ->
-    obj = batch.obj()
-
-    # if user is dead, dont do anything
-    return if obj.stats.lvl == 0
-
-    if newStats.hp?
-      # Game Over
-      if newStats.hp <= 0
-        obj.stats.lvl = 0 # signifies dead
-        obj.stats.hp = 0
-        return
-      else
-        obj.stats.hp = newStats.hp
-
-    if newStats.exp?
-      # level up & carry-over exp
-      tnl = model.get '_tnl'
-      silent = false
-      if newStats.exp >= tnl
-        silent = true
-        newStats.exp -= tnl
-        obj.stats.lvl++
-        obj.stats.hp = 50
-
-      obj.stats.exp = newStats.exp
-      user.pass(silent:true).set('stats.exp', obj.stats.exp) if silent
-
-      # Set flags when they unlock features
-      if !obj.flags.customizationsNotification and (obj.stats.exp > 10 or obj.stats.lvl > 1)
-        batch.set 'flags.customizationsNotification', true
-        obj.flags.customizationsNotification = true
-      if !obj.flags.itemsEnabled and obj.stats.lvl >= 2
-        # Set to object, then also send to browser right away to get model.on() subscription notification
-        batch.set 'flags.itemsEnabled', true
-        obj.flags.itemsEnabled = true
-      if !obj.flags.partyEnabled and obj.stats.lvl >= 3
-        batch.set 'flags.partyEnabled', true
-        obj.flags.partyEnabled = true
-      if !obj.flags.petsEnabled and obj.stats.lvl >= 4
-        batch.set 'flags.petsEnabled', true
-        obj.flags.petsEnabled = true
-
-    if newStats.gp?
-      #FIXME what was I doing here? I can't remember, gp isn't defined
-      gp = 0.0 if (!gp? or gp<0)
-      obj.stats.gp = newStats.gp
-
   # {taskId} task you want to score
   # {direction} 'up' or 'down'
   # {times} # times to call score on this task (1 unless cron, usually)
@@ -119,7 +66,8 @@ module.exports.Scoring = (model) ->
     switch type
       when 'habit'
         # Don't adjust values for habits that don't have both + and -
-        adjustvalue = if (taskObj.up==false or taskObj.down==false) then false else true
+        #adjustvalue = if (taskObj.up==false or taskObj.down==false) then false else true
+        adjustvalue = true;
         calculateDelta(adjustvalue)
         # Add habit value to habit-history (if different)
         if (delta > 0) then addPoints() else subtractPoints()
@@ -130,15 +78,20 @@ module.exports.Scoring = (model) ->
           batch.set "#{taskPath}.history", taskObj.history
 
       when 'daily'
-        calculateDelta()
+        #calculateDelta()
         if cron? # cron
+          calculateDelta()
           subtractPoints()
         else
+          calculateDelta(false)
           addPoints() # obviously for delta>0, but also a trick to undo accidental checkboxes
 
       when 'todo'
-        calculateDelta()
-        unless cron? # don't touch stats on cron
+        if cron? #cron
+          calculateDelta()
+          #don't touch stats on cron
+        else
+          calculateDelta(false)
           addPoints() # obviously for delta>0, but also a trick to undo accidental checkboxes
 
       when 'reward'
@@ -161,10 +114,64 @@ module.exports.Scoring = (model) ->
       newStats = _.clone batch.obj().stats
       _.each Object.keys(origStats), (key) -> obj.stats[key] = origStats[key]
       batch.setStats(newStats)
-  #    batch.setStats()
+      # batch.setStats()
       batch.commit()
     return delta
 
+  ###
+    Updates user stats with new stats. Handles death, leveling up, etc
+    {stats} new stats
+    {update} if aggregated changes, pass in userObj as update. otherwise commits will be made immediately
+  ###
+  updateStats = (newStats, batch) ->
+    obj = batch.obj()
+
+    # if user is dead, dont do anything
+    return if obj.stats.lvl == 0
+
+    if newStats.hp?
+      # Game Over
+      if newStats.hp <= 0
+        obj.stats.lvl = 0 # signifies dead
+        obj.stats.hp = 0
+        return
+      else
+        obj.stats.hp = newStats.hp
+
+    if newStats.exp?
+      # level up & carry-over exp
+      tnl = model.get '_tnl'
+      silent = false
+      if newStats.exp >= tnl
+        silent = true
+        user.set('stats.exp', newStats.exp)
+        newStats.exp -= tnl
+        obj.stats.lvl++
+        obj.stats.hp = 50
+
+      obj.stats.exp = newStats.exp
+      user.pass(silent:true).set('stats.exp', obj.stats.exp) if silent
+
+      # Set flags when they unlock features
+      if !obj.flags.customizationsNotification and (obj.stats.exp > 10 or obj.stats.lvl > 1)
+        batch.set 'flags.customizationsNotification', true
+        obj.flags.customizationsNotification = true
+      if !obj.flags.itemsEnabled and obj.stats.lvl >= 2
+        # Set to object, then also send to browser right away to get model.on() subscription notification
+        batch.set 'flags.itemsEnabled', true
+        obj.flags.itemsEnabled = true
+      if !obj.flags.partyEnabled and obj.stats.lvl >= 3
+        batch.set 'flags.partyEnabled', true
+        obj.flags.partyEnabled = true
+      if !obj.flags.petsEnabled and obj.stats.lvl >= 4
+        batch.set 'flags.petsEnabled', true
+        obj.flags.petsEnabled = true
+
+    if newStats.gp?
+      #FIXME what was I doing here? I can't remember, gp isn't defined
+      gp = 0.0 if (!gp? or gp<0)
+      obj.stats.gp = newStats.gp
+
   ###
     At end of day, add value to all incomplete Daily & Todo tasks (further incentive)
     For incomplete Dailys, deduct experience
diff --git a/styles/app/alerts.styl b/styles/app/alerts.styl
index 38e411f480..97f490cf52 100644
--- a/styles/app/alerts.styl
+++ b/styles/app/alerts.styl
@@ -8,6 +8,8 @@ lvlColor = #d9edf7
 lvlText = #3a87ad
 xpColor = #DCC0FB
 xpText = #635673
+deathColor = #4E4E4E
+deathText = #ABABAB
 borderDarken = 20%
 
 // alert styles
@@ -32,6 +34,11 @@ borderDarken = 20%
   border-color: darken(xpColor,borderDarken)
   color: xpText
 
+.alert-death
+  background-color: deathColor
+  border-color: deathColor
+  color: deathText
+
 // alert icons
 
 .icon-gold
@@ -46,4 +53,11 @@ borderDarken = 20%
   background-position: center center
   background-size: 18px
   width: 14px
+  height: 14px
+
+.icon-death
+  background: url("img/sprites/dead.png") no-repeat
+  background-position: center center
+  background-size: 14px
+  width: 14px
   height: 14px
\ No newline at end of file

From 81eb070ee65c02ec8903f0fbe806b0cbdd93436c Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Sat, 2 Mar 2013 20:03:16 +0000
Subject: [PATCH 049/220] Reset button

---
 views/app/footer.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/app/footer.html b/views/app/footer.html
index 60ccc1b9c9..35be956150 100644
--- a/views/app/footer.html
+++ b/views/app/footer.html
@@ -20,6 +20,7 @@
             <div class='pull-right'>
                 <button class='btn' x-bind="click:emulateNextDay">Emulate Next Day</button>
                 <button class='btn' x-bind="click:cheat">Add GP & Exp</button>
+                <button class='btn' x-bind='click:reset'>Reset Level</button>
             </div>
             {/}
             <div>

From d20fccea752f1b8791d1ec2d24697630b49223d4 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sat, 2 Mar 2013 23:38:31 -0500
Subject: [PATCH 050/220] pass model by reference to scoring functions

---
 src/app/index.coffee         |   3 +-
 src/app/scoring.coffee       | 434 ++++++++++++++++++-----------------
 src/app/tasks.coffee         |   7 +-
 src/server/deprecated.coffee |   3 +-
 4 files changed, 223 insertions(+), 224 deletions(-)

diff --git a/src/app/index.coffee b/src/app/index.coffee
index b25e52cb9d..73a33d3c9b 100644
--- a/src/app/index.coffee
+++ b/src/app/index.coffee
@@ -45,13 +45,12 @@ get '/', (page, model, params, next) ->
 
 ready (model) ->
   user = model.at('_user')
-  score = new scoring.Scoring(model)
 
   #set cron immediately
   lastCron = user.get('lastCron')
   user.set('lastCron', +new Date) if (!lastCron? or lastCron == 'new')
 
-  score.cron()
+  scoring.cron(model)
 
   character.app(exports, model)
   tasks.app(exports, model)
diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index a25bc8d34e..6818db1bac 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -7,240 +7,242 @@ character = require './character'
 items = require './items'
 algos = require './algos'
 
-module.exports.Scoring = (model) ->
-  MODIFIER = algos.MODIFIER # each new level, armor, weapon add 2% modifier (this mechanism will change)
+MODIFIER = algos.MODIFIER # each new level, armor, weapon add 2% modifier (this mechanism will change)
+
+# {taskId} task you want to score
+# {direction} 'up' or 'down'
+# {times} # times to call score on this task (1 unless cron, usually)
+# {update} if we're running updates en-mass (eg, cron on server) pass in userObj
+score = (model, taskId, direction, times, batch, cron) ->
   user = model.at '_user'
 
-  # {taskId} task you want to score
-  # {direction} 'up' or 'down'
-  # {times} # times to call score on this task (1 unless cron, usually)
-  # {update} if we're running updates en-mass (eg, cron on server) pass in userObj
-  score = (taskId, direction, times, batch, cron) ->
-    commit = false
-    unless batch?
-      commit = true
-      batch = new character.BatchUpdate(model)
-      batch.startTransaction()
-    obj = batch.obj()
+  commit = false
+  unless batch?
+    commit = true
+    batch = new character.BatchUpdate(model)
+    batch.startTransaction()
+  obj = batch.obj()
 
-    {gp, hp, exp, lvl} = obj.stats
+  {gp, hp, exp, lvl} = obj.stats
 
-    taskPath = "tasks.#{taskId}"
-    taskObj = obj.tasks[taskId]
-    {type, value} = taskObj
+  taskPath = "tasks.#{taskId}"
+  taskObj = obj.tasks[taskId]
+  {type, value} = taskObj
 
-    # If they're trying to purhcase a too-expensive reward, confirm they want to take a hit for it
-    if taskObj.value > obj.stats.gp and taskObj.type is 'reward'
-      r = confirm "Not enough GP to purchase this reward, buy anyway and lose HP? (Punishment for taking a reward you didn't earn)."
-      unless r
-        batch.commit()
-        return
-
-    delta = 0
-    times ?= 1
-    calculateDelta = (adjustvalue=true) ->
-      # If multiple days have passed, multiply times days missed
-      _.times times, (n) ->
-        # Each iteration calculate the delta (nextDelta), which is then accumulated in delta
-        # (aka, the total delta). This weirdness won't be necessary when calculating mathematically
-        # rather than iteratively
-        nextDelta = algos.taskDeltaFormula(value, direction)
-        value += nextDelta if adjustvalue
-        delta += nextDelta
-
-    addPoints = ->
-      level = user.get('stats.lvl')
-      weaponStrength = items.items.weapon[user.get('items.weapon')].strength
-      modified = algos.expModifier(delta,weaponStrength,level)
-      exp += modified*10
-      gp += delta
-
-    subtractPoints = ->
-      level = user.get('stats.lvl')
-      armorDefense = items.items.armor[user.get('items.armor')].defense
-      helmDefense = items.items.head[user.get('items.head')].defense
-      shieldDefense = items.items.shield[user.get('items.shield')].defense
-      modified = algos.hpModifier(delta,armorDefense,helmDefense,shieldDefense,level)
-      hp += modified
-
-    switch type
-      when 'habit'
-        # Don't adjust values for habits that don't have both + and -
-        #adjustvalue = if (taskObj.up==false or taskObj.down==false) then false else true
-        adjustvalue = true;
-        calculateDelta(adjustvalue)
-        # Add habit value to habit-history (if different)
-        if (delta > 0) then addPoints() else subtractPoints()
-        taskObj.history ?= []
-        if taskObj.value != value
-          historyEntry = { date: +new Date, value: value }
-          taskObj.history.push historyEntry
-          batch.set "#{taskPath}.history", taskObj.history
-
-      when 'daily'
-        #calculateDelta()
-        if cron? # cron
-          calculateDelta()
-          subtractPoints()
-        else
-          calculateDelta(false)
-          addPoints() # obviously for delta>0, but also a trick to undo accidental checkboxes
-
-      when 'todo'
-        if cron? #cron
-          calculateDelta()
-          #don't touch stats on cron
-        else
-          calculateDelta(false)
-          addPoints() # obviously for delta>0, but also a trick to undo accidental checkboxes
-
-      when 'reward'
-        # Don't adjust values for rewards
-        calculateDelta(false)
-        # purchase item
-        gp -= Math.abs(taskObj.value)
-        num = parseFloat(taskObj.value).toFixed(2)
-        # if too expensive, reduce health & zero gp
-        if gp < 0
-          hp += gp # hp - gp difference
-          gp = 0
-
-    taskObj.value = value
-    batch.set "#{taskPath}.value", taskObj.value
-    origStats = _.clone obj.stats
-    updateStats {hp: hp, exp: exp, gp: gp}, batch
-    if commit
-      # newStats / origStats is a glorious hack to trick Derby into seeing the change in model.on(*)
-      newStats = _.clone batch.obj().stats
-      _.each Object.keys(origStats), (key) -> obj.stats[key] = origStats[key]
-      batch.setStats(newStats)
-      # batch.setStats()
+  # If they're trying to purhcase a too-expensive reward, confirm they want to take a hit for it
+  if taskObj.value > obj.stats.gp and taskObj.type is 'reward'
+    r = confirm "Not enough GP to purchase this reward, buy anyway and lose HP? (Punishment for taking a reward you didn't earn)."
+    unless r
       batch.commit()
-    return delta
+      return
 
-  ###
-    Updates user stats with new stats. Handles death, leveling up, etc
-    {stats} new stats
-    {update} if aggregated changes, pass in userObj as update. otherwise commits will be made immediately
-  ###
-  updateStats = (newStats, batch) ->
-    obj = batch.obj()
+  delta = 0
+  times ?= 1
+  calculateDelta = (adjustvalue=true) ->
+    # If multiple days have passed, multiply times days missed
+    _.times times, (n) ->
+      # Each iteration calculate the delta (nextDelta), which is then accumulated in delta
+      # (aka, the total delta). This weirdness won't be necessary when calculating mathematically
+      # rather than iteratively
+      nextDelta = algos.taskDeltaFormula(value, direction)
+      value += nextDelta if adjustvalue
+      delta += nextDelta
 
-    # if user is dead, dont do anything
-    return if obj.stats.lvl == 0
+  addPoints = ->
+    level = user.get('stats.lvl')
+    weaponStrength = items.items.weapon[user.get('items.weapon')].strength
+    modified = algos.expModifier(delta,weaponStrength,level)
+    exp += modified*10
+    gp += delta
 
-    if newStats.hp?
-      # Game Over
-      if newStats.hp <= 0
-        obj.stats.lvl = 0 # signifies dead
-        obj.stats.hp = 0
-        return
+  subtractPoints = ->
+    level = user.get('stats.lvl')
+    armorDefense = items.items.armor[user.get('items.armor')].defense
+    helmDefense = items.items.head[user.get('items.head')].defense
+    shieldDefense = items.items.shield[user.get('items.shield')].defense
+    modified = algos.hpModifier(delta,armorDefense,helmDefense,shieldDefense,level)
+    hp += modified
+
+  switch type
+    when 'habit'
+      # Don't adjust values for habits that don't have both + and -
+      #adjustvalue = if (taskObj.up==false or taskObj.down==false) then false else true
+      adjustvalue = true;
+      calculateDelta(adjustvalue)
+      # Add habit value to habit-history (if different)
+      if (delta > 0) then addPoints() else subtractPoints()
+      taskObj.history ?= []
+      if taskObj.value != value
+        historyEntry = { date: +new Date, value: value }
+        taskObj.history.push historyEntry
+        batch.set "#{taskPath}.history", taskObj.history
+
+    when 'daily'
+      #calculateDelta()
+      if cron? # cron
+        calculateDelta()
+        subtractPoints()
       else
-        obj.stats.hp = newStats.hp
+        calculateDelta(false)
+        addPoints() # obviously for delta>0, but also a trick to undo accidental checkboxes
 
-    if newStats.exp?
-      # level up & carry-over exp
-      tnl = model.get '_tnl'
-      silent = false
-      if newStats.exp >= tnl
-        silent = true
-        user.set('stats.exp', newStats.exp)
-        newStats.exp -= tnl
-        obj.stats.lvl++
-        obj.stats.hp = 50
+    when 'todo'
+      if cron? #cron
+        calculateDelta()
+        #don't touch stats on cron
+      else
+        calculateDelta(false)
+        addPoints() # obviously for delta>0, but also a trick to undo accidental checkboxes
 
-      obj.stats.exp = newStats.exp
-      user.pass(silent:true).set('stats.exp', obj.stats.exp) if silent
+    when 'reward'
+      # Don't adjust values for rewards
+      calculateDelta(false)
+      # purchase item
+      gp -= Math.abs(taskObj.value)
+      num = parseFloat(taskObj.value).toFixed(2)
+      # if too expensive, reduce health & zero gp
+      if gp < 0
+        hp += gp # hp - gp difference
+        gp = 0
 
-      # Set flags when they unlock features
-      if !obj.flags.customizationsNotification and (obj.stats.exp > 10 or obj.stats.lvl > 1)
-        batch.set 'flags.customizationsNotification', true
-        obj.flags.customizationsNotification = true
-      if !obj.flags.itemsEnabled and obj.stats.lvl >= 2
-        # Set to object, then also send to browser right away to get model.on() subscription notification
-        batch.set 'flags.itemsEnabled', true
-        obj.flags.itemsEnabled = true
-      if !obj.flags.partyEnabled and obj.stats.lvl >= 3
-        batch.set 'flags.partyEnabled', true
-        obj.flags.partyEnabled = true
-      if !obj.flags.petsEnabled and obj.stats.lvl >= 4
-        batch.set 'flags.petsEnabled', true
-        obj.flags.petsEnabled = true
+  taskObj.value = value
+  batch.set "#{taskPath}.value", taskObj.value
+  origStats = _.clone obj.stats
+  updateStats model, {hp: hp, exp: exp, gp: gp}, batch
+  if commit
+    # newStats / origStats is a glorious hack to trick Derby into seeing the change in model.on(*)
+    newStats = _.clone batch.obj().stats
+    _.each Object.keys(origStats), (key) -> obj.stats[key] = origStats[key]
+    batch.setStats(newStats)
+    # batch.setStats()
+    batch.commit()
+  return delta
 
-    if newStats.gp?
-      #FIXME what was I doing here? I can't remember, gp isn't defined
-      gp = 0.0 if (!gp? or gp<0)
-      obj.stats.gp = newStats.gp
+###
+  Updates user stats with new stats. Handles death, leveling up, etc
+  {stats} new stats
+  {update} if aggregated changes, pass in userObj as update. otherwise commits will be made immediately
+###
+updateStats = (model, newStats, batch) ->
+  user = model.at '_user'
+  obj = batch.obj()
 
-  ###
-    At end of day, add value to all incomplete Daily & Todo tasks (further incentive)
-    For incomplete Dailys, deduct experience
-  ###
-  cron = () ->
-    today = +new Date
-    daysPassed = helpers.daysBetween(today, user.get('lastCron'))
-    if daysPassed > 0
-      batch = new character.BatchUpdate(model)
-      batch.startTransaction()
-      batch.set 'lastCron', today
-      obj = batch.obj()
-      hpBefore = obj.stats.hp #we'll use this later so we can animate hp loss
-      # Tally each task
-      todoTally = 0
-      _.each obj.tasks, (taskObj) ->
-        {id, type, completed, repeat} = taskObj
-        if type in ['todo', 'daily']
-          # Deduct experience for missed Daily tasks,
-          # but not for Todos (just increase todo's value)
-          unless completed
-            # for todos & typical dailies, these are equivalent
-            daysFailed = daysPassed
-            # however, for dailys which have repeat dates, need
-            # to calculate how many they've missed according to their own schedule
-            if type=='daily' && repeat
-              daysFailed = 0
-              _.times daysPassed, (n) ->
-                thatDay = moment().subtract('days', n+1)
-                if repeat[helpers.dayMapping[thatDay.day()]]==true
-                  daysFailed++
-            score id, 'down', daysFailed, batch, true
+  # if user is dead, dont do anything
+  return if obj.stats.lvl == 0
 
-          if type == 'daily'
-            taskObj.history ?= []
-            taskObj.history.push { date: +new Date, value: value }
-            batch.set "tasks.#{taskObj.id}.history", taskObj.history
-            batch.set "tasks.#{taskObj.id}.completed", false
-          else
-            value = obj.tasks[taskObj.id].value #get updated value
-            absVal = if (completed) then Math.abs(value) else value
-            todoTally += absVal
+  if newStats.hp?
+    # Game Over
+    if newStats.hp <= 0
+      obj.stats.lvl = 0 # signifies dead
+      obj.stats.hp = 0
+      return
+    else
+      obj.stats.hp = newStats.hp
 
-      # Finished tallying
-      obj.history ?= {}; obj.history.todos ?= []; obj.history.exp ?= []
-      obj.history.todos.push { date: today, value: todoTally }
-      # tally experience
-      expTally = obj.stats.exp
-      lvl = 0 #iterator
-      while lvl < (obj.stats.lvl-1)
-        lvl++
-        expTally += algos.tnl(lvl)
-      obj.history.exp.push  { date: today, value: expTally }
+  if newStats.exp?
+    # level up & carry-over exp
+    tnl = model.get '_tnl'
+    silent = false
+    if newStats.exp >= tnl
+      silent = true
+      user.set('stats.exp', newStats.exp)
+      newStats.exp -= tnl
+      obj.stats.lvl++
+      obj.stats.hp = 50
 
-      # Set the new user specs, and animate HP loss
-      [hpAfter, obj.stats.hp] = [obj.stats.hp, hpBefore]
-      batch.setStats()
-      batch.set('history', obj.history)
-      batch.commit()
-      browser.resetDom(model)
-      setTimeout (-> user.set 'stats.hp', hpAfter), 1000 # animate hp loss
+    obj.stats.exp = newStats.exp
+    user.pass(silent:true).set('stats.exp', obj.stats.exp) if silent
+
+    # Set flags when they unlock features
+    if !obj.flags.customizationsNotification and (obj.stats.exp > 10 or obj.stats.lvl > 1)
+      batch.set 'flags.customizationsNotification', true
+      obj.flags.customizationsNotification = true
+    if !obj.flags.itemsEnabled and obj.stats.lvl >= 2
+      # Set to object, then also send to browser right away to get model.on() subscription notification
+      batch.set 'flags.itemsEnabled', true
+      obj.flags.itemsEnabled = true
+    if !obj.flags.partyEnabled and obj.stats.lvl >= 3
+      batch.set 'flags.partyEnabled', true
+      obj.flags.partyEnabled = true
+    if !obj.flags.petsEnabled and obj.stats.lvl >= 4
+      batch.set 'flags.petsEnabled', true
+      obj.flags.petsEnabled = true
+
+  if newStats.gp?
+    #FIXME what was I doing here? I can't remember, gp isn't defined
+    gp = 0.0 if (!gp? or gp<0)
+    obj.stats.gp = newStats.gp
+
+###
+  At end of day, add value to all incomplete Daily & Todo tasks (further incentive)
+  For incomplete Dailys, deduct experience
+###
+cron = (model) ->
+  user = model.at '_user'
+  today = +new Date
+  daysPassed = helpers.daysBetween(today, user.get('lastCron'))
+  if daysPassed > 0
+    batch = new character.BatchUpdate(model)
+    batch.startTransaction()
+    batch.set 'lastCron', today
+    obj = batch.obj()
+    hpBefore = obj.stats.hp #we'll use this later so we can animate hp loss
+    # Tally each task
+    todoTally = 0
+    _.each obj.tasks, (taskObj) ->
+      {id, type, completed, repeat} = taskObj
+      if type in ['todo', 'daily']
+        # Deduct experience for missed Daily tasks,
+        # but not for Todos (just increase todo's value)
+        unless completed
+          # for todos & typical dailies, these are equivalent
+          daysFailed = daysPassed
+          # however, for dailys which have repeat dates, need
+          # to calculate how many they've missed according to their own schedule
+          if type=='daily' && repeat
+            daysFailed = 0
+            _.times daysPassed, (n) ->
+              thatDay = moment().subtract('days', n+1)
+              if repeat[helpers.dayMapping[thatDay.day()]]==true
+                daysFailed++
+          score model, id, 'down', daysFailed, batch, true
+
+        if type == 'daily'
+          taskObj.history ?= []
+          taskObj.history.push { date: +new Date, value: value }
+          batch.set "tasks.#{taskObj.id}.history", taskObj.history
+          batch.set "tasks.#{taskObj.id}.completed", false
+        else
+          value = obj.tasks[taskObj.id].value #get updated value
+          absVal = if (completed) then Math.abs(value) else value
+          todoTally += absVal
+
+    # Finished tallying
+    obj.history ?= {}; obj.history.todos ?= []; obj.history.exp ?= []
+    obj.history.todos.push { date: today, value: todoTally }
+    # tally experience
+    expTally = obj.stats.exp
+    lvl = 0 #iterator
+    while lvl < (obj.stats.lvl-1)
+      lvl++
+      expTally += algos.tnl(lvl)
+    obj.history.exp.push  { date: today, value: expTally }
+
+    # Set the new user specs, and animate HP loss
+    [hpAfter, obj.stats.hp] = [obj.stats.hp, hpBefore]
+    batch.setStats()
+    batch.set('history', obj.history)
+    batch.commit()
+    browser.resetDom(model)
+    setTimeout (-> user.set 'stats.hp', hpAfter), 1000 # animate hp loss
 
 
-  return {
-    score: score
-    cron: cron
+module.exports = {
+  score: score
+  cron: cron
 
-    # testing stuff
-    expModifier: algos.expModifier
-    hpModifier: algos.hpModifier
-    taskDeltaFormula: algos.taskDeltaFormula
-  }
+  # testing stuff
+  expModifier: algos.expModifier
+  hpModifier: algos.hpModifier
+  taskDeltaFormula: algos.taskDeltaFormula
+}
diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index 22995d868c..f84e8d2b2f 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -26,7 +26,6 @@ module.exports.view = (view) ->
 
 module.exports.app = (appExports, model) ->
   user = model.at('_user')
-  score = new scoring.Scoring(model)
 
   user.on 'set', 'tasks.*.completed', (i, completed, previous, isLocal, passed) ->
     return if passed? && passed.cron # Don't do this stuff on cron
@@ -37,7 +36,7 @@ module.exports.app = (appExports, model) ->
 
     # Score the user based on todo task
     task = user.at("tasks.#{i}")
-    score.score(i, direction())
+    scoring.score(model, i, direction())
 
   appExports.addTask = (e, el, next) ->
     type = $(el).attr('data-task-type')
@@ -82,7 +81,7 @@ module.exports.app = (appExports, model) ->
           return # Cancel. Don't delete, don't hurt user
         else
           task.set('type','habit') # hack to make sure it hits HP, instead of performing "undo checkbox"
-          score.score(id, direction:'down')
+          scoring.score(model, id, direction:'down')
 
         # prevent accidently deleting long-standing tasks
       else
@@ -172,4 +171,4 @@ module.exports.app = (appExports, model) ->
     direction = 'up' if direction == 'true/'
     direction = 'down' if direction == 'false/'
     task = model.at $(el).parents('li')[0]
-    score.score(task.get('id'), direction)
+    scoring.score(model, task.get('id'), direction)
diff --git a/src/server/deprecated.coffee b/src/server/deprecated.coffee
index d4e5d3b694..c781433aca 100644
--- a/src/server/deprecated.coffee
+++ b/src/server/deprecated.coffee
@@ -48,8 +48,7 @@ router.post '/v1/users/:uid/tasks/:taskId/:direction', (req, res) ->
         down: true
         notes: "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task."
 
-    score = new scoring.Scoring(model)
-    delta = score.score(taskId, direction)
+    delta = scoring.score(model, taskId, direction)
     result = model.get ('_user.stats')
     result.delta = delta
     res.send(result)

From e6e960ae5eb41abcf8c8e61dd094ab8de3397e03 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sat, 2 Mar 2013 23:52:47 -0500
Subject: [PATCH 051/220] performance boost - only re-establish popover /
 tooltips on saving task

---
 src/app/browser.coffee | 5 -----
 src/app/tasks.coffee   | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index 351573cf43..b7dc450972 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -105,11 +105,6 @@ setupSortable = (model) ->
 setupTooltips = (model) ->
   $('[rel=tooltip]').tooltip()
   $('[rel=popover]').popover()
-  # FIXME: this isn't very efficient, do model.on set for specific attrs for popover
-  model.on 'set', '*', ->
-    $('[rel=tooltip]').tooltip()
-    $('[rel=popover]').popover()
-
 
 setupTour = (model) ->
   tourSteps = [
diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index f84e8d2b2f..50a7fa976b 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -172,3 +172,8 @@ module.exports.app = (appExports, model) ->
     direction = 'down' if direction == 'false/'
     task = model.at $(el).parents('li')[0]
     scoring.score(model, task.get('id'), direction)
+
+  appExports.tasksSaveAndClose = ->
+    # When they update their notes, re-establish tooltip & popover
+    $('[rel=tooltip]').tooltip()
+    $('[rel=popover]').popover()

From 0f0ca21f829513e66956eeb81ce11de5874c6cce Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sat, 2 Mar 2013 23:57:10 -0500
Subject: [PATCH 052/220] fix default dailies repeat schema

---
 src/app/character.coffee | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/app/character.coffee b/src/app/character.coffee
index de1b280c2d..155ea7961e 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -118,14 +118,18 @@ module.exports.newUserObject = ->
   newUser = lodash.cloneDeep userSchema
   newUser.apiToken = derby.uuid()
 
+  repeat = {m:true,t:true,w:true,th:true,f:true,s:true,su:true}
   defaultTasks = [
     {type: 'habit', text: '1h Productive Work', notes: '-- Habits: Constantly Track --\nFor some habits, it only makes sense to *gain* points (like this one).', value: 0, up: true, down: false }
     {type: 'habit', text: 'Eat Junk Food', notes: 'For others, it only makes sense to *lose* points', value: 0, up: false, down: true}
     {type: 'habit', text: 'Take The Stairs', notes: 'For the rest, both + and - make sense (stairs = gain, elevator = lose)', value: 0, up: true, down: true}
-    {type: 'daily', text: '1h Personal Project', notes: '-- Dailies: Complete Once a Day --\nAt the end of each day, non-completed Dailies dock you points.', value: 0, completed: false }
-    {type: 'daily', text: 'Exercise', notes: "If you are doing well, they turn green and are less valuable (experience, gold) and less damaging (HP). This means you can ease up on them for a bit.", value: 3, completed: false }
-    {type: 'daily', text: '45m Reading', notes: 'But if you are doing poorly, they turn red. The worse you do, the more valuable (exp, gold) and more damaging (HP) these goals become. This encourages you to focus on your shortcomings, the reds.', value: -10, completed: false }
+
+    {type: 'daily', text: '1h Personal Project', notes: '-- Dailies: Complete Once a Day --\nAt the end of each day, non-completed Dailies dock you points.', value: 0, completed: false, repeat: repeat }
+    {type: 'daily', text: 'Exercise', notes: "If you are doing well, they turn green and are less valuable (experience, gold) and less damaging (HP). This means you can ease up on them for a bit.", value: 3, completed: false, repeat: repeat }
+    {type: 'daily', text: '45m Reading', notes: 'But if you are doing poorly, they turn red. The worse you do, the more valuable (exp, gold) and more damaging (HP) these goals become. This encourages you to focus on your shortcomings, the reds.', value: -10, completed: false, repeat: repeat }
+
     {type: 'todo', text: 'Call Mom', notes: "-- Todos: Complete Eventually --\nNon-completed Todos won't hurt you, but they will become more valuable over time. This will encourage you to wrap up stale Todos.", value: -3, completed: false }
+
     {type: 'reward', text: '1 Episode of Game of Thrones', notes: '-- Rewards: Treat Yourself! --\nAs you complete goals, you earn gold to buy rewards. Buy them liberally - rewards are integral in forming good habits.', value: 20 }
     {type: 'reward', text: 'Cake', notes: 'But only buy if you have enough gold - you lose HP otherwise.', value: 10 }
   ]

From 34f5f2dc54fc393fddd8efb0c1a6cdde5fa73d6b Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 3 Mar 2013 00:17:39 -0500
Subject: [PATCH 053/220] custom dayStart

---
 CHANGELOG.md             |  3 ++-
 src/app/character.coffee |  2 +-
 src/app/helpers.coffee   |  8 +++++---
 src/app/scoring.coffee   |  2 +-
 test/user.mocha.coffee   | 21 +++++++++++++++++----
 views/app/settings.html  | 11 +++++++++++
 6 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1333ed77b7..5f1508613a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1 +1,2 @@
-TODO
+3/3/2013
+ * Add custom day start: https://trello.com/card/custom-day-start/50e5d3684fe3a7266b0036d6/15
\ No newline at end of file
diff --git a/src/app/character.coffee b/src/app/character.coffee
index 155ea7961e..d9c3208c22 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -99,7 +99,7 @@ userSchema =
   stats: { gp: 0, exp: 0, lvl: 1, hp: 50 }
   party: { current: null, invitation: null }
   items: { weapon: 0, armor: 0, head: 0, shield: 0 }
-  preferences: { gender: 'm', skin: 'white', hair: 'blond', armorSet: 'v1' }
+  preferences: { gender: 'm', skin: 'white', hair: 'blond', armorSet: 'v1', dayStart:0 }
   habitIds: []
   dailyIds: []
   todoIds: []
diff --git a/src/app/helpers.coffee b/src/app/helpers.coffee
index 5c2cccaa15..ff0c82459d 100644
--- a/src/app/helpers.coffee
+++ b/src/app/helpers.coffee
@@ -1,8 +1,10 @@
 moment = require('moment')
 
-# Absolute diff between two dates, based on 12am for both days
-module.exports.daysBetween = (a, b) ->
-  Math.abs(moment(a).startOf('day').diff(moment(b).startOf('day'), 'days'))
+# Absolute diff between two dates
+module.exports.daysBetween = (yesterday, now, dayStart) ->
+  #sanity-check reset-time (is it 24h time?)
+  dayStart = 0 unless (dayStart? and (dayStart = parseInt(dayStart)) and dayStart >= 0 and dayStart <= 24)
+  Math.abs moment(yesterday).startOf('day').add('h', dayStart).diff(moment(now), 'days')
   
 module.exports.dayMapping = dayMapping = {0:'su',1:'m',2:'t',3:'w',4:'th',5:'f',6:'s',7:'su'}
 
diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index 6818db1bac..f9f13a909c 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -180,7 +180,7 @@ updateStats = (model, newStats, batch) ->
 cron = (model) ->
   user = model.at '_user'
   today = +new Date
-  daysPassed = helpers.daysBetween(today, user.get('lastCron'))
+  daysPassed = helpers.daysBetween(user.get('lastCron'), today, user.get('preferences.dayStart'))
   if daysPassed > 0
     batch = new character.BatchUpdate(model)
     batch.startTransaction()
diff --git a/test/user.mocha.coffee b/test/user.mocha.coffee
index 3f4cc1ec5c..33ab7ee431 100644
--- a/test/user.mocha.coffee
+++ b/test/user.mocha.coffee
@@ -1,13 +1,14 @@
 {expect} = require 'derby/node_modules/racer/test/util'
 {BrowserModel: Model} = require 'derby/node_modules/racer/test/util/model'
 derby = require 'derby'
-clone = require 'clone'
+lodash = require 'lodash'
 _ = require 'underscore'
 moment = require 'moment'
 
 # Custom modules
 scoring = require '../src/app/scoring'
-schema = require '../src/app/schema'
+schema = require '../src/app/character'
+helpers = require '../src/app/helpers'
 
 ###### Helpers & Variables ######
 
@@ -19,8 +20,8 @@ taskPath = null
 # Otherwise, using model.get(path) will give the same object before as after
 pathSnapshots = (paths) ->
   if _.isString(paths)
-    return clone(model.get(paths))
-  _.map paths, (path) -> clone(model.get(path))
+    return lodash.cloneDeep(model.get(paths))
+  _.map paths, (path) -> lodash.cloneDeep(model.get(path))
 statsTask = -> pathSnapshots(['_user.stats', taskPath]) # quick snapshot of user.stats & task
 
 cleanUserObj = ->
@@ -67,6 +68,18 @@ modificationsLookup = (direction, options = {}) ->
 
 ###### Specs ######
 
+describe 'Cron', ->
+  it 'calculates day differences with dayStart properly', ->
+    dayStart = 4
+    yesterday = moment().subtract('d', 1).add('h', dayStart)
+    now = moment().startOf('day').add('h', dayStart-1) #today
+    console.log {yesterday: yesterday.format('MM/DD HH:00'), now: now.format('MM/DD HH:00')}
+    console.log {diff: Math.abs(moment(yesterday).diff(moment(now), 'days'))}
+    expect(helpers.daysBetween(yesterday, now, dayStart)).to.eql 0
+    now = moment().startOf('day').add('h', dayStart)
+    console.log {now: now.format('MM/DD HH:00')}
+    expect(helpers.daysBetween(yesterday, now, dayStart)).to.eql 1
+
 describe 'User', ->
   model = null
 
diff --git a/views/app/settings.html b/views/app/settings.html
index 0bba816477..d9715751f2 100644
--- a/views/app/settings.html
+++ b/views/app/settings.html
@@ -9,8 +9,19 @@
             <h6>API Token</h6>
             <pre class=prettyprint>{_user.apiToken}</pre>
 
+            <hr/>
+            <h4>Custom Day Start</h4>
+            <div class="input-append">
+                <input class="span2" type="number" min=0 max=24 value={_user.preferences.dayStart} />
+                <span class="add-on">:00 (24h)</span>
+            </div>
+            <div>
+                <small>Habit defaults to check and reset your dailies at midnight each day. You can customize that here (Enter number between 0 and 24).</small>
+            </div>
+
             {{#if _user.auth.local}}
                 <hr/>
+                <h4>Change Password</h4>
                 <derby-auth:changePassword />
             {{/}}
 

From cc4d1b2508738b269e8409e4c223588f3c6d4648 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 3 Mar 2013 01:41:52 -0500
Subject: [PATCH 054/220] fix double-alerts bug

---
 src/app/browser.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index b7dc450972..25872b0ee1 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -2,6 +2,7 @@ _ = require 'underscore'
 moment = require 'moment'
 #algos = require './algos'
 
+
 module.exports.restoreRefs = restoreRefs = (model) ->
   # tnl function
   model.fn '_tnl', '_user.stats.lvl', (lvl) ->
@@ -22,13 +23,13 @@ module.exports.resetDom = (model) ->
 
 module.exports.app = (appExports, model) ->
   reconstructPage model
+  setupGrowlNotifications(model) unless model.get('_view.mobileDevice')
 
 reconstructPage = (model) ->
   loadJavaScripts(model)
   setupSortable(model)
   setupTooltips(model)
   setupTour(model)
-  setupGrowlNotifications(model) unless model.get('_view.mobileDevice')
   $('.datepicker').datepicker({autoclose:true, todayBtn:true})
   .on 'changeDate', (ev) ->
     #for some reason selecting a date doesn't fire a change event on the field, meaning our changes aren't saved

From 69c8d7835211e5fdc2959d148ce4ff5e44c208c8 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 3 Mar 2013 11:34:09 -0500
Subject: [PATCH 055/220] purchase tokens accessControl bug fix

---
 src/server/store.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/store.coffee b/src/server/store.coffee
index ac4ab491af..ad463ecbaa 100644
--- a/src/server/store.coffee
+++ b/src/server/store.coffee
@@ -53,9 +53,10 @@ userAccess = (store) ->
 
     oldBalance = @session.req?._racerModel?.get("users.#{id}.balance") || 0
     purchasingSomethingOnClient = newBalance < oldBalance
-    accept(purchasingSomethingOnClient or @session.req?._isServer)
+    accept(purchasingSomethingOnClient or derbyAuth.isServer(@))
 
   store.writeAccess "*", "users.*.flags.ads", -> # captures, value, accept, err ->
+    accept = arguments[arguments.length - 2]
     err = arguments[arguments.length - 1]
 #    return err(derbyAuth.SESSION_INVALIDATED_ERROR) if derbyAuth.bustedSession(@)
     return accept(false) if derbyAuth.bustedSession(@)

From afaf3580053a2bf27df063f7a3bc914e8eb8fc93 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 3 Mar 2013 12:15:25 -0500
Subject: [PATCH 056/220] update to chest favicon

---
 public/favicon.ico | Bin 398 -> 789 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/favicon.ico b/public/favicon.ico
index a1783aac9903d3eed7aaed16713514300cd2f939..0a6f815a75432e3c2bbe73fa5192629e9edec0e7 100644
GIT binary patch
delta 730
zcmeBUp2{{srJgOx+ueoXKL{?^yL>VO0|RG)M`SUO_5fqIli79*3`}~SE{-7<r>9P~
z&lU+3Ia>ey@65S(Ps%&rY1xn<d|4xmajRj+f-<G9-q!eo=O3vH%q~&7!J)}=T4Gyp
z#1;W%!<15IqmysWo!e7+UTJnpvf#%McD?5Z_CBwV*}1o<_Gnhv=9s837Qu6_906?(
zLhWleJzCkR9QIz9|M~sx$<x%NuAKeJ$1MJ%YDQstrN#bh>()vsZjmZfFgkQ7<cy22
zbAy2pM{>-Af{2f{?=N>W3p$<dXt=7NbY+d=HmUH+EkO(+|8&+zI=Z+?8BA<FDyCw3
z^yyD-AD3BY>*G!>y{Xw?{Ks8?sb#GC%dZhRjwuH@1ZFCmuQr`{v4dmcMTQlE{E7-n
z5^DppmN4?vztvbA%+GcFK;@-{$pIEgtNouROBL6wIK^J}TebD`pL1MRcXiD^Gp_qo
z!p|0y9jkIyTT650pOq6C9R+eiJ}vvqyLLgryd7bM-`yG+vZd=q=blrvt8louLY#w%
zLrp(1-T&i<X@^6fdY1fk`us3hxZ$^Xd8Ui=A&rp5t#fT%<C;8;A3nA2R%j`>v&~_S
z&&LNJjT!Fkt8<;V^u&r~N&*~9W+o^JM`T&@?czKq`!x2~f%Ub=fBkZ2;QJ=)E1i6G
zVx!@_lRJC1<Qpuq@tkC6Ss#3SdQs3`%kYaoFR?v%wMNa5sVF2c)z<E$fN3Y^2jlgB
zVr(v(D$e=mXnSDlGWG?_M3a^GuoSg(Uobs)a&hnZ%lZwi8!P^^GH#nY`MH|(46_eU
zb_oAxWY77}croC0OYE1|LcnCCTH+c}l9E`GYL#4+3Zxi}3=EBR4GeV+T}?ua46Td}
wtc)ym4NR>J3_?Qg??%y)o1c=IR*BGou0fSEoqeLBIu`?jr>mdKI;Vst05^XzO8@`>

delta 339
zcmV-Z0j&O&295)eB$MX?B!2-gNkl<Zc-o{>F;2ul40Iw|8s5MU?xf^?K!p&}DJ@Oj
zl1JnPX=$K}=tz;2fOIqw9Ssy$BHgmHWFmV{fdWgrYuV#jd+kk}bMhZK!ItOw%+hsT
zvIO=x92ScVvMh5iZwL4Od2rBSi<h?t95BEVmy+%5RODkXa(n-1GJn!H!v_qorUWnR
z%Zp7<fFfZzCfH*`47PNtWtd1zCR4pj!NW|jL<0FO*bqR<vYbh7wwphLj|l3zma3|T
zg_|V~{&^kMqPA^KtJv1Nhv!)*7H1ej&cQg20r2&7Wr8&!d>U)!fU<iX<$QmwYYuM$
z8+@@OVBw%NO(R87&`75rY~@!EMPU-(x#JRWQfHm9U6;TNoVvBAKFtRFD{ZHa&y*@7
lQ(njY=8!2;V&q$Z0RWx_EmC8Q9;W~R002ovPDHLkV1ktlm}vk2


From 264119b755a44f5fc68f966cc53ce283a4764a07 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 3 Mar 2013 12:22:56 -0500
Subject: [PATCH 057/220] remove ical link from new API. shouldn't even be in
 old API, really - it's just a link... don't know why I did that. but alas,
 people already have subscriptions on that link so if it aint broke

---
 src/server/api.coffee | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 287b354f5d..a7ff84d219 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -114,31 +114,4 @@ router.get '/user/tasks', auth, (req, res) ->
 
   res.json 200, tasks
 
-router.get '/users/:uid/calendar.ics', (req, res) ->
-  #return next() #disable for now
-  {uid} = req.params
-  {apiToken} = req.query
-
-  model = req.getModel()
-  query = model.query('users').withIdAndToken(uid, apiToken)
-  query.fetch (err, result) ->
-    return res.send(400, err) if err
-    tasks = result.get('tasks')
-    #      tasks = result[0].tasks
-    tasksWithDates = _.filter tasks, (task) -> !!task.date
-    return res.send(400, "No events found") if _.isEmpty(tasksWithDates)
-
-    ical = new icalendar.iCalendar()
-    ical.addProperty('NAME', 'HabitRPG')
-    _.each tasksWithDates, (task) ->
-      event = new icalendar.VEvent(task.id);
-      event.setSummary(task.text);
-      d = new Date(task.date)
-      d.date_only = true
-      event.setDate d
-      ical.addComponent event
-    res.type('text/calendar')
-    formattedIcal = ical.toString().replace(/DTSTART\:/g, 'DTSTART;VALUE=DATE:')
-    res.send(200, formattedIcal)
-
 module.exports = router

From 4b77daff0a80fd6738bb11a79c1f671da9483378 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 3 Mar 2013 12:36:05 -0500
Subject: [PATCH 058/220] redirect deprecated task-scoring to new API, some
 cleanup to score function to use switz auth

---
 src/server/api.coffee        | 39 +++++++++++++++++++++++++++++-
 src/server/deprecated.coffee | 47 ++++++------------------------------
 2 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index a7ff84d219..7ab6d75e07 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -6,7 +6,6 @@ _ = require 'underscore'
 validator = require 'derby-auth/node_modules/validator'
 check = validator.check
 sanitize = validator.sanitize
-icalendar = require 'icalendar'
 
 NO_TOKEN_OR_UID = err: "You must include a token and uid (user id) in your request"
 NO_USER_FOUND = err: "No user found."
@@ -114,4 +113,42 @@ router.get '/user/tasks', auth, (req, res) ->
 
   res.json 200, tasks
 
+###
+  This is called form deprecated.coffee's score function, and the req.headers are setup properly to handle the login
+###
+scoreTask = (req, res, next) ->
+  auth req, res, ->
+    {taskId, direction} = req.params
+    {title, service, icon} = req.body
+
+    # Send error responses for improper API call
+    return res.send(500, ':taskId required') unless taskId
+    return res.send(500, ":direction must be 'up' or 'down'") unless direction in ['up','down']
+
+    model = req.getModel()
+    {user, userObj} = req
+
+    model.ref('_user', user)
+
+    # Create task if doesn't exist
+    # TODO add service & icon to task
+    unless model.get("_user.tasks.#{taskId}")
+      model.refList "_habitList", "_user.tasks", "_user.habitIds"
+      model.at('_habitList').push
+        id: taskId
+        type: 'habit'
+        text: (title || taskId)
+        value: 0
+        up: true
+        down: true
+        notes: "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task."
+
+    delta = scoring.score(model, taskId, direction)
+    result = model.get ('_user.stats')
+    result.delta = delta
+    res.send(result)
+router.post '/user/tasks/:taskId/:direction', scoreTask
+
 module.exports = router
+module.exports.scoreTask = scoreTask # export so deprecated can call it
+
diff --git a/src/server/deprecated.coffee b/src/server/deprecated.coffee
index c781433aca..a1c1ff817c 100644
--- a/src/server/deprecated.coffee
+++ b/src/server/deprecated.coffee
@@ -4,6 +4,7 @@ router = new express.Router()
 scoring = require '../app/scoring'
 _ = require 'underscore'
 icalendar = require('icalendar')
+api = require './api'
 
 # ---------- Deprecated Paths ------------
 
@@ -13,45 +14,11 @@ router.get '/:uid/up/:score?', (req, res) -> res.send(500, deprecatedMessage)
 router.get '/:uid/down/:score?', (req, res) -> res.send(500, deprecatedMessage)
 router.post '/users/:uid/tasks/:taskId/:direction', (req, res) -> res.send(500, deprecatedMessage)
 
-router.post '/v1/users/:uid/tasks/:taskId/:direction', (req, res) ->
-  {uid, taskId, direction} = req.params
-  {apiToken, title, service, icon} = req.body
-  console.log {params:req.params, body:req.body} if process.env.NODE_ENV == 'development'
-
-  # Send error responses for improper API call
-  return res.send(500, 'request body "apiToken" required') unless apiToken
-  return res.send(500, ':uid required') unless uid
-  return res.send(500, ':taskId required') unless taskId
-  return res.send(500, ":direction must be 'up' or 'down'") unless direction in ['up','down']
-
-  model = req.getModel()
-  model.fetch model.query('users').withIdAndToken(uid, apiToken), (err, result) ->
-    return res.send(500, err) if err
-    user = result
-    userObj = user.get()
-    if _.isEmpty(userObj)
-      return res.send(500, "User with uid=#{uid}, token=#{apiToken} not found. Make sure you're not using your username, but your User Id")
-
-    model.ref('_user', user)
-    req._isServer = true
-
-    # Create task if doesn't exist
-    # TODO add service & icon to task
-    unless model.get("_user.tasks.#{taskId}")
-      model.refList "_habitList", "_user.tasks", "_user.habitIds"
-      model.at('_habitList').push
-        id: taskId
-        type: 'habit'
-        text: (title || taskId)
-        value: 0
-        up: true
-        down: true
-        notes: "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task."
-
-    delta = scoring.score(model, taskId, direction)
-    result = model.get ('_user.stats')
-    result.delta = delta
-    res.send(result)
+# Redirect to new API
+router.post '/v1/users/:uid/tasks/:taskId/:direction', (req, res, next) ->
+  req.headers['x-api-user'] = req.params.uid
+  req.headers['x-api-key'] = req.body.apiToken
+  api.scoreTask(req, res, next)
 
 router.get '/v1/users/:uid/calendar.ics', (req, res) ->
   #return next() #disable for now
@@ -80,4 +47,4 @@ router.get '/v1/users/:uid/calendar.ics', (req, res) ->
     formattedIcal = ical.toString().replace(/DTSTART\:/g, 'DTSTART;VALUE=DATE:')
     res.send(200, formattedIcal)
 
-module.exports = router
+module.exports = router
\ No newline at end of file

From 6189fee74e48034e5852fda101212a815efe0d28 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 3 Mar 2013 16:14:16 -0500
Subject: [PATCH 059/220] algorightms notification (to warn people to restore
 their exp)

---
 src/app/character.coffee | 4 ++--
 views/app/alerts.html    | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/app/character.coffee b/src/app/character.coffee
index d9c3208c22..19a64d0fd3 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -57,8 +57,8 @@ module.exports.app = (appExports, model) ->
     batch.commit()
     browser.resetDom(model)
 
-  appExports.closeCelebrationNofitication = (e, el) ->
-    user.set('flags.celebrationEvent', 'hide')
+  appExports.closeAlgosNotification = (e, el) ->
+    user.set('flags.algosNotification', 'hide')
 
   appExports.customizeGender = (e, el) ->
     user.set 'preferences.gender', $(el).attr('data-value')
diff --git a/views/app/alerts.html b/views/app/alerts.html
index bf10bd2bf0..bb91206ced 100644
--- a/views/app/alerts.html
+++ b/views/app/alerts.html
@@ -3,4 +3,12 @@
         <ul class="unstyled alert alert-error">
             {#each _flash.error as :error}<li>{:error}</li>{/}
         </ul>
+    {/}
+
+    {#if equal(_user.flags.algosNotification,'show')}
+        <div class='alert alert-success'>
+            <a target="_blank" x-bind="click:closeAlgosNotification" class=pull-right>[x]</a>
+            <p>New features! Custom day start, new and better algorithms, authentication enhancements. See <a href="http://habitrpg.tumblr.com/post/44468869138/custom-day-start-better-algorithms-auth-enhancements">details here.</a>
+            &nbsp;"Hey, I had more Exp before this roll-out!" <a href="#restore-modal" data-toggle=modal>Restore your Exp here.</a></p>
+        </div>
     {/}
\ No newline at end of file

From 1a335cc68a88c58f90c0395c5e329e468620aa8c Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 3 Mar 2013 17:54:14 -0500
Subject: [PATCH 060/220] add priority-multiplier to html & tasks.coffee (note,
 requires merge of @IvanGaravito /derby#hotfix-model_at_for_each_blocks

---
 src/app/tasks.coffee |  9 +++++++++
 views/app/tasks.html | 14 ++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index 50a7fa976b..02ee38901f 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -177,3 +177,12 @@ module.exports.app = (appExports, model) ->
     # When they update their notes, re-establish tooltip & popover
     $('[rel=tooltip]').tooltip()
     $('[rel=popover]').popover()
+
+  appExports.tasksToggleAdvanced = (e, el) ->
+    $(el).next('.advanced').toggle()
+
+  appExports.tasksSetMultiplier = (e, el) ->
+    dataId = $(el).parent('[data-id]').attr('data-id')
+    #"_user.tasks.#{dataId}"
+    model.at(e.target).set 'multiplier', parseInt($(el).attr('data-multiplier'))
+    debugger
\ No newline at end of file
diff --git a/views/app/tasks.html b/views/app/tasks.html
index 4d11b210b5..2b881e8a71 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -207,6 +207,20 @@
                     <div><small>Enter as date, eg 02/19/2013 or 02-19-2013</small></div>
                 </div>
             {/}
+
+            {#unless equal(:task.type, 'reward')}
+                <div>
+                    <div>
+                        <a x-bind="click:tasksToggleAdvanced">Advanced</a>
+                        <div class="control-group btn-group priority-multiplier hide advanced" data-id="{{:task.id}}">
+                            <label>Multiplier <a href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a></label>
+                            <button type="button" class="btn btn-info {#if equal(:task.multiplier,1)}active{/}" data-multiplier='1' x-bind=click:tasksSetMultiplier>1</button>
+                            <button type="button" class="btn btn-info {#if equal(:task.multiplier,2)}active{/}" data-multiplier='2' x-bind=click:tasksSetMultiplier>2</button>
+                            <button type="button" class="btn btn-info {#if equal(:task.multiplier,3)}active{/}" data-multiplier='3' x-bind=click:tasksSetMultiplier>3</button>
+                        </div>
+                    </div>
+                </div>
+            {/}
             <button type=submit class="btn" x-bind="click:tasksSaveAndClose">Save & Close</button>
         </form>
     </div>

From c33c6c34807553243cedbc8778f0c9c59ffb2ed4 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 3 Mar 2013 18:18:49 -0500
Subject: [PATCH 061/220] add multiplier functionality to task scoring

---
 src/app/algos.coffee   | 24 ++++++++++++------------
 src/app/scoring.coffee |  5 +++--
 views/app/tasks.html   |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/app/algos.coffee b/src/app/algos.coffee
index 205842d178..8ff90414ca 100644
--- a/src/app/algos.coffee
+++ b/src/app/algos.coffee
@@ -10,11 +10,11 @@ module.exports.tnl = (level) ->
   {weaponStrength) weapon strength 
   {level} current user level
 ###
-module.exports.expModifier = (value, weaponStrength, level) ->
-	levelModifier = (level-1) * MODIFIER
-	weaponModifier = weaponStrength / 100
-	strength = 1 + weaponModifier + levelModifier
-	return value * strength
+module.exports.expModifier = (value, weaponStrength, level, multiplier=1) ->
+  levelModifier = (level-1) * MODIFIER
+  weaponModifier = weaponStrength / 100
+  strength = 1 + weaponModifier + levelModifier
+  return value * strength * multiplier
 
 ###
   Calculates HP modification based on level and armor defence
@@ -23,17 +23,17 @@ module.exports.expModifier = (value, weaponStrength, level) ->
   {helmDefense} defense from helm 
   {level} current user level
 ###
-module.exports.hpModifier = (value, armorDefense, helmDefense, shieldDefense, level) ->
-	levelModifier = (level-1) * MODIFIER
-	armorModifier = (armorDefense + helmDefense + shieldDefense) / 100
-	defense = 1 - levelModifier + armorModifier
-	return value * defense
+module.exports.hpModifier = (value, armorDefense, helmDefense, shieldDefense, level, multiplier=1) ->
+  levelModifier = (level-1) * MODIFIER
+  armorModifier = (armorDefense + helmDefense + shieldDefense) / 100
+  defense = 1 - levelModifier + armorModifier
+  return value * defense * multiplier
 
 ###
   Future use
 ###
-module.exports.gpModifier = (value, modifier) ->
-	return value * modifier
+module.exports.gpModifier = (value, modifier, multiplier=1) ->
+  return value * modifier * multiplier
 
 ###
   Calculates the next task.value based on direction
diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index f9f13a909c..f95d12c7f3 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -28,6 +28,7 @@ score = (model, taskId, direction, times, batch, cron) ->
   taskPath = "tasks.#{taskId}"
   taskObj = obj.tasks[taskId]
   {type, value} = taskObj
+  multiplier = if taskObj.multiplier then parseInt(taskObj.multiplier) else 1
 
   # If they're trying to purhcase a too-expensive reward, confirm they want to take a hit for it
   if taskObj.value > obj.stats.gp and taskObj.type is 'reward'
@@ -51,7 +52,7 @@ score = (model, taskId, direction, times, batch, cron) ->
   addPoints = ->
     level = user.get('stats.lvl')
     weaponStrength = items.items.weapon[user.get('items.weapon')].strength
-    modified = algos.expModifier(delta,weaponStrength,level)
+    modified = algos.expModifier(delta,weaponStrength,level, multiplier)
     exp += modified*10
     gp += delta
 
@@ -60,7 +61,7 @@ score = (model, taskId, direction, times, batch, cron) ->
     armorDefense = items.items.armor[user.get('items.armor')].defense
     helmDefense = items.items.head[user.get('items.head')].defense
     shieldDefense = items.items.shield[user.get('items.shield')].defense
-    modified = algos.hpModifier(delta,armorDefense,helmDefense,shieldDefense,level)
+    modified = algos.hpModifier(delta,armorDefense,helmDefense,shieldDefense,level, multiplier)
     hp += modified
 
   switch type
diff --git a/views/app/tasks.html b/views/app/tasks.html
index 2b881e8a71..b3b6b7e88e 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -214,7 +214,7 @@
                         <a x-bind="click:tasksToggleAdvanced">Advanced</a>
                         <div class="control-group btn-group priority-multiplier hide advanced" data-id="{{:task.id}}">
                             <label>Multiplier <a href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a></label>
-                            <button type="button" class="btn btn-info {#if equal(:task.multiplier,1)}active{/}" data-multiplier='1' x-bind=click:tasksSetMultiplier>1</button>
+                            <button type="button" class="btn btn-info {#if equal(:task.multiplier,1)}active{/}{#unless :task.multiplier}active{/}" data-multiplier='1' x-bind=click:tasksSetMultiplier>1</button>
                             <button type="button" class="btn btn-info {#if equal(:task.multiplier,2)}active{/}" data-multiplier='2' x-bind=click:tasksSetMultiplier>2</button>
                             <button type="button" class="btn btn-info {#if equal(:task.multiplier,3)}active{/}" data-multiplier='3' x-bind=click:tasksSetMultiplier>3</button>
                         </div>

From 120e058346e8e533763bcccb95bea2f26305f554 Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Mon, 4 Mar 2013 00:18:04 +0000
Subject: [PATCH 062/220] onlies now reset their value every day

---
 src/app/scoring.coffee | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index f9f13a909c..4726d7baaf 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -216,6 +216,9 @@ cron = (model) ->
           value = obj.tasks[taskObj.id].value #get updated value
           absVal = if (completed) then Math.abs(value) else value
           todoTally += absVal
+      else if type is 'habit' #reset 'onlies' value to 0
+        if taskObj.up==false or taskObj.down==false
+          batch.set "tasks.#{taskObj.id}.value", 0
 
     # Finished tallying
     obj.history ?= {}; obj.history.todos ?= []; obj.history.exp ?= []

From 4919cd22b55e4c0c0354f7d47f0f4b64ec75d316 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Sun, 3 Mar 2013 19:30:53 -0500
Subject: [PATCH 063/220] Move deprecated API back to deprecated

---
 src/server/api.coffee        | 38 +-----------------------------------
 src/server/deprecated.coffee | 35 +++++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 7ab6d75e07..e27a28fc4e 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -113,42 +113,6 @@ router.get '/user/tasks', auth, (req, res) ->
 
   res.json 200, tasks
 
-###
-  This is called form deprecated.coffee's score function, and the req.headers are setup properly to handle the login
-###
-scoreTask = (req, res, next) ->
-  auth req, res, ->
-    {taskId, direction} = req.params
-    {title, service, icon} = req.body
-
-    # Send error responses for improper API call
-    return res.send(500, ':taskId required') unless taskId
-    return res.send(500, ":direction must be 'up' or 'down'") unless direction in ['up','down']
-
-    model = req.getModel()
-    {user, userObj} = req
-
-    model.ref('_user', user)
-
-    # Create task if doesn't exist
-    # TODO add service & icon to task
-    unless model.get("_user.tasks.#{taskId}")
-      model.refList "_habitList", "_user.tasks", "_user.habitIds"
-      model.at('_habitList').push
-        id: taskId
-        type: 'habit'
-        text: (title || taskId)
-        value: 0
-        up: true
-        down: true
-        notes: "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task."
-
-    delta = scoring.score(model, taskId, direction)
-    result = model.get ('_user.stats')
-    result.delta = delta
-    res.send(result)
-router.post '/user/tasks/:taskId/:direction', scoreTask
-
 module.exports = router
-module.exports.scoreTask = scoreTask # export so deprecated can call it
+module.exports.auth = auth # export so deprecated can call it
 
diff --git a/src/server/deprecated.coffee b/src/server/deprecated.coffee
index a1c1ff817c..e97d7e6710 100644
--- a/src/server/deprecated.coffee
+++ b/src/server/deprecated.coffee
@@ -15,10 +15,41 @@ router.get '/:uid/down/:score?', (req, res) -> res.send(500, deprecatedMessage)
 router.post '/users/:uid/tasks/:taskId/:direction', (req, res) -> res.send(500, deprecatedMessage)
 
 # Redirect to new API
-router.post '/v1/users/:uid/tasks/:taskId/:direction', (req, res, next) ->
+initDeprecated = (req, res, next) ->
   req.headers['x-api-user'] = req.params.uid
   req.headers['x-api-key'] = req.body.apiToken
-  api.scoreTask(req, res, next)
+  next()
+
+router.post '/v1/users/:uid/tasks/:taskId/:direction', initDeprecated, api.auth, (req, res) ->
+  {taskId, direction} = req.params
+  {title, service, icon} = req.body
+
+  # Send error responses for improper API call
+  return res.send(500, ':taskId required') unless taskId
+  return res.send(500, ":direction must be 'up' or 'down'") unless direction in ['up','down']
+
+  model = req.getModel()
+  {user, userObj} = req
+
+  model.ref('_user', user)
+
+  # Create task if doesn't exist
+  # TODO add service & icon to task
+  unless model.get("_user.tasks.#{taskId}")
+    model.refList "_habitList", "_user.tasks", "_user.habitIds"
+    model.at('_habitList').push
+      id: taskId
+      type: 'habit'
+      text: (title || taskId)
+      value: 0
+      up: true
+      down: true
+      notes: "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task."
+
+  delta = scoring.score(model, taskId, direction)
+  result = model.get ('_user.stats')
+  result.delta = delta
+  res.send(result)
 
 router.get '/v1/users/:uid/calendar.ics', (req, res) ->
   #return next() #disable for now

From 30a3e46f20b576000c77611a9f80e987e004bd17 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Sun, 3 Mar 2013 19:37:54 -0500
Subject: [PATCH 064/220] Move deprecated api back into new

---
 src/server/api.coffee        | 41 ++++++++++++++++++++++++++++++++++--
 src/server/deprecated.coffee | 33 ++---------------------------
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index e27a28fc4e..8927f6172b 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -113,6 +113,43 @@ router.get '/user/tasks', auth, (req, res) ->
 
   res.json 200, tasks
 
-module.exports = router
-module.exports.auth = auth # export so deprecated can call it
+###
+  This is called form deprecated.coffee's score function, and the req.headers are setup properly to handle the login
+###
+scoreTask = (req, res, next) ->
+  {taskId, direction} = req.params
+  {title, service, icon} = req.body
+
+  # Send error responses for improper API call
+  return res.send(500, ':taskId required') unless taskId
+  return res.send(500, ":direction must be 'up' or 'down'") unless direction in ['up','down']
+
+  model = req.getModel()
+  {user, userObj} = req
+
+  model.ref('_user', user)
+
+  # Create task if doesn't exist
+  # TODO add service & icon to task
+  unless model.get("_user.tasks.#{taskId}")
+    model.refList "_habitList", "_user.tasks", "_user.habitIds"
+    model.at('_habitList').push
+      id: taskId
+      type: 'habit'
+      text: (title || taskId)
+      value: 0
+      up: true
+      down: true
+      notes: "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task."
+
+  delta = scoring.score(model, taskId, direction)
+  result = model.get ('_user.stats')
+  result.delta = delta
+  res.send(result)
+
+router.post '/user/tasks/:taskId/:direction', auth, scoreTask
+
+module.exports = router
+module.exports.auth = auth
+module.exports.scoreTask = scoreTask # export so deprecated can call it
 
diff --git a/src/server/deprecated.coffee b/src/server/deprecated.coffee
index e97d7e6710..3fcef2c8a3 100644
--- a/src/server/deprecated.coffee
+++ b/src/server/deprecated.coffee
@@ -20,36 +20,7 @@ initDeprecated = (req, res, next) ->
   req.headers['x-api-key'] = req.body.apiToken
   next()
 
-router.post '/v1/users/:uid/tasks/:taskId/:direction', initDeprecated, api.auth, (req, res) ->
-  {taskId, direction} = req.params
-  {title, service, icon} = req.body
-
-  # Send error responses for improper API call
-  return res.send(500, ':taskId required') unless taskId
-  return res.send(500, ":direction must be 'up' or 'down'") unless direction in ['up','down']
-
-  model = req.getModel()
-  {user, userObj} = req
-
-  model.ref('_user', user)
-
-  # Create task if doesn't exist
-  # TODO add service & icon to task
-  unless model.get("_user.tasks.#{taskId}")
-    model.refList "_habitList", "_user.tasks", "_user.habitIds"
-    model.at('_habitList').push
-      id: taskId
-      type: 'habit'
-      text: (title || taskId)
-      value: 0
-      up: true
-      down: true
-      notes: "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task."
-
-  delta = scoring.score(model, taskId, direction)
-  result = model.get ('_user.stats')
-  result.delta = delta
-  res.send(result)
+router.post '/v1/users/:uid/tasks/:taskId/:direction', initDeprecated, api.auth, api.scoreTask
 
 router.get '/v1/users/:uid/calendar.ics', (req, res) ->
   #return next() #disable for now
@@ -78,4 +49,4 @@ router.get '/v1/users/:uid/calendar.ics', (req, res) ->
     formattedIcal = ical.toString().replace(/DTSTART\:/g, 'DTSTART;VALUE=DATE:')
     res.send(200, formattedIcal)
 
-module.exports = router
\ No newline at end of file
+module.exports = router

From 35cea7fcbb086556e26db6e5ab19b719d9478ac2 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 3 Mar 2013 20:59:14 -0500
Subject: [PATCH 065/220] notification on "onlies" mechanic

---
 src/app/character.coffee |  3 +++
 views/app/alerts.html    | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/app/character.coffee b/src/app/character.coffee
index 19a64d0fd3..3acbaba2b3 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -60,6 +60,9 @@ module.exports.app = (appExports, model) ->
   appExports.closeAlgosNotification = (e, el) ->
     user.set('flags.algosNotification', 'hide')
 
+  appExports.closeOnliesNotification = (e, el) ->
+    user.set('flags.onliesNotification', 'hide')
+
   appExports.customizeGender = (e, el) ->
     user.set 'preferences.gender', $(el).attr('data-value')
 
diff --git a/views/app/alerts.html b/views/app/alerts.html
index bb91206ced..a230f65abd 100644
--- a/views/app/alerts.html
+++ b/views/app/alerts.html
@@ -7,8 +7,20 @@
 
     {#if equal(_user.flags.algosNotification,'show')}
         <div class='alert alert-success'>
-            <a target="_blank" x-bind="click:closeAlgosNotification" class=pull-right>[x]</a>
-            <p>New features! Custom day start, new and better algorithms, authentication enhancements. See <a href="http://habitrpg.tumblr.com/post/44468869138/custom-day-start-better-algorithms-auth-enhancements">details here.</a>
+            <a x-bind="click:closeAlgosNotification" class=pull-right>[x]</a>
+            <p>New features! Custom day start, new and better algorithms, authentication enhancements. See <a target="_blank" href="http://habitrpg.tumblr.com/post/44468869138/custom-day-start-better-algorithms-auth-enhancements">details here.</a>
             &nbsp;"Hey, I had more Exp before this roll-out!" <a href="#restore-modal" data-toggle=modal>Restore your Exp here.</a></p>
         </div>
+    {/}
+
+    {#if equal(_user.flags.onliesNotification, 'show')}
+        <div class='alert alert-success'>
+            <a x-bind="click:closeOnliesNotification " class=pull-right>[x]</a>
+            <p>
+                "Onlies" now gain / lose value just like other habits, and are reset back to 0 at the beginning of each day.
+                &nbsp;See <a target="_blank" href="https://trello.com/card/shading-onlies/50e5d3684fe3a7266b0036d6/67">details here</a>, and
+                &nbsp;chime in with your recommendations on this mechanic.
+            </p>
+        </div>
+
     {/}
\ No newline at end of file

From 7f03a30fd59f3c42be4b0bad2f0a40e36c4ffe53 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 3 Mar 2013 21:38:21 -0500
Subject: [PATCH 066/220] remove "advanced" section, clean up the task-edit
 form a bit

---
 src/app/tasks.coffee |  6 +----
 views/app/tasks.html | 58 +++++++++++++++++++++++---------------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index 02ee38901f..32afa0699f 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -178,11 +178,7 @@ module.exports.app = (appExports, model) ->
     $('[rel=tooltip]').tooltip()
     $('[rel=popover]').popover()
 
-  appExports.tasksToggleAdvanced = (e, el) ->
-    $(el).next('.advanced').toggle()
-
   appExports.tasksSetMultiplier = (e, el) ->
     dataId = $(el).parent('[data-id]').attr('data-id')
     #"_user.tasks.#{dataId}"
-    model.at(e.target).set 'multiplier', parseInt($(el).attr('data-multiplier'))
-    debugger
\ No newline at end of file
+    model.at(e.target).set 'multiplier', parseInt($(el).attr('data-multiplier'))
\ No newline at end of file
diff --git a/views/app/tasks.html b/views/app/tasks.html
index b3b6b7e88e..112dfc4aaa 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -176,31 +176,36 @@
                 <label>Notes</label><textarea rows=3>{:task.notes}</textarea>
             </div>
             {#if equal(:task.type, 'habit')}
-            <div class="control-group">
-                <label class="checkbox inline"><input type=checkbox checked={:task.up}>Up</label>
-                <label class="checkbox inline"><input type=checkbox checked={:task.down}>Down</label>
-            </div>
+                <hr/>
+                <label>Direction</label>
+                <div class="control-group">
+                    <label class="checkbox inline"><input type=checkbox checked={:task.up}>Up</label>
+                    <label class="checkbox inline"><input type=checkbox checked={:task.down}>Down</label>
+                </div>
             {else if equal(:task.type, 'daily')}
-            <label>Repeat</label>
-            <div class="control-group btn-group repeat-days">
-                <!-- note, does not use  data-toggle="buttons-checkbox" - it would interfere with our own click binding -->
-                <button type="button" class="btn btn-info {#if :task.repeat.su}active{/}" data-day='su' x-bind=click:toggleDay>Su</button>
-                <button type="button" class="btn btn-info {#if :task.repeat.m}active{/}" data-day='m' x-bind=click:toggleDay>M</button>
-                <button type="button" class="btn btn-info {#if :task.repeat.t}active{/}" data-day='t' x-bind=click:toggleDay>T</button>
-                <button type="button" class="btn btn-info {#if :task.repeat.w}active{/}" data-day='w' x-bind=click:toggleDay>W</button>
-                <button type="button" class="btn btn-info {#if :task.repeat.th}active{/}" data-day='th' x-bind=click:toggleDay>Th</button>
-                <button type="button" class="btn btn-info {#if :task.repeat.f}active{/}" data-day='f' x-bind=click:toggleDay>F</button>
-                <button type="button" class="btn btn-info {#if :task.repeat.s}active{/}" data-day='s' x-bind=click:toggleDay>S</button>
-            </div>
+                <hr/>
+                <label>Repeat</label>
+                <div class="control-group btn-group repeat-days">
+                    <!-- note, does not use  data-toggle="buttons-checkbox" - it would interfere with our own click binding -->
+                    <button type="button" class="btn btn-info {#if :task.repeat.su}active{/}" data-day='su' x-bind=click:toggleDay>Su</button>
+                    <button type="button" class="btn btn-info {#if :task.repeat.m}active{/}" data-day='m' x-bind=click:toggleDay>M</button>
+                    <button type="button" class="btn btn-info {#if :task.repeat.t}active{/}" data-day='t' x-bind=click:toggleDay>T</button>
+                    <button type="button" class="btn btn-info {#if :task.repeat.w}active{/}" data-day='w' x-bind=click:toggleDay>W</button>
+                    <button type="button" class="btn btn-info {#if :task.repeat.th}active{/}" data-day='th' x-bind=click:toggleDay>Th</button>
+                    <button type="button" class="btn btn-info {#if :task.repeat.f}active{/}" data-day='f' x-bind=click:toggleDay>F</button>
+                    <button type="button" class="btn btn-info {#if :task.repeat.s}active{/}" data-day='s' x-bind=click:toggleDay>S</button>
+                </div>
             {else if equal(:task.type, 'reward')}
-            <div class=control-group>
-                <label>Price
+                <hr/>
+                <div class=control-group>
+                    <label>Price</label>
                     <div class="input-append">
                         <input class="span5" size="16" type="number" min="0" value={:task.value}><span class="add-on">Gold</span>
                     </div>
-                </label>
-            </div>
+
+                </div>
             {else if equal(:task.type, 'todo')}
+                <hr/>
                 <div class=control-group>
                     <label>Due Date</label>
                     <input type="text" value="{:task.date}" data-date-format="mm/dd/yyyy" class="datepicker" />
@@ -209,18 +214,17 @@
             {/}
 
             {#unless equal(:task.type, 'reward')}
+                <hr/>
                 <div>
-                    <div>
-                        <a x-bind="click:tasksToggleAdvanced">Advanced</a>
-                        <div class="control-group btn-group priority-multiplier hide advanced" data-id="{{:task.id}}">
-                            <label>Multiplier <a href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a></label>
-                            <button type="button" class="btn btn-info {#if equal(:task.multiplier,1)}active{/}{#unless :task.multiplier}active{/}" data-multiplier='1' x-bind=click:tasksSetMultiplier>1</button>
-                            <button type="button" class="btn btn-info {#if equal(:task.multiplier,2)}active{/}" data-multiplier='2' x-bind=click:tasksSetMultiplier>2</button>
-                            <button type="button" class="btn btn-info {#if equal(:task.multiplier,3)}active{/}" data-multiplier='3' x-bind=click:tasksSetMultiplier>3</button>
-                        </div>
+                    <div class="control-group btn-group priority-multiplier" data-id="{{:task.id}}">
+                        <label>Multiplier <a href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a></label>
+                        <button type="button" class="btn btn-info {#if equal(:task.multiplier,1)}active{/}{#unless :task.multiplier}active{/}" data-multiplier='1' x-bind=click:tasksSetMultiplier>1</button>
+                        <button type="button" class="btn btn-info {#if equal(:task.multiplier,2)}active{/}" data-multiplier='2' x-bind=click:tasksSetMultiplier>2</button>
+                        <button type="button" class="btn btn-info {#if equal(:task.multiplier,3)}active{/}" data-multiplier='3' x-bind=click:tasksSetMultiplier>3</button>
                     </div>
                 </div>
             {/}
+            <hr/>
             <button type=submit class="btn" x-bind="click:tasksSaveAndClose">Save & Close</button>
         </form>
     </div>

From d925c43c7beffb4a9d5ae6a480fc6d1e0941a45e Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 3 Mar 2013 22:01:59 -0500
Subject: [PATCH 067/220] multipy GP with priority-multiplier, too

---
 src/app/algos.coffee   | 3 +++
 src/app/scoring.coffee | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/algos.coffee b/src/app/algos.coffee
index 8ff90414ca..fb366c313a 100644
--- a/src/app/algos.coffee
+++ b/src/app/algos.coffee
@@ -9,6 +9,7 @@ module.exports.tnl = (level) ->
   {value} task.value for exp gain
   {weaponStrength) weapon strength 
   {level} current user level
+  {multiplier} user-defined priority multiplier
 ###
 module.exports.expModifier = (value, weaponStrength, level, multiplier=1) ->
   levelModifier = (level-1) * MODIFIER
@@ -22,6 +23,7 @@ module.exports.expModifier = (value, weaponStrength, level, multiplier=1) ->
   {armorDefense} defense from armor
   {helmDefense} defense from helm 
   {level} current user level
+  {multiplier} user-defined priority multiplier
 ###
 module.exports.hpModifier = (value, armorDefense, helmDefense, shieldDefense, level, multiplier=1) ->
   levelModifier = (level-1) * MODIFIER
@@ -31,6 +33,7 @@ module.exports.hpModifier = (value, armorDefense, helmDefense, shieldDefense, le
 
 ###
   Future use
+  {multiplier} user-defined priority multiplier
 ###
 module.exports.gpModifier = (value, modifier, multiplier=1) ->
   return value * modifier * multiplier
diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index 4ae7dfd955..a728b2a640 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -54,7 +54,7 @@ score = (model, taskId, direction, times, batch, cron) ->
     weaponStrength = items.items.weapon[user.get('items.weapon')].strength
     modified = algos.expModifier(delta,weaponStrength,level, multiplier)
     exp += modified*10
-    gp += delta
+    gp += algos.gpModifier(delta, 1, multiplier)
 
   subtractPoints = ->
     level = user.get('stats.lvl')

From 1bd067f32f91b119c8ce9ff414e058e67f4d01ae Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 3 Mar 2013 22:06:34 -0500
Subject: [PATCH 068/220] add multiplier "new feature" alert

---
 src/app/character.coffee | 3 +++
 views/app/alerts.html    | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/src/app/character.coffee b/src/app/character.coffee
index 3acbaba2b3..25c8ccd87c 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -63,6 +63,9 @@ module.exports.app = (appExports, model) ->
   appExports.closeOnliesNotification = (e, el) ->
     user.set('flags.onliesNotification', 'hide')
 
+  appExports.closeMultiplierNotification = (e, el) ->
+    user.set('flags.multiplierNotification', 'hide')
+
   appExports.customizeGender = (e, el) ->
     user.set 'preferences.gender', $(el).attr('data-value')
 
diff --git a/views/app/alerts.html b/views/app/alerts.html
index a230f65abd..6e5769101a 100644
--- a/views/app/alerts.html
+++ b/views/app/alerts.html
@@ -22,5 +22,11 @@
                 &nbsp;chime in with your recommendations on this mechanic.
             </p>
         </div>
+    {/}
 
+    {#if equal(_user.flags.multiplierNotification, 'show')}
+        <div class='alert alert-success'>
+            <a x-bind="click:closeMultiplierNotification" class=pull-right>[x]</a>
+            <p>New Feature: Priority Multiplier! You can now multiply "more important" tasks on a 1x, 2x, or 3x scale. <a target="_blank" href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17">See details</a>.</p>
+        </div>
     {/}
\ No newline at end of file

From 233f8ea5950df5339b6ba641da7216031ee8a078 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 4 Mar 2013 00:41:59 -0500
Subject: [PATCH 069/220] data-target on modal instead of hrefd

---
 views/app/alerts.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/app/alerts.html b/views/app/alerts.html
index a230f65abd..8032ca8373 100644
--- a/views/app/alerts.html
+++ b/views/app/alerts.html
@@ -9,7 +9,7 @@
         <div class='alert alert-success'>
             <a x-bind="click:closeAlgosNotification" class=pull-right>[x]</a>
             <p>New features! Custom day start, new and better algorithms, authentication enhancements. See <a target="_blank" href="http://habitrpg.tumblr.com/post/44468869138/custom-day-start-better-algorithms-auth-enhancements">details here.</a>
-            &nbsp;"Hey, I had more Exp before this roll-out!" <a href="#restore-modal" data-toggle=modal>Restore your Exp here.</a></p>
+            &nbsp;"Hey, I had more Exp before this roll-out!" <a data-target="#restore-modal" data-toggle=modal>Restore your Exp here.</a></p>
         </div>
     {/}
 

From bd19e09fcf51a8d3b42a0270a36cc73a81a2035a Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 4 Mar 2013 11:17:17 -0500
Subject: [PATCH 070/220] possible fix for #324 - shuffle some function
 placement to be sure definition precedes function call. put re-rendering
 functionality (setupSortable, setupTour, etc) into app.on('render')

---
 src/app/browser.coffee | 43 +++++++++++++++++++++---------------------
 src/app/index.coffee   |  5 +++--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index 25872b0ee1..7c5e47f59f 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -3,7 +3,7 @@ moment = require 'moment'
 #algos = require './algos'
 
 
-module.exports.restoreRefs = restoreRefs = (model) ->
+restoreRefs = module.exports.restoreRefs = (model) ->
   # tnl function
   model.fn '_tnl', '_user.stats.lvl', (lvl) ->
     # see https://github.com/lefnire/habitrpg/issues/4
@@ -15,27 +15,6 @@ module.exports.restoreRefs = restoreRefs = (model) ->
   _.each ['habit', 'daily', 'todo', 'reward'], (type) ->
     model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
 
-module.exports.resetDom = (model) ->
-  window.DERBY.app.dom.clear()
-  restoreRefs(model)
-  window.DERBY.app.view.render(model)
-  reconstructPage model
-
-module.exports.app = (appExports, model) ->
-  reconstructPage model
-  setupGrowlNotifications(model) unless model.get('_view.mobileDevice')
-
-reconstructPage = (model) ->
-  loadJavaScripts(model)
-  setupSortable(model)
-  setupTooltips(model)
-  setupTour(model)
-  $('.datepicker').datepicker({autoclose:true, todayBtn:true})
-  .on 'changeDate', (ev) ->
-    #for some reason selecting a date doesn't fire a change event on the field, meaning our changes aren't saved
-    #FIXME also, it saves as a day behind??
-    model.at(ev.target).set 'date', moment(ev.date).add('d',1).format('MM/DD/YYYY')
-
 ###
   Loads JavaScript files from (1) public/js/* and (2) external sources
   We use this file (instead of <Scripts:> or <Tail:> inside .html) so we can utilize require() to concatinate for
@@ -218,3 +197,23 @@ setupGrowlNotifications = (model) ->
         statsNotification '<i class="icon-death"></i> You died!', 'death' 
       else 
         statsNotification '<i class="icon-chevron-up"></i> Level Up!', 'lvl'
+
+
+module.exports.resetDom = (model) ->
+  window.DERBY.app.dom.clear()
+  window.DERBY.app.view.render(model)
+
+module.exports.app = (appExports, model, app) ->
+  loadJavaScripts(model)
+
+  app.on 'render', (ctx) ->
+    #restoreRefs(model)
+    setupSortable(model)
+    setupTooltips(model)
+    setupGrowlNotifications(model) unless model.get('_view.mobileDevice')
+    setupTour(model)
+    $('.datepicker').datepicker({autoclose:true, todayBtn:true})
+      .on 'changeDate', (ev) ->
+            #for some reason selecting a date doesn't fire a change event on the field, meaning our changes aren't saved
+            #FIXME also, it saves as a day behind??
+            model.at(ev.target).set 'date', moment(ev.date).add('d',1).format('MM/DD/YYYY')
\ No newline at end of file
diff --git a/src/app/index.coffee b/src/app/index.coffee
index 73a33d3c9b..eabdfbde0e 100644
--- a/src/app/index.coffee
+++ b/src/app/index.coffee
@@ -1,5 +1,6 @@
 derby = require 'derby'
-{get, view, ready} = derby.createApp module
+app = derby.createApp module
+{get, view, ready} = app
 derby.use require('derby-ui-boot'), {styles: ['bootstrap', 'responsive']}
 derby.use require '../../ui'
 derby.use require 'derby-auth/components'
@@ -59,5 +60,5 @@ ready (model) ->
   profile.app(exports, model)
   require('../server/private').app(exports, model)
   require('./debug').app(exports, model) if model.get('_view.nodeEnv') != 'production'
-  browser.app(exports, model)
+  browser.app(exports, model, app)
 

From 9517455a798f14df4ec2c99138fa9675701a71dd Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 4 Mar 2013 11:33:36 -0500
Subject: [PATCH 071/220] migrate "multiplier" setup to "priority" setup, with
 ! !! !!! instead of 1 2 3. multipliers are now 1x 1.5x 2x

---
 src/app/algos.coffee     | 25 ++++++++++++++++---------
 src/app/character.coffee |  4 ++--
 src/app/scoring.coffee   |  8 ++++----
 src/app/tasks.coffee     |  4 ++--
 views/app/alerts.html    |  6 +++---
 views/app/tasks.html     |  8 ++++----
 6 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/app/algos.coffee b/src/app/algos.coffee
index fb366c313a..563ae7e5b0 100644
--- a/src/app/algos.coffee
+++ b/src/app/algos.coffee
@@ -1,6 +1,13 @@
 
 MODIFIER = .02
 
+priorityValue = (priority='!') ->
+  switch priority
+    when '!' then 1
+    when '!!' then 1.5
+    when '!!!' then 2
+    else 1
+
 module.exports.tnl = (level) ->
 	return (Math.pow(level,2)*10)+(level*10)+80
 
@@ -9,13 +16,13 @@ module.exports.tnl = (level) ->
   {value} task.value for exp gain
   {weaponStrength) weapon strength 
   {level} current user level
-  {multiplier} user-defined priority multiplier
+  {priority} user-defined priority multiplier
 ###
-module.exports.expModifier = (value, weaponStrength, level, multiplier=1) ->
+module.exports.expModifier = (value, weaponStrength, level, priority='!') ->
   levelModifier = (level-1) * MODIFIER
   weaponModifier = weaponStrength / 100
   strength = 1 + weaponModifier + levelModifier
-  return value * strength * multiplier
+  return value * strength * priorityValue(priority)
 
 ###
   Calculates HP modification based on level and armor defence
@@ -23,20 +30,20 @@ module.exports.expModifier = (value, weaponStrength, level, multiplier=1) ->
   {armorDefense} defense from armor
   {helmDefense} defense from helm 
   {level} current user level
-  {multiplier} user-defined priority multiplier
+  {priority} user-defined priority multiplier
 ###
-module.exports.hpModifier = (value, armorDefense, helmDefense, shieldDefense, level, multiplier=1) ->
+module.exports.hpModifier = (value, armorDefense, helmDefense, shieldDefense, level, priority='!') ->
   levelModifier = (level-1) * MODIFIER
   armorModifier = (armorDefense + helmDefense + shieldDefense) / 100
   defense = 1 - levelModifier + armorModifier
-  return value * defense * multiplier
+  return value * defense * priorityValue(priority)
 
 ###
   Future use
-  {multiplier} user-defined priority multiplier
+  {priority} user-defined priority multiplier
 ###
-module.exports.gpModifier = (value, modifier, multiplier=1) ->
-  return value * modifier * multiplier
+module.exports.gpModifier = (value, modifier, priority='!') ->
+  return value * modifier * priorityValue(priority)
 
 ###
   Calculates the next task.value based on direction
diff --git a/src/app/character.coffee b/src/app/character.coffee
index 25c8ccd87c..5e98588f94 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -63,8 +63,8 @@ module.exports.app = (appExports, model) ->
   appExports.closeOnliesNotification = (e, el) ->
     user.set('flags.onliesNotification', 'hide')
 
-  appExports.closeMultiplierNotification = (e, el) ->
-    user.set('flags.multiplierNotification', 'hide')
+  appExports.closePriorityNotification = (e, el) ->
+    user.set('flags.priorityNotification', 'hide')
 
   appExports.customizeGender = (e, el) ->
     user.set 'preferences.gender', $(el).attr('data-value')
diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index a728b2a640..e82f77e466 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -28,7 +28,7 @@ score = (model, taskId, direction, times, batch, cron) ->
   taskPath = "tasks.#{taskId}"
   taskObj = obj.tasks[taskId]
   {type, value} = taskObj
-  multiplier = if taskObj.multiplier then parseInt(taskObj.multiplier) else 1
+  priority = taskObj.priority or '!'
 
   # If they're trying to purhcase a too-expensive reward, confirm they want to take a hit for it
   if taskObj.value > obj.stats.gp and taskObj.type is 'reward'
@@ -52,16 +52,16 @@ score = (model, taskId, direction, times, batch, cron) ->
   addPoints = ->
     level = user.get('stats.lvl')
     weaponStrength = items.items.weapon[user.get('items.weapon')].strength
-    modified = algos.expModifier(delta,weaponStrength,level, multiplier)
+    modified = algos.expModifier(delta,weaponStrength,level, priority)
     exp += modified*10
-    gp += algos.gpModifier(delta, 1, multiplier)
+    gp += algos.gpModifier(delta, 1, priority)
 
   subtractPoints = ->
     level = user.get('stats.lvl')
     armorDefense = items.items.armor[user.get('items.armor')].defense
     helmDefense = items.items.head[user.get('items.head')].defense
     shieldDefense = items.items.shield[user.get('items.shield')].defense
-    modified = algos.hpModifier(delta,armorDefense,helmDefense,shieldDefense,level, multiplier)
+    modified = algos.hpModifier(delta,armorDefense,helmDefense,shieldDefense,level, priority)
     hp += modified
 
   switch type
diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index 32afa0699f..94d142ad03 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -178,7 +178,7 @@ module.exports.app = (appExports, model) ->
     $('[rel=tooltip]').tooltip()
     $('[rel=popover]').popover()
 
-  appExports.tasksSetMultiplier = (e, el) ->
+  appExports.tasksSetPriority = (e, el) ->
     dataId = $(el).parent('[data-id]').attr('data-id')
     #"_user.tasks.#{dataId}"
-    model.at(e.target).set 'multiplier', parseInt($(el).attr('data-multiplier'))
\ No newline at end of file
+    model.at(e.target).set 'priority', $(el).attr('data-priority')
\ No newline at end of file
diff --git a/views/app/alerts.html b/views/app/alerts.html
index 6e5769101a..5c96173b0a 100644
--- a/views/app/alerts.html
+++ b/views/app/alerts.html
@@ -24,9 +24,9 @@
         </div>
     {/}
 
-    {#if equal(_user.flags.multiplierNotification, 'show')}
+    {#if equal(_user.flags.priorityNotification, 'show')}
         <div class='alert alert-success'>
-            <a x-bind="click:closeMultiplierNotification" class=pull-right>[x]</a>
-            <p>New Feature: Priority Multiplier! You can now multiply "more important" tasks on a 1x, 2x, or 3x scale. <a target="_blank" href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17">See details</a>.</p>
+            <a x-bind="click:closePriorityNotification" class=pull-right>[x]</a>
+            <p>New Feature: Priority Multiplier! You can now multiply "more important" tasks on a 1x, 1.5x, or 2x scale. <a target="_blank" href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17">See details</a>.</p>
         </div>
     {/}
\ No newline at end of file
diff --git a/views/app/tasks.html b/views/app/tasks.html
index 112dfc4aaa..ccdd9bf407 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -217,10 +217,10 @@
                 <hr/>
                 <div>
                     <div class="control-group btn-group priority-multiplier" data-id="{{:task.id}}">
-                        <label>Multiplier <a href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a></label>
-                        <button type="button" class="btn btn-info {#if equal(:task.multiplier,1)}active{/}{#unless :task.multiplier}active{/}" data-multiplier='1' x-bind=click:tasksSetMultiplier>1</button>
-                        <button type="button" class="btn btn-info {#if equal(:task.multiplier,2)}active{/}" data-multiplier='2' x-bind=click:tasksSetMultiplier>2</button>
-                        <button type="button" class="btn btn-info {#if equal(:task.multiplier,3)}active{/}" data-multiplier='3' x-bind=click:tasksSetMultiplier>3</button>
+                        <label>Priority <a href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a></label>
+                        <button type="button" class="btn btn-info {#if equal(:task.priority,'!')}active{/}{#unless :task.priority}active{/}" data-priority='!' x-bind=click:tasksSetPriority>!</button>
+                        <button type="button" class="btn btn-info {#if equal(:task.priority,'!!')}active{/}" data-priority='!!' x-bind=click:tasksSetPriority>!!</button>
+                        <button type="button" class="btn btn-info {#if equal(:task.priority,'!!!')}active{/}" data-priority='!!!' x-bind=click:tasksSetPriority>!!!</button>
                     </div>
                 </div>
             {/}

From 378a03b6a09ddd1079a50e40e6f6e76040ad38d7 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 4 Mar 2013 12:47:33 -0500
Subject: [PATCH 072/220] add bootstrap tour as a submodule, some cleanup

---
 .gitmodules                     |   3 +
 public/vendor/bootstrap-tour    |   1 +
 public/vendor/bootstrap-tour.js | 271 --------------------------------
 src/app/browser.coffee          |  10 +-
 4 files changed, 7 insertions(+), 278 deletions(-)
 create mode 160000 public/vendor/bootstrap-tour
 delete mode 100644 public/vendor/bootstrap-tour.js

diff --git a/.gitmodules b/.gitmodules
index 5d6f25d3b3..d0d9ca48c5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "public/vendor/BrowserQuest"]
 	path = public/vendor/BrowserQuest
 	url = https://github.com/mozilla/BrowserQuest.git
+[submodule "public/vendor/bootstrap-tour"]
+	path = public/vendor/bootstrap-tour
+	url = git://github.com/sorich87/bootstrap-tour.git
diff --git a/public/vendor/bootstrap-tour b/public/vendor/bootstrap-tour
new file mode 160000
index 0000000000..4f94fa056c
--- /dev/null
+++ b/public/vendor/bootstrap-tour
@@ -0,0 +1 @@
+Subproject commit 4f94fa056c88c6099dea135b644d8f95d38ac9e1
diff --git a/public/vendor/bootstrap-tour.js b/public/vendor/bootstrap-tour.js
deleted file mode 100644
index 3ed1b2bbf9..0000000000
--- a/public/vendor/bootstrap-tour.js
+++ /dev/null
@@ -1,271 +0,0 @@
-
-/* ============================================================
- # bootstrap-tour.js v0.1
- # http://pushly.github.com/bootstrap-tour/
- # ==============================================================
- # Copyright 2012 Push.ly
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
- # You may obtain a copy of the License at
- #
- #     http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS IS" BASIS,
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
- */
-
-(function() {
-
-    (function($, window) {
-        var Tour, document;
-        document = window.document;
-        Tour = (function() {
-
-            function Tour(options) {
-                var _this = this;
-                this._options = $.extend({
-                    name: 'tour',
-                    labels: {
-                        end: 'End tour',
-                        next: 'Next &raquo;',
-                        prev: '&laquo; Prev'
-                    },
-                    keyboard: true,
-                    afterSetState: function(key, value) {},
-                    afterGetState: function(key, value) {},
-                    onShow: function(tour) {},
-                    onHide: function(tour) {},
-                    onShown: function(tour) {}
-                }, options);
-                this._steps = [];
-                this.setCurrentStep();
-                this._onresize(function() {
-                    if (!_this.ended) return _this.showStep(_this._current);
-                });
-            }
-
-            Tour.prototype.setState = function(key, value) {
-                $.cookie("" + this._options.name + "_" + key, value, {
-                    expires: 36500,
-                    path: '/'
-                });
-                return this._options.afterSetState(key, value);
-            };
-
-            Tour.prototype.getState = function(key) {
-                var value;
-                value = $.cookie("" + this._options.name + "_" + key);
-                this._options.afterGetState(key, value);
-                return value;
-            };
-
-            Tour.prototype.addStep = function(step) {
-                return this._steps.push(step);
-            };
-
-            Tour.prototype.getStep = function(i) {
-                if (this._steps[i] != null) {
-                    return $.extend({
-                        path: "",
-                        placement: "right",
-                        title: "",
-                        content: "",
-                        next: i === this._steps.length - 1 ? -1 : i + 1,
-                        prev: i - 1,
-                        animation: true,
-                        onShow: this._options.onShow,
-                        onHide: this._options.onHide,
-                        onShown: this._options.onShown
-                    }, this._steps[i]);
-                }
-            };
-
-            Tour.prototype.start = function(force) {
-                var _this = this;
-                if (force == null) force = false;
-                if (this.ended() && !force) return;
-                $(document).off("click.bootstrap-tour", ".popover .next").on("click.bootstrap-tour", ".popover .next", function(e) {
-                    e.preventDefault();
-                    return _this.next();
-                });
-                $(document).off("click.bootstrap-tour", ".popover .prev").on("click.bootstrap-tour", ".popover .prev", function(e) {
-                    e.preventDefault();
-                    return _this.prev();
-                });
-                $(document).off("click.bootstrap-tour", ".popover .end").on("click.bootstrap-tour", ".popover .end", function(e) {
-                    e.preventDefault();
-                    return _this.end();
-                });
-                this._setupKeyboardNavigation();
-                return this.showStep(this._current);
-            };
-
-            Tour.prototype.next = function() {
-                this.hideStep(this._current);
-                return this.showNextStep();
-            };
-
-            Tour.prototype.prev = function() {
-                this.hideStep(this._current);
-                return this.showPrevStep();
-            };
-
-            Tour.prototype.end = function() {
-                this.hideStep(this._current);
-                $(document).off(".bootstrap-tour");
-                return this.setState("end", "yes");
-            };
-
-            Tour.prototype.ended = function() {
-                return !!this.getState("end");
-            };
-
-            Tour.prototype.restart = function() {
-                this.setState("current_step", null);
-                this.setState("end", null);
-                this.setCurrentStep(0);
-                return this.start();
-            };
-
-            Tour.prototype.hideStep = function(i) {
-                var step;
-                step = this.getStep(i);
-                if (step.onHide != null) step.onHide(this);
-                return $(step.element).popover("hide");
-            };
-
-            Tour.prototype.showStep = function(i) {
-                var step;
-                step = this.getStep(i);
-                if (!step) return;
-                this.setCurrentStep(i);
-                if (step.path !== "" && document.location.pathname !== step.path && document.location.pathname.replace(/^.*[\\\/]/, '') !== step.path) {
-                    document.location.href = step.path;
-                    return;
-                }
-                if (step.onShow != null) step.onShow(this);
-                if (!((step.element != null) && $(step.element).length !== 0 && $(step.element).is(":visible"))) {
-                    this.showNextStep();
-                    return;
-                }
-                this._showPopover(step, i);
-                if (step.onShown != null) return step.onShown(this);
-            };
-
-            Tour.prototype.setCurrentStep = function(value) {
-                if (value != null) {
-                    this._current = value;
-                    return this.setState("current_step", value);
-                } else {
-                    this._current = this.getState("current_step");
-                    if (this._current === null || this._current === "null") {
-                        return this._current = 0;
-                    } else {
-                        return this._current = parseInt(this._current);
-                    }
-                }
-            };
-
-            Tour.prototype.showNextStep = function() {
-                var step;
-                step = this.getStep(this._current);
-                return this.showStep(step.next);
-            };
-
-            Tour.prototype.showPrevStep = function() {
-                var step;
-                step = this.getStep(this._current);
-                return this.showStep(step.prev);
-            };
-
-            Tour.prototype._showPopover = function(step, i) {
-                var content, nav, options, tip,
-                    _this = this;
-                content = "" + step.content + "<br /><p>";
-                options = $.extend({}, this._options);
-                if (step.options) $.extend(options, step.options);
-                if (step.reflex) {
-                    $(step.element).css("cursor", "pointer");
-                    $(step.element).on("click", function(e) {
-                        $(step.element).css("cursor", "auto");
-                        return _this.next();
-                    });
-                }
-                nav = [];
-                if (step.prev >= 0) {
-                    nav.push("<a href='#" + step.prev + "' class='prev'>" + options.labels.prev + "</a>");
-                }
-                if (step.next >= 0) {
-                    nav.push("<a href='#" + step.next + "' class='next'>" + options.labels.next + "</a>");
-                }
-                content += nav.join(" | ");
-                content += "<a href='#' class='pull-right end'>" + options.labels.end + "</a>";
-                $(step.element).popover({
-                    placement: step.placement,
-                    trigger: "manual",
-                    title: step.title,
-                    content: content,
-                    html: true,
-                    animation: step.animation
-                }).popover("show");
-                tip = $(step.element).data("popover").tip();
-                this._reposition(tip);
-                return this._scrollIntoView(tip);
-            };
-
-            Tour.prototype._reposition = function(tip) {
-                var offsetBottom, offsetRight, tipOffset;
-                tipOffset = tip.offset();
-                offsetBottom = $(document).outerHeight() - tipOffset.top - $(tip).outerHeight();
-                if (offsetBottom < 0) tipOffset.top = tipOffset.top + offsetBottom;
-                offsetRight = $(document).outerWidth() - tipOffset.left - $(tip).outerWidth();
-                if (offsetRight < 0) tipOffset.left = tipOffset.left + offsetRight;
-                if (tipOffset.top < 0) tipOffset.top = 0;
-                if (tipOffset.left < 0) tipOffset.left = 0;
-                return tip.offset(tipOffset);
-            };
-
-            Tour.prototype._scrollIntoView = function(tip) {
-                var tipRect;
-                tipRect = tip.get(0).getBoundingClientRect();
-                if (!(tipRect.top > 0 && tipRect.bottom < $(window).height() && tipRect.left > 0 && tipRect.right < $(window).width())) {
-                    return tip.get(0).scrollIntoView(true);
-                }
-            };
-
-            Tour.prototype._onresize = function(cb, timeout) {
-                return $(window).resize(function() {
-                    clearTimeout(timeout);
-                    return timeout = setTimeout(cb, 100);
-                });
-            };
-
-            Tour.prototype._setupKeyboardNavigation = function() {
-                var _this = this;
-                if (this._options.keyboard) {
-                    return $(document).on("keyup.bootstrap-tour", function(e) {
-                        if (!e.which) return;
-                        switch (e.which) {
-                            case 39:
-                                e.preventDefault();
-                                if (_this._current < _this._steps.length - 1) return _this.next();
-                                break;
-                            case 37:
-                                e.preventDefault();
-                                if (_this._current > 0) return _this.prev();
-                        }
-                    });
-                }
-            };
-
-            return Tour;
-
-        })();
-        return window.Tour = Tour;
-    })(jQuery, window);
-
-}).call(this);
\ No newline at end of file
diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index 7c5e47f59f..ef6ff8d9ec 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -39,7 +39,7 @@ loadJavaScripts = (model) ->
 
 
   require '../../public/vendor/jquery-cookie/jquery.cookie'
-  require '../../public/vendor/bootstrap-tour' #https://raw.github.com/pushly/bootstrap-tour/master/bootstrap-tour.js
+  require '../../public/vendor/bootstrap-tour/bootstrap-tour'
   require '../../public/vendor/bootstrap-datepicker/js/bootstrap-datepicker'
   require '../../public/vendor/bootstrap-growl/jquery.bootstrap-growl.min'
 
@@ -133,12 +133,8 @@ setupTour = (model) ->
   $('.main-avatar').popover('destroy') #remove previous popovers
   tour = new Tour()
   _.each tourSteps, (step) ->
-    tour.addStep
-      html: true
-      element: step.element
-      title: step.title
-      content: step.content
-      placement: step.placement
+    tour.addStep _.defaults step, {html:true}
+  tour._current = 0 if isNaN(tour._current) #bootstrap-tour bug
   tour.start()
 
 ###

From 721803d4dec07bde34a58a99f695ba08f53f9f14 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 4 Mar 2013 12:48:10 -0500
Subject: [PATCH 073/220] don't use bootstrap tour until #578 fixed

---
 src/app/browser.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index ef6ff8d9ec..e4201a3d3e 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -207,7 +207,7 @@ module.exports.app = (appExports, model, app) ->
     setupSortable(model)
     setupTooltips(model)
     setupGrowlNotifications(model) unless model.get('_view.mobileDevice')
-    setupTour(model)
+    #setupTour(model)
     $('.datepicker').datepicker({autoclose:true, todayBtn:true})
       .on 'changeDate', (ev) ->
             #for some reason selecting a date doesn't fire a change event on the field, meaning our changes aren't saved

From bb5fe4520f0904548440c4c653d272e96077784e Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 4 Mar 2013 12:50:49 -0500
Subject: [PATCH 074/220] only setup bootstrap growl notifications once. i
 still don't get this. this issue is caused after browser.resetDom(), which
 happens on (1) cron, (2) reset, (3) reroll. after which for some people this
 commit will cause notifications to disappear altogether, while for others
 reverting this commit will cause notifications to double.

---
 src/app/browser.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index e4201a3d3e..ff3a4b71cc 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -201,12 +201,12 @@ module.exports.resetDom = (model) ->
 
 module.exports.app = (appExports, model, app) ->
   loadJavaScripts(model)
+  setupGrowlNotifications(model) unless model.get('_view.mobileDevice')
 
   app.on 'render', (ctx) ->
     #restoreRefs(model)
     setupSortable(model)
     setupTooltips(model)
-    setupGrowlNotifications(model) unless model.get('_view.mobileDevice')
     #setupTour(model)
     $('.datepicker').datepicker({autoclose:true, todayBtn:true})
       .on 'changeDate', (ev) ->

From 8c1c5bba1399d825236f1bf011d1a2e7db94aad3 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 4 Mar 2013 15:20:53 -0500
Subject: [PATCH 075/220] possible fix for #562 - reflists sometimes contain a
 null value

---
 src/app/character.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/character.coffee b/src/app/character.coffee
index 5e98588f94..ef2f36fadd 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -175,7 +175,7 @@ module.exports.updateUser = (model) ->
     union = _.union obj[type + 'Ids'], taskIds
 
     # 2. remove empty (grey) tasks
-    preened = _.filter(union, (val) -> _.contains(taskIds, val))
+    preened = _.filter union, (val) -> _.contains(taskIds, val) and val?
 
     # There were indeed issues found, set the new list
     batch.set("#{type}Ids", preened) # if _.difference(preened, userObj[path]).length != 0

From 87692e90b541cbc2203032ddac408d0471005aba Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 4 Mar 2013 16:10:36 -0500
Subject: [PATCH 076/220] too many emails!

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 28ca6ebcce..cb809a92e5 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,6 @@
 ##Contact
 ###[Bugs](https://github.com/lefnire/habitrpg/issues)
 ###[New Features](https://trello.com/board/habitrpg/50e5d3684fe3a7266b0036d6)
-###[Email](mailto:tylerrenelle@gmail.com)
 
 ##License
 Code is licensed under GNU GPL v3. Content is licensed under CC-BY-SA 3.0.

From 7c10aafb1cdff856455871a1e8055ef2955c458e Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Mon, 4 Mar 2013 22:00:12 +0000
Subject: [PATCH 077/220] Fixes galore

---
 src/app/algos.coffee   |  6 +-----
 src/app/scoring.coffee | 20 +++++++++++---------
 src/app/tasks.coffee   |  6 +++---
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/app/algos.coffee b/src/app/algos.coffee
index 563ae7e5b0..d9cbf56d8c 100644
--- a/src/app/algos.coffee
+++ b/src/app/algos.coffee
@@ -56,9 +56,5 @@ module.exports.taskDeltaFormula = (currentValue, direction) ->
 		delta = Math.max(Math.pow(0.95,currentValue),0.25)
 	else
 		delta = -Math.min(Math.pow(0.95,currentValue),5)
-	#sign = if (direction is 'up') then 1 else -1
-	#delta = Math.pow(0.95,currentValue) * sign
-	#if delta < -5 then delta = -5
-	#console.log("CurrentValue: " + currentValue + " delta: " + delta)
-	#delta = if (currentValue < 0) then (( -0.1 * currentValue + 1 ) * sign) else (( Math.pow(0.9,currentValue) ) * sign)
+	console.log("CV = " + currentValue + " Dir = " + direction + " delta = " + delta)
 	return delta
\ No newline at end of file
diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index e82f77e466..ce76393839 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -46,7 +46,7 @@ score = (model, taskId, direction, times, batch, cron) ->
       # (aka, the total delta). This weirdness won't be necessary when calculating mathematically
       # rather than iteratively
       nextDelta = algos.taskDeltaFormula(value, direction)
-      value += nextDelta if adjustvalue
+      value = Math.max(value + nextDelta, -31) if adjustvalue #cap values so we don't get silly values
       delta += nextDelta
 
   addPoints = ->
@@ -66,10 +66,7 @@ score = (model, taskId, direction, times, batch, cron) ->
 
   switch type
     when 'habit'
-      # Don't adjust values for habits that don't have both + and -
-      #adjustvalue = if (taskObj.up==false or taskObj.down==false) then false else true
-      adjustvalue = true;
-      calculateDelta(adjustvalue)
+      calculateDelta()
       # Add habit value to habit-history (if different)
       if (delta > 0) then addPoints() else subtractPoints()
       taskObj.history ?= []
@@ -79,7 +76,6 @@ score = (model, taskId, direction, times, batch, cron) ->
         batch.set "#{taskPath}.history", taskObj.history
 
     when 'daily'
-      #calculateDelta()
       if cron? # cron
         calculateDelta()
         subtractPoints()
@@ -92,7 +88,7 @@ score = (model, taskId, direction, times, batch, cron) ->
         calculateDelta()
         #don't touch stats on cron
       else
-        calculateDelta(false)
+        calculateDelta()
         addPoints() # obviously for delta>0, but also a trick to undo accidental checkboxes
 
     when 'reward'
@@ -207,8 +203,11 @@ cron = (model) ->
               if repeat[helpers.dayMapping[thatDay.day()]]==true
                 daysFailed++
           score model, id, 'down', daysFailed, batch, true
-
         if type == 'daily'
+          if completed #set OHV for completed dailies
+            newValue = taskObj.value + algos.taskDeltaFormula(taskObj.value,'up')
+            batch.set "tasks.#{taskObj.id}.value", newValue
+
           taskObj.history ?= []
           taskObj.history.push { date: +new Date, value: value }
           batch.set "tasks.#{taskObj.id}.history", taskObj.history
@@ -219,7 +218,10 @@ cron = (model) ->
           todoTally += absVal
       else if type is 'habit' #reset 'onlies' value to 0
         if taskObj.up==false or taskObj.down==false
-          batch.set "tasks.#{taskObj.id}.value", 0
+          if Math.abs(taskObj.value) < 0.02
+            batch.set "tasks.#{taskObj.id}.value", 0
+          else
+            batch.set "tasks.#{taskObj.id}.value", taskObj.value / 2
 
     # Finished tallying
     obj.history ?= {}; obj.history.todos ?= []; obj.history.exp ?= []
diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index 94d142ad03..d9d904d8ac 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -15,9 +15,9 @@ module.exports.view = (view) ->
       classes += " uncompleted"
 
     switch
-      when value<-8 then classes += ' color-worst'
-      when value>=-8 and value<-5 then classes += ' color-worse'
-      when value>=-5 and value<-1 then classes += ' color-bad'
+      when value<-20 then classes += ' color-worst'
+      when value>=-20 and value<-10 then classes += ' color-worse'
+      when value>=-10 and value<-1 then classes += ' color-bad'
       when value>=-1 and value<1 then classes += ' color-neutral'
       when value>=1 and value<5 then classes += ' color-good'
       when value>=5 and value<10 then classes += ' color-better'

From 78ba0f52147080ba0260fb1f87462e5ee3400250 Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Mon, 4 Mar 2013 22:04:02 +0000
Subject: [PATCH 078/220] comment logging

---
 src/app/algos.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/algos.coffee b/src/app/algos.coffee
index d9cbf56d8c..bb51ea1741 100644
--- a/src/app/algos.coffee
+++ b/src/app/algos.coffee
@@ -56,5 +56,5 @@ module.exports.taskDeltaFormula = (currentValue, direction) ->
 		delta = Math.max(Math.pow(0.95,currentValue),0.25)
 	else
 		delta = -Math.min(Math.pow(0.95,currentValue),5)
-	console.log("CV = " + currentValue + " Dir = " + direction + " delta = " + delta)
+	#console.log("CV = " + currentValue + " Dir = " + direction + " delta = " + delta)
 	return delta
\ No newline at end of file

From 41fc027150c1cfa9d8bc4dce9fd918f966a720bd Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Mon, 4 Mar 2013 17:31:33 -0500
Subject: [PATCH 079/220] add npm-debug.log to gitignore because DANG

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 029b274b27..01f730f678 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ node_modules
 *.swp
 .idea*
 config.json
+npm-debug.log
\ No newline at end of file

From 01971fba1e1187acbed11ee17f3dbc084ba2c4cb Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Mon, 4 Mar 2013 19:11:37 -0500
Subject: [PATCH 080/220] improve vertical centering of task checkbox and text

---
 styles/app/tasks.styl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index 70d54c189d..adf7efd112 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -76,7 +76,11 @@ li:hover .task-meta-controls .hover-show
 
   .task-controls,.task-text
     display:inline
-    margin-right:10px
+    margin: 0 10px 0 0
+    vertical-align: -4%
+
+    input
+      margin-top: 0
 
   .task-meta-controls .hover-show
     display: none;

From b7d46b1e20a8a4611f33879880ca5148f62b4fc9 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Mon, 4 Mar 2013 19:42:48 -0500
Subject: [PATCH 081/220] start new task column css, add classes

---
 styles/app/tasks.styl | 10 +++++-
 views/app/tasks.html  | 75 +++++++++++++++++++++++--------------------
 2 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index adf7efd112..2fbdfacb0b 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -89,4 +89,12 @@ li:hover .task-meta-controls .hover-show
     text-decoration:none;
 
 .new-task-form
-  margin-bottom:5px;
\ No newline at end of file
+  margin-bottom:5px;
+
+
+// begin rewrite css 2013-03-04
+
+.addtask-form
+  margin-bottom: 0.75em
+  .addtask-btn
+    float: right
\ No newline at end of file
diff --git a/views/app/tasks.html b/views/app/tasks.html
index ccdd9bf407..ae4defe0bf 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -123,49 +123,54 @@
     </div>
 
 <newTask:>
-    <form class="form-inline new-task-form" id="new-{@type}" data-task-type="{@type}" x-bind="submit:addTask">
-        <input value="{@inputValue}" type="text" name="new-task" placeholder="{@placeHolder}"/>
-        <input class="btn" type="submit" value="Add" />
+    <form class="addtask-form form-inline new-task-form" id="new-{@type}" data-task-type="{@type}" x-bind="submit:addTask">
+        <input class="addtask-field" value="{@inputValue}" type="text" name="new-task" placeholder="{@placeHolder}"/>
+        <input class="btn addtask-btn" type="submit" value="Add">
     </form>
 
+    <!-- all the parts of a single task -->
     <task:>
         <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
-    <pre>
-    <div class="task-meta-controls">
+            <pre>
+                <!-- right-hand side control buttons -->
+                <div class="task-meta-controls">
+                    <div class="hover-show">
+                        <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
+                        <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
+                        {#if :task.history}
+                        <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
+                            <i class="icon-signal"></i>
+                        </a>
+                        {/}
+                    </div>
 
-        <div class="hover-show">
-            <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
-            <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
-            {#if :task.history}
-            <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
-                <i class="icon-signal"></i>
-            </a>
-            {/}
-        </div>
+                    {#if :task.notes}
+                    <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
+                    {/}
+                </div>
 
-        {#if :task.notes}
-        <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
-        {/}
-    </div>
+                <!-- left-hand side checkbox -->
+                <div class="task-controls">
+                    <!-- Habits -->
+                    {#if equal(:task.type, 'habit')}
+                    {#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
+                    {#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
+                    <!-- Rewards -->
+                    {else if equal(:task.type, 'reward')}
+                    <a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
+                    <!-- Daily & Todos -->
+                    {else}
+                    <input type=checkbox checked="{:task.completed}">
+                    {/}
+                </div>
 
-    <div class="task-controls">
-        <!-- Habits -->
-        {#if equal(:task.type, 'habit')}
-        {#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
-        {#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
-        <!-- Rewards -->
-        {else if equal(:task.type, 'reward')}
-        <a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
-        <!-- Daily & Todos -->
-        {else}
-        <input type=checkbox checked="{:task.completed}"/>
-        {/}
-    </div>
-    <div class="task-text">{:task.text}</div>
+                <!-- main content -->
+                <div class="task-text">{:task.text}</div>
 
-    <app:taskMeta />
-    </pre>
-    </li>
+                <!-- edit/options dialog -->
+                <app:taskMeta />
+            </pre>
+        </li>
 
 <taskMeta:>
     <div style="display:none;" id={{:task.id}}-edit>

From ba1a8dabc854b286575ef11bb7acbf9ff07badb1 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Mon, 4 Mar 2013 20:36:11 -0500
Subject: [PATCH 082/220] add in Lato as main font, lots of minor layout
 tweaks. Continue refactoring tasks html

---
 styles/app/tasks.styl | 46 +++++++++++++++++++-------
 views/app/index.html  |  2 ++
 views/app/tasks.html  | 76 +++++++++++++++++++++----------------------
 3 files changed, 74 insertions(+), 50 deletions(-)

diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index 2fbdfacb0b..8c0b370fa0 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -1,21 +1,21 @@
-.color-worst pre
+.color-worst
   background-color: rgb(230, 184, 175)
-.color-worse pre
+.color-worse
   background-color: rgb(244, 204, 204)
-.color-bad pre
+.color-bad
   background-color: rgb(252, 229, 205)
-.color-neutral pre
+.color-neutral
   background-color: rgb(255, 242, 204)
-.color-good pre
+.color-good
   background-color: rgb(217, 234, 211)
-.color-better pre
+.color-better
   background-color: rgb(208, 224, 227)
-.color-best pre
+.color-best
   background-color: rgb(201, 218, 248)
-.completed pre
+.completed
   background-color: rgb(217, 217, 217)
   color: rgb(153, 153, 153)
-.reward pre
+.reward
   background-color: white
 
 label.checkbox.inline{
@@ -77,7 +77,6 @@ li:hover .task-meta-controls .hover-show
   .task-controls,.task-text
     display:inline
     margin: 0 10px 0 0
-    vertical-align: -4%
 
     input
       margin-top: 0
@@ -94,7 +93,32 @@ li:hover .task-meta-controls .hover-show
 
 // begin rewrite css 2013-03-04
 
+.task-column
+  padding: 1.5em
+  background: #f5f5f5
+  border: 1px solid #bbb
+  border-radius: 0.25em
+  font-family: 'Lato', sans-serif
+  h2
+    margin: 0 0 0.5em
+    padding: 0
+
+.task
+  clear: both
+  padding: 0.5em
+  margin-bottom: 0.75em
+  border: 1px solid rgba(0, 0, 0, 0.2)
+  border-radius: 0.25em
+  &:last-child
+    margin-bottom: 0
+
 .addtask-form
   margin-bottom: 0.75em
+  .addtask-field
+    max-width: 70%
   .addtask-btn
-    float: right
\ No newline at end of file
+    float: right
+    font-family: 'Lato', sans-serif
+
+.todo-status-toggler
+  margin-top: 0.75em
\ No newline at end of file
diff --git a/views/app/index.html b/views/app/index.html
index 9d66e2fd2b..69ce9f1db5 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -14,6 +14,8 @@
 <Head:>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="apple-mobile-web-app-capable" content="yes">
+  <!-- webfonts -->
+  <link href='http://fonts.googleapis.com/css?family=Lato:400,700,400italic' rel='stylesheet' type='text/css'>
 
 <Header:>
   <app:modals:modals />
diff --git a/views/app/tasks.html b/views/app/tasks.html
index ae4defe0bf..f0ff20c787 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -1,18 +1,18 @@
 <taskLists:>
     <!--helpTitle & helpContent moved to tour -->
-    <div class="span3 well habits">
+    <div class="task-column span3 habits">
         <h2>Habits</h2>
         <app:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
         <ul class="habits">{#each _habitList as :task}<app:task />{/}</ul>
     </div>
 
-    <div class="span3 well dailys">
+    <div class="task-column span3 dailys">
         <h2>Daily</h2>
         <app:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
         <ul class='dailys'>{#each _dailyList as :task}<app:task />{/}</ul>
     </div>
 
-    <div class="span3 well todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
+    <div class="task-column span3 todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
         <h2>Todos</h2>
         <div class="display-context-dependant show-for-uncompleted">
             <app:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
@@ -32,14 +32,14 @@
                 <!--&nbsp;<a target="_blank" href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}"><img src='/img/calendar_google.png' title="Google Calendar" alt="Google Calendar" rel=tooltip /></a>-->
             </span>
         <div id="todos-chart" style="display:none;"></div>
-        <ul class="nav nav-tabs">
+        <ul class="todo-status-toggler nav nav-tabs">
             <li class="active"><a x-bind=click:changeContext data-target="#todo-well" data-context="context-uncompleted">Remaining</a></li>
             <li><a x-bind=click:changeContext data-target="#todo-well" data-context="context-completed">Complete</a></li>
         </ul>
 
     </div>
 
-    <div class="span3 well rewards">
+    <div class="task-column span3 rewards">
 
         <!--Title -->
         <div class="row-fluid">
@@ -131,45 +131,43 @@
     <!-- all the parts of a single task -->
     <task:>
         <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
-            <pre>
-                <!-- right-hand side control buttons -->
-                <div class="task-meta-controls">
-                    <div class="hover-show">
-                        <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
-                        <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
-                        {#if :task.history}
-                        <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
-                            <i class="icon-signal"></i>
-                        </a>
-                        {/}
-                    </div>
-
-                    {#if :task.notes}
-                    <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
+            <!-- right-hand side control buttons -->
+            <div class="task-meta-controls">
+                <div class="hover-show">
+                    <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
+                    <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
+                    {#if :task.history}
+                    <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
+                        <i class="icon-signal"></i>
+                    </a>
                     {/}
                 </div>
 
-                <!-- left-hand side checkbox -->
-                <div class="task-controls">
-                    <!-- Habits -->
-                    {#if equal(:task.type, 'habit')}
-                    {#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
-                    {#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
-                    <!-- Rewards -->
-                    {else if equal(:task.type, 'reward')}
-                    <a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
-                    <!-- Daily & Todos -->
-                    {else}
-                    <input type=checkbox checked="{:task.completed}">
-                    {/}
-                </div>
+                {#if :task.notes}
+                <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
+                {/}
+            </div>
 
-                <!-- main content -->
-                <div class="task-text">{:task.text}</div>
+            <!-- left-hand side checkbox -->
+            <div class="task-controls">
+                <!-- Habits -->
+                {#if equal(:task.type, 'habit')}
+                {#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
+                {#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
+                <!-- Rewards -->
+                {else if equal(:task.type, 'reward')}
+                <a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
+                <!-- Daily & Todos -->
+                {else}
+                <input type=checkbox checked="{:task.completed}">
+                {/}
+            </div>
 
-                <!-- edit/options dialog -->
-                <app:taskMeta />
-            </pre>
+            <!-- main content -->
+            <div class="task-text">{:task.text}</div>
+
+            <!-- edit/options dialog -->
+            <app:taskMeta />
         </li>
 
 <taskMeta:>

From d616579e4eba361519dcfd238f262be176d2642e Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Tue, 5 Mar 2013 09:51:42 +0000
Subject: [PATCH 083/220] cap deltas

---
 src/app/algos.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/algos.coffee b/src/app/algos.coffee
index bb51ea1741..3a72add2cb 100644
--- a/src/app/algos.coffee
+++ b/src/app/algos.coffee
@@ -57,4 +57,5 @@ module.exports.taskDeltaFormula = (currentValue, direction) ->
 	else
 		delta = -Math.min(Math.pow(0.95,currentValue),5)
 	#console.log("CV = " + currentValue + " Dir = " + direction + " delta = " + delta)
+	delta = 20 if delta > 20
 	return delta
\ No newline at end of file

From ce09d72708529935b362e41652e127a80333cd0b Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Tue, 5 Mar 2013 09:51:42 +0000
Subject: [PATCH 084/220] cap deltas

---
 src/app/algos.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/algos.coffee b/src/app/algos.coffee
index bb51ea1741..3a72add2cb 100644
--- a/src/app/algos.coffee
+++ b/src/app/algos.coffee
@@ -57,4 +57,5 @@ module.exports.taskDeltaFormula = (currentValue, direction) ->
 	else
 		delta = -Math.min(Math.pow(0.95,currentValue),5)
 	#console.log("CV = " + currentValue + " Dir = " + direction + " delta = " + delta)
+	delta = 20 if delta > 20
 	return delta
\ No newline at end of file

From 8e7c93aa0be63fe323a3ebe4e02ccb31e52e9c93 Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Tue, 5 Mar 2013 13:11:13 +0000
Subject: [PATCH 085/220] iterative levelling

---
 src/app/scoring.coffee | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index ce76393839..2ba065944d 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -142,9 +142,14 @@ updateStats = (model, newStats, batch) ->
     silent = false
     if newStats.exp >= tnl
       silent = true
-      user.set('stats.exp', newStats.exp)
-      newStats.exp -= tnl
-      obj.stats.lvl++
+      #user.set('stats.exp', newStats.exp)
+      while newStats.exp >= tnl
+        console.log(newStats.exp + " " + tnl)
+        newStats.exp -= tnl
+        obj.stats.lvl++
+        tnl = obj.stats.lvl * 2
+        #tnl = algos.tnl(obj.stats.lvl)
+        console.log(tnl)
       obj.stats.hp = 50
 
     obj.stats.exp = newStats.exp

From 7e402c568803fa077c4e2bd028fe7bf0ebdbf7ee Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Tue, 5 Mar 2013 13:17:46 +0000
Subject: [PATCH 086/220] iterative levelling

---
 src/app/scoring.coffee | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index 2ba065944d..a63a31a467 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -142,14 +142,11 @@ updateStats = (model, newStats, batch) ->
     silent = false
     if newStats.exp >= tnl
       silent = true
-      #user.set('stats.exp', newStats.exp)
-      while newStats.exp >= tnl
-        console.log(newStats.exp + " " + tnl)
+      user.set('stats.exp', newStats.exp)
+      while newStats.exp >= tnl # keep levelling up
         newStats.exp -= tnl
         obj.stats.lvl++
-        tnl = obj.stats.lvl * 2
-        #tnl = algos.tnl(obj.stats.lvl)
-        console.log(tnl)
+        tnl = algos.tnl(obj.stats.lvl)
       obj.stats.hp = 50
 
     obj.stats.exp = newStats.exp

From 2d2e7bbf5406b5ce6373b5b5e1f50264e6f5aa3a Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Tue, 5 Mar 2013 09:13:14 -0500
Subject: [PATCH 087/220] reposition Todo options, use proper icon

---
 views/app/tasks.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/views/app/tasks.html b/views/app/tasks.html
index f0ff20c787..9b983cbd5f 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -13,6 +13,13 @@
     </div>
 
     <div class="task-column span3 todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
+        <span class='pull-right'>
+            {#if _user.history.todos}
+              <a x-bind=click:toggleChart data-toggle-id="todos-chart" data-history-path="_user.history.todos" rel=tooltip title="Progress"><i class=icon-signal></i></a>
+            {/}
+            &nbsp;<a href="/v1/users/{{_user.id}}/calendar.ics?apiToken={{_user.apiToken}}" rel=tooltip title="iCal"><i class=icon-calendar></i></a>
+            <!--&nbsp;<a target="_blank" href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}"><img src='/img/calendar_google.png' title="Google Calendar" alt="Google Calendar" rel=tooltip /></a>-->
+        </span>
         <h2>Todos</h2>
         <div class="display-context-dependant show-for-uncompleted">
             <app:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
@@ -24,13 +31,6 @@
             <a class='btn' x-bind=click:clearCompleted>Clear Completed</a>
             <p>&nbsp;</p>
         </div>
-            <span class='pull-right'>
-                {#if _user.history.todos}
-                  <a x-bind=click:toggleChart data-toggle-id="todos-chart" data-history-path="_user.history.todos" rel=tooltip title="Progress"><i class=icon-signal></i></a>
-                {/}
-                &nbsp;<a href="/v1/users/{{_user.id}}/calendar.ics?apiToken={{_user.apiToken}}"><img src='/img/calendar_ical.png' title="iCal" alt="iCal" rel=tooltip /></a>
-                <!--&nbsp;<a target="_blank" href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}"><img src='/img/calendar_google.png' title="Google Calendar" alt="Google Calendar" rel=tooltip /></a>-->
-            </span>
         <div id="todos-chart" style="display:none;"></div>
         <ul class="todo-status-toggler nav nav-tabs">
             <li class="active"><a x-bind=click:changeContext data-target="#todo-well" data-context="context-uncompleted">Remaining</a></li>

From 9d312ce184efec55c6d2736efddebc28e81c67db Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Tue, 5 Mar 2013 09:18:21 -0500
Subject: [PATCH 088/220] clean up nbsp, replace old gcal markup with new
 markup, still commented out

---
 views/app/tasks.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/app/tasks.html b/views/app/tasks.html
index 9b983cbd5f..f28d83c3e1 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -17,8 +17,8 @@
             {#if _user.history.todos}
               <a x-bind=click:toggleChart data-toggle-id="todos-chart" data-history-path="_user.history.todos" rel=tooltip title="Progress"><i class=icon-signal></i></a>
             {/}
-            &nbsp;<a href="/v1/users/{{_user.id}}/calendar.ics?apiToken={{_user.apiToken}}" rel=tooltip title="iCal"><i class=icon-calendar></i></a>
-            <!--&nbsp;<a target="_blank" href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}"><img src='/img/calendar_google.png' title="Google Calendar" alt="Google Calendar" rel=tooltip /></a>-->
+            <a href="/v1/users/{{_user.id}}/calendar.ics?apiToken={{_user.apiToken}}" rel=tooltip title="iCal"><i class=icon-calendar></i></a>
+            <!-- <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> -->
         </span>
         <h2>Todos</h2>
         <div class="display-context-dependant show-for-uncompleted">

From 2cf267ccf533f2453545254150740acd856dee59 Mon Sep 17 00:00:00 2001
From: aaron4 <aaron.herman4@gmail.com>
Date: Tue, 5 Mar 2013 10:26:08 -0600
Subject: [PATCH 089/220] added space after each line of text

With previous privacy.html, there was not a space after each line of text (if line of text following). This caused words to be combined together.
Fixed issue by adding a space after each line of text.
---
 views/privacy.html | 369 ++++++++++++++++++++++-----------------------
 1 file changed, 184 insertions(+), 185 deletions(-)

diff --git a/views/privacy.html b/views/privacy.html
index 5251ff01dd..9d6faeec80 100644
--- a/views/privacy.html
+++ b/views/privacy.html
@@ -13,308 +13,307 @@
     <p>
       <strong>PLEASE READ THIS PRIVACY POLICY CAREFULLY.</strong>
       <br>
-      By accessing
-      or otherwise using habitrpg.com or any sub domains thereto ("the Sites"),
-      or using a habitrpg.com or HabitRPG application on a mobile device ("the Applications"),
-      you agree to be bound contractually by this Privacy Policy. Individually
-      or collectively, the Applications and the Sites may be referred to as
+      By accessing or otherwise using habitrpg.com or any sub domains thereto ("the Sites"), 
+      or using a habitrpg.com or HabitRPG application on a mobile device ("the Applications"), 
+      you agree to be bound contractually by this Privacy Policy. Individually 
+      or collectively, the Applications and the Sites may be referred to as 
       the "Services."
     </p>
     <p>
-      To review material modifications and their effective dates scroll
+      To review material modifications and their effective dates scroll 
       to the bottom of the page.
     </p>
     <p>
-      <strong> 1. Privacy Statement; Collection of Personal
+      <strong> 1. Privacy Statement; Collection of Personal 
       Information. </strong>
       <br>
-      1.1 OCDevel owns and operates this business. All
+      1.1 OCDevel owns and operates this business. All 
       references to "we", "us", shall be construed to mean OCDevel.
     </p>
     <p>
-      1.2 We understand that visitors to this website are concerned
-      about the privacy of information. The following describes our privacy
-      policy regarding information, including personal information, that we
+      1.2 We understand that visitors to this website are concerned 
+      about the privacy of information. The following describes our privacy 
+      policy regarding information, including personal information, that we 
       collect through this website.
     </p>
     <p>
       <strong>2. Modification of Privacy Policy.</strong>
       <br>
-      We reserve the right to modify this Privacy Policy at any time,
-      and without prior notice, by posting an amended Privacy Policy that is
-      always accessible by clicking on the "Privacy Policy" link on this
-      site's home page. Your continued use of this site indicates your
-      acceptance of the amended Privacy Policy. You should check the Privacy
-      Policy through this link periodically for modifications by clicking on
-      the link provided near the top of the Privacy Policy for a listing of
-      material modifications and their effective dates. Regarding personal
-      information, if any modifications are materially less restrictive on our
-      use or disclosure of the personal information previously disclosed by
-      you, we will obtain your consent before implementing such revisions with
+      We reserve the right to modify this Privacy Policy at any time, 
+      and without prior notice, by posting an amended Privacy Policy that is 
+      always accessible by clicking on the "Privacy Policy" link on this 
+      site's home page. Your continued use of this site indicates your 
+      acceptance of the amended Privacy Policy. You should check the Privacy 
+      Policy through this link periodically for modifications by clicking on 
+      the link provided near the top of the Privacy Policy for a listing of 
+      material modifications and their effective dates. Regarding personal 
+      information, if any modifications are materially less restrictive on our 
+      use or disclosure of the personal information previously disclosed by 
+      you, we will obtain your consent before implementing such revisions with 
       respect to such information.
     </p>
     <p>
       <strong>3. Collection of Anonymous, Passive Information.</strong>
       <br>
-      We reserve the right to monitor your use of the services. As you
-      navigate through the services, certain anonymous information may be
-      passively collected (that is, gathered without your actively providing
-      the information) using various technologies, such as cookies, Internet
-      tags or web beacons, and navigational data collection (log files, server
-      logs, clickstream). The following is a listing and a brief explanation
-      of passive information collection methodologies which we may use from
+      We reserve the right to monitor your use of the services. As you 
+      navigate through the services, certain anonymous information may be 
+      passively collected (that is, gathered without your actively providing 
+      the information) using various technologies, such as cookies, Internet 
+      tags or web beacons, and navigational data collection (log files, server 
+      logs, clickstream). The following is a listing and a brief explanation 
+      of passive information collection methodologies which we may use from 
       time to time to better understand how the Services are being used.
     </p>
     <p>
-      3.1 A "cookie" is a text file that this site sends to your
-      browser in the form of a text file The information generated by the
-      cookie about your use of this site (including your IP address) will be
-      transmitted to and stored. Most browsers automatically accept cookies,
-      but they usually can be modified to decline cookies if you prefer;
-      however, certain features of this site might not work without cookies.
+      3.1 A "cookie" is a text file that this site sends to your 
+      browser in the form of a text file The information generated by the 
+      cookie about your use of this site (including your IP address) will be 
+      transmitted to and stored. Most browsers automatically accept cookies, 
+      but they usually can be modified to decline cookies if you prefer; 
+      however, certain features of this site might not work without cookies. 
     </p>
     <p>
-      3.2 "Session" cookies are temporary bits of information that are
-      used to improve navigation, block visitors from providing information
-      where inappropriate (the Services "remembers" previous entries of age or
-      country of origin that were outside the specified parameters and blocks
-      subsequent changes), and collect aggregate statistical information on
-      the Services. They are erased once you exit your Web browser or
+      3.2 "Session" cookies are temporary bits of information that are 
+      used to improve navigation, block visitors from providing information 
+      where inappropriate (the Services "remembers" previous entries of age or 
+      country of origin that were outside the specified parameters and blocks 
+      subsequent changes), and collect aggregate statistical information on 
+      the Services. They are erased once you exit your Web browser or 
       otherwise turn off your computer.
     </p>
     <p>
-      3.3 "Persistent" cookies are more permanent bits of information
-      that are placed on the hard drive of your computer and stay there unless
-      you delete the cookie. Persistent cookies store information on your
-      computer for a number of purposes, such as retrieving certain
-      information you have previously provided, helping to determine what
-      areas of the Services you may find most valuable, and customizing the
-      Services based on your preferences on an ongoing basis. Persistent
-      cookies placed by this site in your computer do not hold personal
+      3.3 "Persistent" cookies are more permanent bits of information 
+      that are placed on the hard drive of your computer and stay there unless 
+      you delete the cookie. Persistent cookies store information on your 
+      computer for a number of purposes, such as retrieving certain 
+      information you have previously provided, helping to determine what 
+      areas of the Services you may find most valuable, and customizing the 
+      Services based on your preferences on an ongoing basis. Persistent 
+      cookies placed by this site in your computer do not hold personal 
       information.
     </p>
     <p>
-      3.4 You can set your browser to accept all cookies, to reject all
-      cookies, or to notify you whenever a cookie is offered so that you can
-      decide each time whether to accept it. To learn more about cookies and
-      how to specify your preferences, please search for "cookie" in the
+      3.4 You can set your browser to accept all cookies, to reject all 
+      cookies, or to notify you whenever a cookie is offered so that you can 
+      decide each time whether to accept it. To learn more about cookies and 
+      how to specify your preferences, please search for "cookie" in the 
       "Help" portion of your browser.
     </p>
     <p>
-      3.5 An Internet Protocol (IP) address is a number assigned to
-      your computer by your Internet service provider so you can access the
-      Internet and is generally considered to be non-personally identifiable
-      information, because in most cases an IP address is dynamic (changing
-      each time you connect to the Internet), rather than static (unique to a
-      particular user's computer). The IP address can be used to diagnose
-      problems with a server, report aggregate information, determine the
-      fastest route for your computer to use in connecting to a site, and
+      3.5 An Internet Protocol (IP) address is a number assigned to 
+      your computer by your Internet service provider so you can access the 
+      Internet and is generally considered to be non-personally identifiable 
+      information, because in most cases an IP address is dynamic (changing 
+      each time you connect to the Internet), rather than static (unique to a 
+      particular user's computer). The IP address can be used to diagnose 
+      problems with a server, report aggregate information, determine the 
+      fastest route for your computer to use in connecting to a site, and 
       administer and improve the Services.
     </p>
     <p>
-      3.6 "Internet tags" (also known as Web Beacons, single-pixel
-      GIFs, clear GIFs, invisible GIFs, and 1-by-1 GIFs) are smaller than
-      cookies and tell the Web site server information such as the IP address
-      and browser type related to the visitor's computer. Tags may be placed
-      both on online advertisements that bring people to the Services and on
-      different pages of the Services. Such tags indicate how many times a
+      3.6 "Internet tags" (also known as Web Beacons, single-pixel 
+      GIFs, clear GIFs, invisible GIFs, and 1-by-1 GIFs) are smaller than 
+      cookies and tell the Web site server information such as the IP address 
+      and browser type related to the visitor's computer. Tags may be placed 
+      both on online advertisements that bring people to the Services and on 
+      different pages of the Services. Such tags indicate how many times a 
       page is opened and which information is consulted.
     </p>
     <p>
-      3.7 "Navigational data" (log files, server logs, and clickstream
-      data) are used for system management, to improve the content of the
-      Services, market research purposes, and to communicate information to
+      3.7 "Navigational data" (log files, server logs, and clickstream 
+      data) are used for system management, to improve the content of the 
+      Services, market research purposes, and to communicate information to 
       visitors.
     </p>
     <p>
       <strong>4. Use and Sharing of Anonymous, Passive Information.</strong>
       <br>
-      The Services may make full use of passively collected anonymous
-      information, including without limitation the right to use such
-      information to provide better service to Service users, customize the
-      Services based on your preferences, compile and analyze statistics and
-      trends, and otherwise administer and improve the Services for your use. We
-      reserve the right to share this anonymous, passive information in
+      The Services may make full use of passively collected anonymous 
+      information, including without limitation the right to use such 
+      information to provide better service to Service users, customize the 
+      Services based on your preferences, compile and analyze statistics and 
+      trends, and otherwise administer and improve the Services for your use. We 
+      reserve the right to share this anonymous, passive information in 
       aggregated form.
     </p>
     <p>
       <strong>5. 3rd Party Behavioral Ads; Google's AdSense Network.</strong>
       <br>
-      5.1 We reserve the right to use anonymous, passive information
-      about your visits to this and other websites (not including your name,
-      address, email address or telephone number) for purposes of serving our
-      ads and third party ads that are targeted to your interests ("3rd Party
-      Behavioral Ads"). We reserve the right to share anonymous, passive
-      information collected on the services with third parties for purposes of
-      serving 3rd Party Behavioral Ads. These 3rd Party Behavioral Ads do not
-      identify you personally. Instead, they associate your behavioral data on
-      visited sites with your browser, so that the ads your computer sees on
-      this site are more likely to be relevant to your interests. 3rd Party
-      Behavioral Ads require that that you be served with a cookie containing
-      a tracking code. You may refuse the use of cookies by selecting the
-      appropriate settings on your browser; however, please note that if you
+      5.1 We reserve the right to use anonymous, passive information 
+      about your visits to this and other websites (not including your name, 
+      address, email address or telephone number) for purposes of serving our 
+      ads and third party ads that are targeted to your interests ("3rd Party 
+      Behavioral Ads"). We reserve the right to share anonymous, passive 
+      information collected on the services with third parties for purposes of 
+      serving 3rd Party Behavioral Ads. These 3rd Party Behavioral Ads do not 
+      identify you personally. Instead, they associate your behavioral data on 
+      visited sites with your browser, so that the ads your computer sees on 
+      this site are more likely to be relevant to your interests. 3rd Party 
+      Behavioral Ads require that that you be served with a cookie containing 
+      a tracking code. You may refuse the use of cookies by selecting the 
+      appropriate settings on your browser; however, please note that if you 
       do this you may not be able to use the full functionality of this site.
     </p>
     <p>
-      5.2 We reserve the right to participate in Google's AdSense
-      network for purposes of serving 3rd Party Behavioral Ads. Google uses
-      DoubleClick's DART cookie for serving 3rd Party Behavioral Ads over the
-      AdSense network. You may opt out of the use of the DART cookie. For
+      5.2 We reserve the right to participate in Google's AdSense 
+      network for purposes of serving 3rd Party Behavioral Ads. Google uses 
+      DoubleClick's DART cookie for serving 3rd Party Behavioral Ads over the 
+      AdSense network. You may opt out of the use of the DART cookie. For 
       information regarding how to opt out, go to
       http://www.google.com/privacy_ads.html.
     </p>
     <p>
       <strong>6. Use of 3rd Party Analytics.</strong>
       <br>
-      We reserve the right to use analytics services provided by
-      third parties. These services use 3rd party cookies to collect
-      anonymous, passive information about your use of this site (see
-      explanation of cookies in Collection of Anonymous, Passive Information
-      above). We use this information for the purpose of evaluating your use
-      of the Services, compiling reports on activity, and providing other
-      services. These web analytics services may also transfer this
-      information to third parties where required to do so by law, or where
+      We reserve the right to use analytics services provided by 
+      third parties. These services use 3rd party cookies to collect 
+      anonymous, passive information about your use of this site (see 
+      explanation of cookies in Collection of Anonymous, Passive Information 
+      above). We use this information for the purpose of evaluating your use 
+      of the Services, compiling reports on activity, and providing other 
+      services. These web analytics services may also transfer this 
+      information to third parties where required to do so by law, or where 
       such third parties process the information on the service's behalf.
     </p>
     <p>
       <strong>7. Collection of Personal Information; Categories.</strong>
       <br>
-      We will ask you for personal information when you sign up for any
-      specific benefit or purpose that requires registration. Personal
-      information that we collect may vary with the each registration, and it
-      may include one or more of the following categories: name, physical
-      address, an email address, phone number, and credit card information
-      including credit card number, expiration date, and billing address,
-      emergency contact information, current medications, allergies, medical
+      We will ask you for personal information when you sign up for any 
+      specific benefit or purpose that requires registration. Personal 
+      information that we collect may vary with the each registration, and it 
+      may include one or more of the following categories: name, physical 
+      address, an email address, phone number, and credit card information 
+      including credit card number, expiration date, and billing address, 
+      emergency contact information, current medications, allergies, medical 
       insurance information.
     </p>
     <p>
-      <strong> 8. Use And Sharing of Personal Information: General
+      <strong> 8. Use And Sharing of Personal Information: General 
       Policy And Exceptions. </strong>
       <br>
-      Our general policy is that we will use your personal information,
-      including combining your personal information with passive information
-      collected from this site, only for: the performance of the services or
-      transaction for which it was given, our private, internal reporting for
-      this site, and security assessments for this site, and we will not
-      share, sell, or rent your personal information to others. The only
-      exceptions to this general policy: (i) are described in the subsections
+      Our general policy is that we will use your personal information, 
+      including combining your personal information with passive information 
+      collected from this site, only for: the performance of the services or 
+      transaction for which it was given, our private, internal reporting for 
+      this site, and security assessments for this site, and we will not 
+      share, sell, or rent your personal information to others. The only 
+      exceptions to this general policy: (i) are described in the subsections 
       below, and (ii) if you explicitly approve through our site.
     </p>
     <p>
-      8.1 Affiliates And Service Providers. We reserve the right to
-      provide such information to our affiliates or subsidiaries, or trusted
-      service providers for the purpose of hosting our servers or processing
-      or archiving personal information for us. We require that these parties
-      agree to privacy and security safeguards for this information that are
+      8.1 Affiliates And Service Providers. We reserve the right to 
+      provide such information to our affiliates or subsidiaries, or trusted 
+      service providers for the purpose of hosting our servers or processing 
+      or archiving personal information for us. We require that these parties 
+      agree to privacy and security safeguards for this information that are 
       consistent with this Privacy Policy.
     </p>
     <p>
-      8.2 Acquisition; Bankruptcy. In the event that we are acquired by
-      or merged with a third party entity, we reserve the right to transfer
-      such information as part of such merger, acquisition, sale, or other
-      change of control. In the unlikely event of our bankruptcy, insolvency,
-      reorganization, receivership, or assignment for the benefit of
-      creditors, or the application of laws or equitable principles affecting
-      creditors' rights generally, we reserve the right to transfer such
+      8.2 Acquisition; Bankruptcy. In the event that we are acquired by 
+      or merged with a third party entity, we reserve the right to transfer 
+      such information as part of such merger, acquisition, sale, or other 
+      change of control. In the unlikely event of our bankruptcy, insolvency, 
+      reorganization, receivership, or assignment for the benefit of 
+      creditors, or the application of laws or equitable principles affecting 
+      creditors' rights generally, we reserve the right to transfer such 
       information to protect our rights or as required by law.
     </p>
     <p>
-      8.3 Enforcement; Legal Process. We reserve the right to transfer
-      such information if we have a good faith belief that access, use,
-      preservation or disclosure of such information is reasonably necessary
-      (i) to satisfy any applicable law, regulation, legal process or
-      enforceable governmental request, or (ii) to investigate or enforce
+      8.3 Enforcement; Legal Process. We reserve the right to transfer 
+      such information if we have a good faith belief that access, use, 
+      preservation or disclosure of such information is reasonably necessary 
+      (i) to satisfy any applicable law, regulation, legal process or 
+      enforceable governmental request, or (ii) to investigate or enforce 
       violations of our rights or the security of this site.
     </p>
     <p>
-      8.4 Miscellaneous. We reserve the right to share personal
-      information with the following additional parties: online organizers
-      using our tools and resellers of our products and services from whose
-      site the sale originated (even though the sale originates at site of the
-      reseller, registration and collection of personal information occurs at
+      8.4 Miscellaneous. We reserve the right to share personal 
+      information with the following additional parties: online organizers 
+      using our tools and resellers of our products and services from whose 
+      site the sale originated (even though the sale originates at site of the 
+      reseller, registration and collection of personal information occurs at 
       this site).
     </p>
     <p>
-      <strong> 9. Onward Transfer of Personal Information Outside Your
+      <strong> 9. Onward Transfer of Personal Information Outside Your 
       Country of Residence. </strong>
       <br>
-      Any personal information which we may collect on this site will
-      be stored and processed in our servers located only in the United
-      States. By using this site, if you reside outside the United States, you
-      consent to the transfer of personal information outside your country of
+      Any personal information which we may collect on this site will 
+      be stored and processed in our servers located only in the United 
+      States. By using this site, if you reside outside the United States, you 
+      consent to the transfer of personal information outside your country of 
       residence to the United States.
     </p>
     <p>
       <strong>10. Security of Personal Information.</strong>
       <br>
-      We follow reasonable and appropriate industry standards to
-      protect your personal information and data. Unfortunately, no data
-      transmission over the Internet or method of data storage can be
-      guaranteed 100% secure. Therefore, while we strive to protect your
-      personal information by following generally accepted industry standards,
-      we cannot ensure or warrant the absolute security of any information you
+      We follow reasonable and appropriate industry standards to 
+      protect your personal information and data. Unfortunately, no data 
+      transmission over the Internet or method of data storage can be 
+      guaranteed 100% secure. Therefore, while we strive to protect your 
+      personal information by following generally accepted industry standards, 
+      we cannot ensure or warrant the absolute security of any information you 
       transmit to us or archive at this site.
     </p>
     <p>
       <strong>11. Changing And Updating Personal Information.</strong>
       <br>
-      Upon request, we will permit you to request or make changes or
-      updates to your personal information for legitimate purposes. We request
-      identification prior to approving such requests. We reserve the right to
-      decline any requests that are unreasonably repetitive or systematic,
-      require unreasonable time or effort of our technical or administrative
-      personnel, or undermine the privacy rights of others. We reserve the
-      right to permit you to access your personal information in any account
-      you establish with this site for purposes of making your own changes or
-      updates, and in such case, instructions for making such changes or
+      Upon request, we will permit you to request or make changes or 
+      updates to your personal information for legitimate purposes. We request 
+      identification prior to approving such requests. We reserve the right to 
+      decline any requests that are unreasonably repetitive or systematic, 
+      require unreasonable time or effort of our technical or administrative 
+      personnel, or undermine the privacy rights of others. We reserve the 
+      right to permit you to access your personal information in any account 
+      you establish with this site for purposes of making your own changes or 
+      updates, and in such case, instructions for making such changes or 
       updates will be provided where necessary.
     </p>
     <p>
       <strong>12. Email From This Site; Opt-Out Rights.</strong>
       <br>
-      If you supply us with your e-mail address you may receive
-      periodic messages from us with information specific to the Services and
-      required for the normal functioning of the Services as well as for new
-      products or services or upcoming events. If you prefer not to receive
-      periodic email messages, you may opt-out by following the instructions
+      If you supply us with your e-mail address you may receive 
+      periodic messages from us with information specific to the Services and 
+      required for the normal functioning of the Services as well as for new 
+      products or services or upcoming events. If you prefer not to receive 
+      periodic email messages, you may opt-out by following the instructions 
       on the email.
     </p>
     <p>
       <strong>13. Children's Online Policy.</strong>
       <br>
-      We are committed to preserving online privacy for all of its
-      website visitors, including children. This site is a general audience
-      site. Consistent with the Children's Online Privacy Protection Act
-      (COPPA), we will not knowingly collect any information from, or sell to,
-      children under the age of 13. If you are a parent or guardian who has
-      discovered that your child under the age of 13 has submitted his or her
-      personally identifiable information without your permission or consent,
-      we will remove the information from our active list, at your request. To
-      request the removal of your child's information, please send contact our
-      site as provided below under “Contact Us”, and be sure to include in
+      We are committed to preserving online privacy for all of its 
+      website visitors, including children. This site is a general audience 
+      site. Consistent with the Children's Online Privacy Protection Act 
+      (COPPA), we will not knowingly collect any information from, or sell to, 
+      children under the age of 13. If you are a parent or guardian who has 
+      discovered that your child under the age of 13 has submitted his or her 
+      personally identifiable information without your permission or consent, 
+      we will remove the information from our active list, at your request. To 
+      request the removal of your child's information, please send contact our 
+      site as provided below under “Contact Us”, and be sure to include in 
       your message the same login information that your child submitted.
     </p>
     <p>
-      <strong> 14. Email And Other Messages Through This Site; ECPA
+      <strong> 14. Email And Other Messages Through This Site; ECPA 
       Notice. </strong>
       <br>
-      This site treats email messages and other electronic messages
-      that are sent through this site and not viewable by others as
-      confidential and private, except as required by law, including without
-      limitation, the Electronic Communications Privacy Act of 1986, 18 U.S.C.
-      Sections 2701-2711 (the "ECPA"). The ECPA permits this site's limited
-      ability to intercept and/or disclose electronic messages, for example
-      (i) as necessary to operate our system or to protect our rights or
-      property, (ii) upon legal demand (court orders, warrants, subpoenas), or
-      (iii) where we receive information inadvertently which appears to
-      pertain to the commission of a crime. This site is not considered a
+      This site treats email messages and other electronic messages 
+      that are sent through this site and not viewable by others as 
+      confidential and private, except as required by law, including without 
+      limitation, the Electronic Communications Privacy Act of 1986, 18 U.S.C. 
+      Sections 2701-2711 (the "ECPA"). The ECPA permits this site's limited 
+      ability to intercept and/or disclose electronic messages, for example 
+      (i) as necessary to operate our system or to protect our rights or 
+      property, (ii) upon legal demand (court orders, warrants, subpoenas), or 
+      (iii) where we receive information inadvertently which appears to 
+      pertain to the commission of a crime. This site is not considered a 
       "secure communications medium" under the ECPA.
     </p>
     <p>
       <strong>15. Contact Us.</strong>
       <br>
-      If you have any questions regarding this Privacy Policy, please
+      If you have any questions regarding this Privacy Policy, please 
       contact the owner and operator of this website business:
     </p>
     <address>

From 9ad67fa169257bad481162d8619f6ffaef9122a4 Mon Sep 17 00:00:00 2001
From: aaron4 <aaron.herman4@gmail.com>
Date: Tue, 5 Mar 2013 10:42:40 -0600
Subject: [PATCH 090/220] Added space after each line of text

Same for this one. Added space to each line of text if line of text is following.
Also changed "Terms Of Use" to "Terms of Use".
---
 views/terms.html | 770 +++++++++++++++++++++++------------------------
 1 file changed, 385 insertions(+), 385 deletions(-)

diff --git a/views/terms.html b/views/terms.html
index 5f5eb3bc6e..a83d98885d 100644
--- a/views/terms.html
+++ b/views/terms.html
@@ -1,221 +1,221 @@
 <Title:>
-  Terms Of Use
+  Terms of Use
 
 <Body:>
   <div class="well">
     <a href="/">&laquo; Back</a>
     <div class="page-header">
-      <h1>Terms Of Use</h1>
+      <h1>Terms of Use</h1>
     </div>
     <p>
       Last updated September 2, 2012
     </p>
     <p>
-      HabitRPG (or "we") provides services through our
-      software applications for various devices and platforms ("HabitRPG
+      HabitRPG (or "we") provides services through our 
+      software applications for various devices and platforms ("HabitRPG 
       Applications") and the HabitRPG.com domain, and any sub domains thereto
-      (the "Sites"). Individually or collectively, HabitRPG Applications and
+      (the "Sites"). Individually or collectively, HabitRPG Applications and 
       Sites may be referred to as the "Services".
     </p>
     <p>
-      Please read the following terms and conditions ("Terms of
-      Service") carefully. These Terms of Service govern your access to and
-      use of the Services and HabitRPG Content (defined below) and set forth
-      the legally binding terms for your use of the Services and HabitRPG
+      Please read the following terms and conditions ("Terms of 
+      Service") carefully. These Terms of Service govern your access to and 
+      use of the Services and HabitRPG Content (defined below) and set forth 
+      the legally binding terms for your use of the Services and HabitRPG 
       Content, whether or not you have registered as a Member.
     </p>
     <p>
-      Certain areas of the Services (and your access to or use of
-      HabitRPG Content) may have different terms and conditions posted or may
-      require you to agree with and accept additional terms and conditions. If
-      there is a conflict between these Terms of Service and terms and
-      conditions posted for a specific area of the Services or HabitRPG
-      Content, the latter terms and conditions will take precedence with
-      respect to your use of or access to that area of the Services or HabitRPG
+      Certain areas of the Services (and your access to or use of 
+      HabitRPG Content) may have different terms and conditions posted or may 
+      require you to agree with and accept additional terms and conditions. If 
+      there is a conflict between these Terms of Service and terms and 
+      conditions posted for a specific area of the Services or HabitRPG 
+      Content, the latter terms and conditions will take precedence with 
+      respect to your use of or access to that area of the Services or HabitRPG 
       Content.
     </p>
     <p>
-      YOU ACKNOWLEDGE AND AGREE THAT, BY CLICKING ON THE "I AGREE" OR
-      "I ACCEPT" BUTTON, OR BY ACCESSING OR USING THE SERVICES OR BY
-      DOWNLOADING OR POSTING ANY CONTENT FROM OR ON THE SITES OR THROUGH THE
-      SERVICES, YOU ARE INDICATING THAT YOU HAVE READ, UNDERSTAND AND AGREE TO
-      BE BOUND BY THESE TERMS, WHETHER OR NOT YOU HAVE REGISTERED AS A MEMBER,
-      AND AGREE TO OUR PRIVACY POLICY AS DESCRIBED BELOW. IF YOU DO NOT AGREE
-      TO THESE TERMS, THEN YOU HAVE NO RIGHT TO ACCESS OR USE THE SERVICES OR
+      YOU ACKNOWLEDGE AND AGREE THAT, BY CLICKING ON THE "I AGREE" OR 
+      "I ACCEPT" BUTTON, OR BY ACCESSING OR USING THE SERVICES OR BY 
+      DOWNLOADING OR POSTING ANY CONTENT FROM OR ON THE SITES OR THROUGH THE 
+      SERVICES, YOU ARE INDICATING THAT YOU HAVE READ, UNDERSTAND AND AGREE TO 
+      BE BOUND BY THESE TERMS, WHETHER OR NOT YOU HAVE REGISTERED AS A MEMBER, 
+      AND AGREE TO OUR PRIVACY POLICY AS DESCRIBED BELOW. IF YOU DO NOT AGREE 
+      TO THESE TERMS, THEN YOU HAVE NO RIGHT TO ACCESS OR USE THE SERVICES OR 
       HABITRPG CONTENT.
     </p>
     <p>
       <strong>Modification</strong>
       <br>
-      HabitRPG reserves the right, at its sole discretion, to modify,
-      discontinue or terminate the Services, including any portion thereof on
-      a global or individual basis, or to modify these Terms of Service, at
-      any time and without prior notice. If we modify these Terms of Service,
-      we will update the "Last Updated Date" above and post the modification
-      on the Sites and perhaps elsewhere within the Services. By continuing to
-      access or use the Services after we have posted a modification to these
-      Terms of Service or have provided you with notice of a modification, you
-      are indicating that you agree to be bound by the modified Terms of
-      Service. If the modified Terms of Service are not acceptable to you,
+      HabitRPG reserves the right, at its sole discretion, to modify, 
+      discontinue or terminate the Services, including any portion thereof on 
+      a global or individual basis, or to modify these Terms of Service, at 
+      any time and without prior notice. If we modify these Terms of Service, 
+      we will update the "Last Updated Date" above and post the modification 
+      on the Sites and perhaps elsewhere within the Services. By continuing to 
+      access or use the Services after we have posted a modification to these 
+      Terms of Service or have provided you with notice of a modification, you 
+      are indicating that you agree to be bound by the modified Terms of 
+      Service. If the modified Terms of Service are not acceptable to you, 
       your only recourse is to cease using the Services.
     </p>
     <p>
       <strong>Eligibility and HabitRPG Account Registration</strong>
       <br>
-      In order to access certain features of the Sites and Services, and to
-      post any Public User Content (defined below) on the Sites or through the
-      Services, you must register to create an account ("HabitRPG Account") and
-      become a "Member". In compliance with privacy laws, we do not allow
-      people below the age of 14 to create accounts; please see our Privacy
-      Policy for further information. During the registration process, you
-      will be required to provide certain information and you will establish a
-      username and a password. You agree to provide accurate, current and
-      complete information during the registration process and to update such
-      information to keep it accurate, current and complete. HabitRPG reserves
-      the right to suspend or terminate your HabitRPG Account if any
-      information provided during the registration process or thereafter
-      proves to be inaccurate, not current or incomplete. If you are not a
-      Member you may browse all areas of the Sites or use the parts of the
-      Services that are not limited to Members only. You are responsible for
-      safeguarding your password. You agree not to disclose your password to
-      any third party and to take sole responsibility for any activities or
-      actions under your HabitRPG Account, whether or not you have authorized
-      such activities or actions. You agree to immediately notify HabitRPG of
-      any unauthorized use of your HabitRPG Account. We are not liable for any
-      damages or losses caused by someone using your account without your
+      In order to access certain features of the Sites and Services, and to 
+      post any Public User Content (defined below) on the Sites or through the 
+      Services, you must register to create an account ("HabitRPG Account") and 
+      become a "Member". In compliance with privacy laws, we do not allow 
+      people below the age of 14 to create accounts; please see our Privacy 
+      Policy for further information. During the registration process, you 
+      will be required to provide certain information and you will establish a 
+      username and a password. You agree to provide accurate, current and 
+      complete information during the registration process and to update such 
+      information to keep it accurate, current and complete. HabitRPG reserves 
+      the right to suspend or terminate your HabitRPG Account if any 
+      information provided during the registration process or thereafter 
+      proves to be inaccurate, not current or incomplete. If you are not a 
+      Member you may browse all areas of the Sites or use the parts of the 
+      Services that are not limited to Members only. You are responsible for 
+      safeguarding your password. You agree not to disclose your password to 
+      any third party and to take sole responsibility for any activities or 
+      actions under your HabitRPG Account, whether or not you have authorized 
+      such activities or actions. You agree to immediately notify HabitRPG of 
+      any unauthorized use of your HabitRPG Account. We are not liable for any 
+      damages or losses caused by someone using your account without your 
       permission.
     </p>
     <p>
       <strong>Privacy</strong>
       <br>
-      See HabitRPG's Privacy Policy at http://www.HabitRPG.com/privacy for
-      information and notices concerning HabitRPG's collection and use of your
-      personal information. If you have any questions about the HabitRPG
-      Privacy Policy, please contact HabitRPG at privacy AT HabitRPG.com. By
-      accessing the Services you are agreeing to the terms of our Privacy
+      See HabitRPG's Privacy Policy at http://www.HabitRPG.com/privacy for 
+      information and notices concerning HabitRPG's collection and use of your 
+      personal information. If you have any questions about the HabitRPG 
+      Privacy Policy, please contact HabitRPG at privacy AT HabitRPG.com. By 
+      accessing the Services you are agreeing to the terms of our Privacy 
       Policy.
     </p>
     <p>
       <strong>Content</strong>
       <br>
-      Certain types of content are made available through the Services.
-      "HabitRPG Content" means, collectively, the text, data, graphics, images,
-      illustrations, forms and look and feel attributes, HabitRPG trademarks
-      and logos and other content made available through the Services,
-      including any technology or code making up the Services, excluding User
-      Content. "Public User Content" means the text, data, graphics, images, photos,
-      video or audiovisual content, hypertext links and any other content uploaded,
-      transmitted or submitted by a Member via the Services with the intent to share
-      with other users. "Private User Content" means data created through the services
+      Certain types of content are made available through the Services. 
+      "HabitRPG Content" means, collectively, the text, data, graphics, images, 
+      illustrations, forms and look and feel attributes, HabitRPG trademarks 
+      and logos and other content made available through the Services, 
+      including any technology or code making up the Services, excluding User 
+      Content. "Public User Content" means the text, data, graphics, images, photos, 
+      video or audiovisual content, hypertext links and any other content uploaded, 
+      transmitted or submitted by a Member via the Services with the intent to share 
+      with other users. "Private User Content" means data created through the services 
       exclusively for personal use or private sharing.
-      This includes tasks and related data created in HabitRPG Tasks that have not
+      This includes tasks and related data created in HabitRPG Tasks that have not 
       been explicitly shared publicly.
-      You understand that by using any of the Services, you may encounter content
-      that may be deemed offensive, indecent, or objectionable, which content
-      may or may not be identified as having explicit language, and that the
-      results of any search or entering of a particular URL may automatically
-      and unintentionally generate links or references to objectionable
-      material. Nevertheless, you agree to use the Services at your sole risk
-      and that we shall not have any liability to you for content that may be
+      You understand that by using any of the Services, you may encounter content 
+      that may be deemed offensive, indecent, or objectionable, which content 
+      may or may not be identified as having explicit language, and that the 
+      results of any search or entering of a particular URL may automatically 
+      and unintentionally generate links or references to objectionable 
+      material. Nevertheless, you agree to use the Services at your sole risk 
+      and that we shall not have any liability to you for content that may be 
       found to be offensive, indecent, or objectionable.
     </p>
     <p>
       <strong>Ownership</strong>
       <br>
-      The Services and HabitRPG Content are protected by copyright, trademark,
-      and other laws of the United States and foreign countries. Except as
-      expressly provided in these Terms of Service, HabitRPG and its licensors
-      exclusively own all right, title and interest in and to the Services and
-      HabitRPG Content, including all associated intellectual property rights.
-      You will not remove, alter or obscure any copyright, trademark, service
-      mark or other proprietary rights notices incorporated in or accompanying
+      The Services and HabitRPG Content are protected by copyright, trademark, 
+      and other laws of the United States and foreign countries. Except as 
+      expressly provided in these Terms of Service, HabitRPG and its licensors 
+      exclusively own all right, title and interest in and to the Services and 
+      HabitRPG Content, including all associated intellectual property rights. 
+      You will not remove, alter or obscure any copyright, trademark, service 
+      mark or other proprietary rights notices incorporated in or accompanying 
       the Services or HabitRPG Content.
     </p>
     <p>
       <strong>HabitRPG License</strong>
       <br>
-      Subject to your compliance with the terms and conditions of these Terms
-      of Service, HabitRPG grants you a limited, non-exclusive,
-      non-transferable license, without the right to sublicense, to access,
-      use, view, download and print, where applicable, the Services and any
-      HabitRPG Content solely for your personal and non-commercial purposes.
-      You will not use, copy, adapt, modify, prepare derivative works based
-      upon, distribute, license, sell, transfer, publicly display, publicly
-      perform, transmit, stream, broadcast or otherwise exploit the Services
-      or HabitRPG Content, except as expressly permitted in these Terms of
-      Service. No licenses or rights are granted to you by implication or
-      otherwise under any intellectual property rights owned or controlled by
-      HabitRPG or its licensors, except for the licenses and rights expressly
-      granted in these Terms of Service. With respect to HabitRPG Applications,
-      your license is limited to use of such applications on platforms and
-      devices that you own or control, and you may not distribute or make the
-      HabitRPG Applications available over a network where it could be used by
+      Subject to your compliance with the terms and conditions of these Terms 
+      of Service, HabitRPG grants you a limited, non-exclusive, 
+      non-transferable license, without the right to sublicense, to access, 
+      use, view, download and print, where applicable, the Services and any 
+      HabitRPG Content solely for your personal and non-commercial purposes. 
+      You will not use, copy, adapt, modify, prepare derivative works based 
+      upon, distribute, license, sell, transfer, publicly display, publicly 
+      perform, transmit, stream, broadcast or otherwise exploit the Services 
+      or HabitRPG Content, except as expressly permitted in these Terms of 
+      Service. No licenses or rights are granted to you by implication or 
+      otherwise under any intellectual property rights owned or controlled by 
+      HabitRPG or its licensors, except for the licenses and rights expressly 
+      granted in these Terms of Service. With respect to HabitRPG Applications, 
+      your license is limited to use of such applications on platforms and 
+      devices that you own or control, and you may not distribute or make the 
+      HabitRPG Applications available over a network where it could be used by 
       multiple devices at the same time.
     </p>
     <p>
       <strong>Public User Content</strong>
       <br>
-      By making available any Public User Content through the Services, you hereby
-      grant to HabitRPG a worldwide, irrevocable, perpetual, non-exclusive,
-      transferable, royalty-free license, with the right to sublicense, to
-      use, copy, adapt, modify, distribute, license, sell, transfer, publicly
-      display, publicly perform, transmit, stream, broadcast and otherwise
-      exploit such Public User Content only on, through or by means of the Services.
-      HabitRPG does not claim any ownership rights in any such Public User Content and
-      nothing in these Terms of Service will be deemed to restrict any rights
+      By making available any Public User Content through the Services, you hereby 
+      grant to HabitRPG a worldwide, irrevocable, perpetual, non-exclusive, 
+      transferable, royalty-free license, with the right to sublicense, to 
+      use, copy, adapt, modify, distribute, license, sell, transfer, publicly 
+      display, publicly perform, transmit, stream, broadcast and otherwise 
+      exploit such Public User Content only on, through or by means of the Services. 
+      HabitRPG does not claim any ownership rights in any such Public User Content and 
+      nothing in these Terms of Service will be deemed to restrict any rights 
       that you may have to use and exploit any such Public User Content.
     </p>
     <p>
-      You acknowledge and agree that you are solely responsible for all
-      Public User Content that you make available through the Services. Accordingly,
-      you represent and warrant that: (i) you either are the sole and
-      exclusive owner of all Public User Content that you make available through the
-      Services or you have all rights, licenses, consents and releases that
-      are necessary to grant to HabitRPG the rights in such Public User Content, as
-      contemplated under these Terms of Service; and (ii) neither the User
-      Content nor your posting, uploading, publication, submission or
-      transmittal of the Public User Content or HabitRPG's use of the Public User Content (or
-      any portion thereof) on, through or by means of the Services will
-      infringe, misappropriate or violate a third party's patent, copyright,
-      trademark, trade secret, moral rights or other intellectual property
-      rights, or rights of publicity or privacy, or result in the violation of
+      You acknowledge and agree that you are solely responsible for all 
+      Public User Content that you make available through the Services. Accordingly, 
+      you represent and warrant that: (i) you either are the sole and 
+      exclusive owner of all Public User Content that you make available through the 
+      Services or you have all rights, licenses, consents and releases that 
+      are necessary to grant to HabitRPG the rights in such Public User Content, as 
+      contemplated under these Terms of Service; and (ii) neither the User 
+      Content nor your posting, uploading, publication, submission or 
+      transmittal of the Public User Content or HabitRPG's use of the Public User Content (or 
+      any portion thereof) on, through or by means of the Services will 
+      infringe, misappropriate or violate a third party's patent, copyright, 
+      trademark, trade secret, moral rights or other intellectual property 
+      rights, or rights of publicity or privacy, or result in the violation of 
       any applicable law or regulation.
     </p>
     <p>
-      Copyrighted Materials: No Infringing Use. You will not use the
-      Services to offer, display, distribute, transmit, route, provide
-      connections to or store any material that infringes copyrighted works or
-      otherwise violates or promotes the violation of the intellectual
-      property rights of any third party. HabitRPG has adopted and implemented
-      a policy that provides for the termination in appropriate circumstances
-      of the accounts of users who repeatedly infringe or are believed to be
-      or are charged with repeatedly infringing the rights of copyright
+      Copyrighted Materials: No Infringing Use. You will not use the 
+      Services to offer, display, distribute, transmit, route, provide 
+      connections to or store any material that infringes copyrighted works or 
+      otherwise violates or promotes the violation of the intellectual 
+      property rights of any third party. HabitRPG has adopted and implemented 
+      a policy that provides for the termination in appropriate circumstances 
+      of the accounts of users who repeatedly infringe or are believed to be 
+      or are charged with repeatedly infringing the rights of copyright 
       holders.
     </p>
     <p>
       <strong>Notify Us of Infringers</strong>
       <br>
-      If you believe that something on the Services violates your copyright,
-      notify our copyright agent in writing. The contact information for our
+      If you believe that something on the Services violates your copyright, 
+      notify our copyright agent in writing. The contact information for our 
       copyright agent is at the bottom of this section.
     </p>
     <p>
-      In order for us to take action, you must do the following in your
+      In order for us to take action, you must do the following in your 
       notice:
     </p>
     <p>
-      (1) provide your physical or electronic signature; (2) identify
-      the copyrighted work that you believe is being infringed; (3) identify
-      the item on the Services that you think is infringing your work and
-      include sufficient information about where the material is located on
-      the Services (including which website and URL) so that we can find it;
-      (4) provide us with a way to contact you, such as your address,
-      telephone number, or e-mail; (5) provide a statement that you believe in
-      good faith that the item you have identified as infringing is not
-      authorized by the copyright owner, its agent, or the law to be used on
-      the Services; and (6) provide a statement that the information you
-      provide in your notice is accurate, and that (under penalty of perjury),
-      you are authorized to act on behalf of the copyright owner whose work is
+      (1) provide your physical or electronic signature; (2) identify 
+      the copyrighted work that you believe is being infringed; (3) identify 
+      the item on the Services that you think is infringing your work and 
+      include sufficient information about where the material is located on 
+      the Services (including which website and URL) so that we can find it; 
+      (4) provide us with a way to contact you, such as your address, 
+      telephone number, or e-mail; (5) provide a statement that you believe in 
+      good faith that the item you have identified as infringing is not 
+      authorized by the copyright owner, its agent, or the law to be used on 
+      the Services; and (6) provide a statement that the information you 
+      provide in your notice is accurate, and that (under penalty of perjury), 
+      you are authorized to act on behalf of the copyright owner whose work is 
       being infringed.
     </p>
     <p>
@@ -235,398 +235,398 @@
       E-Mail: tylerrenelle at gmail dot com
     </p>
     <p>
-      Again, we cannot take action unless you give us all the required
+      Again, we cannot take action unless you give us all the required 
       information.
     </p>
     <p>
       <strong>Ratings and Comments &amp; Feedback.</strong>
       <br>
-      You can rate and make comments about content made available through the
-      Services ("Comments"). HabitRPG advises you to exercise caution and good
-      judgment when leaving such Comments. Once you complete and submit your
-      Comments to the Services you will not be able to go back and edit your
-      Comments. You should also be aware that you could be held legally
-      responsible for damages to someone's reputation if your Comments are
-      deemed to be defamatory. Without limiting any other terms of this Terms
-      of Service, HabitRPG may, but is under no obligation to, monitor or
-      censor Comments and disclaims any and all liability relating thereto.
-      Notwithstanding the foregoing, HabitRPG does reserve the right, in its
-      sole discretion, to remove any Comments that it deems to be improper,
-      inappropriate or inconsistent with the online activities that are
-      permitted under these Terms of Service. We welcome and encourage you to
-      provide feedback, comments and suggestions for improvements to the
-      Services ("Feedback"). You may submit Feedback by emailing us at support
-      AT HabitRPG.com. You acknowledge and agree that all Comments and Feedback
-      will be the sole and exclusive property of HabitRPG and you hereby
-      irrevocably assign to HabitRPG and agree to irrevocably assign to HabitRPG
-      all of your right, title, and interest in and to all Comments and
-      Feedback, including without limitation all worldwide patent rights,
-      copyright rights, trade secret rights, and other proprietary or
-      intellectual property rights therein. At HabitRPG's request and expense,
-      you will execute documents and take such further acts as HabitRPG may
-      reasonably request to assist HabitRPG to acquire, perfect, and maintain
-      its intellectual property rights and other legal protections for the
+      You can rate and make comments about content made available through the 
+      Services ("Comments"). HabitRPG advises you to exercise caution and good 
+      judgment when leaving such Comments. Once you complete and submit your 
+      Comments to the Services you will not be able to go back and edit your 
+      Comments. You should also be aware that you could be held legally 
+      responsible for damages to someone's reputation if your Comments are 
+      deemed to be defamatory. Without limiting any other terms of this Terms 
+      of Service, HabitRPG may, but is under no obligation to, monitor or 
+      censor Comments and disclaims any and all liability relating thereto. 
+      Notwithstanding the foregoing, HabitRPG does reserve the right, in its 
+      sole discretion, to remove any Comments that it deems to be improper, 
+      inappropriate or inconsistent with the online activities that are 
+      permitted under these Terms of Service. We welcome and encourage you to 
+      provide feedback, comments and suggestions for improvements to the 
+      Services ("Feedback"). You may submit Feedback by emailing us at support 
+      AT HabitRPG.com. You acknowledge and agree that all Comments and Feedback 
+      will be the sole and exclusive property of HabitRPG and you hereby 
+      irrevocably assign to HabitRPG and agree to irrevocably assign to HabitRPG 
+      all of your right, title, and interest in and to all Comments and 
+      Feedback, including without limitation all worldwide patent rights, 
+      copyright rights, trade secret rights, and other proprietary or 
+      intellectual property rights therein. At HabitRPG's request and expense, 
+      you will execute documents and take such further acts as HabitRPG may 
+      reasonably request to assist HabitRPG to acquire, perfect, and maintain 
+      its intellectual property rights and other legal protections for the 
       Comments and Feedback.
     </p>
     <p>
       <strong>Interactions between Users</strong>
       <br>
-      You are solely responsible for your interactions (including any
-      disputes) with other users. You understand that HabitRPG does not in any
-      way screen HabitRPG users, except to only allow people aged 14 and over
-      to create accounts. You are solely responsible for, and will exercise
-      caution, discretion, common sense and judgment in, using the Services
-      and disclosing personal information to other HabitRPG users. You agree to
-      take reasonable precautions in all interactions with other HabitRPG
-      users, particularly if you decide to meet a HabitRPG user offline, or in
-      person. Your use of the Services, HabitRPG Content and any other content
-      made available through the Services is at your sole risk and discretion
-      and HabitRPG hereby disclaims any and all liability to you or any third
-      party relating thereto. HabitRPG reserves the right to contact Members,
-      in compliance with applicable law, in order to evaluate compliance with
-      the rules and policies in these Terms of Service. You will cooperate
-      fully with HabitRPG to investigate any suspected unlawful, fraudulent or
-      improper activity, including, without limitation, granting authorized
-      HabitRPG representatives access to any password-protected portions of
+      You are solely responsible for your interactions (including any 
+      disputes) with other users. You understand that HabitRPG does not in any 
+      way screen HabitRPG users, except to only allow people aged 14 and over 
+      to create accounts. You are solely responsible for, and will exercise 
+      caution, discretion, common sense and judgment in, using the Services 
+      and disclosing personal information to other HabitRPG users. You agree to 
+      take reasonable precautions in all interactions with other HabitRPG 
+      users, particularly if you decide to meet a HabitRPG user offline, or in 
+      person. Your use of the Services, HabitRPG Content and any other content 
+      made available through the Services is at your sole risk and discretion 
+      and HabitRPG hereby disclaims any and all liability to you or any third 
+      party relating thereto. HabitRPG reserves the right to contact Members, 
+      in compliance with applicable law, in order to evaluate compliance with 
+      the rules and policies in these Terms of Service. You will cooperate 
+      fully with HabitRPG to investigate any suspected unlawful, fraudulent or 
+      improper activity, including, without limitation, granting authorized 
+      HabitRPG representatives access to any password-protected portions of 
       your HabitRPG Account.
     </p>
     <p>
       <strong>General Prohibitions</strong>
       <br>
-      You agree not to do any of the following while using the Services or
+      You agree not to do any of the following while using the Services or 
       HabitRPG Content:
       <br>
     </p>
     <ul>
       <li>
-        Post, upload, publish, submit or transmit any text, graphics,
-        images, software, music, audio, video, information or other material
-        that: (i) infringes, misappropriates or violates a third party's
-        patent, copyright, trademark, trade secret, moral rights or other
-        intellectual property rights, or rights of publicity or privacy; (ii)
-        violates, or encourages any conduct that would violate, any applicable
-        law or regulation or would give rise to civil liability; (iii) is
-        fraudulent, false, misleading or deceptive; (iv) is defamatory,
-        obscene, pornographic, vulgar or offensive; (v) promotes
-        discrimination, bigotry, racism, hatred, harassment or harm against any
-        individual or group; (vi) is violent or threatening or promotes
-        violence or actions that are threatening to any other person; or (vii)
-        promotes illegal or harmful activities or substances (including but not
-        limited to activities that promote or provide instructional information
-        regarding the manufacture or purchase of illegal weapons or illegal
+        Post, upload, publish, submit or transmit any text, graphics, 
+        images, software, music, audio, video, information or other material 
+        that: (i) infringes, misappropriates or violates a third party's 
+        patent, copyright, trademark, trade secret, moral rights or other 
+        intellectual property rights, or rights of publicity or privacy; (ii) 
+        violates, or encourages any conduct that would violate, any applicable 
+        law or regulation or would give rise to civil liability; (iii) is 
+        fraudulent, false, misleading or deceptive; (iv) is defamatory, 
+        obscene, pornographic, vulgar or offensive; (v) promotes 
+        discrimination, bigotry, racism, hatred, harassment or harm against any 
+        individual or group; (vi) is violent or threatening or promotes 
+        violence or actions that are threatening to any other person; or (vii) 
+        promotes illegal or harmful activities or substances (including but not 
+        limited to activities that promote or provide instructional information 
+        regarding the manufacture or purchase of illegal weapons or illegal 
         substances).
       </li>
       <li>
-        Use, display, mirror, frame or utilize framing techniques to
-        enclose the Services, or any individual element or materials within the
-        Services, HabitRPG's name, any HabitRPG trademark, logo or other
-        proprietary information, the content of any text or the layout and
-        design of any page or form contained on a page, without HabitRPG's
+        Use, display, mirror, frame or utilize framing techniques to 
+        enclose the Services, or any individual element or materials within the 
+        Services, HabitRPG's name, any HabitRPG trademark, logo or other 
+        proprietary information, the content of any text or the layout and 
+        design of any page or form contained on a page, without HabitRPG's 
         express written consent;
       </li>
       <li>
-        Access, tamper with, or use non-public areas of the Services,
-        HabitRPG's computer systems, or the technical delivery systems of
+        Access, tamper with, or use non-public areas of the Services, 
+        HabitRPG's computer systems, or the technical delivery systems of 
         HabitRPG's providers;
       </li>
       <li>
-        Attempt to probe, scan, or test the vulnerability of any
-        HabitRPG system or network or breach any security or authentication
+        Attempt to probe, scan, or test the vulnerability of any 
+        HabitRPG system or network or breach any security or authentication 
         measures;
       </li>
       <li>
-        Avoid, bypass, remove, deactivate, impair, descramble or
-        otherwise circumvent any technological measure implemented by HabitRPG
-        or any of HabitRPG's providers or any other third party (including
+        Avoid, bypass, remove, deactivate, impair, descramble or 
+        otherwise circumvent any technological measure implemented by HabitRPG 
+        or any of HabitRPG's providers or any other third party (including 
         another user) to protect the Services or HabitRPG Content;
       </li>
       <li>
-        Attempt to access or search the Services or HabitRPG Content or
-        download HabitRPG Content from the Services through the use of any
-        engine, software, tool, agent, device or mechanism (including spiders,
-        robots, crawlers, data mining tools or the like) other than the
-        software and/or search agents provided by HabitRPG or other generally
-        available third party web browsers (such as Google Chrome, Microsoft
+        Attempt to access or search the Services or HabitRPG Content or 
+        download HabitRPG Content from the Services through the use of any 
+        engine, software, tool, agent, device or mechanism (including spiders, 
+        robots, crawlers, data mining tools or the like) other than the 
+        software and/or search agents provided by HabitRPG or other generally 
+        available third party web browsers (such as Google Chrome, Microsoft 
         Internet Explorer, Mozilla Firefox, Safari or Opera);
       </li>
       <li>
-        Send any unsolicited or unauthorized advertising, promotional
-        materials, email, junk mail, spam, chain letters or other form of
+        Send any unsolicited or unauthorized advertising, promotional 
+        materials, email, junk mail, spam, chain letters or other form of 
         solicitation;
       </li>
       <li>
-        Use any meta tags or other hidden text or metadata utilizing a
-        HabitRPG trademark, logo URL or product name without HabitRPG's express
+        Use any meta tags or other hidden text or metadata utilizing a 
+        HabitRPG trademark, logo URL or product name without HabitRPG's express 
         written consent;
       </li>
       <li>
-        Use the Services or HabitRPG Content for any commercial purpose
-        or the benefit of any third party or in any manner not permitted by
+        Use the Services or HabitRPG Content for any commercial purpose 
+        or the benefit of any third party or in any manner not permitted by 
         these Terms of Service;
       </li>
       <li>
-        Forge any TCP/IP packet header or any part of the header
-        information in any email or newsgroup posting, or in any way use the
-        Services or HabitRPG Content to send altered, deceptive or false
+        Forge any TCP/IP packet header or any part of the header 
+        information in any email or newsgroup posting, or in any way use the 
+        Services or HabitRPG Content to send altered, deceptive or false 
         source-identifying information;
       </li>
       <li>
-        Attempt to decipher, decompile, disassemble or reverse
-        engineer any of the software used to provide the Services or HabitRPG
+        Attempt to decipher, decompile, disassemble or reverse 
+        engineer any of the software used to provide the Services or HabitRPG 
         Content;
       </li>
       <li>
-        Interfere with, or attempt to interfere with, the access of
-        any user, host or network, including, without limitation, sending a
+        Interfere with, or attempt to interfere with, the access of 
+        any user, host or network, including, without limitation, sending a 
         virus, overloading, flooding, spamming, or mail-bombing the Services;
       </li>
       <li>
-        Collect or store any personally identifiable information from
-        the Services from other users of the Services without their express
+        Collect or store any personally identifiable information from 
+        the Services from other users of the Services without their express 
         permission;
       </li>
       <li>
-        Impersonate or misrepresent your affiliation with any person
+        Impersonate or misrepresent your affiliation with any person 
         or entity; Violate any applicable law or regulation; or
       </li>
       <li>
-        Encourage or enable any other individual to do any of the
+        Encourage or enable any other individual to do any of the 
         foregoing.
       </li>
     </ul>
     <p>
-      HabitRPG will have the right to investigate and prosecute
-      violations of any of the above, including intellectual property rights
-      infringement and Services security issues, to the fullest extent of the
-      law. HabitRPG may involve and cooperate with law enforcement authorities
-      in prosecuting users who violate these Terms of Service. You acknowledge
-      that HabitRPG has no obligation to monitor your access to or use of the
-      Services or HabitRPG Content or to review or edit any Public User Content, but
-      has the right to do so for the purpose of operating the Services, to
-      ensure your compliance with these Terms of Service, or to comply with
-      applicable law or the order or requirement of a court, administrative
-      agency or other governmental body. HabitRPG reserves the right, at any
-      time and without prior notice, to remove or disable access to any
-      HabitRPG Content, including, any Public User Content, that HabitRPG, in its sole
-      discretion, considers to be in violation of these Terms of Service or
+      HabitRPG will have the right to investigate and prosecute 
+      violations of any of the above, including intellectual property rights 
+      infringement and Services security issues, to the fullest extent of the 
+      law. HabitRPG may involve and cooperate with law enforcement authorities 
+      in prosecuting users who violate these Terms of Service. You acknowledge 
+      that HabitRPG has no obligation to monitor your access to or use of the 
+      Services or HabitRPG Content or to review or edit any Public User Content, but 
+      has the right to do so for the purpose of operating the Services, to 
+      ensure your compliance with these Terms of Service, or to comply with 
+      applicable law or the order or requirement of a court, administrative 
+      agency or other governmental body. HabitRPG reserves the right, at any 
+      time and without prior notice, to remove or disable access to any 
+      HabitRPG Content, including, any Public User Content, that HabitRPG, in its sole 
+      discretion, considers to be in violation of these Terms of Service or 
       otherwise harmful to the Services.
     </p>
     <p>
       <strong>Links</strong>
       <br>
-      The Services may contain links to third-party websites or resources. You
-      acknowledge and agree that HabitRPG is not responsible or liable for: (i)
-      the availability or accuracy of such websites or resources; or (ii) the
-      content, products, or services on or available from such websites or
-      resources. Links to such websites or resources do not imply any
-      endorsement by HabitRPG of such websites or resources or the content,
-      products, or services available from such websites or resources. You
-      acknowledge sole responsibility for and assume all risk arising from
-      your use of any such websites or resources.
+      The Services may contain links to third-party websites or resources. You 
+      acknowledge and agree that HabitRPG is not responsible or liable for: (i) 
+      the availability or accuracy of such websites or resources; or (ii) the 
+      content, products, or services on or available from such websites or 
+      resources. Links to such websites or resources do not imply any 
+      endorsement by HabitRPG of such websites or resources or the content, 
+      products, or services available from such websites or resources. You 
+      acknowledge sole responsibility for and assume all risk arising from 
+      your use of any such websites or resources. 
     </p>
     <p>
       <strong>Termination and HabitRPG Account; Cancellation</strong>
       <br>
-      Without limiting other remedies, HabitRPG may at any time suspend or
-      terminate your HabitRPG Account and refuse to provide access to the
-      Services. In addition, HabitRPG may notify authorities or take any
-      actions it deems appropriate, without notice to you, if HabitRPG suspects
-      or determines, in its own discretion, that you may have or there is a
-      significant risk that you have (i) failed to comply with any provision
-      of these Terms of Service or any policies or rules established by
-      HabitRPG; or (ii) engaged in actions relating to or in the course of
-      using the Services that may be illegal or cause liability, harm,
-      embarrassment, harassment, abuse or disruption for you, HabitRPG Users,
+      Without limiting other remedies, HabitRPG may at any time suspend or 
+      terminate your HabitRPG Account and refuse to provide access to the 
+      Services. In addition, HabitRPG may notify authorities or take any 
+      actions it deems appropriate, without notice to you, if HabitRPG suspects 
+      or determines, in its own discretion, that you may have or there is a 
+      significant risk that you have (i) failed to comply with any provision 
+      of these Terms of Service or any policies or rules established by 
+      HabitRPG; or (ii) engaged in actions relating to or in the course of 
+      using the Services that may be illegal or cause liability, harm, 
+      embarrassment, harassment, abuse or disruption for you, HabitRPG Users, 
       HabitRPG or any other third parties or the Services.
     </p>
     <p>
-      You may terminate your HabitRPG Account at any time and for any
-      reason by sending email to support AT HabitRPG.com. Upon any termination
+      You may terminate your HabitRPG Account at any time and for any 
+      reason by sending email to support AT HabitRPG.com. Upon any termination 
       by a Member, the related account will no longer be accessible.
     </p>
     <p>
-      After any termination, you understand and acknowledge that we
-      will have no further obligation to provide the Services and all licenses
-      and other rights granted to you by these Terms of Service will
-      immediately cease. HabitRPG will not be liable to you or any third party
-      for termination of the Services or termination of your use of either.
-      UPON ANY TERMINATION OR SUSPENSION, ANY CONTENT, MATERIALS OR
-      INFORMATION (INCLUDING PUBLIC USER CONTENT) THAT YOU HAVE SUBMITTED ON THE
-      SERVICES OR THAT WHICH IS RELATED TO YOUR ACCOUNT MAY NO LONGER BE
-      ACCESSED BY YOU. Furthermore, HabitRPG will have no obligation to
-      maintain any information stored in our database related to your account
-      or to forward any information to you or any third party.
+      After any termination, you understand and acknowledge that we 
+      will have no further obligation to provide the Services and all licenses 
+      and other rights granted to you by these Terms of Service will 
+      immediately cease. HabitRPG will not be liable to you or any third party 
+      for termination of the Services or termination of your use of either. 
+      UPON ANY TERMINATION OR SUSPENSION, ANY CONTENT, MATERIALS OR 
+      INFORMATION (INCLUDING PUBLIC USER CONTENT) THAT YOU HAVE SUBMITTED ON THE 
+      SERVICES OR THAT WHICH IS RELATED TO YOUR ACCOUNT MAY NO LONGER BE 
+      ACCESSED BY YOU. Furthermore, HabitRPG will have no obligation to 
+      maintain any information stored in our database related to your account 
+      or to forward any information to you or any third party. 
     </p>
     <p>
-      Any suspension, termination or cancellation will not affect your
-      obligations to HabitRPG under these Terms of Service (including, without
-      limitation, proprietary rights and ownership, indemnification and
-      limitation of liability), which by their sense and context are intended
+      Any suspension, termination or cancellation will not affect your 
+      obligations to HabitRPG under these Terms of Service (including, without 
+      limitation, proprietary rights and ownership, indemnification and 
+      limitation of liability), which by their sense and context are intended 
       to survive such suspension, termination or cancellation.
     </p>
     <p>
       <strong>Disclaimers</strong>
       <br>
-      THE SERVICES, HABITRPG CONTENT AND PUBLIC USER CONTENT ARE PROVIDED "AS IS",
-      WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHOUT
-      LIMITING THE FOREGOING, HABITRPG EXPLICITLY DISCLAIMS ANY WARRANTIES OF
-      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR
-      NON-INFRINGEMENT, AND ANY WARRANTIES ARISING OUT OF COURSE OF DEALING OR
+      THE SERVICES, HABITRPG CONTENT AND PUBLIC USER CONTENT ARE PROVIDED "AS IS", 
+      WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHOUT 
+      LIMITING THE FOREGOING, HABITRPG EXPLICITLY DISCLAIMS ANY WARRANTIES OF 
+      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR 
+      NON-INFRINGEMENT, AND ANY WARRANTIES ARISING OUT OF COURSE OF DEALING OR 
       USAGE OF TRADE.
     </p>
     <p>
-      HABITRPG MAKES NO WARRANTY THAT THE SERVICES, HABITRPG CONTENT OR
-      PUBLIC USER CONTENT WILL MEET YOUR REQUIREMENTS OR BE AVAILABLE ON AN
-      UNINTERRUPTED, SECURE, OR ERROR-FREE BASIS. HABITRPG MAKES NO WARRANTY
-      REGARDING THE QUALITY OF ANY PRODUCTS, SERVICES OR CONTENT PURCHASED OR
-      OBTAINED THROUGH THE SERVICES OR THE ACCURACY, TIMELINESS, TRUTHFULNESS,
-      COMPLETENESS OR RELIABILITY OF ANY CONTENT OBTAINED THROUGH THE
+      HABITRPG MAKES NO WARRANTY THAT THE SERVICES, HABITRPG CONTENT OR 
+      PUBLIC USER CONTENT WILL MEET YOUR REQUIREMENTS OR BE AVAILABLE ON AN 
+      UNINTERRUPTED, SECURE, OR ERROR-FREE BASIS. HABITRPG MAKES NO WARRANTY 
+      REGARDING THE QUALITY OF ANY PRODUCTS, SERVICES OR CONTENT PURCHASED OR 
+      OBTAINED THROUGH THE SERVICES OR THE ACCURACY, TIMELINESS, TRUTHFULNESS, 
+      COMPLETENESS OR RELIABILITY OF ANY CONTENT OBTAINED THROUGH THE 
       SERVICES.
     </p>
     <p>
-      NO ADVICE OR INFORMATION, WHETHER ORAL OR WRITTEN, OBTAINED FROM
-      HABITRPG OR THROUGH THE SERVICES, HABITRPG CONTENT OR PUBLIC USER CONTENT, WILL
+      NO ADVICE OR INFORMATION, WHETHER ORAL OR WRITTEN, OBTAINED FROM 
+      HABITRPG OR THROUGH THE SERVICES, HABITRPG CONTENT OR PUBLIC USER CONTENT, WILL 
       CREATE ANY WARRANTY NOT EXPRESSLY MADE HEREIN.
     </p>
     <p>
       <strong>Indemnity</strong>
       <br>
-      You agree to defend, indemnify, and hold HabitRPG, its officers,
-      directors, employees and agents, harmless from and against any claims,
-      liabilities, damages, losses, and expenses, including, without
-      limitation, reasonable legal and accounting fees, arising out of or in
-      any way connected with Public User Content you submit to HabitRPG, your access
-      to or use of the Services or HabitRPG Content, or your violation of these
+      You agree to defend, indemnify, and hold HabitRPG, its officers, 
+      directors, employees and agents, harmless from and against any claims, 
+      liabilities, damages, losses, and expenses, including, without 
+      limitation, reasonable legal and accounting fees, arising out of or in 
+      any way connected with Public User Content you submit to HabitRPG, your access 
+      to or use of the Services or HabitRPG Content, or your violation of these 
       Terms of Service.
     </p>
     <p>
       <strong>Limitation of Liability</strong>
       <br>
-      YOU ACKNOWLEDGE AND AGREE THAT, TO THE MAXIMUM EXTENT PERMITTED BY LAW,
-      THE ENTIRE RISK ARISING OUT OF YOUR ACCESS TO AND USE OF THE SERVICES
-      AND CONTENT THEREIN REMAINS WITH YOU. NEITHER HABITRPG NOR ANY OTHER
-      PARTY INVOLVED IN CREATING, PRODUCING, OR DELIVERING THE SERVICES OR
-      HABITRPG CONTENT WILL BE LIABLE FOR ANY INCIDENTAL, SPECIAL, EXEMPLARY OR
-      CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, LOSS OF DATA OR LOSS OF
-      GOODWILL, SERVICE INTERRUPTION, COMPUTER DAMAGE OR SYSTEM FAILURE OR THE
-      COST OF SUBSTITUTE PRODUCTS OR SERVICES, ARISING OUT OF OR IN CONNECTION
-      WITH THESE TERMS OR FROM THE USE OF OR INABILITY TO USE THE SERVICES OR
-      CONTENT THEREIN, WHETHER BASED ON WARRANTY, CONTRACT, TORT (INCLUDING
-      NEGLIGENCE), PRODUCT LIABILITY OR ANY OTHER LEGAL THEORY, AND WHETHER OR
-      NOT HABITRPG HAS BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGE, EVEN IF
-      A LIMITED REMEDY SET FORTH HEREIN IS FOUND TO HAVE FAILED OF ITS
-      ESSENTIAL PURPOSE. YOU SPECIFICALLY ACKNOWLEDGE THAT HABITRPG IS NOT
-      LIABLE FOR THE DEFAMATORY, OFFENSIVE OR ILLEGAL CONDUCT OF OTHER USERS
-      OR THIRD PARTIES AND THAT THE RISK OF INJURY FROM THE FOREGOING RESTS
-      ENTIRELY WITH YOU. FURTHER, HABITRPG WILL HAVE NO LIABILITY TO YOU OR TO
-      ANY THIRD PARTY FOR ANY PUBLIC USER CONTENT OR THIRD-PARTY CONTENT UPLOADED
+      YOU ACKNOWLEDGE AND AGREE THAT, TO THE MAXIMUM EXTENT PERMITTED BY LAW, 
+      THE ENTIRE RISK ARISING OUT OF YOUR ACCESS TO AND USE OF THE SERVICES 
+      AND CONTENT THEREIN REMAINS WITH YOU. NEITHER HABITRPG NOR ANY OTHER 
+      PARTY INVOLVED IN CREATING, PRODUCING, OR DELIVERING THE SERVICES OR 
+      HABITRPG CONTENT WILL BE LIABLE FOR ANY INCIDENTAL, SPECIAL, EXEMPLARY OR 
+      CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, LOSS OF DATA OR LOSS OF 
+      GOODWILL, SERVICE INTERRUPTION, COMPUTER DAMAGE OR SYSTEM FAILURE OR THE 
+      COST OF SUBSTITUTE PRODUCTS OR SERVICES, ARISING OUT OF OR IN CONNECTION 
+      WITH THESE TERMS OR FROM THE USE OF OR INABILITY TO USE THE SERVICES OR 
+      CONTENT THEREIN, WHETHER BASED ON WARRANTY, CONTRACT, TORT (INCLUDING 
+      NEGLIGENCE), PRODUCT LIABILITY OR ANY OTHER LEGAL THEORY, AND WHETHER OR 
+      NOT HABITRPG HAS BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGE, EVEN IF 
+      A LIMITED REMEDY SET FORTH HEREIN IS FOUND TO HAVE FAILED OF ITS 
+      ESSENTIAL PURPOSE. YOU SPECIFICALLY ACKNOWLEDGE THAT HABITRPG IS NOT 
+      LIABLE FOR THE DEFAMATORY, OFFENSIVE OR ILLEGAL CONDUCT OF OTHER USERS 
+      OR THIRD PARTIES AND THAT THE RISK OF INJURY FROM THE FOREGOING RESTS 
+      ENTIRELY WITH YOU. FURTHER, HABITRPG WILL HAVE NO LIABILITY TO YOU OR TO 
+      ANY THIRD PARTY FOR ANY PUBLIC USER CONTENT OR THIRD-PARTY CONTENT UPLOADED 
       ONTO OR DOWNLOADED FROM THE SITES OR THROUGH THE SERVICES.
     </p>
     <p>
-      IN NO EVENT WILL HABITRPG'S AGGREGATE LIABILITY ARISING OUT OF OR
-      IN CONNECTION WITH THESE TERMS OF SERVICE OR FROM THE USE OF OR
-      INABILITY TO USE THE SITE, SERVICES OR CONTENT THEREIN EXCEED ONE
-      HUNDRED U.S. DOLLARS ($100). THE LIMITATIONS OF DAMAGES SET FORTH ABOVE
-      ARE FUNDAMENTAL ELEMENTS OF THE BASIS OF THE BARGAIN BETWEEN HABITRPG AND
-      YOU. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF
-      LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, SO THE ABOVE
+      IN NO EVENT WILL HABITRPG'S AGGREGATE LIABILITY ARISING OUT OF OR 
+      IN CONNECTION WITH THESE TERMS OF SERVICE OR FROM THE USE OF OR 
+      INABILITY TO USE THE SITE, SERVICES OR CONTENT THEREIN EXCEED ONE 
+      HUNDRED U.S. DOLLARS ($100). THE LIMITATIONS OF DAMAGES SET FORTH ABOVE 
+      ARE FUNDAMENTAL ELEMENTS OF THE BASIS OF THE BARGAIN BETWEEN HABITRPG AND 
+      YOU. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
+      LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, SO THE ABOVE 
       LIMITATION MAY NOT APPLY TO YOU.
     </p>
     <p>
       <strong>Proprietary Rights Notices</strong>
       <br>
-      All trademarks, service marks, logos, trade names and any other
-      proprietary designations of HabitRPG used herein are trademarks or
-      registered trademarks of HabitRPG. Any other trademarks, service marks,
-      logos, trade names and any other proprietary designations are the
+      All trademarks, service marks, logos, trade names and any other 
+      proprietary designations of HabitRPG used herein are trademarks or 
+      registered trademarks of HabitRPG. Any other trademarks, service marks, 
+      logos, trade names and any other proprietary designations are the 
       trademarks or registered trademarks of their respective parties.
     </p>
     <p>
       <strong>Controlling Law and Jurisdiction</strong>
       <br>
-      These Terms of Service and any action related thereto will be governed
-      by the laws of the State of California without regard to its conflict of
-      laws provisions. The exclusive jurisdiction and venue of any action with
-      respect to the subject matter of these Terms of Service will be the
-      courts having jurisdiction over disputes arising in Santa Clara County,
-      California, and each of the parties hereto waives any objection to
+      These Terms of Service and any action related thereto will be governed 
+      by the laws of the State of California without regard to its conflict of 
+      laws provisions. The exclusive jurisdiction and venue of any action with 
+      respect to the subject matter of these Terms of Service will be the 
+      courts having jurisdiction over disputes arising in Santa Clara County, 
+      California, and each of the parties hereto waives any objection to 
       jurisdiction and venue in such courts.
     </p>
     <p>
-      YOU AGREE THAT IF YOU WANT TO SUE US, YOU MUST FILE YOUR LAWSUIT
-      WITHIN ONE YEAR AFTER THE EVENT THAT GAVE RISE TO YOUR LAWSUIT.
+      YOU AGREE THAT IF YOU WANT TO SUE US, YOU MUST FILE YOUR LAWSUIT 
+      WITHIN ONE YEAR AFTER THE EVENT THAT GAVE RISE TO YOUR LAWSUIT. 
       OTHERWISE, YOUR LAWSUIT WILL BE PERMANENTLY BARRED.
     </p>
     <p>
       <strong>Export Control</strong>
       <br>
-      You may not use or otherwise export or re-export the Services except as
-      authorized by United States law and the laws of the jurisdiction in
-      which the Services were obtained. In particular, but without limitation,
-      the Services may not be exported or re-exported (a) into any U.S.
-      embargoed countries or (b) to anyone on the U.S. Treasury Department's
-      list of Specially Designated Nationals or the U.S. Department of
-      Commerce Denied Person's List or Entity List. By using the Services, you
-      represent and warrant that you are not located in any such country or on
-      any such list. You also agree that you will not use these products for
-      any purposes prohibited by United States law, including, without
-      limitation, the development, design, manufacture or production of
+      You may not use or otherwise export or re-export the Services except as 
+      authorized by United States law and the laws of the jurisdiction in 
+      which the Services were obtained. In particular, but without limitation, 
+      the Services may not be exported or re-exported (a) into any U.S. 
+      embargoed countries or (b) to anyone on the U.S. Treasury Department's 
+      list of Specially Designated Nationals or the U.S. Department of 
+      Commerce Denied Person's List or Entity List. By using the Services, you 
+      represent and warrant that you are not located in any such country or on 
+      any such list. You also agree that you will not use these products for 
+      any purposes prohibited by United States law, including, without 
+      limitation, the development, design, manufacture or production of 
       nuclear, missiles, or chemical or biological weapons.
     </p>
     <p>
       <strong>Entire Agreement</strong>
       <br>
-      These Terms of Service constitute the entire and exclusive understanding
-      and agreement between HabitRPG and you regarding the Services and HabitRPG
-      Content, and these Terms of Service supersede and replace any and all
-      prior oral or written understandings or agreements between HabitRPG and
+      These Terms of Service constitute the entire and exclusive understanding 
+      and agreement between HabitRPG and you regarding the Services and HabitRPG 
+      Content, and these Terms of Service supersede and replace any and all 
+      prior oral or written understandings or agreements between HabitRPG and 
       you regarding the Services and HabitRPG Content.
     </p>
     <p>
       <strong>Assignment</strong>
       <br>
-      You may not assign or transfer these Terms of Service, by operation of
-      law or otherwise, without HabitRPG's prior written consent. Any attempt
-      by you to assign or transfer these Terms of Service, without such
-      consent, will be null and of no effect. HabitRPG may freely assign these
-      Terms of Service. Subject to the foregoing, these Terms of Service will
-      bind and inure to the benefit of the parties, their successors and
+      You may not assign or transfer these Terms of Service, by operation of 
+      law or otherwise, without HabitRPG's prior written consent. Any attempt 
+      by you to assign or transfer these Terms of Service, without such 
+      consent, will be null and of no effect. HabitRPG may freely assign these 
+      Terms of Service. Subject to the foregoing, these Terms of Service will 
+      bind and inure to the benefit of the parties, their successors and 
       permitted assigns.
     </p>
     <p>
       <strong>Notices</strong>
       <br>
-      You consent to the use of: (i) electronic means to complete these Terms
-      of Service and to deliver any notices or other communications permitted
-      or required hereunder; and (ii) electronic records to store information
-      related to these Terms of Service or your use of the Services. Any
-      notices or other communications permitted to required hereunder,
-      including those regarding modifications to these Terms of Service, will
-      be in writing and given: (x) by HabitRPG via email (in each case to the
-      address that you provide) or (y) by posting to the Sites or Services.
-      For notices made by e-mail, the date of receipt will be deemed the date
+      You consent to the use of: (i) electronic means to complete these Terms 
+      of Service and to deliver any notices or other communications permitted 
+      or required hereunder; and (ii) electronic records to store information 
+      related to these Terms of Service or your use of the Services. Any 
+      notices or other communications permitted to required hereunder, 
+      including those regarding modifications to these Terms of Service, will 
+      be in writing and given: (x) by HabitRPG via email (in each case to the 
+      address that you provide) or (y) by posting to the Sites or Services. 
+      For notices made by e-mail, the date of receipt will be deemed the date 
       on which such notice is transmitted.
     </p>
     <p>
       <strong>General</strong>
       <br>
-      The failure of HabitRPG to enforce any right or provision of these Terms
-      of Service will not constitute a waiver of future enforcement of that
-      right or provision. The waiver of any such right or provision will be
-      effective only if in writing and signed by a duly authorized
-      representative of HabitRPG. Except as expressly set forth in these Terms
-      of Service, the exercise by either party of any of its remedies under
-      these Terms of Service will be without prejudice to its other remedies
-      under these Terms of Service or otherwise. If for any reason a court of
-      competent jurisdiction finds any provision of these Terms of Service
-      invalid or unenforceable, that provision will be enforced to the maximum
-      extent permissible and the other provisions of these Terms of Service
+      The failure of HabitRPG to enforce any right or provision of these Terms 
+      of Service will not constitute a waiver of future enforcement of that 
+      right or provision. The waiver of any such right or provision will be 
+      effective only if in writing and signed by a duly authorized 
+      representative of HabitRPG. Except as expressly set forth in these Terms 
+      of Service, the exercise by either party of any of its remedies under 
+      these Terms of Service will be without prejudice to its other remedies 
+      under these Terms of Service or otherwise. If for any reason a court of 
+      competent jurisdiction finds any provision of these Terms of Service 
+      invalid or unenforceable, that provision will be enforced to the maximum 
+      extent permissible and the other provisions of these Terms of Service 
       will remain in full force and effect.
     </p>
     <p>
       <strong>Contacting Us</strong>
       <br>
-      If you have any questions about these Terms of Service, please contact
+      If you have any questions about these Terms of Service, please contact 
       us at tylerrenelle@gmail.com.
     </p>
     <div id="home_static_footer">

From 1f94085875e3504b6f32b5ddfeb6c4f2bb1b1683 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 13:12:09 -0500
Subject: [PATCH 091/220] CORS middleware

---
 src/server/index.coffee      | 2 +-
 src/server/middleware.coffee | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/server/index.coffee b/src/server/index.coffee
index 41b447f677..f4c005ebeb 100644
--- a/src/server/index.coffee
+++ b/src/server/index.coffee
@@ -74,11 +74,11 @@ mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, ->
     )
     # Adds req.getModel method
     .use(store.modelMiddleware())
+    .use(middleware.allowCrossDomain)
     # API should be hit before all other routes
     .use('/api/v1', require('./api').middleware)
     .use(require('./deprecated').middleware)
     # Show splash page for newcomers
-    .use(middleware.splash)
     .use(priv.middleware)
     .use(middleware.view)
     .use(auth.middleware(strategies, options))
diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee
index 9ad133788d..191ccc8f40 100644
--- a/src/server/middleware.coffee
+++ b/src/server/middleware.coffee
@@ -12,3 +12,10 @@ module.exports.view = (req, res, next) ->
   _view.nodeEnv = process.env.NODE_ENV
   model.set '_view', _view
   next()
+
+#CORS middleware
+module.exports.allowCrossDomain = (req, res, next) ->
+  res.header "Access-Control-Allow-Origin", '*'
+  res.header "Access-Control-Allow-Methods", "GET,PUT,POST,DELETE"
+  res.header "Access-Control-Allow-Headers", "Content-Type"
+  next()
\ No newline at end of file

From 22c5acc303c01a0597e723092b0dfd840442e191 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 14:02:46 -0500
Subject: [PATCH 092/220] tour fix

---
 public/vendor/bootstrap | 2 +-
 src/app/browser.coffee  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/vendor/bootstrap b/public/vendor/bootstrap
index 8c7f9c66a7..eb24718add 160000
--- a/public/vendor/bootstrap
+++ b/public/vendor/bootstrap
@@ -1 +1 @@
-Subproject commit 8c7f9c66a7d12f47f50618ef420868fe836d0c33
+Subproject commit eb24718add4dd36fe92fdbdb79e6ff4ce5919300
diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index ff3a4b71cc..f5e6143f93 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -207,7 +207,7 @@ module.exports.app = (appExports, model, app) ->
     #restoreRefs(model)
     setupSortable(model)
     setupTooltips(model)
-    #setupTour(model)
+    setupTour(model)
     $('.datepicker').datepicker({autoclose:true, todayBtn:true})
       .on 'changeDate', (ev) ->
             #for some reason selecting a date doesn't fire a change event on the field, meaning our changes aren't saved

From 26a89178621e22abf488482f02df8866ddfdb917 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 14:02:46 -0500
Subject: [PATCH 093/220] tour fix

---
 public/vendor/bootstrap | 2 +-
 src/app/browser.coffee  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/vendor/bootstrap b/public/vendor/bootstrap
index 8c7f9c66a7..eb24718add 160000
--- a/public/vendor/bootstrap
+++ b/public/vendor/bootstrap
@@ -1 +1 @@
-Subproject commit 8c7f9c66a7d12f47f50618ef420868fe836d0c33
+Subproject commit eb24718add4dd36fe92fdbdb79e6ff4ce5919300
diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index ff3a4b71cc..f5e6143f93 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -207,7 +207,7 @@ module.exports.app = (appExports, model, app) ->
     #restoreRefs(model)
     setupSortable(model)
     setupTooltips(model)
-    #setupTour(model)
+    setupTour(model)
     $('.datepicker').datepicker({autoclose:true, todayBtn:true})
       .on 'changeDate', (ev) ->
             #for some reason selecting a date doesn't fire a change event on the field, meaning our changes aren't saved

From 57b497f1bd9746a6b5aeea8ff544a423c96955b7 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 14:09:39 -0500
Subject: [PATCH 094/220] put splash middleware back in

---
 src/server/index.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/index.coffee b/src/server/index.coffee
index f4c005ebeb..8fc29583a8 100644
--- a/src/server/index.coffee
+++ b/src/server/index.coffee
@@ -79,6 +79,7 @@ mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, ->
     .use('/api/v1', require('./api').middleware)
     .use(require('./deprecated').middleware)
     # Show splash page for newcomers
+    .use(middleware.splash)
     .use(priv.middleware)
     .use(middleware.view)
     .use(auth.middleware(strategies, options))

From 6bfe1d076e2de488d6f05943e65bf6773e2dea95 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 13:12:09 -0500
Subject: [PATCH 095/220] CORS middleware

---
 src/server/index.coffee      | 2 +-
 src/server/middleware.coffee | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/server/index.coffee b/src/server/index.coffee
index 41b447f677..f4c005ebeb 100644
--- a/src/server/index.coffee
+++ b/src/server/index.coffee
@@ -74,11 +74,11 @@ mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, ->
     )
     # Adds req.getModel method
     .use(store.modelMiddleware())
+    .use(middleware.allowCrossDomain)
     # API should be hit before all other routes
     .use('/api/v1', require('./api').middleware)
     .use(require('./deprecated').middleware)
     # Show splash page for newcomers
-    .use(middleware.splash)
     .use(priv.middleware)
     .use(middleware.view)
     .use(auth.middleware(strategies, options))
diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee
index 9ad133788d..191ccc8f40 100644
--- a/src/server/middleware.coffee
+++ b/src/server/middleware.coffee
@@ -12,3 +12,10 @@ module.exports.view = (req, res, next) ->
   _view.nodeEnv = process.env.NODE_ENV
   model.set '_view', _view
   next()
+
+#CORS middleware
+module.exports.allowCrossDomain = (req, res, next) ->
+  res.header "Access-Control-Allow-Origin", '*'
+  res.header "Access-Control-Allow-Methods", "GET,PUT,POST,DELETE"
+  res.header "Access-Control-Allow-Headers", "Content-Type"
+  next()
\ No newline at end of file

From 4ca62b9f28b4dc383328d8df5be64ae9ecb5618b Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 14:09:39 -0500
Subject: [PATCH 096/220] put splash middleware back in

---
 src/server/index.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/index.coffee b/src/server/index.coffee
index f4c005ebeb..8fc29583a8 100644
--- a/src/server/index.coffee
+++ b/src/server/index.coffee
@@ -79,6 +79,7 @@ mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, ->
     .use('/api/v1', require('./api').middleware)
     .use(require('./deprecated').middleware)
     # Show splash page for newcomers
+    .use(middleware.splash)
     .use(priv.middleware)
     .use(middleware.view)
     .use(auth.middleware(strategies, options))

From efe1c9267ead0428a217f6a7de9183b8e794f3da Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Tue, 5 Mar 2013 14:16:10 -0500
Subject: [PATCH 097/220] WIP: new 'Task Actions' UI (buttons, checkboxes, etc)

---
 styles/app/helpers.styl |  32 +++++++
 styles/app/index.styl   |   1 +
 styles/app/tasks.styl   | 206 ++++++++++++++++++++++++++++++++++------
 views/app/rewards.html  |   2 -
 views/app/tasks.html    |  24 +++--
 5 files changed, 225 insertions(+), 40 deletions(-)
 create mode 100644 styles/app/helpers.styl

diff --git a/styles/app/helpers.styl b/styles/app/helpers.styl
new file mode 100644
index 0000000000..e827803593
--- /dev/null
+++ b/styles/app/helpers.styl
@@ -0,0 +1,32 @@
+// Hide from both screenreaders and browsers: h5bp.com/u
+.hidden
+  display: none !important
+  visibility: hidden
+
+
+// Hide only visually, but have it available for screenreaders: h5bp.com/v
+.visuallyhidden
+  border: 0
+  clip: rect(0 0 0 0)
+  height: 1px
+  margin: -1px
+  overflow: hidden
+  padding: 0
+  position: absolute
+  width: 1px
+
+
+// Extends the .visuallyhidden class to allow the element to be focusable when navigated to via the keyboard: h5bp.com/p
+.visuallyhidden.focusable:active,
+.visuallyhidden.focusable:focus
+  clip: auto
+  height: auto
+  margin: 0
+  overflow: visible
+  position: static
+  width: auto
+
+
+// Hide visually and from screenreaders, but maintain layout
+.invisible
+  visibility: hidden
\ No newline at end of file
diff --git a/styles/app/index.styl b/styles/app/index.styl
index 406f26d74e..fcec0af9e1 100644
--- a/styles/app/index.styl
+++ b/styles/app/index.styl
@@ -7,6 +7,7 @@
 @import "./customizer.styl";
 @import "./items.styl";
 @import "./alerts.styl";
+@import "./helpers.styl";
 
 @import "../../public/vendor/bootstrap-datepicker/css/datepicker.css";
 
diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index 8c0b370fa0..1299bd5f00 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -1,19 +1,73 @@
+// color variables
+$color-worst      =   rgb(230, 184, 175)
+$color-worse      =   rgb(244, 204, 204)
+$color-bad        =   rgb(252, 229, 205)
+$color-neutral    =   rgb(255, 242, 204)
+$color-good       =   rgb(217, 234, 211)
+$color-better     =   rgb(208, 224, 227)
+$color-best       =   rgb(201, 218, 248)
+$color-completed  =   rgb(217, 217, 217)
+
 .color-worst
-  background-color: rgb(230, 184, 175)
+  background-color: $color-worst
+  .task-checker label
+    background-color: darken($color-worst, 30%)
+  .action-plus
+    background-color: darken($color-worst, 30%)
+  .action-minus
+    background-color: darken($color-worst, 30%)
 .color-worse
-  background-color: rgb(244, 204, 204)
+  background-color: $color-worse
+  .task-checker label
+    background-color: darken($color-worse, 30%)
+  .action-plus
+    background-color: darken($color-worse, 30%)
+  .action-minus
+    background-color: darken($color-worse, 30%)
 .color-bad
-  background-color: rgb(252, 229, 205)
+  background-color: $color-bad
+  .task-checker label
+    background-color: darken($color-bad, 30%)
+  .action-plus
+    background-color: darken($color-bad, 30%)
+  .action-minus
+    background-color: darken($color-bad, 30%)
 .color-neutral
-  background-color: rgb(255, 242, 204)
+  background-color: $color-neutral
+  .task-checker label
+    background-color: darken($color-neutral, 30%)
+  .action-plus
+    background-color: darken($color-neutral, 30%)
+  .action-minus
+    background-color: darken($color-neutral, 30%)
 .color-good
-  background-color: rgb(217, 234, 211)
+  background-color: $color-good
+  .task-checker label
+    background-color: darken($color-good, 30%)
+  .action-plus
+    background-color: darken($color-good, 30%)
+  .action-minus
+    background-color: darken($color-good, 30%)
 .color-better
-  background-color: rgb(208, 224, 227)
+  background-color: $color-better
+  .task-checker label
+    background-color: darken($color-better, 30%)
+  .action-plus
+    background-color: darken($color-better, 30%)
+  .action-minus
+    background-color: darken($color-better, 30%)
 .color-best
-  background-color: rgb(201, 218, 248)
+  background-color: $color-best
+  .task-checker label
+    background-color: darken($color-best, 30%)
+  .action-plus
+    background-color: darken($color-best, 30%)
+  .action-minus
+    background-color: darken($color-best, 30%)
 .completed
-  background-color: rgb(217, 217, 217)
+  background-color: $color-completed
+  .task-checker label
+    background-color: darken($color-completed, 30%)
   color: rgb(153, 153, 153)
 .reward
   background-color: white
@@ -60,26 +114,18 @@ li:hover .task-meta-controls .hover-show
   display: inline
 
 .task
-  list-style:none
-
-  pre
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif
-    font-size: 13px
-    line-height: 18px
-    color: black
-    word-break: normal
 
   .task-meta-controls
     float:right
     i
       margin-left:5px
 
-  .task-controls,.task-text
-    display:inline
-    margin: 0 10px 0 0
+  // .task-controls,.task-text
+  //   // display:inline
+  //   // margin: 0 10px 0 0
 
-    input
-      margin-top: 0
+  //   input
+  //     margin-top: 0
 
   .task-meta-controls .hover-show
     display: none;
@@ -102,23 +148,127 @@ li:hover .task-meta-controls .hover-show
   h2
     margin: 0 0 0.5em
     padding: 0
+  
+  .nav-tabs
+    margin-top: 0.75em
+
+  .option-box
+    .option-action
+      margin-left: 0.25em
+
+
+.rewards
+  margin-bottom: 0.75em
 
 .task
+  list-style: none
   clear: both
-  padding: 0.5em
+  padding: 0 0.5em 0 0
+  min-height: 2.5em
+  line-height: 2.5
   margin-bottom: 0.75em
-  border: 1px solid rgba(0, 0, 0, 0.2)
+  // border: 1px solid rgba(0,0,0,0.2)
+  // -webkit-background-clip: padding-box
   border-radius: 0.25em
+  overflow: hidden
   &:last-child
     margin-bottom: 0
 
+.task-controls
+  display: inline
+.task-text
+  display: inline-block
+  text-indent: 0.5em
+
+.task-checker
+  label
+    display: inline-block
+    width: 2.5em
+    height: 2.5em
+    padding: 0
+    margin: 0
+    vertical-align: top
+    cursor: pointer
+    // border-radius: 0.25em 0 0 0.25em
+    &:after
+      content: '¬'
+      transform: rotate(135deg)
+      display: block
+      line-height: 1.1
+      text-align: left
+      opacity: 0.1
+      color: black
+      font-size: 3em
+    &:hover:after,
+    &:focus:after
+      opacity: 0.5 !important
+    &:active:after
+      opacity: 0.75 !important
+
+  & input[type=checkbox]:checked + label:after
+    opacity: 1
+  
+  input[type=checkbox]
+    margin: 0
+    padding: 0
+    visibility: hidden
+
 .addtask-form
   margin-bottom: 0.75em
+  border-radius: 0.25em
+  overflow: hidden
   .addtask-field
-    max-width: 70%
+    display: inline-block
+    width: 80% // fallback for Safari 5.1
+    // width: calc(unquote('100% - 3em'))
+    input
+      font-family: 'Lato', sans-serif
+      outline: 0
+      border: 0
+      box-shadow: none
+      background-color: white
+      border-radius 0 0.25em 0.25em 0
+      height: 2.5em
+      padding: 0 0 0 0.5em
+      width: 100%
+      &:focus
+        box-shadow: inset 0 0 3px darken($color-best, 20%)
   .addtask-btn
-    float: right
-    font-family: 'Lato', sans-serif
+    display: inline-block
+    width: 1.51515em
+    height: 1.51515em
+    padding: 0
+    font-size: 1.65em
+    line-height: 1.55
+    outline: 0
+    border: 0
+    background-color: darken($color-best, 20%)
+    opacity: 0.5
+    &:hover,
+    &:focus
+      opacity: 0.75
+      background-color: darken($color-best, 20%)
+    &:active
+      background-color: darken($color-best, 30%)
+      opacity: 1
 
-.todo-status-toggler
-  margin-top: 0.75em
\ No newline at end of file
+.task-action-btn
+  display: inline-block
+  width: 1.773em
+  height: 1.773em
+  padding: 0
+  font-size: 1.41em
+  line-height: 1.773
+  text-align: center
+  color: black
+  vertical-align: top
+  border-right: 1px solid rgba(0,0,0,0.25)
+  &:last-child
+    border: 0
+  &:hover,
+  &:focus
+    text-decoration: none
+  // &.action-plus
+  //   background-color: darken($color-good, 20%)
+  // &.action-minus
+  //   background-color: darken($color-worst, 20%)
\ No newline at end of file
diff --git a/views/app/rewards.html b/views/app/rewards.html
index e7e1bd29e9..dd4394e625 100644
--- a/views/app/rewards.html
+++ b/views/app/rewards.html
@@ -38,7 +38,6 @@
 <item:>
     {#unless :item.hide}
     <li class="task reward item">
-    <pre>
       <div class="task-meta-controls">
           <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:item.notes}" data-original-title="{:item.text}" class='task-notes'><i class="icon-comment"></i></span>
       </div>
@@ -60,6 +59,5 @@
           {/}
 
       </div>
-    </pre>
     </li>
     {/}
\ No newline at end of file
diff --git a/views/app/tasks.html b/views/app/tasks.html
index f28d83c3e1..a02fd393a5 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -13,11 +13,11 @@
     </div>
 
     <div class="task-column span3 todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
-        <span class='pull-right'>
+        <span class='option-box pull-right'>
             {#if _user.history.todos}
-              <a x-bind=click:toggleChart data-toggle-id="todos-chart" data-history-path="_user.history.todos" rel=tooltip title="Progress"><i class=icon-signal></i></a>
+              <a class="option-action" x-bind=click:toggleChart data-toggle-id="todos-chart" data-history-path="_user.history.todos" rel=tooltip title="Progress"><i class=icon-signal></i></a>
             {/}
-            <a href="/v1/users/{{_user.id}}/calendar.ics?apiToken={{_user.apiToken}}" rel=tooltip title="iCal"><i class=icon-calendar></i></a>
+            <a class="option-action" href="/v1/users/{{_user.id}}/calendar.ics?apiToken={{_user.apiToken}}" rel=tooltip title="iCal"><i class=icon-calendar></i></a>
             <!-- <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> -->
         </span>
         <h2>Todos</h2>
@@ -124,9 +124,10 @@
 
 <newTask:>
     <form class="addtask-form form-inline new-task-form" id="new-{@type}" data-task-type="{@type}" x-bind="submit:addTask">
-        <input class="addtask-field" value="{@inputValue}" type="text" name="new-task" placeholder="{@placeHolder}"/>
-        <input class="btn addtask-btn" type="submit" value="Add">
+        <input class="addtask-btn" type="submit" value="＋">
+        <span class="addtask-field"><input value="{@inputValue}" type="text" name="new-task" placeholder="{@placeHolder}"/></span>
     </form>
+    <hr>
 
     <!-- all the parts of a single task -->
     <task:>
@@ -152,19 +153,22 @@
             <div class="task-controls">
                 <!-- Habits -->
                 {#if equal(:task.type, 'habit')}
-                {#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
-                {#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
+                {#if :task.up}<a class="task-action-btn action-plus" data-direction=up x-bind=click:score>＋</a>{/}
+                {#if :task.down}<a class="task-action-btn action-minus" data-direction=down x-bind=click:score>−</a>{/}
                 <!-- Rewards -->
                 {else if equal(:task.type, 'reward')}
-                <a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
+                <a class="task-action-btn action-buy" x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
                 <!-- Daily & Todos -->
                 {else}
-                <input type=checkbox checked="{:task.completed}">
+                <span class="task-checker">
+                    <input type=checkbox id="box-{{:task.id}}" class="visuallyhidden focusable" checked="{:task.completed}">
+                    <label for="box-{{:task.id}}"></label>
+                </span>
                 {/}
             </div>
 
             <!-- main content -->
-            <div class="task-text">{:task.text}</div>
+            <p class="task-text">{:task.text}</p>
 
             <!-- edit/options dialog -->
             <app:taskMeta />

From 1a308da495aab91bfd718596fd94aaf2e9ff0e9a Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Tue, 5 Mar 2013 15:01:52 -0500
Subject: [PATCH 098/220] better responsive breakpoints, more robust custom
 grid

---
 styles/app/index.styl      |  8 ++++--
 styles/app/responsive.styl | 28 +++++++++++++++++++
 views/app/index.html       |  4 +--
 views/app/tasks.html       | 55 +++++++++++++++++++++++---------------
 4 files changed, 69 insertions(+), 26 deletions(-)
 create mode 100644 styles/app/responsive.styl

diff --git a/styles/app/index.styl b/styles/app/index.styl
index fcec0af9e1..40204aaba0 100644
--- a/styles/app/index.styl
+++ b/styles/app/index.styl
@@ -8,6 +8,10 @@
 @import "./items.styl";
 @import "./alerts.styl";
 @import "./helpers.styl";
+@import "./responsive.styl";
+
+// where's the actual bootstrap include?
+// @import "../bootstrap-responsive.styl";
 
 @import "../../public/vendor/bootstrap-datepicker/css/datepicker.css";
 
@@ -35,7 +39,7 @@ html,body,p,h1,ul,li,table,tr,th,td
   box-sizing: border-box
   z-index: 1000
 
-@media (max-width: 480px) {
+@media (max-width: 600px) {
   #head {
     position: static;
   }
@@ -132,7 +136,7 @@ html,body,p,h1,ul,li,table,tr,th,td
   /*overflow:auto;*/                                                                                                                                                                                                                             
   padding-bottom: 250px; /* don't know why this works, sticky footers are weird */
 
-@media (max-width: 480px) {
+@media (max-width: 600px) {
   #wrap {
     margin-top: 0
   }
diff --git a/styles/app/responsive.styl b/styles/app/responsive.styl
new file mode 100644
index 0000000000..4047c3bbfd
--- /dev/null
+++ b/styles/app/responsive.styl
@@ -0,0 +1,28 @@
+.grid
+	padding: 0 1.5em 1.5em 0
+	letter-spacing: -4px
+
+.module
+	display: inline-block
+	letter-spacing: normal
+	vertical-align: top
+	width: 25%
+	padding: 0 0 1.5em 1.5em
+	-moz-box-sizing: border-box
+	box-sizing: border-box
+
+// at 960px when 4 columns really starts to break
+@media (max-width: 60em)
+	.module
+		width: 50%
+	.task-column
+		max-height: 18em
+		overflow-y: scroll
+
+// at 600px when 2col starts breaking
+@media (max-width: 37.5em)
+	.module
+		width: 100%
+		.task-column
+			max-height: none
+			overflow: visible
\ No newline at end of file
diff --git a/views/app/index.html b/views/app/index.html
index 69ce9f1db5..e16e6fd1eb 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -28,9 +28,9 @@
 <Body:>
   <br/>
   <div id="notification-area"></div>
-  <div id=wrap class="container-fluid">
+  <div id="wrap">
     <app:alerts:alerts />
-    <div id=main class="row-fluid">
+    <div id=main class="grid">
       <app:taskLists />
     </div>
   </div>
diff --git a/views/app/tasks.html b/views/app/tasks.html
index a02fd393a5..e8930c33da 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -1,18 +1,27 @@
 <taskLists:>
-    <!--helpTitle & helpContent moved to tour -->
-    <div class="task-column span3 habits">
+<!--helpTitle & helpContent moved to tour -->
+
+<!-- Habits Column -->
+<div class="module">
+    <div class="task-column habits">
         <h2>Habits</h2>
         <app:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
         <ul class="habits">{#each _habitList as :task}<app:task />{/}</ul>
     </div>
+</div>
 
-    <div class="task-column span3 dailys">
+<!-- Dailys Column -->
+<div class="module">
+    <div class="task-column dailys">
         <h2>Daily</h2>
         <app:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
         <ul class='dailys'>{#each _dailyList as :task}<app:task />{/}</ul>
     </div>
+</div>
 
-    <div class="task-column span3 todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
+<!-- Todos Column -->
+<div class="module">
+    <div class="task-column todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
         <span class='option-box pull-right'>
             {#if _user.history.todos}
               <a class="option-action" x-bind=click:toggleChart data-toggle-id="todos-chart" data-history-path="_user.history.todos" rel=tooltip title="Progress"><i class=icon-signal></i></a>
@@ -36,11 +45,12 @@
             <li class="active"><a x-bind=click:changeContext data-target="#todo-well" data-context="context-uncompleted">Remaining</a></li>
             <li><a x-bind=click:changeContext data-target="#todo-well" data-context="context-completed">Complete</a></li>
         </ul>
-
     </div>
+</div>
 
-    <div class="task-column span3 rewards">
-
+<!-- Rewards Column -->
+<div class="module">
+    <div class="task-column rewards">
         <!--Title -->
         <div class="row-fluid">
             <div class="span6"><h2>Rewards</h2></div>
@@ -60,68 +70,69 @@
             </div>
         </div>
         <app:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
-
+        
         {#if _user.flags.petsEnabled}
         <div class='tabbable tabs-below'>
-
+        
             <div class="tab-content">
                 <div class="tab-pane active" id="rewards-tab">
                     <app:rewardsTab />
                 </div>
-
+        
                 <div class="tab-pane" id="pets-tab">
                     {#with _view.items.pets as :pets}
-
+        
                     <div class="row-fluid">
                         {#with :pets[0]}<app:pet />{/}
                         {#with :pets[1]}<app:pet />{/}
                         {#with :pets[2]}<app:pet />{/}
                         {#with :pets[3]}<app:pet />{/}
                     </div>
-
+        
                     <div class="row-fluid">
                         {#with :pets[4]}<app:pet />{/}
                         {#with :pets[5]}<app:pet />{/}
                         {#with :pets[6]}<app:pet />{/}
                         {#with :pets[7]}<app:pet />{/}
                     </div>
-
+        
                     <div class="row-fluid">
                         {#with :pets[8]}<app:pet />{/}
                         {#with :pets[9]}<app:pet />{/}
                         {#with :pets[10]}<app:pet />{/}
                         {#with :pets[11]}<app:pet />{/}
                     </div>
-
+        
                     <div class="row-fluid">
                         {#with :pets[12]}<app:pet />{/}
                         {#with :pets[13]}<app:pet />{/}
                         {#with :pets[14]}<app:pet />{/}
                         {#with :pets[15]}<app:pet />{/}
                     </div>
-
+        
                     <div class="row-fluid">
                         {#with :pets[16]}<app:pet />{/}
                     </div>
-
-
+        
+        
                     {/}
                 </div>
                 <!--<div class="tab-pane" id="mounts-tab">...</div>-->
             </div>
-
-
+        
+        
             <ul class="nav nav-tabs" id="rewardsTabs">
                 <li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
                 <li><a href="#pets-tab" id='pets-tab' data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
                 <!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
             </ul>
         </div>
-    {else}
+        {else}
         <app:rewardsTab />
-    {/}
-    </div>
+        {/}</div>
+</div>
 
+<!-- Templates -->
 <newTask:>
     <form class="addtask-form form-inline new-task-form" id="new-{@type}" data-task-type="{@type}" x-bind="submit:addTask">
         <input class="addtask-btn" type="submit" value="＋">

From 5fb3ba67f61f50b62146624061df5b0f8dee5106 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Tue, 5 Mar 2013 15:13:59 -0500
Subject: [PATCH 099/220] circle icon for uncompleted tasks, and rollin with
 square edges for now

---
 styles/app/tasks.styl | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index 1299bd5f00..c454ca3cce 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -167,10 +167,11 @@ li:hover .task-meta-controls .hover-show
   min-height: 2.5em
   line-height: 2.5
   margin-bottom: 0.75em
-  // border: 1px solid rgba(0,0,0,0.2)
-  // -webkit-background-clip: padding-box
+  outline: 1px solid rgba(0,0,0,0.1)
+  outline-offset: -1px
+  -webkit-background-clip: padding-box
   border-radius: 0.25em
-  overflow: hidden
+  // overflow: hidden
   &:last-child
     margin-bottom: 0
 
@@ -191,21 +192,31 @@ li:hover .task-meta-controls .hover-show
     cursor: pointer
     // border-radius: 0.25em 0 0 0.25em
     &:after
-      content: '¬'
-      transform: rotate(135deg)
+      content: '○'
       display: block
-      line-height: 1.1
-      text-align: left
-      opacity: 0.1
+      opacity: 0.2
+      line-height: 0.8
+      text-align: center
       color: black
       font-size: 3em
-    &:hover:after,
-    &:focus:after
+    &:hover:before,
+    &:focus:before
+      content: '¬'
+      display: block
+      font-size: 3em
+      color: black
+      transform: rotate(135deg)
+      line-height: 1.1
+      text-align: left
       opacity: 0.5 !important
-    &:active:after
+    &:active:before
       opacity: 0.75 !important
 
   & input[type=checkbox]:checked + label:after
+    content: '¬'
+    transform: rotate(135deg)
+    line-height: 1.1
+    text-align: left
     opacity: 1
   
   input[type=checkbox]

From 8132dbfe058b5c8a3b4367f31b41a1fd1914ad6e Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 15:23:02 -0500
Subject: [PATCH 100/220] <task:> tabbing borked

---
 views/app/tasks.html | 72 ++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/views/app/tasks.html b/views/app/tasks.html
index f0ff20c787..3c20388679 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -128,47 +128,47 @@
         <input class="btn addtask-btn" type="submit" value="Add">
     </form>
 
-    <!-- all the parts of a single task -->
-    <task:>
-        <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
-            <!-- right-hand side control buttons -->
-            <div class="task-meta-controls">
-                <div class="hover-show">
-                    <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
-                    <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
-                    {#if :task.history}
-                    <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
-                        <i class="icon-signal"></i>
-                    </a>
-                    {/}
-                </div>
-
-                {#if :task.notes}
-                <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
+<!-- all the parts of a single task -->
+<task:>
+    <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
+        <!-- right-hand side control buttons -->
+        <div class="task-meta-controls">
+            <div class="hover-show">
+                <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
+                <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
+                {#if :task.history}
+                <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
+                    <i class="icon-signal"></i>
+                </a>
                 {/}
             </div>
 
-            <!-- left-hand side checkbox -->
-            <div class="task-controls">
-                <!-- Habits -->
-                {#if equal(:task.type, 'habit')}
-                {#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
-                {#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
-                <!-- Rewards -->
-                {else if equal(:task.type, 'reward')}
-                <a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
-                <!-- Daily & Todos -->
-                {else}
-                <input type=checkbox checked="{:task.completed}">
-                {/}
-            </div>
+            {#if :task.notes}
+            <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
+            {/}
+        </div>
 
-            <!-- main content -->
-            <div class="task-text">{:task.text}</div>
+        <!-- left-hand side checkbox -->
+        <div class="task-controls">
+            <!-- Habits -->
+            {#if equal(:task.type, 'habit')}
+            {#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
+            {#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
+            <!-- Rewards -->
+            {else if equal(:task.type, 'reward')}
+            <a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
+            <!-- Daily & Todos -->
+            {else}
+            <input type=checkbox checked="{:task.completed}">
+            {/}
+        </div>
 
-            <!-- edit/options dialog -->
-            <app:taskMeta />
-        </li>
+        <!-- main content -->
+        <div class="task-text">{:task.text}</div>
+
+        <!-- edit/options dialog -->
+        <app:taskMeta />
+    </li>
 
 <taskMeta:>
     <div style="display:none;" id={{:task.id}}-edit>

From bb82bcc62aa7c729a3037e09bee916e3fadeefc3 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 15:52:47 -0500
Subject: [PATCH 101/220] namespacing for tasks & rewards too

---
 views/app/index.html   |  6 ++---
 views/app/modals.html  |  4 +--
 views/app/rewards.html | 14 +++++-----
 views/app/tasks.html   | 58 +++++++++++++++++++++---------------------
 4 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/views/app/index.html b/views/app/index.html
index 69ce9f1db5..c3ce1ca06f 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -1,9 +1,9 @@
 <import: src="modals">
-<import: src="tasks" ns="">
+<import: src="tasks">
 <import: src="header">
 <import: src="alerts">
 <import: src="avatar">
-<import: src="rewards" ns="">
+<import: src="rewards">
 <import: src="footer">
 <import: src="settings">
 <import: src="party">
@@ -31,7 +31,7 @@
   <div id=wrap class="container-fluid">
     <app:alerts:alerts />
     <div id=main class="row-fluid">
-      <app:taskLists />
+      <app:tasks:taskLists />
     </div>
   </div>
   
diff --git a/views/app/modals.html b/views/app/modals.html
index 5b0b26792f..aa6d010a1d 100644
--- a/views/app/modals.html
+++ b/views/app/modals.html
@@ -17,7 +17,7 @@
 
     <!-- Re-Roll modal -->
     <app:modals:modal modalId='reroll-modal' header="Reset Your Tasks">
-        <app:userTokens/>
+        <app:rewards:userTokens/>
         <p>Highly discouraged because red tasks provide good incentive to improve (<a target="_blank" href="https://github.com/lefnire/habitrpg#all-my-tasks-are-red-im-dying-too-fast">read more</a>). However, this becomes necessary after long bouts of bad habits.</p>
         <@footer>
             {#if lt(_user.balance,1)}
@@ -30,7 +30,7 @@
 
     <!-- Buy more tokens modal -->
     <app:modals:modal modalId='more-tokens-modal' header="Out Of Tokens">
-        <app:userTokens/>
+        <app:rewards:userTokens/>
         <p>You're out of tokens, which are used to buy pets and mounts.</p>
         <@footer>
         <a data-dismiss="modal" x-bind="click:showStripe" class="btn btn-success btn-large">Buy More Tokens</a><span class='token-cost'>Not enough tokens</span>
diff --git a/views/app/rewards.html b/views/app/rewards.html
index e7e1bd29e9..673db54571 100644
--- a/views/app/rewards.html
+++ b/views/app/rewards.html
@@ -1,17 +1,17 @@
 <rewardsTab:>
     <ul class='rewards'>
-        {#each _rewardList as :task}<app:task />{/}
+        {#each _rewardList as :task}<app:tasks:task />{/}
     </ul>
 
 
     {#if _user.flags.itemsEnabled}
     <ul class='items'>
-        {#with _view.items.weapon as :item}<app:item />{/}
-        {#with _view.items.armor as :item}<app:item />{/}
-        {#with _view.items.head as :item}<app:item />{/}
-        {#with _view.items.shield as :item}<app:item />{/}
-        {#with _view.items.potion as :item}<app:item />{/}
-        {#with _view.items.reroll as :item}<app:item reroll=true />{/}
+        {#with _view.items.weapon as :item}<app:rewards:item />{/}
+        {#with _view.items.armor as :item}<app:rewards:item />{/}
+        {#with _view.items.head as :item}<app:rewards:item />{/}
+        {#with _view.items.shield as :item}<app:rewards:item />{/}
+        {#with _view.items.potion as :item}<app:rewards:item />{/}
+        {#with _view.items.reroll as :item}<app:rewards:item reroll=true />{/}
     </ul>
     {/}
 
diff --git a/views/app/tasks.html b/views/app/tasks.html
index 3c20388679..4c2e0ed39b 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -2,23 +2,23 @@
     <!--helpTitle & helpContent moved to tour -->
     <div class="task-column span3 habits">
         <h2>Habits</h2>
-        <app:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
-        <ul class="habits">{#each _habitList as :task}<app:task />{/}</ul>
+        <app:tasks:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
+        <ul class="habits">{#each _habitList as :task}<app:tasks:task />{/}</ul>
     </div>
 
     <div class="task-column span3 dailys">
         <h2>Daily</h2>
-        <app:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
-        <ul class='dailys'>{#each _dailyList as :task}<app:task />{/}</ul>
+        <app:tasks:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
+        <ul class='dailys'>{#each _dailyList as :task}<app:tasks:task />{/}</ul>
     </div>
 
     <div class="task-column span3 todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
         <h2>Todos</h2>
         <div class="display-context-dependant show-for-uncompleted">
-            <app:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
+            <app:tasks:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
         </div>
         <ul class='todos task-list'>
-            {#each _todoList as :task}<app:task />{/}
+            {#each _todoList as :task}<app:tasks:task />{/}
         </ul>
         <div class="display-context-dependant show-for-completed">
             <a class='btn' x-bind=click:clearCompleted>Clear Completed</a>
@@ -55,53 +55,53 @@
                     <td><div class='shop_copper' rel='tooltip' title='shop_copper'></div></td>-->
                 </tr></table>
                 {else}
-                <app:userTokens />
+                <app:rewards:userTokens />
                 {/}
             </div>
         </div>
-        <app:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
+        <app:tasks:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
 
         {#if _user.flags.petsEnabled}
         <div class='tabbable tabs-below'>
 
             <div class="tab-content">
                 <div class="tab-pane active" id="rewards-tab">
-                    <app:rewardsTab />
+                    <app:rewards:rewardsTab />
                 </div>
 
                 <div class="tab-pane" id="pets-tab">
                     {#with _view.items.pets as :pets}
 
                     <div class="row-fluid">
-                        {#with :pets[0]}<app:pet />{/}
-                        {#with :pets[1]}<app:pet />{/}
-                        {#with :pets[2]}<app:pet />{/}
-                        {#with :pets[3]}<app:pet />{/}
+                        {#with :pets[0]}<app:rewards:pet />{/}
+                        {#with :pets[1]}<app:rewards:pet />{/}
+                        {#with :pets[2]}<app:rewards:pet />{/}
+                        {#with :pets[3]}<app:rewards:pet />{/}
                     </div>
 
                     <div class="row-fluid">
-                        {#with :pets[4]}<app:pet />{/}
-                        {#with :pets[5]}<app:pet />{/}
-                        {#with :pets[6]}<app:pet />{/}
-                        {#with :pets[7]}<app:pet />{/}
+                        {#with :pets[4]}<app:rewards:pet />{/}
+                        {#with :pets[5]}<app:rewards:pet />{/}
+                        {#with :pets[6]}<app:rewards:pet />{/}
+                        {#with :pets[7]}<app:rewards:pet />{/}
                     </div>
 
                     <div class="row-fluid">
-                        {#with :pets[8]}<app:pet />{/}
-                        {#with :pets[9]}<app:pet />{/}
-                        {#with :pets[10]}<app:pet />{/}
-                        {#with :pets[11]}<app:pet />{/}
+                        {#with :pets[8]}<app:rewards:pet />{/}
+                        {#with :pets[9]}<app:rewards:pet />{/}
+                        {#with :pets[10]}<app:rewards:pet />{/}
+                        {#with :pets[11]}<app:rewards:pet />{/}
                     </div>
 
                     <div class="row-fluid">
-                        {#with :pets[12]}<app:pet />{/}
-                        {#with :pets[13]}<app:pet />{/}
-                        {#with :pets[14]}<app:pet />{/}
-                        {#with :pets[15]}<app:pet />{/}
+                        {#with :pets[12]}<app:rewards:pet />{/}
+                        {#with :pets[13]}<app:rewards:pet />{/}
+                        {#with :pets[14]}<app:rewards:pet />{/}
+                        {#with :pets[15]}<app:rewards:pet />{/}
                     </div>
 
                     <div class="row-fluid">
-                        {#with :pets[16]}<app:pet />{/}
+                        {#with :pets[16]}<app:rewards:pet />{/}
                     </div>
 
 
@@ -113,12 +113,12 @@
 
             <ul class="nav nav-tabs" id="rewardsTabs">
                 <li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
-                <li><a href="#pets-tab" id='pets-tab' data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
+                <li><a href="#pets-tab" data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
                 <!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
             </ul>
         </div>
     {else}
-        <app:rewardsTab />
+        <app:rewards:rewardsTab />
     {/}
     </div>
 
@@ -167,7 +167,7 @@
         <div class="task-text">{:task.text}</div>
 
         <!-- edit/options dialog -->
-        <app:taskMeta />
+        <app:tasks:taskMeta />
     </li>
 
 <taskMeta:>

From 9a60ed52692effef9a7e30e310d0376c4477723e Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 16:06:56 -0500
Subject: [PATCH 102/220] some html cleanup

---
 views/app/index.html |   6 +--
 views/app/tasks.html | 110 +++++++++++++++++++++----------------------
 2 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/views/app/index.html b/views/app/index.html
index c3ce1ca06f..359f325817 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -1,11 +1,11 @@
 <import: src="modals">
+<import: src="alerts">
+<import: src="settings">
+<import: src="rewards">
 <import: src="tasks">
 <import: src="header">
-<import: src="alerts">
 <import: src="avatar">
-<import: src="rewards">
 <import: src="footer">
-<import: src="settings">
 <import: src="party">
 
 <Title:>
diff --git a/views/app/tasks.html b/views/app/tasks.html
index 4c2e0ed39b..b4bb54b592 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -62,69 +62,69 @@
         <app:tasks:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
 
         {#if _user.flags.petsEnabled}
-        <div class='tabbable tabs-below'>
+            <div class='tabbable tabs-below'>
 
-            <div class="tab-content">
-                <div class="tab-pane active" id="rewards-tab">
-                    <app:rewards:rewardsTab />
+                <div class="tab-content">
+                    <div class="tab-pane active" id="rewards-tab">
+                        <app:rewards:rewardsTab />
+                    </div>
+
+                    <div class="tab-pane" id="pets-tab">
+                        {#with _view.items.pets as :pets}
+
+                        <div class="row-fluid">
+                            {#with :pets[0]}<app:rewards:pet />{/}
+                            {#with :pets[1]}<app:rewards:pet />{/}
+                            {#with :pets[2]}<app:rewards:pet />{/}
+                            {#with :pets[3]}<app:rewards:pet />{/}
+                        </div>
+
+                        <div class="row-fluid">
+                            {#with :pets[4]}<app:rewards:pet />{/}
+                            {#with :pets[5]}<app:rewards:pet />{/}
+                            {#with :pets[6]}<app:rewards:pet />{/}
+                            {#with :pets[7]}<app:rewards:pet />{/}
+                        </div>
+
+                        <div class="row-fluid">
+                            {#with :pets[8]}<app:rewards:pet />{/}
+                            {#with :pets[9]}<app:rewards:pet />{/}
+                            {#with :pets[10]}<app:rewards:pet />{/}
+                            {#with :pets[11]}<app:rewards:pet />{/}
+                        </div>
+
+                        <div class="row-fluid">
+                            {#with :pets[12]}<app:rewards:pet />{/}
+                            {#with :pets[13]}<app:rewards:pet />{/}
+                            {#with :pets[14]}<app:rewards:pet />{/}
+                            {#with :pets[15]}<app:rewards:pet />{/}
+                        </div>
+
+                        <div class="row-fluid">
+                            {#with :pets[16]}<app:rewards:pet />{/}
+                        </div>
+
+
+                        {/}
+                    </div>
+                    <!--<div class="tab-pane" id="mounts-tab">...</div>-->
                 </div>
 
-                <div class="tab-pane" id="pets-tab">
-                    {#with _view.items.pets as :pets}
 
-                    <div class="row-fluid">
-                        {#with :pets[0]}<app:rewards:pet />{/}
-                        {#with :pets[1]}<app:rewards:pet />{/}
-                        {#with :pets[2]}<app:rewards:pet />{/}
-                        {#with :pets[3]}<app:rewards:pet />{/}
-                    </div>
-
-                    <div class="row-fluid">
-                        {#with :pets[4]}<app:rewards:pet />{/}
-                        {#with :pets[5]}<app:rewards:pet />{/}
-                        {#with :pets[6]}<app:rewards:pet />{/}
-                        {#with :pets[7]}<app:rewards:pet />{/}
-                    </div>
-
-                    <div class="row-fluid">
-                        {#with :pets[8]}<app:rewards:pet />{/}
-                        {#with :pets[9]}<app:rewards:pet />{/}
-                        {#with :pets[10]}<app:rewards:pet />{/}
-                        {#with :pets[11]}<app:rewards:pet />{/}
-                    </div>
-
-                    <div class="row-fluid">
-                        {#with :pets[12]}<app:rewards:pet />{/}
-                        {#with :pets[13]}<app:rewards:pet />{/}
-                        {#with :pets[14]}<app:rewards:pet />{/}
-                        {#with :pets[15]}<app:rewards:pet />{/}
-                    </div>
-
-                    <div class="row-fluid">
-                        {#with :pets[16]}<app:rewards:pet />{/}
-                    </div>
-
-
-                    {/}
-                </div>
-                <!--<div class="tab-pane" id="mounts-tab">...</div>-->
+                <ul class="nav nav-tabs" id="rewardsTabs">
+                    <li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
+                    <li><a href="#pets-tab" data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
+                    <!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
+                </ul>
             </div>
-
-
-            <ul class="nav nav-tabs" id="rewardsTabs">
-                <li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
-                <li><a href="#pets-tab" data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
-                <!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
-            </ul>
-        </div>
-    {else}
-        <app:rewards:rewardsTab />
-    {/}
+        {else}
+            <app:rewards:rewardsTab />
+        {/}
     </div>
 
 <newTask:>
-    <form class="addtask-form form-inline new-task-form" id="new-{@type}" data-task-type="{@type}" x-bind="submit:addTask">
-        <input class="addtask-field" value="{@inputValue}" type="text" name="new-task" placeholder="{@placeHolder}"/>
+    <form class="addtask-form form-inline new-task-form" id="new-{{@type}}" data-task-type="{{@type}}" x-bind="submit:addTask">
+        <input class="addtask-field" value="{@inputValue}" type="text" name="new-task" placeholder="{{@placeHolder}}"/>
         <input class="btn addtask-btn" type="submit" value="Add">
     </form>
 

From 1cd32993885f81d06198b8bc55777aaebf7a9330 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 16:16:08 -0500
Subject: [PATCH 103/220] strange fix for #553, also #539 take note

---
 views/app/tasks.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/app/tasks.html b/views/app/tasks.html
index b4bb54b592..68f83d0f2f 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -61,7 +61,7 @@
         </div>
         <app:tasks:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
 
-        {#if _user.flags.petsEnabled}
+        {#if equal(_user.flags.petsEnabled,true)}
             <div class='tabbable tabs-below'>
 
                 <div class="tab-content">

From 16b9ea3b58177a6d7b62e1ae11ed8d9ecf865496 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 17:00:44 -0500
Subject: [PATCH 104/220] reverting my #553 & html cleanup fixes, merge
 conflicts from redesign - gotta go through and do these again

---
 views/app/index.html   |  10 +--
 views/app/modals.html  |   4 +-
 views/app/rewards.html |  14 +--
 views/app/tasks.html   | 200 ++++++++++++++++++++---------------------
 4 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/views/app/index.html b/views/app/index.html
index 359f325817..69ce9f1db5 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -1,11 +1,11 @@
 <import: src="modals">
-<import: src="alerts">
-<import: src="settings">
-<import: src="rewards">
-<import: src="tasks">
+<import: src="tasks" ns="">
 <import: src="header">
+<import: src="alerts">
 <import: src="avatar">
+<import: src="rewards" ns="">
 <import: src="footer">
+<import: src="settings">
 <import: src="party">
 
 <Title:>
@@ -31,7 +31,7 @@
   <div id=wrap class="container-fluid">
     <app:alerts:alerts />
     <div id=main class="row-fluid">
-      <app:tasks:taskLists />
+      <app:taskLists />
     </div>
   </div>
   
diff --git a/views/app/modals.html b/views/app/modals.html
index aa6d010a1d..5b0b26792f 100644
--- a/views/app/modals.html
+++ b/views/app/modals.html
@@ -17,7 +17,7 @@
 
     <!-- Re-Roll modal -->
     <app:modals:modal modalId='reroll-modal' header="Reset Your Tasks">
-        <app:rewards:userTokens/>
+        <app:userTokens/>
         <p>Highly discouraged because red tasks provide good incentive to improve (<a target="_blank" href="https://github.com/lefnire/habitrpg#all-my-tasks-are-red-im-dying-too-fast">read more</a>). However, this becomes necessary after long bouts of bad habits.</p>
         <@footer>
             {#if lt(_user.balance,1)}
@@ -30,7 +30,7 @@
 
     <!-- Buy more tokens modal -->
     <app:modals:modal modalId='more-tokens-modal' header="Out Of Tokens">
-        <app:rewards:userTokens/>
+        <app:userTokens/>
         <p>You're out of tokens, which are used to buy pets and mounts.</p>
         <@footer>
         <a data-dismiss="modal" x-bind="click:showStripe" class="btn btn-success btn-large">Buy More Tokens</a><span class='token-cost'>Not enough tokens</span>
diff --git a/views/app/rewards.html b/views/app/rewards.html
index 673db54571..e7e1bd29e9 100644
--- a/views/app/rewards.html
+++ b/views/app/rewards.html
@@ -1,17 +1,17 @@
 <rewardsTab:>
     <ul class='rewards'>
-        {#each _rewardList as :task}<app:tasks:task />{/}
+        {#each _rewardList as :task}<app:task />{/}
     </ul>
 
 
     {#if _user.flags.itemsEnabled}
     <ul class='items'>
-        {#with _view.items.weapon as :item}<app:rewards:item />{/}
-        {#with _view.items.armor as :item}<app:rewards:item />{/}
-        {#with _view.items.head as :item}<app:rewards:item />{/}
-        {#with _view.items.shield as :item}<app:rewards:item />{/}
-        {#with _view.items.potion as :item}<app:rewards:item />{/}
-        {#with _view.items.reroll as :item}<app:rewards:item reroll=true />{/}
+        {#with _view.items.weapon as :item}<app:item />{/}
+        {#with _view.items.armor as :item}<app:item />{/}
+        {#with _view.items.head as :item}<app:item />{/}
+        {#with _view.items.shield as :item}<app:item />{/}
+        {#with _view.items.potion as :item}<app:item />{/}
+        {#with _view.items.reroll as :item}<app:item reroll=true />{/}
     </ul>
     {/}
 
diff --git a/views/app/tasks.html b/views/app/tasks.html
index 68f83d0f2f..f0ff20c787 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -2,23 +2,23 @@
     <!--helpTitle & helpContent moved to tour -->
     <div class="task-column span3 habits">
         <h2>Habits</h2>
-        <app:tasks:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
-        <ul class="habits">{#each _habitList as :task}<app:tasks:task />{/}</ul>
+        <app:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
+        <ul class="habits">{#each _habitList as :task}<app:task />{/}</ul>
     </div>
 
     <div class="task-column span3 dailys">
         <h2>Daily</h2>
-        <app:tasks:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
-        <ul class='dailys'>{#each _dailyList as :task}<app:tasks:task />{/}</ul>
+        <app:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
+        <ul class='dailys'>{#each _dailyList as :task}<app:task />{/}</ul>
     </div>
 
     <div class="task-column span3 todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
         <h2>Todos</h2>
         <div class="display-context-dependant show-for-uncompleted">
-            <app:tasks:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
+            <app:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
         </div>
         <ul class='todos task-list'>
-            {#each _todoList as :task}<app:tasks:task />{/}
+            {#each _todoList as :task}<app:task />{/}
         </ul>
         <div class="display-context-dependant show-for-completed">
             <a class='btn' x-bind=click:clearCompleted>Clear Completed</a>
@@ -55,120 +55,120 @@
                     <td><div class='shop_copper' rel='tooltip' title='shop_copper'></div></td>-->
                 </tr></table>
                 {else}
-                <app:rewards:userTokens />
+                <app:userTokens />
                 {/}
             </div>
         </div>
-        <app:tasks:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
+        <app:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
 
-        {#if equal(_user.flags.petsEnabled,true)}
-            <div class='tabbable tabs-below'>
+        {#if _user.flags.petsEnabled}
+        <div class='tabbable tabs-below'>
 
-                <div class="tab-content">
-                    <div class="tab-pane active" id="rewards-tab">
-                        <app:rewards:rewardsTab />
-                    </div>
-
-                    <div class="tab-pane" id="pets-tab">
-                        {#with _view.items.pets as :pets}
-
-                        <div class="row-fluid">
-                            {#with :pets[0]}<app:rewards:pet />{/}
-                            {#with :pets[1]}<app:rewards:pet />{/}
-                            {#with :pets[2]}<app:rewards:pet />{/}
-                            {#with :pets[3]}<app:rewards:pet />{/}
-                        </div>
-
-                        <div class="row-fluid">
-                            {#with :pets[4]}<app:rewards:pet />{/}
-                            {#with :pets[5]}<app:rewards:pet />{/}
-                            {#with :pets[6]}<app:rewards:pet />{/}
-                            {#with :pets[7]}<app:rewards:pet />{/}
-                        </div>
-
-                        <div class="row-fluid">
-                            {#with :pets[8]}<app:rewards:pet />{/}
-                            {#with :pets[9]}<app:rewards:pet />{/}
-                            {#with :pets[10]}<app:rewards:pet />{/}
-                            {#with :pets[11]}<app:rewards:pet />{/}
-                        </div>
-
-                        <div class="row-fluid">
-                            {#with :pets[12]}<app:rewards:pet />{/}
-                            {#with :pets[13]}<app:rewards:pet />{/}
-                            {#with :pets[14]}<app:rewards:pet />{/}
-                            {#with :pets[15]}<app:rewards:pet />{/}
-                        </div>
-
-                        <div class="row-fluid">
-                            {#with :pets[16]}<app:rewards:pet />{/}
-                        </div>
-
-
-                        {/}
-                    </div>
-                    <!--<div class="tab-pane" id="mounts-tab">...</div>-->
+            <div class="tab-content">
+                <div class="tab-pane active" id="rewards-tab">
+                    <app:rewardsTab />
                 </div>
 
+                <div class="tab-pane" id="pets-tab">
+                    {#with _view.items.pets as :pets}
 
-                <ul class="nav nav-tabs" id="rewardsTabs">
-                    <li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
-                    <li><a href="#pets-tab" data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
-                    <!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
-                </ul>
+                    <div class="row-fluid">
+                        {#with :pets[0]}<app:pet />{/}
+                        {#with :pets[1]}<app:pet />{/}
+                        {#with :pets[2]}<app:pet />{/}
+                        {#with :pets[3]}<app:pet />{/}
+                    </div>
+
+                    <div class="row-fluid">
+                        {#with :pets[4]}<app:pet />{/}
+                        {#with :pets[5]}<app:pet />{/}
+                        {#with :pets[6]}<app:pet />{/}
+                        {#with :pets[7]}<app:pet />{/}
+                    </div>
+
+                    <div class="row-fluid">
+                        {#with :pets[8]}<app:pet />{/}
+                        {#with :pets[9]}<app:pet />{/}
+                        {#with :pets[10]}<app:pet />{/}
+                        {#with :pets[11]}<app:pet />{/}
+                    </div>
+
+                    <div class="row-fluid">
+                        {#with :pets[12]}<app:pet />{/}
+                        {#with :pets[13]}<app:pet />{/}
+                        {#with :pets[14]}<app:pet />{/}
+                        {#with :pets[15]}<app:pet />{/}
+                    </div>
+
+                    <div class="row-fluid">
+                        {#with :pets[16]}<app:pet />{/}
+                    </div>
+
+
+                    {/}
+                </div>
+                <!--<div class="tab-pane" id="mounts-tab">...</div>-->
             </div>
-        {else}
-            <app:rewards:rewardsTab />
-        {/}
+
+
+            <ul class="nav nav-tabs" id="rewardsTabs">
+                <li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
+                <li><a href="#pets-tab" id='pets-tab' data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
+                <!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
+            </ul>
+        </div>
+    {else}
+        <app:rewardsTab />
+    {/}
     </div>
 
 <newTask:>
-    <form class="addtask-form form-inline new-task-form" id="new-{{@type}}" data-task-type="{{@type}}" x-bind="submit:addTask">
-        <input class="addtask-field" value="{@inputValue}" type="text" name="new-task" placeholder="{{@placeHolder}}"/>
+    <form class="addtask-form form-inline new-task-form" id="new-{@type}" data-task-type="{@type}" x-bind="submit:addTask">
+        <input class="addtask-field" value="{@inputValue}" type="text" name="new-task" placeholder="{@placeHolder}"/>
         <input class="btn addtask-btn" type="submit" value="Add">
     </form>
 
-<!-- all the parts of a single task -->
-<task:>
-    <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
-        <!-- right-hand side control buttons -->
-        <div class="task-meta-controls">
-            <div class="hover-show">
-                <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
-                <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
-                {#if :task.history}
-                <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
-                    <i class="icon-signal"></i>
-                </a>
+    <!-- all the parts of a single task -->
+    <task:>
+        <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
+            <!-- right-hand side control buttons -->
+            <div class="task-meta-controls">
+                <div class="hover-show">
+                    <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
+                    <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
+                    {#if :task.history}
+                    <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
+                        <i class="icon-signal"></i>
+                    </a>
+                    {/}
+                </div>
+
+                {#if :task.notes}
+                <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
                 {/}
             </div>
 
-            {#if :task.notes}
-            <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
-            {/}
-        </div>
+            <!-- left-hand side checkbox -->
+            <div class="task-controls">
+                <!-- Habits -->
+                {#if equal(:task.type, 'habit')}
+                {#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
+                {#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
+                <!-- Rewards -->
+                {else if equal(:task.type, 'reward')}
+                <a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
+                <!-- Daily & Todos -->
+                {else}
+                <input type=checkbox checked="{:task.completed}">
+                {/}
+            </div>
 
-        <!-- left-hand side checkbox -->
-        <div class="task-controls">
-            <!-- Habits -->
-            {#if equal(:task.type, 'habit')}
-            {#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
-            {#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
-            <!-- Rewards -->
-            {else if equal(:task.type, 'reward')}
-            <a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
-            <!-- Daily & Todos -->
-            {else}
-            <input type=checkbox checked="{:task.completed}">
-            {/}
-        </div>
+            <!-- main content -->
+            <div class="task-text">{:task.text}</div>
 
-        <!-- main content -->
-        <div class="task-text">{:task.text}</div>
-
-        <!-- edit/options dialog -->
-        <app:tasks:taskMeta />
-    </li>
+            <!-- edit/options dialog -->
+            <app:taskMeta />
+        </li>
 
 <taskMeta:>
     <div style="display:none;" id={{:task.id}}-edit>

From a8c09110f7513e2a97edc9a4fb51f2a8e2e0620f Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 17:02:22 -0500
Subject: [PATCH 105/220] reverting redisign commits. @zakkain some issues here
 ill follow up with you on - if i forget, "add" button in responsive layout,
 item store issues

---
 styles/app/tasks.styl | 58 ++++++------------------------
 views/app/index.html  |  2 --
 views/app/tasks.html  | 83 +++++++++++++++++++++----------------------
 3 files changed, 51 insertions(+), 92 deletions(-)

diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index 8c0b370fa0..70d54c189d 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -1,21 +1,21 @@
-.color-worst
+.color-worst pre
   background-color: rgb(230, 184, 175)
-.color-worse
+.color-worse pre
   background-color: rgb(244, 204, 204)
-.color-bad
+.color-bad pre
   background-color: rgb(252, 229, 205)
-.color-neutral
+.color-neutral pre
   background-color: rgb(255, 242, 204)
-.color-good
+.color-good pre
   background-color: rgb(217, 234, 211)
-.color-better
+.color-better pre
   background-color: rgb(208, 224, 227)
-.color-best
+.color-best pre
   background-color: rgb(201, 218, 248)
-.completed
+.completed pre
   background-color: rgb(217, 217, 217)
   color: rgb(153, 153, 153)
-.reward
+.reward pre
   background-color: white
 
 label.checkbox.inline{
@@ -76,10 +76,7 @@ li:hover .task-meta-controls .hover-show
 
   .task-controls,.task-text
     display:inline
-    margin: 0 10px 0 0
-
-    input
-      margin-top: 0
+    margin-right:10px
 
   .task-meta-controls .hover-show
     display: none;
@@ -88,37 +85,4 @@ li:hover .task-meta-controls .hover-show
     text-decoration:none;
 
 .new-task-form
-  margin-bottom:5px;
-
-
-// begin rewrite css 2013-03-04
-
-.task-column
-  padding: 1.5em
-  background: #f5f5f5
-  border: 1px solid #bbb
-  border-radius: 0.25em
-  font-family: 'Lato', sans-serif
-  h2
-    margin: 0 0 0.5em
-    padding: 0
-
-.task
-  clear: both
-  padding: 0.5em
-  margin-bottom: 0.75em
-  border: 1px solid rgba(0, 0, 0, 0.2)
-  border-radius: 0.25em
-  &:last-child
-    margin-bottom: 0
-
-.addtask-form
-  margin-bottom: 0.75em
-  .addtask-field
-    max-width: 70%
-  .addtask-btn
-    float: right
-    font-family: 'Lato', sans-serif
-
-.todo-status-toggler
-  margin-top: 0.75em
\ No newline at end of file
+  margin-bottom:5px;
\ No newline at end of file
diff --git a/views/app/index.html b/views/app/index.html
index 69ce9f1db5..9d66e2fd2b 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -14,8 +14,6 @@
 <Head:>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="apple-mobile-web-app-capable" content="yes">
-  <!-- webfonts -->
-  <link href='http://fonts.googleapis.com/css?family=Lato:400,700,400italic' rel='stylesheet' type='text/css'>
 
 <Header:>
   <app:modals:modals />
diff --git a/views/app/tasks.html b/views/app/tasks.html
index f0ff20c787..ccdd9bf407 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -1,18 +1,18 @@
 <taskLists:>
     <!--helpTitle & helpContent moved to tour -->
-    <div class="task-column span3 habits">
+    <div class="span3 well habits">
         <h2>Habits</h2>
         <app:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
         <ul class="habits">{#each _habitList as :task}<app:task />{/}</ul>
     </div>
 
-    <div class="task-column span3 dailys">
+    <div class="span3 well dailys">
         <h2>Daily</h2>
         <app:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
         <ul class='dailys'>{#each _dailyList as :task}<app:task />{/}</ul>
     </div>
 
-    <div class="task-column span3 todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
+    <div class="span3 well todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
         <h2>Todos</h2>
         <div class="display-context-dependant show-for-uncompleted">
             <app:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
@@ -32,14 +32,14 @@
                 <!--&nbsp;<a target="_blank" href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}"><img src='/img/calendar_google.png' title="Google Calendar" alt="Google Calendar" rel=tooltip /></a>-->
             </span>
         <div id="todos-chart" style="display:none;"></div>
-        <ul class="todo-status-toggler nav nav-tabs">
+        <ul class="nav nav-tabs">
             <li class="active"><a x-bind=click:changeContext data-target="#todo-well" data-context="context-uncompleted">Remaining</a></li>
             <li><a x-bind=click:changeContext data-target="#todo-well" data-context="context-completed">Complete</a></li>
         </ul>
 
     </div>
 
-    <div class="task-column span3 rewards">
+    <div class="span3 well rewards">
 
         <!--Title -->
         <div class="row-fluid">
@@ -123,52 +123,49 @@
     </div>
 
 <newTask:>
-    <form class="addtask-form form-inline new-task-form" id="new-{@type}" data-task-type="{@type}" x-bind="submit:addTask">
-        <input class="addtask-field" value="{@inputValue}" type="text" name="new-task" placeholder="{@placeHolder}"/>
-        <input class="btn addtask-btn" type="submit" value="Add">
+    <form class="form-inline new-task-form" id="new-{@type}" data-task-type="{@type}" x-bind="submit:addTask">
+        <input value="{@inputValue}" type="text" name="new-task" placeholder="{@placeHolder}"/>
+        <input class="btn" type="submit" value="Add" />
     </form>
 
-    <!-- all the parts of a single task -->
     <task:>
         <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
-            <!-- right-hand side control buttons -->
-            <div class="task-meta-controls">
-                <div class="hover-show">
-                    <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
-                    <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
-                    {#if :task.history}
-                    <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
-                        <i class="icon-signal"></i>
-                    </a>
-                    {/}
-                </div>
+    <pre>
+    <div class="task-meta-controls">
 
-                {#if :task.notes}
-                <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
-                {/}
-            </div>
+        <div class="hover-show">
+            <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
+            <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
+            {#if :task.history}
+            <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
+                <i class="icon-signal"></i>
+            </a>
+            {/}
+        </div>
 
-            <!-- left-hand side checkbox -->
-            <div class="task-controls">
-                <!-- Habits -->
-                {#if equal(:task.type, 'habit')}
-                {#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
-                {#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
-                <!-- Rewards -->
-                {else if equal(:task.type, 'reward')}
-                <a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
-                <!-- Daily & Todos -->
-                {else}
-                <input type=checkbox checked="{:task.completed}">
-                {/}
-            </div>
+        {#if :task.notes}
+        <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
+        {/}
+    </div>
 
-            <!-- main content -->
-            <div class="task-text">{:task.text}</div>
+    <div class="task-controls">
+        <!-- Habits -->
+        {#if equal(:task.type, 'habit')}
+        {#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
+        {#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
+        <!-- Rewards -->
+        {else if equal(:task.type, 'reward')}
+        <a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
+        <!-- Daily & Todos -->
+        {else}
+        <input type=checkbox checked="{:task.completed}"/>
+        {/}
+    </div>
+    <div class="task-text">{:task.text}</div>
 
-            <!-- edit/options dialog -->
-            <app:taskMeta />
-        </li>
+    <app:taskMeta />
+    </pre>
+    </li>
 
 <taskMeta:>
     <div style="display:none;" id={{:task.id}}-edit>

From 6a280c57ea81a024022845dc8268a91ad2b7d792 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 17:04:22 -0500
Subject: [PATCH 106/220] re-applying #553 fix

---
 views/app/tasks.html | 68 ++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/views/app/tasks.html b/views/app/tasks.html
index ccdd9bf407..6226fd8191 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -61,7 +61,7 @@
         </div>
         <app:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
 
-        {#if _user.flags.petsEnabled}
+        {#if equals(_user.flags.petsEnabled,true)}
         <div class='tabbable tabs-below'>
 
             <div class="tab-content">
@@ -128,43 +128,43 @@
         <input class="btn" type="submit" value="Add" />
     </form>
 
-    <task:>
-        <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
-    <pre>
-    <div class="task-meta-controls">
+<task:>
+    <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
+        <pre>
+            <div class="task-meta-controls">
 
-        <div class="hover-show">
-            <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
-            <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
-            {#if :task.history}
-            <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
-                <i class="icon-signal"></i>
-            </a>
-            {/}
-        </div>
+                <div class="hover-show">
+                    <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
+                    <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
+                    {#if :task.history}
+                    <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
+                        <i class="icon-signal"></i>
+                    </a>
+                    {/}
+                </div>
 
-        {#if :task.notes}
-        <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
-        {/}
-    </div>
+                {#if :task.notes}
+                <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
+                {/}
+            </div>
 
-    <div class="task-controls">
-        <!-- Habits -->
-        {#if equal(:task.type, 'habit')}
-        {#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
-        {#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
-        <!-- Rewards -->
-        {else if equal(:task.type, 'reward')}
-        <a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
-        <!-- Daily & Todos -->
-        {else}
-        <input type=checkbox checked="{:task.completed}"/>
-        {/}
-    </div>
-    <div class="task-text">{:task.text}</div>
+            <div class="task-controls">
+                <!-- Habits -->
+                {#if equal(:task.type, 'habit')}
+                {#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
+                {#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
+                <!-- Rewards -->
+                {else if equal(:task.type, 'reward')}
+                <a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
+                <!-- Daily & Todos -->
+                {else}
+                <input type=checkbox checked="{:task.completed}"/>
+                {/}
+            </div>
+            <div class="task-text">{:task.text}</div>
 
-    <app:taskMeta />
-    </pre>
+            <app:taskMeta />
+        </pre>
     </li>
 
 <taskMeta:>

From 41b1ca9f73604c7cc1e0c7b4a96b194d9a01d5ea Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 17:05:05 -0500
Subject: [PATCH 107/220] typo

---
 views/app/tasks.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/app/tasks.html b/views/app/tasks.html
index 6226fd8191..e0cfd92d45 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -61,7 +61,7 @@
         </div>
         <app:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
 
-        {#if equals(_user.flags.petsEnabled,true)}
+        {#if equal(_user.flags.petsEnabled,true)}
         <div class='tabbable tabs-below'>
 
             <div class="tab-content">

From 9c14b29a3d2a785f5858435cd047c191e2f59b3a Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 18:07:22 -0500
Subject: [PATCH 108/220] rename priority multiplier to "Difficulty" -> easy,
 medium, hard (people keep getting confused) and putting it back into
 "advanced" section

---
 src/app/tasks.coffee |  3 +++
 views/app/tasks.html | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index d9d904d8ac..16d17257b7 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -173,6 +173,9 @@ module.exports.app = (appExports, model) ->
     task = model.at $(el).parents('li')[0]
     scoring.score(model, task.get('id'), direction)
 
+  appExports.tasksToggleAdvanced = (e, el) ->
+    $(el).next('.advanced').toggle()
+
   appExports.tasksSaveAndClose = ->
     # When they update their notes, re-establish tooltip & popover
     $('[rel=tooltip]').tooltip()
diff --git a/views/app/tasks.html b/views/app/tasks.html
index e0cfd92d45..6aa27af05f 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -213,18 +213,21 @@
                 </div>
             {/}
 
+            <hr/>
             {#unless equal(:task.type, 'reward')}
-                <hr/>
                 <div>
-                    <div class="control-group btn-group priority-multiplier" data-id="{{:task.id}}">
-                        <label>Priority <a href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a></label>
-                        <button type="button" class="btn btn-info {#if equal(:task.priority,'!')}active{/}{#unless :task.priority}active{/}" data-priority='!' x-bind=click:tasksSetPriority>!</button>
-                        <button type="button" class="btn btn-info {#if equal(:task.priority,'!!')}active{/}" data-priority='!!' x-bind=click:tasksSetPriority>!!</button>
-                        <button type="button" class="btn btn-info {#if equal(:task.priority,'!!!')}active{/}" data-priority='!!!' x-bind=click:tasksSetPriority>!!!</button>
+                    <a x-bind="click:tasksToggleAdvanced">Advanced</a>
+                    <div class='advanced hide'>
+                        <div class="control-group btn-group priority-multiplier" data-id="{{:task.id}}">
+                            <label>Difficulty <a href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank" title="How difficult is this task? Multiplies it's point value." rel='tooltip'><i class='icon-question-sign'></i></a></label>
+                            <button type="button" class="btn btn-info {#if equal(:task.priority,'!')}active{/}{#unless :task.priority}active{/}" data-priority='!' x-bind=click:tasksSetPriority>Easy</button>
+                            <button type="button" class="btn btn-info {#if equal(:task.priority,'!!')}active{/}" data-priority='!!' x-bind=click:tasksSetPriority>Medium</button>
+                            <button type="button" class="btn btn-info {#if equal(:task.priority,'!!!')}active{/}" data-priority='!!!' x-bind=click:tasksSetPriority>Hard</button>
+                        </div>
                     </div>
                 </div>
+                <br/>
             {/}
-            <hr/>
             <button type=submit class="btn" x-bind="click:tasksSaveAndClose">Save & Close</button>
         </form>
     </div>

From 4f7cdc38e99c4fbad95c669082244e8dfb4b91ca Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 18:58:15 -0500
Subject: [PATCH 109/220] add help popover to difficulty

---
 src/app/browser.coffee | 5 +++++
 views/app/tasks.html   | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index f5e6143f93..f4d5c8e31d 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -86,6 +86,11 @@ setupTooltips = (model) ->
   $('[rel=tooltip]').tooltip()
   $('[rel=popover]').popover()
 
+  $('.priority-multiplier-help').popover
+    title: "How difficult is this task?"
+    trigger: "hover"
+    content: "This multiplies its point value. Use sparingly, rely instead on our organic value-adjustment algorithms. But some tasks are grossly more valuable (Write Thesis vs Floss Teeth). Click for more info."
+
 setupTour = (model) ->
   tourSteps = [
     {
diff --git a/views/app/tasks.html b/views/app/tasks.html
index 6aa27af05f..0f2ea4b69a 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -218,8 +218,9 @@
                 <div>
                     <a x-bind="click:tasksToggleAdvanced">Advanced</a>
                     <div class='advanced hide'>
+
+                        <label>Difficulty <a class='priority-multiplier-help' href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a></label>
                         <div class="control-group btn-group priority-multiplier" data-id="{{:task.id}}">
-                            <label>Difficulty <a href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank" title="How difficult is this task? Multiplies it's point value." rel='tooltip'><i class='icon-question-sign'></i></a></label>
                             <button type="button" class="btn btn-info {#if equal(:task.priority,'!')}active{/}{#unless :task.priority}active{/}" data-priority='!' x-bind=click:tasksSetPriority>Easy</button>
                             <button type="button" class="btn btn-info {#if equal(:task.priority,'!!')}active{/}" data-priority='!!' x-bind=click:tasksSetPriority>Medium</button>
                             <button type="button" class="btn btn-info {#if equal(:task.priority,'!!!')}active{/}" data-priority='!!!' x-bind=click:tasksSetPriority>Hard</button>

From fbc4345d05a0b4ea714a5a2b15c91419369f3e0b Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Tue, 5 Mar 2013 19:47:08 -0500
Subject: [PATCH 110/220] further refactoring of tasks code. Last commit before
 merge in the revert

---
 styles/app/tasks.styl | 125 ++++++++++++++----------------------------
 1 file changed, 41 insertions(+), 84 deletions(-)

diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index c454ca3cce..9327eec73d 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -1,77 +1,42 @@
-// color variables
-$color-worst      =   rgb(230, 184, 175)
-$color-worse      =   rgb(244, 204, 204)
-$color-bad        =   rgb(252, 229, 205)
-$color-neutral    =   rgb(255, 242, 204)
-$color-good       =   rgb(217, 234, 211)
-$color-better     =   rgb(208, 224, 227)
-$color-best       =   rgb(201, 218, 248)
-$color-completed  =   rgb(217, 217, 217)
+// 1. Set up color classes
+// ========================
 
-.color-worst
-  background-color: $color-worst
-  .task-checker label
-    background-color: darken($color-worst, 30%)
-  .action-plus
-    background-color: darken($color-worst, 30%)
-  .action-minus
-    background-color: darken($color-worst, 30%)
-.color-worse
-  background-color: $color-worse
-  .task-checker label
-    background-color: darken($color-worse, 30%)
-  .action-plus
-    background-color: darken($color-worse, 30%)
-  .action-minus
-    background-color: darken($color-worse, 30%)
-.color-bad
-  background-color: $color-bad
-  .task-checker label
-    background-color: darken($color-bad, 30%)
-  .action-plus
-    background-color: darken($color-bad, 30%)
-  .action-minus
-    background-color: darken($color-bad, 30%)
-.color-neutral
-  background-color: $color-neutral
-  .task-checker label
-    background-color: darken($color-neutral, 30%)
-  .action-plus
-    background-color: darken($color-neutral, 30%)
-  .action-minus
-    background-color: darken($color-neutral, 30%)
-.color-good
-  background-color: $color-good
-  .task-checker label
-    background-color: darken($color-good, 30%)
-  .action-plus
-    background-color: darken($color-good, 30%)
-  .action-minus
-    background-color: darken($color-good, 30%)
-.color-better
-  background-color: $color-better
-  .task-checker label
-    background-color: darken($color-better, 30%)
-  .action-plus
-    background-color: darken($color-better, 30%)
-  .action-minus
-    background-color: darken($color-better, 30%)
-.color-best
-  background-color: $color-best
-  .task-checker label
-    background-color: darken($color-best, 30%)
-  .action-plus
-    background-color: darken($color-best, 30%)
-  .action-minus
-    background-color: darken($color-best, 30%)
+// color variables
+$worst      =   rgb(230, 184, 175)
+$worse      =   rgb(244, 204, 204)
+$bad        =   rgb(252, 229, 205)
+$neutral    =   rgb(255, 242, 204)
+$good       =   rgb(217, 234, 211)
+$better     =   rgb(208, 224, 227)
+$best       =   rgb(201, 218, 248)
+$completed  =   rgb(217, 217, 217)
+
+// array of keywords and their associated color vars
+$stages = (worst $worst) (worse $worse) (bad $bad) (neutral $neutral) (good $good) (better $better) (best $best)
+
+// for each color stage, generate a named class w/ the appropriate color
+for $stage in $stages
+  .color-{$stage[0]}
+    background-color: $stage[1]
+    .task-checker label,
+    .action-plus,
+    .action-minus
+      background-color: darken($stage[1], 30%)
+
+// completed has to be outside the loop to override the color class
 .completed
-  background-color: $color-completed
+  background-color: $completed
+  color: #999
   .task-checker label
-    background-color: darken($color-completed, 30%)
-  color: rgb(153, 153, 153)
+    background-color: darken($completed, 30%)
+
 .reward
   background-color: white
 
+
+// 2. Task Options
+// ================
+
 label.checkbox.inline{
     width: 40px
 }
@@ -120,13 +85,6 @@ li:hover .task-meta-controls .hover-show
     i
       margin-left:5px
 
-  // .task-controls,.task-text
-  //   // display:inline
-  //   // margin: 0 10px 0 0
-
-  //   input
-  //     margin-top: 0
-
   .task-meta-controls .hover-show
     display: none;
 
@@ -190,17 +148,16 @@ li:hover .task-meta-controls .hover-show
     margin: 0
     vertical-align: top
     cursor: pointer
-    // border-radius: 0.25em 0 0 0.25em
     &:after
       content: '○'
       display: block
       opacity: 0.2
-      line-height: 0.8
+      line-height: 0.76
       text-align: center
       color: black
       font-size: 3em
-    &:hover:before,
-    &:focus:before
+    &:hover:after,
+    &:focus:after
       content: '¬'
       display: block
       font-size: 3em
@@ -209,7 +166,7 @@ li:hover .task-meta-controls .hover-show
       line-height: 1.1
       text-align: left
       opacity: 0.5 !important
-    &:active:before
+    &:active:after
       opacity: 0.75 !important
 
   & input[type=checkbox]:checked + label:after
@@ -243,7 +200,7 @@ li:hover .task-meta-controls .hover-show
       padding: 0 0 0 0.5em
       width: 100%
       &:focus
-        box-shadow: inset 0 0 3px darken($color-best, 20%)
+        box-shadow: inset 0 0 3px darken($best, 20%)
   .addtask-btn
     display: inline-block
     width: 1.51515em
@@ -253,14 +210,14 @@ li:hover .task-meta-controls .hover-show
     line-height: 1.55
     outline: 0
     border: 0
-    background-color: darken($color-best, 20%)
+    background-color: darken($best, 20%)
     opacity: 0.5
     &:hover,
     &:focus
       opacity: 0.75
-      background-color: darken($color-best, 20%)
+      background-color: darken($best, 20%)
     &:active
-      background-color: darken($color-best, 30%)
+      background-color: darken($best, 30%)
       opacity: 1
 
 .task-action-btn

From 3f33261792ac31b9b997987db7d01c05fd85d81d Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 20:08:31 -0500
Subject: [PATCH 111/220] proper derby tabbing

---
 views/app/tasks.html | 324 +++++++++++++++++++++----------------------
 1 file changed, 162 insertions(+), 162 deletions(-)

diff --git a/views/app/tasks.html b/views/app/tasks.html
index e8930c33da..13f4d6cd52 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -1,136 +1,136 @@
 <taskLists:>
-<!--helpTitle & helpContent moved to tour -->
+    <!--helpTitle & helpContent moved to tour -->
 
-<!-- Habits Column -->
-<div class="module">
-    <div class="task-column habits">
-        <h2>Habits</h2>
-        <app:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
-        <ul class="habits">{#each _habitList as :task}<app:task />{/}</ul>
-    </div>
-</div>
-
-<!-- Dailys Column -->
-<div class="module">
-    <div class="task-column dailys">
-        <h2>Daily</h2>
-        <app:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
-        <ul class='dailys'>{#each _dailyList as :task}<app:task />{/}</ul>
-    </div>
-</div>
-
-<!-- Todos Column -->
-<div class="module">
-    <div class="task-column todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
-        <span class='option-box pull-right'>
-            {#if _user.history.todos}
-              <a class="option-action" x-bind=click:toggleChart data-toggle-id="todos-chart" data-history-path="_user.history.todos" rel=tooltip title="Progress"><i class=icon-signal></i></a>
-            {/}
-            <a class="option-action" href="/v1/users/{{_user.id}}/calendar.ics?apiToken={{_user.apiToken}}" rel=tooltip title="iCal"><i class=icon-calendar></i></a>
-            <!-- <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> -->
-        </span>
-        <h2>Todos</h2>
-        <div class="display-context-dependant show-for-uncompleted">
-            <app:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
+    <!-- Habits Column -->
+    <div class="module">
+        <div class="task-column habits">
+            <h2>Habits</h2>
+            <app:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
+            <ul class="habits">{#each _habitList as :task}<app:task />{/}</ul>
         </div>
-        <ul class='todos task-list'>
-            {#each _todoList as :task}<app:task />{/}
-        </ul>
-        <div class="display-context-dependant show-for-completed">
-            <a class='btn' x-bind=click:clearCompleted>Clear Completed</a>
-            <p>&nbsp;</p>
-        </div>
-        <div id="todos-chart" style="display:none;"></div>
-        <ul class="todo-status-toggler nav nav-tabs">
-            <li class="active"><a x-bind=click:changeContext data-target="#todo-well" data-context="context-uncompleted">Remaining</a></li>
-            <li><a x-bind=click:changeContext data-target="#todo-well" data-context="context-completed">Complete</a></li>
-        </ul>
     </div>
-</div>
 
-<!-- Rewards Column -->
-<div class="module">
-    <div class="task-column rewards">
-        <!--Title -->
-        <div class="row-fluid">
-            <div class="span6"><h2>Rewards</h2></div>
-            <div class="span6">
-                {#unless _view.activeTabPets}
-                <table><tr>
-                    <td>{gold(_user.stats.gp)} </td>
-                    <td><div class='shop_gold' rel='tooltip' title='Gold'></div></td>
-                    <td>{silver(_user.stats.gp)} </td>
-                    <td><div class='shop_silver' rel='tooltip' title='Silver'></div></td>
-                    <!--<td>{copper(_user.stats.gp)} </td>
-                    <td><div class='shop_copper' rel='tooltip' title='shop_copper'></div></td>-->
-                </tr></table>
-                {else}
-                <app:userTokens />
+    <!-- Dailys Column -->
+    <div class="module">
+        <div class="task-column dailys">
+            <h2>Daily</h2>
+            <app:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
+            <ul class='dailys'>{#each _dailyList as :task}<app:task />{/}</ul>
+        </div>
+    </div>
+
+    <!-- Todos Column -->
+    <div class="module">
+        <div class="task-column todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
+            <span class='option-box pull-right'>
+                {#if _user.history.todos}
+                  <a class="option-action" x-bind=click:toggleChart data-toggle-id="todos-chart" data-history-path="_user.history.todos" rel=tooltip title="Progress"><i class=icon-signal></i></a>
                 {/}
+                <a class="option-action" href="/v1/users/{{_user.id}}/calendar.ics?apiToken={{_user.apiToken}}" rel=tooltip title="iCal"><i class=icon-calendar></i></a>
+                <!-- <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> -->
+            </span>
+            <h2>Todos</h2>
+            <div class="display-context-dependant show-for-uncompleted">
+                <app:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
             </div>
-        </div>
-        <app:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
-        
-        {#if _user.flags.petsEnabled}
-        <div class='tabbable tabs-below'>
-        
-            <div class="tab-content">
-                <div class="tab-pane active" id="rewards-tab">
-                    <app:rewardsTab />
-                </div>
-        
-                <div class="tab-pane" id="pets-tab">
-                    {#with _view.items.pets as :pets}
-        
-                    <div class="row-fluid">
-                        {#with :pets[0]}<app:pet />{/}
-                        {#with :pets[1]}<app:pet />{/}
-                        {#with :pets[2]}<app:pet />{/}
-                        {#with :pets[3]}<app:pet />{/}
-                    </div>
-        
-                    <div class="row-fluid">
-                        {#with :pets[4]}<app:pet />{/}
-                        {#with :pets[5]}<app:pet />{/}
-                        {#with :pets[6]}<app:pet />{/}
-                        {#with :pets[7]}<app:pet />{/}
-                    </div>
-        
-                    <div class="row-fluid">
-                        {#with :pets[8]}<app:pet />{/}
-                        {#with :pets[9]}<app:pet />{/}
-                        {#with :pets[10]}<app:pet />{/}
-                        {#with :pets[11]}<app:pet />{/}
-                    </div>
-        
-                    <div class="row-fluid">
-                        {#with :pets[12]}<app:pet />{/}
-                        {#with :pets[13]}<app:pet />{/}
-                        {#with :pets[14]}<app:pet />{/}
-                        {#with :pets[15]}<app:pet />{/}
-                    </div>
-        
-                    <div class="row-fluid">
-                        {#with :pets[16]}<app:pet />{/}
-                    </div>
-        
-        
-                    {/}
-                </div>
-                <!--<div class="tab-pane" id="mounts-tab">...</div>-->
+            <ul class='todos task-list'>
+                {#each _todoList as :task}<app:task />{/}
+            </ul>
+            <div class="display-context-dependant show-for-completed">
+                <a class='btn' x-bind=click:clearCompleted>Clear Completed</a>
+                <p>&nbsp;</p>
             </div>
-        
-        
-            <ul class="nav nav-tabs" id="rewardsTabs">
-                <li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
-                <li><a href="#pets-tab" id='pets-tab' data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
-                <!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
+            <div id="todos-chart" style="display:none;"></div>
+            <ul class="todo-status-toggler nav nav-tabs">
+                <li class="active"><a x-bind=click:changeContext data-target="#todo-well" data-context="context-uncompleted">Remaining</a></li>
+                <li><a x-bind=click:changeContext data-target="#todo-well" data-context="context-completed">Complete</a></li>
             </ul>
         </div>
-        {else}
-        <app:rewardsTab />
-        {/}</div>
-</div>
+    </div>
+
+    <!-- Rewards Column -->
+    <div class="module">
+        <div class="task-column rewards">
+            <!--Title -->
+            <div class="row-fluid">
+                <div class="span6"><h2>Rewards</h2></div>
+                <div class="span6">
+                    {#unless _view.activeTabPets}
+                    <table><tr>
+                        <td>{gold(_user.stats.gp)} </td>
+                        <td><div class='shop_gold' rel='tooltip' title='Gold'></div></td>
+                        <td>{silver(_user.stats.gp)} </td>
+                        <td><div class='shop_silver' rel='tooltip' title='Silver'></div></td>
+                        <!--<td>{copper(_user.stats.gp)} </td>
+                        <td><div class='shop_copper' rel='tooltip' title='shop_copper'></div></td>-->
+                    </tr></table>
+                    {else}
+                    <app:userTokens />
+                    {/}
+                </div>
+            </div>
+            <app:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
+
+            {#if _user.flags.petsEnabled}
+            <div class='tabbable tabs-below'>
+
+                <div class="tab-content">
+                    <div class="tab-pane active" id="rewards-tab">
+                        <app:rewardsTab />
+                    </div>
+
+                    <div class="tab-pane" id="pets-tab">
+                        {#with _view.items.pets as :pets}
+
+                        <div class="row-fluid">
+                            {#with :pets[0]}<app:pet />{/}
+                            {#with :pets[1]}<app:pet />{/}
+                            {#with :pets[2]}<app:pet />{/}
+                            {#with :pets[3]}<app:pet />{/}
+                        </div>
+
+                        <div class="row-fluid">
+                            {#with :pets[4]}<app:pet />{/}
+                            {#with :pets[5]}<app:pet />{/}
+                            {#with :pets[6]}<app:pet />{/}
+                            {#with :pets[7]}<app:pet />{/}
+                        </div>
+
+                        <div class="row-fluid">
+                            {#with :pets[8]}<app:pet />{/}
+                            {#with :pets[9]}<app:pet />{/}
+                            {#with :pets[10]}<app:pet />{/}
+                            {#with :pets[11]}<app:pet />{/}
+                        </div>
+
+                        <div class="row-fluid">
+                            {#with :pets[12]}<app:pet />{/}
+                            {#with :pets[13]}<app:pet />{/}
+                            {#with :pets[14]}<app:pet />{/}
+                            {#with :pets[15]}<app:pet />{/}
+                        </div>
+
+                        <div class="row-fluid">
+                            {#with :pets[16]}<app:pet />{/}
+                        </div>
+
+
+                        {/}
+                    </div>
+                    <!--<div class="tab-pane" id="mounts-tab">...</div>-->
+                </div>
+
+
+                <ul class="nav nav-tabs" id="rewardsTabs">
+                    <li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
+                    <li><a href="#pets-tab" id='pets-tab' data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
+                    <!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
+                </ul>
+            </div>
+            {else}
+            <app:rewardsTab />
+            {/}</div>
+    </div>
 
 <!-- Templates -->
 <newTask:>
@@ -140,50 +140,50 @@
     </form>
     <hr>
 
-    <!-- all the parts of a single task -->
-    <task:>
-        <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
-            <!-- right-hand side control buttons -->
-            <div class="task-meta-controls">
-                <div class="hover-show">
-                    <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
-                    <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
-                    {#if :task.history}
-                    <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
-                        <i class="icon-signal"></i>
-                    </a>
-                    {/}
-                </div>
-
-                {#if :task.notes}
-                <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
+<!-- all the parts of a single task -->
+<task:>
+    <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
+        <!-- right-hand side control buttons -->
+        <div class="task-meta-controls">
+            <div class="hover-show">
+                <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
+                <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
+                {#if :task.history}
+                <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
+                    <i class="icon-signal"></i>
+                </a>
                 {/}
             </div>
 
-            <!-- left-hand side checkbox -->
-            <div class="task-controls">
-                <!-- Habits -->
-                {#if equal(:task.type, 'habit')}
-                {#if :task.up}<a class="task-action-btn action-plus" data-direction=up x-bind=click:score>＋</a>{/}
-                {#if :task.down}<a class="task-action-btn action-minus" data-direction=down x-bind=click:score>−</a>{/}
-                <!-- Rewards -->
-                {else if equal(:task.type, 'reward')}
-                <a class="task-action-btn action-buy" x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
-                <!-- Daily & Todos -->
-                {else}
-                <span class="task-checker">
-                    <input type=checkbox id="box-{{:task.id}}" class="visuallyhidden focusable" checked="{:task.completed}">
-                    <label for="box-{{:task.id}}"></label>
-                </span>
-                {/}
-            </div>
+            {#if :task.notes}
+            <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
+            {/}
+        </div>
 
-            <!-- main content -->
-            <p class="task-text">{:task.text}</p>
+        <!-- left-hand side checkbox -->
+        <div class="task-controls">
+            <!-- Habits -->
+            {#if equal(:task.type, 'habit')}
+            {#if :task.up}<a class="task-action-btn action-plus" data-direction=up x-bind=click:score>＋</a>{/}
+            {#if :task.down}<a class="task-action-btn action-minus" data-direction=down x-bind=click:score>−</a>{/}
+            <!-- Rewards -->
+            {else if equal(:task.type, 'reward')}
+            <a class="task-action-btn action-buy" x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
+            <!-- Daily & Todos -->
+            {else}
+            <span class="task-checker">
+                <input type=checkbox id="box-{{:task.id}}" class="visuallyhidden focusable" checked="{:task.completed}">
+                <label for="box-{{:task.id}}"></label>
+            </span>
+            {/}
+        </div>
 
-            <!-- edit/options dialog -->
-            <app:taskMeta />
-        </li>
+        <!-- main content -->
+        <p class="task-text">{:task.text}</p>
+
+        <!-- edit/options dialog -->
+        <app:taskMeta />
+    </li>
 
 <taskMeta:>
     <div style="display:none;" id={{:task.id}}-edit>

From 48dc49e1c4730a209076ab922f4a883d47cad182 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 20:10:03 -0500
Subject: [PATCH 112/220] re-enstate double-rewards bug fix

---
 views/app/tasks.html | 104 +++++++++++++++++++++----------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/views/app/tasks.html b/views/app/tasks.html
index 13f4d6cd52..235f5b1447 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -71,64 +71,64 @@
             </div>
             <app:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
 
-            {#if _user.flags.petsEnabled}
-            <div class='tabbable tabs-below'>
+            {#if equal(_user.flags.petsEnabled,true)}
+                <div class='tabbable tabs-below'>
 
-                <div class="tab-content">
-                    <div class="tab-pane active" id="rewards-tab">
-                        <app:rewardsTab />
+                    <div class="tab-content">
+                        <div class="tab-pane active" id="rewards-tab">
+                            <app:rewardsTab />
+                        </div>
+
+                        <div class="tab-pane" id="pets-tab">
+                            {#with _view.items.pets as :pets}
+
+                            <div class="row-fluid">
+                                {#with :pets[0]}<app:pet />{/}
+                                {#with :pets[1]}<app:pet />{/}
+                                {#with :pets[2]}<app:pet />{/}
+                                {#with :pets[3]}<app:pet />{/}
+                            </div>
+
+                            <div class="row-fluid">
+                                {#with :pets[4]}<app:pet />{/}
+                                {#with :pets[5]}<app:pet />{/}
+                                {#with :pets[6]}<app:pet />{/}
+                                {#with :pets[7]}<app:pet />{/}
+                            </div>
+
+                            <div class="row-fluid">
+                                {#with :pets[8]}<app:pet />{/}
+                                {#with :pets[9]}<app:pet />{/}
+                                {#with :pets[10]}<app:pet />{/}
+                                {#with :pets[11]}<app:pet />{/}
+                            </div>
+
+                            <div class="row-fluid">
+                                {#with :pets[12]}<app:pet />{/}
+                                {#with :pets[13]}<app:pet />{/}
+                                {#with :pets[14]}<app:pet />{/}
+                                {#with :pets[15]}<app:pet />{/}
+                            </div>
+
+                            <div class="row-fluid">
+                                {#with :pets[16]}<app:pet />{/}
+                            </div>
+
+
+                            {/}
+                        </div>
+                        <!--<div class="tab-pane" id="mounts-tab">...</div>-->
                     </div>
 
-                    <div class="tab-pane" id="pets-tab">
-                        {#with _view.items.pets as :pets}
 
-                        <div class="row-fluid">
-                            {#with :pets[0]}<app:pet />{/}
-                            {#with :pets[1]}<app:pet />{/}
-                            {#with :pets[2]}<app:pet />{/}
-                            {#with :pets[3]}<app:pet />{/}
-                        </div>
-
-                        <div class="row-fluid">
-                            {#with :pets[4]}<app:pet />{/}
-                            {#with :pets[5]}<app:pet />{/}
-                            {#with :pets[6]}<app:pet />{/}
-                            {#with :pets[7]}<app:pet />{/}
-                        </div>
-
-                        <div class="row-fluid">
-                            {#with :pets[8]}<app:pet />{/}
-                            {#with :pets[9]}<app:pet />{/}
-                            {#with :pets[10]}<app:pet />{/}
-                            {#with :pets[11]}<app:pet />{/}
-                        </div>
-
-                        <div class="row-fluid">
-                            {#with :pets[12]}<app:pet />{/}
-                            {#with :pets[13]}<app:pet />{/}
-                            {#with :pets[14]}<app:pet />{/}
-                            {#with :pets[15]}<app:pet />{/}
-                        </div>
-
-                        <div class="row-fluid">
-                            {#with :pets[16]}<app:pet />{/}
-                        </div>
-
-
-                        {/}
-                    </div>
-                    <!--<div class="tab-pane" id="mounts-tab">...</div>-->
+                    <ul class="nav nav-tabs" id="rewardsTabs">
+                        <li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
+                        <li><a href="#pets-tab" id='pets-tab' data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
+                        <!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
+                    </ul>
                 </div>
-
-
-                <ul class="nav nav-tabs" id="rewardsTabs">
-                    <li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
-                    <li><a href="#pets-tab" id='pets-tab' data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
-                    <!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
-                </ul>
-            </div>
             {else}
-            <app:rewardsTab />
+                <app:rewardsTab />
             {/}</div>
     </div>
 

From 4bb0207564415b74809690d2ce858226fa8898e7 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 18:07:22 -0500
Subject: [PATCH 113/220] rename priority multiplier to "Difficulty" -> easy,
 medium, hard (people keep getting confused) and putting it back into
 "advanced" section

---
 views/app/tasks.html | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/views/app/tasks.html b/views/app/tasks.html
index 235f5b1447..7b96fac499 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -231,18 +231,21 @@
                 </div>
             {/}
 
+            <hr/>
             {#unless equal(:task.type, 'reward')}
-                <hr/>
                 <div>
-                    <div class="control-group btn-group priority-multiplier" data-id="{{:task.id}}">
-                        <label>Priority <a href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a></label>
-                        <button type="button" class="btn btn-info {#if equal(:task.priority,'!')}active{/}{#unless :task.priority}active{/}" data-priority='!' x-bind=click:tasksSetPriority>!</button>
-                        <button type="button" class="btn btn-info {#if equal(:task.priority,'!!')}active{/}" data-priority='!!' x-bind=click:tasksSetPriority>!!</button>
-                        <button type="button" class="btn btn-info {#if equal(:task.priority,'!!!')}active{/}" data-priority='!!!' x-bind=click:tasksSetPriority>!!!</button>
+                    <a x-bind="click:tasksToggleAdvanced">Advanced</a>
+                    <div class='advanced hide'>
+                        <div class="control-group btn-group priority-multiplier" data-id="{{:task.id}}">
+                            <label>Difficulty <a href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank" title="How difficult is this task? Multiplies it's point value." rel='tooltip'><i class='icon-question-sign'></i></a></label>
+                            <button type="button" class="btn btn-info {#if equal(:task.priority,'!')}active{/}{#unless :task.priority}active{/}" data-priority='!' x-bind=click:tasksSetPriority>Easy</button>
+                            <button type="button" class="btn btn-info {#if equal(:task.priority,'!!')}active{/}" data-priority='!!' x-bind=click:tasksSetPriority>Medium</button>
+                            <button type="button" class="btn btn-info {#if equal(:task.priority,'!!!')}active{/}" data-priority='!!!' x-bind=click:tasksSetPriority>Hard</button>
+                        </div>
                     </div>
                 </div>
+                <br/>
             {/}
-            <hr/>
             <button type=submit class="btn" x-bind="click:tasksSaveAndClose">Save & Close</button>
         </form>
     </div>

From 4f6a78c0ae912854698b45676a9a6def9c785d18 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 18:58:15 -0500
Subject: [PATCH 114/220] add help popover to difficulty

---
 views/app/tasks.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/app/tasks.html b/views/app/tasks.html
index 7b96fac499..0826a1f742 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -236,8 +236,9 @@
                 <div>
                     <a x-bind="click:tasksToggleAdvanced">Advanced</a>
                     <div class='advanced hide'>
+
+                        <label>Difficulty <a class='priority-multiplier-help' href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a></label>
                         <div class="control-group btn-group priority-multiplier" data-id="{{:task.id}}">
-                            <label>Difficulty <a href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank" title="How difficult is this task? Multiplies it's point value." rel='tooltip'><i class='icon-question-sign'></i></a></label>
                             <button type="button" class="btn btn-info {#if equal(:task.priority,'!')}active{/}{#unless :task.priority}active{/}" data-priority='!' x-bind=click:tasksSetPriority>Easy</button>
                             <button type="button" class="btn btn-info {#if equal(:task.priority,'!!')}active{/}" data-priority='!!' x-bind=click:tasksSetPriority>Medium</button>
                             <button type="button" class="btn btn-info {#if equal(:task.priority,'!!!')}active{/}" data-priority='!!!' x-bind=click:tasksSetPriority>Hard</button>

From 16bba9461cf562615ad2e75f2ee82f9a5b747685 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Tue, 5 Mar 2013 20:21:17 -0500
Subject: [PATCH 115/220] add the bootstrap update

---
 public/vendor/bootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/vendor/bootstrap b/public/vendor/bootstrap
index eb24718add..8c7f9c66a7 160000
--- a/public/vendor/bootstrap
+++ b/public/vendor/bootstrap
@@ -1 +1 @@
-Subproject commit eb24718add4dd36fe92fdbdb79e6ff4ce5919300
+Subproject commit 8c7f9c66a7d12f47f50618ef420868fe836d0c33

From 7e304afc544273855fa1d7af8bfbab851b9c6908 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 20:23:31 -0500
Subject: [PATCH 116/220] upgrade bootstrap

---
 public/vendor/bootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/vendor/bootstrap b/public/vendor/bootstrap
index 8c7f9c66a7..eb24718add 160000
--- a/public/vendor/bootstrap
+++ b/public/vendor/bootstrap
@@ -1 +1 @@
-Subproject commit 8c7f9c66a7d12f47f50618ef420868fe836d0c33
+Subproject commit eb24718add4dd36fe92fdbdb79e6ff4ce5919300

From a002932210525a6d16df3cca04b528db5baa8047 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Tue, 5 Mar 2013 20:29:20 -0500
Subject: [PATCH 117/220] re-add Lato webfont

---
 views/app/index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/app/index.html b/views/app/index.html
index a9cb2bbc43..e16e6fd1eb 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -14,6 +14,8 @@
 <Head:>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="apple-mobile-web-app-capable" content="yes">
+  <!-- webfonts -->
+  <link href='http://fonts.googleapis.com/css?family=Lato:400,700,400italic' rel='stylesheet' type='text/css'>
 
 <Header:>
   <app:modals:modals />

From 44714bcc5bb457489ea5ab031e6fa35e586cd3a5 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 20:35:13 -0500
Subject: [PATCH 118/220] comment out webkit-devtools-agent - only for my
 pesronal use, really

---
 package.json | 3 +--
 server.js    | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index a80458cca0..6f65508171 100644
--- a/package.json
+++ b/package.json
@@ -26,8 +26,7 @@
     "superagent": "~0.12.4",
     "resolve": "~0.2.3",
     "browserify": "1.17.3",
-    "expect.js": "~0.2.0",
-    "webkit-devtools-agent": "*"
+    "expect.js": "~0.2.0"
   },
   "private": true,
   "subdomain": "habitrpg",
diff --git a/server.js b/server.js
index 51db9480cf..6412b78225 100644
--- a/server.js
+++ b/server.js
@@ -22,7 +22,7 @@ process.env.SMTP_SERVICE = conf.get("SMTP_SERVICE");
 process.env.STRIPE_API_KEY = conf.get("STRIPE_API_KEY");
 process.env.STRIPE_PUB_KEY = conf.get("STRIPE_PUB_KEY");
 
-var agent;
+/*var agent;
 if (process.env.NODE_ENV === 'development') {
     // Follow these instructions for profiling / debugging leaks
     // * https://developers.google.com/chrome-developer-tools/docs/heap-profiling
@@ -31,7 +31,7 @@ if (process.env.NODE_ENV === 'development') {
     console.log("To debug memory leaks:" +
         "\n\t(1) Run `kill -SIGUSR2 " + process.pid + "`" +
         "\n\t(2) open http://c4milo.github.com/node-webkit-agent/21.0.1180.57/inspector.html?host=localhost:1337&page=0");
-}
+}*/
 
 process.on('uncaughtException', function (error) {
 

From b6564828cef31a758a40f5df14d518096419c9f0 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 21:36:18 -0500
Subject: [PATCH 119/220] use different rewards selector for items-unlocked
 popover, wasn't getting it

---
 src/app/items.coffee | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/items.coffee b/src/app/items.coffee
index 58799b1d1c..5990a24412 100644
--- a/src/app/items.coffee
+++ b/src/app/items.coffee
@@ -165,22 +165,22 @@ module.exports.app = (appExports, model) ->
     model.set '_view.activeTabPets', true
     model.set '_view.activeTabRewards', false
 
-  user.on 'set', 'flags.itemsEnabled', (captures, args) ->
-    return unless captures == true
+  model.on 'set', '_user.flags.itemsEnabled', (captures, args) ->
+    return unless captures is true
     html = """
            <div class='item-store-popover'>
            <img src='/vendor/BrowserQuest/client/img/1/chest.png' />
            Congratulations, you have unlocked the Item Store! You can now buy weapons, armor, potions, etc. Read each item's comment for more information.
-           <a href='#' onClick="$('ul.items').popover('hide');return false;">[Close]</a>
+           <a href='#' onClick="$('div.rewards').popover('hide');return false;">[Close]</a>
            </div>
            """
-    $('ul.items').popover
+    $('div.rewards').popover({
       title: "Item Store Unlocked"
       placement: 'left'
       trigger: 'manual'
       html: true
       content: html
-    $('ul.items').popover 'show'
+    }).popover 'show'
 
   user.on 'set', 'flags.petsEnabled', (captures, args) ->
     return unless captures == true

From 27ce1b050bcb176ffb42809e504b98d6adfb6334 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 5 Mar 2013 23:05:59 -0500
Subject: [PATCH 120/220] try x-requested-with for CORS

---
 src/server/middleware.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee
index 191ccc8f40..e5ada1e5e1 100644
--- a/src/server/middleware.coffee
+++ b/src/server/middleware.coffee
@@ -17,5 +17,5 @@ module.exports.view = (req, res, next) ->
 module.exports.allowCrossDomain = (req, res, next) ->
   res.header "Access-Control-Allow-Origin", '*'
   res.header "Access-Control-Allow-Methods", "GET,PUT,POST,DELETE"
-  res.header "Access-Control-Allow-Headers", "Content-Type"
+  res.header "Access-Control-Allow-Headers", "Content-Type,x-requested-with"
   next()
\ No newline at end of file

From ce19fed852b6e4f770b9b6186c4d91f357781949 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Tue, 5 Mar 2013 20:35:13 -0500
Subject: [PATCH 121/220] remove responsive from bootstrap includes. Rolling
 our own!

---
 src/app/index.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/index.coffee b/src/app/index.coffee
index eabdfbde0e..d7445536a0 100644
--- a/src/app/index.coffee
+++ b/src/app/index.coffee
@@ -1,7 +1,7 @@
 derby = require 'derby'
 app = derby.createApp module
 {get, view, ready} = app
-derby.use require('derby-ui-boot'), {styles: ['bootstrap', 'responsive']}
+derby.use require('derby-ui-boot'), {styles: ['bootstrap']}
 derby.use require '../../ui'
 derby.use require 'derby-auth/components'
 

From fd216719c364c5b3875c1bfed0b8c03b3795b763 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Tue, 5 Mar 2013 21:03:35 -0500
Subject: [PATCH 122/220] allow task text to word-wrap and be padded from
 element edge

---
 styles/app/tasks.styl | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index 9327eec73d..9dc1b45b94 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -100,8 +100,7 @@ li:hover .task-meta-controls .hover-show
 .task-column
   padding: 1.5em
   background: #f5f5f5
-  border: 1px solid #bbb
-  border-radius: 0.25em
+  border: 1px solid #ccc
   font-family: 'Lato', sans-serif
   h2
     margin: 0 0 0.5em
@@ -121,7 +120,7 @@ li:hover .task-meta-controls .hover-show
 .task
   list-style: none
   clear: both
-  padding: 0 0.5em 0 0
+  padding: 0 0.5em 0 0.5em
   min-height: 2.5em
   line-height: 2.5
   margin-bottom: 0.75em
@@ -135,9 +134,10 @@ li:hover .task-meta-controls .hover-show
 
 .task-controls
   display: inline
+  margin-left: -0.5em
+  margin-right: 0.5em
 .task-text
-  display: inline-block
-  text-indent: 0.5em
+  display: inline
 
 .task-checker
   label
@@ -174,7 +174,7 @@ li:hover .task-meta-controls .hover-show
     transform: rotate(135deg)
     line-height: 1.1
     text-align: left
-    opacity: 1
+    opacity: 0.75
   
   input[type=checkbox]
     margin: 0
@@ -183,19 +183,16 @@ li:hover .task-meta-controls .hover-show
 
 .addtask-form
   margin-bottom: 0.75em
-  border-radius: 0.25em
-  overflow: hidden
   .addtask-field
     display: inline-block
     width: 80% // fallback for Safari 5.1
-    // width: calc(unquote('100% - 3em'))
+    width: calc(unquote('100% - 3em'))
     input
       font-family: 'Lato', sans-serif
       outline: 0
       border: 0
       box-shadow: none
       background-color: white
-      border-radius 0 0.25em 0.25em 0
       height: 2.5em
       padding: 0 0 0 0.5em
       width: 100%

From 174c7a8b9f14da4e39df6a32a3ab593cc03f0745 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Tue, 5 Mar 2013 22:06:45 -0500
Subject: [PATCH 123/220] tweaks, most notably DISABLE CHART BUTAN

---
 styles/app/tasks.styl | 269 ++++++++++++++++++++----------------------
 views/app/tasks.html  |  29 +++--
 2 files changed, 139 insertions(+), 159 deletions(-)

diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index 9dc1b45b94..ce121649f4 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -34,89 +34,75 @@ for $stage in $stages
   background-color: white
 
 
-// 2. Task Options
-// ================
 
-label.checkbox.inline{
-    width: 40px
-}
-
-.todos
-  .nav-pills > .active > a, .nav-pills > .active > a:hover
-    color: #005580
-    background-color: #DEE5F2
-
-.dailys
-  .repeat-days > .btn:not(.active)
-    background-color: #aaa;
-    background-image: -moz-linear-gradient(top, #eee, #aaa);
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#eee), to(#aaa));
-    background-image: -webkit-linear-gradient(top, #eee, #aaa);
-    background-image: -o-linear-gradient(top, #eee, #aaa);
-    background-image: linear-gradient(to bottom, #eee, #aaa);
-    background-repeat: repeat-x;
-
-.context-enabled
-  .display-context-dependant,
-  .task-list li
-    display: none
-
-  &.context-completed
-    .show-for-completed, .completed
-      display: block
-
-  &.context-uncompleted
-    .show-for-uncompleted, .uncompleted
-      display: block
-
-.help-icon
-  float:right;
-
-.task:hover
-  cursor: move
-
-li:hover .task-meta-controls .hover-show
-  display: inline
-
-.task
-
-  .task-meta-controls
-    float:right
-    i
-      margin-left:5px
-
-  .task-meta-controls .hover-show
-    display: none;
-
-.vote-up, .vote-down
-    text-decoration:none;
-
-.new-task-form
-  margin-bottom:5px;
-
-
-// begin rewrite css 2013-03-04
+// 2. Columns & Tasks
+// ===================
 
+// main columns
+// ------------
 .task-column
   padding: 1.5em
   background: #f5f5f5
   border: 1px solid #ccc
   font-family: 'Lato', sans-serif
-  h2
+
+  .task-column_title
     margin: 0 0 0.5em
     padding: 0
-  
-  .nav-tabs
-    margin-top: 0.75em
 
-  .option-box
-    .option-action
-      margin-left: 0.25em
+  hr
+    border: 0
+    border-bottom: 1px solid #ddd
 
-
-.rewards
+// add new task form
+// -----------------
+.addtask-form
   margin-bottom: 0.75em
+  outline: 1px solid rgba(0,0,0,0.15)
+  outline-offset: -1px
 
+// the input field
+.addtask-field
+  display: inline-block
+  width: 80% // fallback for Safari 5.1
+  width: calc(unquote('100% - 3em'))
+  input
+    font-family: 'Lato', sans-serif
+    border: 0
+    outline: 0
+    border-radius: 0
+    box-shadow: none
+    background-color: white
+    height: 2.5em
+    padding: 0 0 0 0.5em
+    width: 100%
+    &:focus
+      box-shadow: inset 0 0 3px darken($best, 20%)
+
+// the button
+.addtask-btn
+  display: inline-block
+  // important for overriding bootstrap, remove later
+  width: 1.51515em !important
+  height: 1.51515em
+  padding: 0
+  font-size: 1.65em
+  line-height: 1.55
+  outline: 0
+  border: 0
+  background-color: darken($best, 20%)
+  opacity: 0.75
+  &:hover,
+  &:focus
+    opacity: 1
+    background-color: darken($best, 20%)
+  &:active
+    background-color: darken($best, 30%)
+    opacity: 1
+
+
+// an individual task entry
+// ------------------------
 .task
   list-style: none
   clear: both
@@ -126,114 +112,109 @@ li:hover .task-meta-controls .hover-show
   margin-bottom: 0.75em
   outline: 1px solid rgba(0,0,0,0.1)
   outline-offset: -1px
-  -webkit-background-clip: padding-box
-  border-radius: 0.25em
-  // overflow: hidden
+  &:hover
+    cursor: move
   &:last-child
     margin-bottom: 0
 
+// task content
+.task-text
+  display: inline
+
+
+// primary task commands
+// ----------------------
 .task-controls
   display: inline
   margin-left: -0.5em
   margin-right: 0.5em
-.task-text
-  display: inline
 
-.task-checker
-  label
+  // plus/minus commands
+  .task-action-btn
+    display: inline-block
+    width: 1.773em
+    height: 1.773em
+    padding: 0
+    font-size: 1.41em
+    line-height: 1.773
+    text-align: center
+    color: black
+    vertical-align: top
+    border-right: 1px solid rgba(0,0,0,0.25)
+    &:last-child
+      border: 0
+    &:hover, &:focus
+      text-decoration: none
+
+  // checkbox
+  .task-checker input[type=checkbox]
+    margin: 0
+    padding: 0
+    visibility: hidden
+
+  .task-checker label
     display: inline-block
     width: 2.5em
     height: 2.5em
-    padding: 0
     margin: 0
     vertical-align: top
     cursor: pointer
+
+    // uncompleted icon
     &:after
       content: '○'
       display: block
-      opacity: 0.2
+      font-size: 3em
       line-height: 0.76
       text-align: center
       color: black
-      font-size: 3em
+      opacity: 0.2
+
+    // hint at completed icon
     &:hover:after,
     &:focus:after
       content: '¬'
-      display: block
       font-size: 3em
-      color: black
-      transform: rotate(135deg)
       line-height: 1.1
       text-align: left
+      transform: rotate(135deg)
       opacity: 0.5 !important
     &:active:after
       opacity: 0.75 !important
 
-  & input[type=checkbox]:checked + label:after
+  // completed icon
+  .task-checker input[type=checkbox]:checked + label:after
     content: '¬'
     transform: rotate(135deg)
     line-height: 1.1
     text-align: left
     opacity: 0.75
-  
-  input[type=checkbox]
-    margin: 0
-    padding: 0
-    visibility: hidden
 
-.addtask-form
-  margin-bottom: 0.75em
-  .addtask-field
-    display: inline-block
-    width: 80% // fallback for Safari 5.1
-    width: calc(unquote('100% - 3em'))
-    input
-      font-family: 'Lato', sans-serif
-      outline: 0
-      border: 0
-      box-shadow: none
-      background-color: white
-      height: 2.5em
-      padding: 0 0 0 0.5em
-      width: 100%
-      &:focus
-        box-shadow: inset 0 0 3px darken($best, 20%)
-  .addtask-btn
-    display: inline-block
-    width: 1.51515em
-    height: 1.51515em
-    padding: 0
-    font-size: 1.65em
-    line-height: 1.55
-    outline: 0
-    border: 0
-    background-color: darken($best, 20%)
-    opacity: 0.5
-    &:hover,
-    &:focus
-      opacity: 0.75
-      background-color: darken($best, 20%)
-    &:active
-      background-color: darken($best, 30%)
-      opacity: 1
 
-.task-action-btn
-  display: inline-block
-  width: 1.773em
-  height: 1.773em
-  padding: 0
-  font-size: 1.41em
-  line-height: 1.773
-  text-align: center
-  color: black
-  vertical-align: top
-  border-right: 1px solid rgba(0,0,0,0.25)
-  &:last-child
-    border: 0
-  &:hover,
-  &:focus
-    text-decoration: none
-  // &.action-plus
-  //   background-color: darken($color-good, 20%)
-  // &.action-minus
-  //   background-color: darken($color-worst, 20%)
\ No newline at end of file
+// secondary task commands
+// -----------------------
+.task-meta-controls
+  float: right
+  margin-left: 0.25em
+  opacity: 0.25
+  a > i
+    margin-left: 0.125em
+  .task-notes
+    margin-left: 0.125em
+
+.task:hover .task-meta-controls
+  opacity: 1
+
+
+// .context-enabled
+//   .display-context-dependant,
+//   .task-list li
+//     display: none
+
+//   &.context-completed
+//     .show-for-completed, .completed
+//       display: block
+
+//   &.context-uncompleted
+//     .show-for-uncompleted, .uncompleted
+//       display: block
\ No newline at end of file
diff --git a/views/app/tasks.html b/views/app/tasks.html
index 0826a1f742..fd880e1767 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -4,7 +4,7 @@
     <!-- Habits Column -->
     <div class="module">
         <div class="task-column habits">
-            <h2>Habits</h2>
+            <h2 class="task-column_title">Habits</h2>
             <app:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
             <ul class="habits">{#each _habitList as :task}<app:task />{/}</ul>
         </div>
@@ -13,7 +13,7 @@
     <!-- Dailys Column -->
     <div class="module">
         <div class="task-column dailys">
-            <h2>Daily</h2>
+            <h2 class="task-column_title">Daily</h2>
             <app:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
             <ul class='dailys'>{#each _dailyList as :task}<app:task />{/}</ul>
         </div>
@@ -29,7 +29,7 @@
                 <a class="option-action" href="/v1/users/{{_user.id}}/calendar.ics?apiToken={{_user.apiToken}}" rel=tooltip title="iCal"><i class=icon-calendar></i></a>
                 <!-- <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> -->
             </span>
-            <h2>Todos</h2>
+            <h2 class="task-column_title">Todos</h2>
             <div class="display-context-dependant show-for-uncompleted">
                 <app:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
             </div>
@@ -38,7 +38,6 @@
             </ul>
             <div class="display-context-dependant show-for-completed">
                 <a class='btn' x-bind=click:clearCompleted>Clear Completed</a>
-                <p>&nbsp;</p>
             </div>
             <div id="todos-chart" style="display:none;"></div>
             <ul class="todo-status-toggler nav nav-tabs">
@@ -53,7 +52,7 @@
         <div class="task-column rewards">
             <!--Title -->
             <div class="row-fluid">
-                <div class="span6"><h2>Rewards</h2></div>
+                <div class="span6"><h2 class="task-column_title">Rewards</h2></div>
                 <div class="span6">
                     {#unless _view.activeTabPets}
                     <table><tr>
@@ -145,16 +144,16 @@
     <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
         <!-- right-hand side control buttons -->
         <div class="task-meta-controls">
-            <div class="hover-show">
-                <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
-                <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
-                {#if :task.history}
-                <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
-                    <i class="icon-signal"></i>
-                </a>
-                {/}
-            </div>
-
+            <!-- edit -->
+            <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
+            <!-- delete -->
+            <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
+            <!-- chart -->
+            <!-- removing for now cuz it's broken -->
+            {#if :task.history}
+            <!-- <a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress"><i class="icon-signal"></i></a> -->
+            {/}
+            <!-- notes -->
             {#if :task.notes}
             <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
             {/}

From 84e07a03178828d73c141c392c765d98444dfd80 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Tue, 5 Mar 2013 22:19:20 -0500
Subject: [PATCH 124/220] better a11y than display:none

---
 src/app/tasks.coffee | 4 ++--
 views/app/tasks.html | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index 16d17257b7..c7888cce5f 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -117,8 +117,8 @@ module.exports.app = (appExports, model) ->
   appExports.toggleTaskEdit = (e, el) ->
     hideId = $(el).attr('data-hide-id')
     toggleId = $(el).attr('data-toggle-id')
-    $(document.getElementById(hideId)).hide()
-    $(document.getElementById(toggleId)).toggle()
+    $(document.getElementById(hideId)).addClass('visuallyhidden')
+    $(document.getElementById(toggleId)).toggleClass('visuallyhidden')
 
   appExports.toggleChart = (e, el) ->
     hideSelector = $(el).attr('data-hide-id')
diff --git a/views/app/tasks.html b/views/app/tasks.html
index fd880e1767..d1d67d137d 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -184,9 +184,10 @@
         <app:taskMeta />
     </li>
 
+<!-- task edit/options -->
 <taskMeta:>
-    <div style="display:none;" id={{:task.id}}-edit>
-        <hr/>
+    <div id="{{:task.id}}-edit" class="task-options visuallyhidden">
+        <hr>
         <form x-bind=submit:toggleTaskEdit data-toggle-id="{{:task.id}}-edit">
             <div class=control-group>
                 <label>Text</label><input type=text value={:task.text} />

From 456580e352e00ab5e527ff032b8a982155a8cf0b Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Wed, 6 Mar 2013 00:49:02 -0500
Subject: [PATCH 125/220] gut & re-style Task Options, only Rewards tasks &
 options left to go through

---
 src/app/tasks.coffee  |   2 +-
 styles/app/index.styl |  18 +++-
 styles/app/tasks.styl | 207 +++++++++++++++++++++++++++++++-----------
 views/app/index.html  |   2 +-
 views/app/tasks.html  | 105 +++++++++++----------
 5 files changed, 226 insertions(+), 108 deletions(-)

diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index c7888cce5f..1ee480be93 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -174,7 +174,7 @@ module.exports.app = (appExports, model) ->
     scoring.score(model, task.get('id'), direction)
 
   appExports.tasksToggleAdvanced = (e, el) ->
-    $(el).next('.advanced').toggle()
+    $(el).next('.advanced-option').toggleClass('visuallyhidden')
 
   appExports.tasksSaveAndClose = ->
     # When they update their notes, re-establish tooltip & popover
diff --git a/styles/app/index.styl b/styles/app/index.styl
index 40204aaba0..cdd14936e9 100644
--- a/styles/app/index.styl
+++ b/styles/app/index.styl
@@ -10,15 +10,27 @@
 @import "./helpers.styl";
 @import "./responsive.styl";
 
-// where's the actual bootstrap include?
-// @import "../bootstrap-responsive.styl";
-
 @import "../../public/vendor/bootstrap-datepicker/css/datepicker.css";
 
+// fix exploding to very wide for some reason
+.datepicker
+  width: 210px
+
 html,body,p,h1,ul,li,table,tr,th,td
   margin: 0
   padding: 0
 
+*
+  -webkit-box-sizing: border-box
+  -moz-box-sizing: border-box
+  box-sizing: border-box
+
+hr
+  border-top: 0
+  border-bottom: 1px solid #ddd
+  border-color: rgba(0,0,0,0.1)
+
+
 /* Header
 -------------------------------------------------- */
 
diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index ce121649f4..cebc396437 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -18,10 +18,11 @@ $stages = (worst $worst) (worse $worse) (bad $bad) (neutral $neutral) (good $goo
 for $stage in $stages
   .color-{$stage[0]}
     background-color: $stage[1]
-    .task-checker label,
-    .action-plus,
-    .action-minus
+    .action-yesno label,
+    .task-action-btn
       background-color: darken($stage[1], 30%)
+      &:hover, &:focus
+        background-color: darken($stage[1], 40%)
 
 // completed has to be outside the loop to override the color class
 .completed
@@ -29,6 +30,8 @@ for $stage in $stages
   color: #999
   .task-checker label
     background-color: darken($completed, 30%)
+  .task-action-btn
+    background-color: darken($completed, 30%)
 
 .reward
   background-color: white
@@ -50,9 +53,6 @@ for $stage in $stages
     margin: 0 0 0.5em
     padding: 0
 
-  hr
-    border: 0
-    border-bottom: 1px solid #ddd
 
 // add new task form
 // -----------------
@@ -65,7 +65,7 @@ for $stage in $stages
 .addtask-field
   display: inline-block
   width: 80% // fallback for Safari 5.1
-  width: calc(unquote('100% - 3em'))
+  width: calc(unquote('100% - 2.5em'))
   input
     font-family: 'Lato', sans-serif
     border: 0
@@ -109,7 +109,7 @@ for $stage in $stages
   padding: 0 0.5em 0 0.5em
   min-height: 2.5em
   line-height: 2.5
-  margin-bottom: 0.75em
+  margin-bottom: 1em
   outline: 1px solid rgba(0,0,0,0.1)
   outline-offset: -1px
   &:hover
@@ -129,61 +129,88 @@ for $stage in $stages
   margin-left: -0.5em
   margin-right: 0.5em
 
-  // plus/minus commands
-  .task-action-btn
-    display: inline-block
+// plus/minus commands
+.task-action-btn
+  display: inline-block
+  width: 1.773em
+  height: 1.773em
+  padding: 0
+  font-size: 1.41em
+  line-height: 1.773
+  text-align: center
+  color: #222
+  vertical-align: top
+  border-right: 1px solid rgba(0,0,0,0.25)
+  &:last-child
+    border: 0
+  &:hover, &:focus
+    color: #222
+    text-decoration: none
+
+// checkbox
+.task-checker input[type=checkbox]
+  margin: 0
+  padding: 0
+  visibility: hidden
+
+.task-checker label
+  display: inline-block
+  width: 2.5em
+  height: 2.5em
+  margin: 0
+  vertical-align: top
+  cursor: pointer
+
+// plus/minus checkbox
+.action-plusminus
+  label
+    margin-right: 1.5em
+  label:after
+    font-size: 1.41em
     width: 1.773em
     height: 1.773em
-    padding: 0
-    font-size: 1.41em
     line-height: 1.773
     text-align: center
-    color: black
-    vertical-align: top
-    border-right: 1px solid rgba(0,0,0,0.25)
-    &:last-child
-      border: 0
-    &:hover, &:focus
-      text-decoration: none
-
-  // checkbox
-  .task-checker input[type=checkbox]
-    margin: 0
-    padding: 0
-    visibility: hidden
-
-  .task-checker label
     display: inline-block
-    width: 2.5em
-    height: 2.5em
-    margin: 0
-    vertical-align: top
-    cursor: pointer
+    vertical-align top
+    opacity: 0.3
+    background-color: #ddd
+    outline: 1px solid rgba(0,0,0,0.5)
+    color: #222
+  label[for$="plus"]:after
+    content: '＋'
+  label[for$="minus"]:after
+    content: '−'
 
-    // uncompleted icon
-    &:after
-      content: '○'
-      display: block
-      font-size: 3em
-      line-height: 0.76
-      text-align: center
-      color: black
-      opacity: 0.2
+  &.select-toggle input[type=checkbox]:checked + label:after
+    opacity: 1
 
-    // hint at completed icon
-    &:hover:after,
-    &:focus:after
-      content: '¬'
-      font-size: 3em
-      line-height: 1.1
-      text-align: left
-      transform: rotate(135deg)
-      opacity: 0.5 !important
-    &:active:after
-      opacity: 0.75 !important
+// yes/no checkbox
+.action-yesno
+  // uncompleted icon
+  label:after
+    content: '○'
+    display: block
+    font-size: 3em
+    line-height: 0.76
+    text-align: center
+    color: black
+    opacity: 0.2
+
+  // hint at completed icon
+  label:hover:after,
+  label:focus:after
+    content: '¬'
+    font-size: 3em
+    line-height: 1.1
+    text-align: left
+    transform: rotate(135deg)
+    opacity: 0.5 !important
+  label:active:after
+    opacity: 0.75 !important
 
   // completed icon
-  .task-checker input[type=checkbox]:checked + label:after
+  input[type=checkbox]:checked + label:after
     content: '¬'
     transform: rotate(135deg)
     line-height: 1.1
@@ -206,6 +233,78 @@ for $stage in $stages
   opacity: 1
 
 
+// task editing
+// ------------
+.task-options
+  padding: 0 0.5em
+  margin-top: 1.25em
+  color: #333
+
+  .option-group
+    border-bottom: 1px solid rgba(0,0,0,0.1)
+    padding: 0 0 1em
+    margin-bottom: 1em
+
+  .option-title
+    font-size: 1em
+    margin: 0 0 0.5em
+    line-height: 1.5
+    border: 0
+    padding: 0
+    color: #333
+    font-style: italic
+    &:not(.mega):after
+      content: ':'
+    &.mega
+      cursor: pointer
+      font-style: normal
+      font-weight: bold
+      text-decoration: underline
+
+
+  .option-content
+    height: 2.5em
+    width: 100%
+    margin: 0 0 1em
+    padding: 0 0 0 0.5em
+    outline: 0
+    border: 1px solid rgba(0,0,0,0.2)
+    box-shadow: none
+    border-radius: 0
+    font-family: 'Lato', sans-serif //bootstrap override
+  
+  textarea.option-content
+    height: 5em
+    padding-top: 0.25em
+    resize: none
+    margin-bottom: 0
+
+// button-group
+.task-controls.tile-group
+  display: block
+  text-align: center
+  margin: 0
+
+.task-action-btn.tile
+  border: 0
+  font-size: 1.15em
+  font-weight: 300
+  outline: 1px solid rgba(0,0,0,0.2)
+  outline-offset: -1px
+  margin: 0 0 0 3px
+  font-family: 'Lato', sans-serif
+  text-align: inherit
+  opacity: 0.5
+  width: auto
+  padding: 0 0.5em
+  &.active
+    opacity: 1
+  &.spacious
+    margin: 0.75em 0
+    font-size: 1.5em
+    opacity: 1
+
+
 // .context-enabled
 //   .display-context-dependant,
 //   .task-list li
diff --git a/views/app/index.html b/views/app/index.html
index e16e6fd1eb..3efc331405 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -15,7 +15,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="apple-mobile-web-app-capable" content="yes">
   <!-- webfonts -->
-  <link href='http://fonts.googleapis.com/css?family=Lato:400,700,400italic' rel='stylesheet' type='text/css'>
+  <link href='http://fonts.googleapis.com/css?family=Lato:300,400,700,400italic,700italic' rel='stylesheet' type='text/css'>
 
 <Header:>
   <app:modals:modals />
diff --git a/views/app/tasks.html b/views/app/tasks.html
index d1d67d137d..757c1eb7b6 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -142,6 +142,7 @@
 <!-- all the parts of a single task -->
 <task:>
     <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
+        
         <!-- right-hand side control buttons -->
         <div class="task-meta-controls">
             <!-- edit -->
@@ -163,14 +164,14 @@
         <div class="task-controls">
             <!-- Habits -->
             {#if equal(:task.type, 'habit')}
-            {#if :task.up}<a class="task-action-btn action-plus" data-direction=up x-bind=click:score>＋</a>{/}
-            {#if :task.down}<a class="task-action-btn action-minus" data-direction=down x-bind=click:score>−</a>{/}
+            {#if :task.up}<a class="task-action-btn btn-plus" data-direction=up x-bind=click:score>＋</a>{/}
+            {#if :task.down}<a class="task-action-btn btn-minus" data-direction=down x-bind=click:score>−</a>{/}
             <!-- Rewards -->
             {else if equal(:task.type, 'reward')}
             <a class="task-action-btn action-buy" x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
             <!-- Daily & Todos -->
             {else}
-            <span class="task-checker">
+            <span class="task-checker action-yesno">
                 <input type=checkbox id="box-{{:task.id}}" class="visuallyhidden focusable" checked="{:task.completed}">
                 <label for="box-{{:task.id}}"></label>
             </span>
@@ -187,67 +188,73 @@
 <!-- task edit/options -->
 <taskMeta:>
     <div id="{{:task.id}}-edit" class="task-options visuallyhidden">
-        <hr>
         <form x-bind=submit:toggleTaskEdit data-toggle-id="{{:task.id}}-edit">
-            <div class=control-group>
-                <label>Text</label><input type=text value={:task.text} />
-                <label>Notes</label><textarea rows=3>{:task.notes}</textarea>
-            </div>
+            <!-- text & notes -->
+            <fieldset class="option-group">
+                <label class="option-title">Text</label><input class="option-content" type=text value={:task.text}>
+                <label class="option-title">Extra Notes</label><textarea class="option-content" rows=3>{:task.notes}</textarea>
+            </fieldset>
+
+            <!-- if Habit, plus/minus command options -->
             {#if equal(:task.type, 'habit')}
-                <hr/>
-                <label>Direction</label>
-                <div class="control-group">
-                    <label class="checkbox inline"><input type=checkbox checked={:task.up}>Up</label>
-                    <label class="checkbox inline"><input type=checkbox checked={:task.down}>Down</label>
-                </div>
+                <fieldset class="option-group">
+                    <legend class="option-title">Direction/Actions</legend>
+                    <span class="task-checker action-plusminus select-toggle">
+                        <input class="visuallyhidden focusable" type=checkbox id="{{:task.id}}-option-plus" checked={:task.up}>
+                        <label for="{{:task.id}}-option-plus"></label>
+                    </span>
+                    <span class="task-checker action-plusminus select-toggle">
+                        <input class="visuallyhidden focusable" type=checkbox id="{{:task.id}}-option-minus" checked={:task.down}>
+                        <label for="{{:task.id}}-option-minus"></label>
+                    </span>
+                </fieldset>
+
+            <!-- if Daily, calendar -->
             {else if equal(:task.type, 'daily')}
-                <hr/>
-                <label>Repeat</label>
-                <div class="control-group btn-group repeat-days">
-                    <!-- note, does not use  data-toggle="buttons-checkbox" - it would interfere with our own click binding -->
-                    <button type="button" class="btn btn-info {#if :task.repeat.su}active{/}" data-day='su' x-bind=click:toggleDay>Su</button>
-                    <button type="button" class="btn btn-info {#if :task.repeat.m}active{/}" data-day='m' x-bind=click:toggleDay>M</button>
-                    <button type="button" class="btn btn-info {#if :task.repeat.t}active{/}" data-day='t' x-bind=click:toggleDay>T</button>
-                    <button type="button" class="btn btn-info {#if :task.repeat.w}active{/}" data-day='w' x-bind=click:toggleDay>W</button>
-                    <button type="button" class="btn btn-info {#if :task.repeat.th}active{/}" data-day='th' x-bind=click:toggleDay>Th</button>
-                    <button type="button" class="btn btn-info {#if :task.repeat.f}active{/}" data-day='f' x-bind=click:toggleDay>F</button>
-                    <button type="button" class="btn btn-info {#if :task.repeat.s}active{/}" data-day='s' x-bind=click:toggleDay>S</button>
-                </div>
+                <fieldset class="option-group">
+                    <legend class="option-title">Repeat</legend>
+                    <div class="task-controls tile-group repeat-days">
+                        <!-- note, does not use  data-toggle="buttons-checkbox" - it would interfere with our own click binding -->
+                        <button type="button" class="task-action-btn tile {#if :task.repeat.su}active{/}" data-day='su' x-bind=click:toggleDay>Su</button>
+                        <button type="button" class="task-action-btn tile {#if :task.repeat.m}active{/}" data-day='m' x-bind=click:toggleDay>M</button>
+                        <button type="button" class="task-action-btn tile {#if :task.repeat.t}active{/}" data-day='t' x-bind=click:toggleDay>T</button>
+                        <button type="button" class="task-action-btn tile {#if :task.repeat.w}active{/}" data-day='w' x-bind=click:toggleDay>W</button>
+                        <button type="button" class="task-action-btn tile {#if :task.repeat.th}active{/}" data-day='th' x-bind=click:toggleDay>Th</button>
+                        <button type="button" class="task-action-btn tile {#if :task.repeat.f}active{/}" data-day='f' x-bind=click:toggleDay>F</button>
+                        <button type="button" class="task-action-btn tile {#if :task.repeat.s}active{/}" data-day='s' x-bind=click:toggleDay>S</button>
+                    </div>
+                </fieldset>
+
+            <!-- if Reward, pricing -->
             {else if equal(:task.type, 'reward')}
-                <hr/>
                 <div class=control-group>
                     <label>Price</label>
                     <div class="input-append">
                         <input class="span5" size="16" type="number" min="0" value={:task.value}><span class="add-on">Gold</span>
                     </div>
-
                 </div>
+
+            <!-- if Todo, the due date -->
             {else if equal(:task.type, 'todo')}
-                <hr/>
-                <div class=control-group>
-                    <label>Due Date</label>
-                    <input type="text" value="{:task.date}" data-date-format="mm/dd/yyyy" class="datepicker" />
-                    <div><small>Enter as date, eg 02/19/2013 or 02-19-2013</small></div>
-                </div>
+                <fieldset class="option-group">
+                    <legend class="option-title">Due Date</legend>
+                    <input class="option-content datepicker" type="text" value="{:task.date}" data-date-format="mm/dd/yyyy">
+                </fieldset>
             {/}
-
-            <hr/>
+            
+            <!-- Advanced Options -->
             {#unless equal(:task.type, 'reward')}
-                <div>
-                    <a x-bind="click:tasksToggleAdvanced">Advanced</a>
-                    <div class='advanced hide'>
-
-                        <label>Difficulty <a class='priority-multiplier-help' href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a></label>
-                        <div class="control-group btn-group priority-multiplier" data-id="{{:task.id}}">
-                            <button type="button" class="btn btn-info {#if equal(:task.priority,'!')}active{/}{#unless :task.priority}active{/}" data-priority='!' x-bind=click:tasksSetPriority>Easy</button>
-                            <button type="button" class="btn btn-info {#if equal(:task.priority,'!!')}active{/}" data-priority='!!' x-bind=click:tasksSetPriority>Medium</button>
-                            <button type="button" class="btn btn-info {#if equal(:task.priority,'!!!')}active{/}" data-priority='!!!' x-bind=click:tasksSetPriority>Hard</button>
-                        </div>
+                <p x-bind="click:tasksToggleAdvanced" class="option-title mega">Advanced Options</p>
+                <fieldset class="option-group advanced-option visuallyhidden">
+                    <legend class="option-title"><a class='priority-multiplier-help' href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a> Difficulty</legend>
+                    <div class="task-controls tile-group priority-multiplier" data-id="{{:task.id}}">
+                        <button type="button" class="task-action-btn tile {#if equal(:task.priority,'!')}active{/}{#unless :task.priority}active{/}" data-priority='!' x-bind=click:tasksSetPriority>Easy</button>
+                        <button type="button" class="task-action-btn tile {#if equal(:task.priority,'!!')}active{/}" data-priority='!!' x-bind=click:tasksSetPriority>Medium</button>
+                        <button type="button" class="task-action-btn tile {#if equal(:task.priority,'!!!')}active{/}" data-priority='!!!' x-bind=click:tasksSetPriority>Hard</button>
                     </div>
-                </div>
-                <br/>
+                </fieldset>
             {/}
-            <button type=submit class="btn" x-bind="click:tasksSaveAndClose">Save & Close</button>
+            <button type=submit class="task-action-btn tile spacious" x-bind="click:tasksSaveAndClose">Save & Close</button>
         </form>
     </div>
 

From f0462d022f270587d6429bd9437cab83617a97b9 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Wed, 6 Mar 2013 01:15:45 -0500
Subject: [PATCH 126/220] style Todo tabs, misc stuff

---
 styles/app/tasks.styl | 50 ++++++++++++++++++++++++++++++-------------
 views/app/tasks.html  | 12 ++++++++---
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index cebc396437..0553a6be61 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -261,7 +261,6 @@ for $stage in $stages
       font-weight: bold
       text-decoration: underline
 
-
   .option-content
     height: 2.5em
     width: 100%
@@ -299,21 +298,42 @@ for $stage in $stages
   padding: 0 0.5em
   &.active
     opacity: 1
-  &.spacious
-    margin: 0.75em 0
-    font-size: 1.5em
-    opacity: 1
 
+.tile.spacious
+  margin: 0.75em 0
+  font-size: 1.5em
+  opacity: 1
+.tile.bright
+  background-color: lighten($best, 20%)
+  &:hover, &:focus
+    background-color: lighten($best, 40%)
 
-// .context-enabled
-//   .display-context-dependant,
-//   .task-list li
-//     display: none
+// todo context switching
+.context-enabled
+  .display-context-dependant,
+  .task-list li
+    display: none
 
-//   &.context-completed
-//     .show-for-completed, .completed
-//       display: block
+  &.context-completed
+    .show-for-completed, .completed
+      display: block
 
-//   &.context-uncompleted
-//     .show-for-uncompleted, .uncompleted
-//       display: block
\ No newline at end of file
+  &.context-uncompleted
+    .show-for-uncompleted, .uncompleted
+      display: block
+
+// nav tabs
+.nav-tabs
+  margin-top: 1.5em
+.nav-tabs > li
+  &.active > a
+    color: #333
+    &:hover
+      margin-top: 1px
+  > a
+    border-radius: 0 !important
+    margin-top: 1px
+    color: #333
+    &:hover
+      border-top: 0
+      margin-top: 2px
\ No newline at end of file
diff --git a/views/app/tasks.html b/views/app/tasks.html
index 757c1eb7b6..857ed6793b 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -22,6 +22,7 @@
     <!-- Todos Column -->
     <div class="module">
         <div class="task-column todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
+            <!-- todo export/graph options -->
             <span class='option-box pull-right'>
                 {#if _user.history.todos}
                   <a class="option-action" x-bind=click:toggleChart data-toggle-id="todos-chart" data-history-path="_user.history.todos" rel=tooltip title="Progress"><i class=icon-signal></i></a>
@@ -30,16 +31,21 @@
                 <!-- <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> -->
             </span>
             <h2 class="task-column_title">Todos</h2>
+
+            <!-- create new todo -->
             <div class="display-context-dependant show-for-uncompleted">
                 <app:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
             </div>
+
+            <!-- list of all the todos -->
             <ul class='todos task-list'>
                 {#each _todoList as :task}<app:task />{/}
             </ul>
-            <div class="display-context-dependant show-for-completed">
-                <a class='btn' x-bind=click:clearCompleted>Clear Completed</a>
-            </div>
+            
+            <button class='task-action-btn tile spacious bright display-context-dependant show-for-completed' x-bind=click:clearCompleted>Clear Completed</button>
             <div id="todos-chart" style="display:none;"></div>
+            
+            <!-- remaining/completed tabs -->
             <ul class="todo-status-toggler nav nav-tabs">
                 <li class="active"><a x-bind=click:changeContext data-target="#todo-well" data-context="context-uncompleted">Remaining</a></li>
                 <li><a x-bind=click:changeContext data-target="#todo-well" data-context="context-completed">Complete</a></li>

From 81a527e5d638e03f7953e466e8ed88b6af673e15 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Wed, 6 Mar 2013 01:29:13 -0500
Subject: [PATCH 127/220] android mobile bugfixes

---
 styles/app/responsive.styl | 3 +++
 styles/app/tasks.styl      | 3 ++-
 views/app/index.html       | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/styles/app/responsive.styl b/styles/app/responsive.styl
index 4047c3bbfd..d79c8dc14e 100644
--- a/styles/app/responsive.styl
+++ b/styles/app/responsive.styl
@@ -21,8 +21,11 @@
 
 // at 600px when 2col starts breaking
 @media (max-width: 37.5em)
+	.grid
+		padding-right: 0
 	.module
 		width: 100%
+		padding-left: 0
 		.task-column
 			max-height: none
 			overflow: visible
\ No newline at end of file
diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index 0553a6be61..a006a8cbbf 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -60,6 +60,7 @@ for $stage in $stages
   margin-bottom: 0.75em
   outline: 1px solid rgba(0,0,0,0.15)
   outline-offset: -1px
+  background-color: white
 
 // the input field
 .addtask-field
@@ -192,7 +193,7 @@ for $stage in $stages
     content: '○'
     display: block
     font-size: 3em
-    line-height: 0.76
+    line-height: 0.8
     text-align: center
     color: black
     opacity: 0.2
diff --git a/views/app/index.html b/views/app/index.html
index 3efc331405..b27d2563ee 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -12,7 +12,7 @@
   HabitRPG | Gamify Your Life
 
 <Head:>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="viewport" content="width=device-width">
   <meta name="apple-mobile-web-app-capable" content="yes">
   <!-- webfonts -->
   <link href='http://fonts.googleapis.com/css?family=Lato:300,400,700,400italic,700italic' rel='stylesheet' type='text/css'>

From 5ac7403241180e22122f63a282ec3683358188cf Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Wed, 6 Mar 2013 01:58:07 -0500
Subject: [PATCH 128/220] add scrollbars

---
 styles/app/index.styl      |   2 +
 styles/app/scrollbars.styl | 106 +++++++++++++++++++++++++++++++++++++
 styles/app/tasks.styl      |   1 +
 3 files changed, 109 insertions(+)
 create mode 100644 styles/app/scrollbars.styl

diff --git a/styles/app/index.styl b/styles/app/index.styl
index cdd14936e9..24a8261cce 100644
--- a/styles/app/index.styl
+++ b/styles/app/index.styl
@@ -10,6 +10,8 @@
 @import "./helpers.styl";
 @import "./responsive.styl";
 
+@import "./scrollbars.styl";
+
 @import "../../public/vendor/bootstrap-datepicker/css/datepicker.css";
 
 // fix exploding to very wide for some reason
diff --git a/styles/app/scrollbars.styl b/styles/app/scrollbars.styl
new file mode 100644
index 0000000000..1d87ff4c15
--- /dev/null
+++ b/styles/app/scrollbars.styl
@@ -0,0 +1,106 @@
+/* Gmail style scrollbar */
+::-webkit-scrollbar {
+    width: 12px
+}
+::-webkit-scrollbar-thumb {
+    border-width: 1px 1px 1px 2px
+}
+::-webkit-scrollbar-track {
+    border-width: 0
+}
+::-webkit-scrollbar {
+    height: 16px;
+    overflow: visible;
+    width: 16px;
+}
+::-webkit-scrollbar-button {
+    height: 0;
+    width: 0;
+}
+::-webkit-scrollbar-track {
+    background-clip: padding-box;
+    border: solid transparent;
+    border-width: 0 0 0 4px;
+}
+::-webkit-scrollbar-track:horizontal {
+    border-width: 4px 0 0
+}
+::-webkit-scrollbar-track:hover {
+    background-color: rgba(150,150,150,.05);
+    box-shadow: inset 1px 0 0 rgba(150,150,150,.1);
+}
+::-webkit-scrollbar-track:horizontal:hover {
+    box-shadow: inset 0 1px 0 rgba(150,150,150,.1)
+}
+::-webkit-scrollbar-track:active {
+    background-color: rgba(150,150,150,.05);
+    box-shadow: inset 1px 0 0 rgba(150,150,150,.14),inset -1px 0 0 rgba(150,150,150,.07);
+}
+::-webkit-scrollbar-track:horizontal:active {
+    box-shadow: inset 0 1px 0 rgba(150,150,150,.14),inset 0 -1px 0 rgba(150,150,150,.07)
+}
+::-webkit-scrollbar-thumb {
+    background-color: rgba(150,150,150,.2);
+    background-clip: padding-box;
+    border: solid transparent;
+    border-width: 1px 1px 1px 6px;
+    min-height: 28px;
+    padding: 100px 0 0;
+    box-shadow: inset 1px 1px 0 rgba(150,150,150,.1),inset 0 -1px 0 rgba(150,150,150,.07);
+}
+::-webkit-scrollbar-thumb:horizontal {
+    border-width: 6px 1px 1px;
+    padding: 0 0 0 100px;
+    box-shadow: inset 1px 1px 0 rgba(150,150,150,.1),inset -1px 0 0 rgba(150,150,150,.07);
+}
+::-webkit-scrollbar-thumb:hover {
+    background-color: rgba(150,150,150,.4);
+    box-shadow: inset 1px 1px 1px rgba(150,150,150,.25);
+}
+::-webkit-scrollbar-thumb:active {
+    background-color: rgba(150,150,150,0.5);
+    box-shadow: inset 1px 1px 3px rgba(150,150,150,0.35);
+}
+::-webkit-scrollbar-track {
+    border-width: 0 1px 0 6px
+}
+::-webkit-scrollbar-track:horizontal {
+    border-width: 6px 0 1px
+}
+::-webkit-scrollbar-track:hover {
+    background-color: rgba(150,150,150,.035);
+    box-shadow: inset 1px 1px 0 rgba(150,150,150,.14),inset -1px -1px 0 rgba(150,150,150,.07);
+}
+::-webkit-scrollbar-thumb {
+    border-width: 0 1px 0 6px
+}
+::-webkit-scrollbar-thumb:horizontal {
+    border-width: 6px 0 1px
+}
+::-webkit-scrollbar-corner {
+    background: transparent
+}
+body::-webkit-scrollbar-track-piece {
+    background-clip: padding-box;
+    background-color: #f5f5f5;
+    border: solid #fff;
+    border-width: 0 0 0 3px;
+    box-shadow: inset 1px 0 0 rgba(150,150,150,.14),inset -1px 0 0 rgba(150,150,150,.07);
+}
+body::-webkit-scrollbar-track-piece:horizontal {
+    border-width: 3px 0 0;
+    box-shadow: inset 0 1px 0 rgba(150,150,150,.14),inset 0 -1px 0 rgba(150,150,150,.07);
+}
+body::-webkit-scrollbar-thumb {
+    border-width: 1px 1px 1px 5px
+}
+body::-webkit-scrollbar-thumb:horizontal {
+    border-width: 5px 1px 1px
+}
+body::-webkit-scrollbar-corner {
+    background-clip: padding-box;
+    background-color: #f5f5f5;
+    border: solid #fff;
+    border-width: 3px 0 0 3px;
+    box-shadow: inset 1px 1px 0 rgba(150,150,150,.14);
+}
\ No newline at end of file
diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index a006a8cbbf..bd0605778e 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -91,6 +91,7 @@ for $stage in $stages
   line-height: 1.55
   outline: 0
   border: 0
+  border-radius: 0 //required to nuke BB-playbook user agent styles
   background-color: darken($best, 20%)
   opacity: 0.75
   &:hover,

From 8008b71ecd2fadb1e02e5013c249c3fc3fc14f0a Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Wed, 6 Mar 2013 02:16:51 -0500
Subject: [PATCH 129/220] make everything a bit bigger, better on mobile

---
 styles/app/tasks.styl | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index bd0605778e..c1b6c7ae9d 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -66,7 +66,7 @@ for $stage in $stages
 .addtask-field
   display: inline-block
   width: 80% // fallback for Safari 5.1
-  width: calc(unquote('100% - 2.5em'))
+  width: calc(unquote('100% - 3em'))
   input
     font-family: 'Lato', sans-serif
     border: 0
@@ -74,7 +74,7 @@ for $stage in $stages
     border-radius: 0
     box-shadow: none
     background-color: white
-    height: 2.5em
+    height: 3em
     padding: 0 0 0 0.5em
     width: 100%
     &:focus
@@ -84,11 +84,11 @@ for $stage in $stages
 .addtask-btn
   display: inline-block
   // important for overriding bootstrap, remove later
-  width: 1.51515em !important
-  height: 1.51515em
+  width: 1.81818em !important
+  height: 1.88em
   padding: 0
-  font-size: 1.65em
-  line-height: 1.55
+  font-size: 1.61em
+  line-height: 1.7
   outline: 0
   border: 0
   border-radius: 0 //required to nuke BB-playbook user agent styles
@@ -109,9 +109,9 @@ for $stage in $stages
   list-style: none
   clear: both
   padding: 0 0.5em 0 0.5em
-  min-height: 2.5em
-  line-height: 2.5
-  margin-bottom: 1em
+  min-height: 3em
+  line-height: 3
+  margin-bottom: 0.75em
   outline: 1px solid rgba(0,0,0,0.1)
   outline-offset: -1px
   &:hover
@@ -134,11 +134,11 @@ for $stage in $stages
 // plus/minus commands
 .task-action-btn
   display: inline-block
-  width: 1.773em
-  height: 1.773em
+  width: 2.12765em
+  height: 2.12765em
   padding: 0
   font-size: 1.41em
-  line-height: 1.773
+  line-height: 2.12765
   text-align: center
   color: #222
   vertical-align: top
@@ -157,8 +157,8 @@ for $stage in $stages
 
 .task-checker label
   display: inline-block
-  width: 2.5em
-  height: 2.5em
+  width: 3em
+  height: 3em
   margin: 0
   vertical-align: top
   cursor: pointer
@@ -169,9 +169,9 @@ for $stage in $stages
     margin-right: 1.5em
   label:after
     font-size: 1.41em
-    width: 1.773em
-    height: 1.773em
-    line-height: 1.773
+    width: 2.12765em
+    height: 2.12765em
+    line-height: 2.12765
     text-align: center
     display: inline-block
     vertical-align top
@@ -194,7 +194,7 @@ for $stage in $stages
     content: '○'
     display: block
     font-size: 3em
-    line-height: 0.8
+    line-height: 0.93
     text-align: center
     color: black
     opacity: 0.2
@@ -204,7 +204,8 @@ for $stage in $stages
   label:focus:after
     content: '¬'
     font-size: 3em
-    line-height: 1.1
+    margin-left: -9px
+    line-height: 1.5
     text-align: left
     transform: rotate(135deg)
     opacity: 0.5 !important
@@ -215,7 +216,8 @@ for $stage in $stages
   input[type=checkbox]:checked + label:after
     content: '¬'
     transform: rotate(135deg)
-    line-height: 1.1
+    line-height: 1.5
+    margin-left: -9px
     text-align: left
     opacity: 0.75
 

From ef7d705059ac08cc58a56e9b9e0e016bffe8c7bb Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Wed, 6 Mar 2013 08:45:51 -0500
Subject: [PATCH 130/220] Add to next level to user stats on API

---
 src/server/api.coffee | 3 +++
 test/api.mocha.coffee | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 8927f6172b..97865db4f6 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -3,6 +3,7 @@ router = new express.Router()
 
 scoring = require '../app/scoring'
 _ = require 'underscore'
+{ tnl } = require '../app/algos'
 validator = require 'derby-auth/node_modules/validator'
 check = validator.check
 sanitize = validator.sanitize
@@ -41,6 +42,8 @@ auth = (req, res, next) ->
 router.get '/user', auth, (req, res) ->
   user = req.userObj
 
+  user.stats.tnl = tnl user.stats.lvl
+
   delete user.apiToken
 
   res.json user
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 6d82d71516..776be9f0c1 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -100,6 +100,8 @@ describe 'API', ->
           expect(res.body.id).not.to.be.empty()
           self = _.clone(currentUser)
           delete self.apiToken
+          # To next level should be 100
+          self.stats.tnl = 100
 
           expect(res.body).to.eql self
           done()

From 5a1343a3b745ef0f8b1d891345f5a8393678c521 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Wed, 6 Mar 2013 09:11:14 -0500
Subject: [PATCH 131/220] Set maxHealth to 50

---
 src/server/api.coffee | 1 +
 test/api.mocha.coffee | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 97865db4f6..3fe4bd598a 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -43,6 +43,7 @@ router.get '/user', auth, (req, res) ->
   user = req.userObj
 
   user.stats.tnl = tnl user.stats.lvl
+  user.stats.maxHealth = 50
 
   delete user.apiToken
 
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 776be9f0c1..2b185afd96 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -102,6 +102,7 @@ describe 'API', ->
           delete self.apiToken
           # To next level should be 100
           self.stats.tnl = 100
+          self.stats.maxHealth = 50
 
           expect(res.body).to.eql self
           done()

From 0dbf2257d757e7ae396299b1cecd5cff5016f766 Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Wed, 6 Mar 2013 17:02:08 +0000
Subject: [PATCH 132/220] New Algorithms + fixes

---
 src/app/algos.coffee   | 46 ++++++++++++++++++++++++------------------
 src/app/browser.coffee | 22 +++++++++++---------
 src/app/debug.coffee   |  7 ++++++-
 src/app/helpers.coffee |  3 +++
 src/app/scoring.coffee | 45 ++++++++++++++++++++++++-----------------
 views/app/footer.html  |  3 ++-
 views/app/header.html  |  2 +-
 7 files changed, 78 insertions(+), 50 deletions(-)

diff --git a/src/app/algos.coffee b/src/app/algos.coffee
index 3a72add2cb..0ba65e1c45 100644
--- a/src/app/algos.coffee
+++ b/src/app/algos.coffee
@@ -1,5 +1,5 @@
-
-MODIFIER = .02
+XP = 15
+HP = 2
 
 priorityValue = (priority='!') ->
   switch priority
@@ -9,7 +9,11 @@ priorityValue = (priority='!') ->
     else 1
 
 module.exports.tnl = (level) ->
-	return (Math.pow(level,2)*10)+(level*10)+80
+  if level >= 100
+    value = 0
+  else
+    value = Math.round(((Math.pow(level,2)*0.25)+(10 * level) + 139.75)/10)*10 # round to nearest 10
+  return value
 
 ###
   Calculates Exp modificaiton based on level and weapon strength
@@ -18,11 +22,12 @@ module.exports.tnl = (level) ->
   {level} current user level
   {priority} user-defined priority multiplier
 ###
-module.exports.expModifier = (value, weaponStrength, level, priority='!') ->
-  levelModifier = (level-1) * MODIFIER
-  weaponModifier = weaponStrength / 100
-  strength = 1 + weaponModifier + levelModifier
-  return value * strength * priorityValue(priority)
+module.exports.expModifier = (value, weaponStr, level, priority='!') ->
+  str = (level-1) * 2 # ultimately get this from user
+  totalStr = (str + weaponStr) / 100
+  strMod = 1 + totalStr
+  exp = value * XP * strMod * priorityValue(priority)
+  return Math.round(exp)
 
 ###
   Calculates HP modification based on level and armor defence
@@ -32,11 +37,12 @@ module.exports.expModifier = (value, weaponStrength, level, priority='!') ->
   {level} current user level
   {priority} user-defined priority multiplier
 ###
-module.exports.hpModifier = (value, armorDefense, helmDefense, shieldDefense, level, priority='!') ->
-  levelModifier = (level-1) * MODIFIER
-  armorModifier = (armorDefense + helmDefense + shieldDefense) / 100
-  defense = 1 - levelModifier + armorModifier
-  return value * defense * priorityValue(priority)
+module.exports.hpModifier = (value, armorDef, helmDef, shieldDef, level, priority='!') ->
+  def = (level-1) * 2 # ultimately get this from user?
+  totalDef = (def + armorDef + helmDef + shieldDef) / 100 #ultimate get this from user
+  defMod = 1 - totalDef
+  hp = value * HP * defMod * priorityValue(priority)
+  return Math.round(hp * 10)/10 # round to 1dp
 
 ###
   Future use
@@ -52,10 +58,10 @@ module.exports.gpModifier = (value, modifier, priority='!') ->
   {direction} up or down
 ###
 module.exports.taskDeltaFormula = (currentValue, direction) ->
-	if direction is 'up'
-		delta = Math.max(Math.pow(0.95,currentValue),0.25)
-	else
-		delta = -Math.min(Math.pow(0.95,currentValue),5)
-	#console.log("CV = " + currentValue + " Dir = " + direction + " delta = " + delta)
-	delta = 20 if delta > 20
-	return delta
\ No newline at end of file
+  if currentValue < -47.27 then currentValue = -47.27
+  else if currentValue > 21.27 then currentValue = 21.27
+  delta = Math.pow(0.9747,currentValue)
+  return delta if direction is 'up'
+  return -delta
+	
+	
diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index f4d5c8e31d..fcc32647ee 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -9,7 +9,10 @@ restoreRefs = module.exports.restoreRefs = (model) ->
     # see https://github.com/lefnire/habitrpg/issues/4
     # also update in scoring.coffee. TODO create a function accessible in both locations
     #TODO find a method of calling algos.tnl()
-    10*Math.pow(lvl,2)+(lvl*10)+80
+    if lvl==100
+      0
+    else
+      Math.round(((Math.pow(lvl,2)*0.25)+(10 * lvl) + 139.75)/10)*10
 
   #refLists
   _.each ['habit', 'daily', 'todo', 'reward'], (type) ->
@@ -171,13 +174,14 @@ setupGrowlNotifications = (model) ->
     else if num > 0
       statsNotification "<i class='icon-heart'></i> + #{rounded} HP", 'hp' # gained hp from potion/level? 
   
-  user.on 'set', 'stats.exp', (captures, args, isLocal, silent) ->
-      num = captures - args
-      rounded = Math.abs(num.toFixed(1))
-      if num < 0 and not silent
-        statsNotification "<i class='icon-star'></i> - #{rounded} XP", 'xp'
-      else if num > 0
-        statsNotification "<i class='icon-star'></i> + #{rounded} XP", 'xp'
+  user.on 'set', 'stats.exp', (captures, args, isLocal, silent=false) ->
+    # unless silent
+    num = captures - args
+    rounded = Math.abs(num.toFixed(1))
+    if num < 0 and num > -100 # TODO fix hackey negative notification supress
+      statsNotification "<i class='icon-star'></i> - #{rounded} XP", 'xp'
+    else if num > 0
+      statsNotification "<i class='icon-star'></i> + #{rounded} XP", 'xp'
 
   user.on 'set', 'stats.gp', (captures, args) ->
     num = captures - args
@@ -195,7 +199,7 @@ setupGrowlNotifications = (model) ->
   user.on 'set', 'stats.lvl', (captures, args) ->
     if captures > args
       if captures is 1 and args is 0
-        statsNotification '<i class="icon-death"></i> You died!', 'death' 
+        statsNotification '<i class="icon-death"></i> You died! Game over.', 'death' 
       else 
         statsNotification '<i class="icon-chevron-up"></i> Level Up!', 'lvl'
 
diff --git a/src/app/debug.coffee b/src/app/debug.coffee
index 24195797bb..1f2172d272 100644
--- a/src/app/debug.coffee
+++ b/src/app/debug.coffee
@@ -8,8 +8,13 @@ module.exports.app = (appExports, model) ->
     user.set 'lastCron', yesterday
     window.location.reload()
 
+  appExports.emulateTenDays = ->
+    yesterday = +moment().subtract('days', 10).toDate()
+    user.set 'lastCron', yesterday
+    window.location.reload()
+
   appExports.cheat = ->
-    user.incr 'stats.exp', 20
+    user.incr 'stats.exp', model.get '_tnl'
     user.incr 'stats.gp', 1000
 
   appExports.reset = ->
diff --git a/src/app/helpers.coffee b/src/app/helpers.coffee
index ff0c82459d..b6389bfba9 100644
--- a/src/app/helpers.coffee
+++ b/src/app/helpers.coffee
@@ -19,6 +19,9 @@ module.exports.viewHelpers = (view) ->
 
   view.fn "floor", (num) ->
     Math.floor num
+
+  view.fn "ceil", (num) ->
+    Math.ceil num
     
   view.fn "lt", (a, b) ->
     a < b
diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index a63a31a467..5cc5a8428c 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -46,14 +46,13 @@ score = (model, taskId, direction, times, batch, cron) ->
       # (aka, the total delta). This weirdness won't be necessary when calculating mathematically
       # rather than iteratively
       nextDelta = algos.taskDeltaFormula(value, direction)
-      value = Math.max(value + nextDelta, -31) if adjustvalue #cap values so we don't get silly values
+      value += nextDelta if adjustvalue
       delta += nextDelta
 
   addPoints = ->
     level = user.get('stats.lvl')
     weaponStrength = items.items.weapon[user.get('items.weapon')].strength
-    modified = algos.expModifier(delta,weaponStrength,level, priority)
-    exp += modified*10
+    exp += algos.expModifier(delta,weaponStrength,level, priority)
     gp += algos.gpModifier(delta, 1, priority)
 
   subtractPoints = ->
@@ -61,8 +60,7 @@ score = (model, taskId, direction, times, batch, cron) ->
     armorDefense = items.items.armor[user.get('items.armor')].defense
     helmDefense = items.items.head[user.get('items.head')].defense
     shieldDefense = items.items.shield[user.get('items.shield')].defense
-    modified = algos.hpModifier(delta,armorDefense,helmDefense,shieldDefense,level, priority)
-    hp += modified
+    hp += algos.hpModifier(delta,armorDefense,helmDefense,shieldDefense,level, priority)
 
   switch type
     when 'habit'
@@ -81,7 +79,8 @@ score = (model, taskId, direction, times, batch, cron) ->
         subtractPoints()
       else
         calculateDelta(false)
-        addPoints() # obviously for delta>0, but also a trick to undo accidental checkboxes
+        if delta != 0
+          addPoints() # obviously for delta>0, but also a trick to undo accidental checkboxes
 
     when 'todo'
       if cron? #cron
@@ -137,20 +136,30 @@ updateStats = (model, newStats, batch) ->
       obj.stats.hp = newStats.hp
 
   if newStats.exp?
-    # level up & carry-over exp
     tnl = model.get '_tnl'
-    silent = false
-    if newStats.exp >= tnl
-      silent = true
-      user.set('stats.exp', newStats.exp)
-      while newStats.exp >= tnl # keep levelling up
-        newStats.exp -= tnl
-        obj.stats.lvl++
-        tnl = algos.tnl(obj.stats.lvl)
-      obj.stats.hp = 50
+    #silent = false
+    # if we're at level 100, turn xp to gold
+    if obj.stats.lvl >= 100
+      newStats.gp += newStats.exp / 15
+      newStats.exp = 0
+      obj.stats.lvl = 100
+    else
+      # level up & carry-over exp
+      if newStats.exp >= tnl
+        #silent = true # push through the negative xp silently
+        user.set('stats.exp', newStats.exp) # push normal + notification
+        while newStats.exp >= tnl and obj.stats.lvl < 100 # keep levelling up
+          newStats.exp -= tnl
+          obj.stats.lvl++
+          tnl = algos.tnl(obj.stats.lvl)
+        if obj.stats.lvl== 100
+          newStats.exp = 0
+        obj.stats.hp = 50
 
     obj.stats.exp = newStats.exp
-    user.pass(silent:true).set('stats.exp', obj.stats.exp) if silent
+    #if silent
+      #console.log("pushing silent :"  + obj.stats.exp)
+      #user.pass(true).set('stats.exp', obj.stats.exp) 
 
     # Set flags when they unlock features
     if !obj.flags.customizationsNotification and (obj.stats.exp > 10 or obj.stats.lvl > 1)
@@ -218,7 +227,7 @@ cron = (model) ->
           value = obj.tasks[taskObj.id].value #get updated value
           absVal = if (completed) then Math.abs(value) else value
           todoTally += absVal
-      else if type is 'habit' #reset 'onlies' value to 0
+      else if type is 'habit' # slowly reset 'onlies' value to 0
         if taskObj.up==false or taskObj.down==false
           if Math.abs(taskObj.value) < 0.02
             batch.set "tasks.#{taskObj.id}.value", 0
diff --git a/views/app/footer.html b/views/app/footer.html
index 35be956150..bd7626f248 100644
--- a/views/app/footer.html
+++ b/views/app/footer.html
@@ -19,7 +19,8 @@
             {else}
             <div class='pull-right'>
                 <button class='btn' x-bind="click:emulateNextDay">Emulate Next Day</button>
-                <button class='btn' x-bind="click:cheat">Add GP & Exp</button>
+                <button class='btn' x-bind="click:emulateTenDays">Emulate 10 Days</button>
+                <button class='btn' x-bind="click:cheat">Insta Level</button>
                 <button class='btn' x-bind='click:reset'>Reset Level</button>
             </div>
             {/}
diff --git a/views/app/header.html b/views/app/header.html
index 2491090dae..d7bc716b3e 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -20,7 +20,7 @@
             <div class="progress-bars">
                 <div class="progress progress-danger" rel=tooltip data-placement=bottom title="Health">
                     <div class="bar" style="width: {percent(_user.stats.hp, 50)}%;"></div>
-                    <span class="progress-text"><i class=icon-heart></i> {round(_user.stats.hp)} / 50</span>
+                    <span class="progress-text"><i class=icon-heart></i> {ceil(_user.stats.hp)} / 50</span>
                 </div>
 
                 <div class="progress progress-warning" rel=tooltip data-placement=bottom title="Experience">

From 75aadf6eb118114f2ec6101e17392aee4293aac1 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Wed, 6 Mar 2013 13:32:10 -0500
Subject: [PATCH 133/220] add default numbers for restore tool if one isn't
 provided: #594

---
 src/app/character.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/character.coffee b/src/app/character.coffee
index ef2f36fadd..2fe875e563 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -82,7 +82,7 @@ module.exports.app = (appExports, model) ->
     batch = new BatchUpdate(model)
     batch.startTransaction()
     $('#restore-form input').each ->
-      batch.set $(this).attr('data-for'), parseInt($(this).val())
+      batch.set $(this).attr('data-for'), parseInt($(this).val() || 1)
     batch.commit()
 
   user.on 'set', 'flags.customizationsNotification', (captures, args) ->

From 5141aeda78a834cf55cda9ed9190227f0fdf3472 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Wed, 6 Mar 2013 19:59:19 -0500
Subject: [PATCH 134/220] Fix broken tnl test

---
 test/api.mocha.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 2b185afd96..f622810a40 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -100,8 +100,8 @@ describe 'API', ->
           expect(res.body.id).not.to.be.empty()
           self = _.clone(currentUser)
           delete self.apiToken
-          # To next level should be 100
-          self.stats.tnl = 100
+          # To next level
+          self.stats.tnl = 150
           self.stats.maxHealth = 50
 
           expect(res.body).to.eql self

From 7cb291c4de7f604505276557ac7ca1a981695faf Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Wed, 6 Mar 2013 20:39:48 -0500
Subject: [PATCH 135/220] Rename user.stats.tnl to user.stats.toNextLevel

---
 src/server/api.coffee | 2 +-
 test/api.mocha.coffee | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 3fe4bd598a..6bdc0699c4 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -42,7 +42,7 @@ auth = (req, res, next) ->
 router.get '/user', auth, (req, res) ->
   user = req.userObj
 
-  user.stats.tnl = tnl user.stats.lvl
+  user.stats.toNextLevel = tnl user.stats.lvl
   user.stats.maxHealth = 50
 
   delete user.apiToken
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index f622810a40..4b0adfebe5 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -100,8 +100,7 @@ describe 'API', ->
           expect(res.body.id).not.to.be.empty()
           self = _.clone(currentUser)
           delete self.apiToken
-          # To next level
-          self.stats.tnl = 150
+          self.stats.toNextLevel = 150
           self.stats.maxHealth = 50
 
           expect(res.body).to.eql self

From ac419e78137985cc875352c92d196ff5313562f5 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Wed, 6 Mar 2013 13:32:10 -0500
Subject: [PATCH 136/220] add default numbers for restore tool if one isn't
 provided: #594

---
 src/app/character.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/character.coffee b/src/app/character.coffee
index ef2f36fadd..2fe875e563 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -82,7 +82,7 @@ module.exports.app = (appExports, model) ->
     batch = new BatchUpdate(model)
     batch.startTransaction()
     $('#restore-form input').each ->
-      batch.set $(this).attr('data-for'), parseInt($(this).val())
+      batch.set $(this).attr('data-for'), parseInt($(this).val() || 1)
     batch.commit()
 
   user.on 'set', 'flags.customizationsNotification', (captures, args) ->

From c9822efbf802e6258fdcb9bcfeb3491be73e697c Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Wed, 6 Mar 2013 19:59:19 -0500
Subject: [PATCH 137/220] Fix broken tnl test

---
 test/api.mocha.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 2b185afd96..f622810a40 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -100,8 +100,8 @@ describe 'API', ->
           expect(res.body.id).not.to.be.empty()
           self = _.clone(currentUser)
           delete self.apiToken
-          # To next level should be 100
-          self.stats.tnl = 100
+          # To next level
+          self.stats.tnl = 150
           self.stats.maxHealth = 50
 
           expect(res.body).to.eql self

From d5b3d89a7371060707ec9f679854a0bfde32c5dd Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Wed, 6 Mar 2013 20:39:48 -0500
Subject: [PATCH 138/220] Rename user.stats.tnl to user.stats.toNextLevel

---
 src/server/api.coffee | 2 +-
 test/api.mocha.coffee | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 3fe4bd598a..6bdc0699c4 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -42,7 +42,7 @@ auth = (req, res, next) ->
 router.get '/user', auth, (req, res) ->
   user = req.userObj
 
-  user.stats.tnl = tnl user.stats.lvl
+  user.stats.toNextLevel = tnl user.stats.lvl
   user.stats.maxHealth = 50
 
   delete user.apiToken
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index f622810a40..4b0adfebe5 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -100,8 +100,7 @@ describe 'API', ->
           expect(res.body.id).not.to.be.empty()
           self = _.clone(currentUser)
           delete self.apiToken
-          # To next level
-          self.stats.tnl = 150
+          self.stats.toNextLevel = 150
           self.stats.maxHealth = 50
 
           expect(res.body).to.eql self

From 63c00a726194011dbb92775131dc4d31cd9059d3 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Thu, 7 Mar 2013 12:53:45 -0500
Subject: [PATCH 139/220] add @MrConcepts normalization migration for busted
 busted values, and in preparation for another big algorithm upgrade

---
 migrations/20130307_normalize_algo_values.js | 47 ++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 migrations/20130307_normalize_algo_values.js

diff --git a/migrations/20130307_normalize_algo_values.js b/migrations/20130307_normalize_algo_values.js
new file mode 100644
index 0000000000..116627251e
--- /dev/null
+++ b/migrations/20130307_normalize_algo_values.js
@@ -0,0 +1,47 @@
+// mongo habitrpg ./node_modules/underscore/underscore.js ./migrations/20130307_normalize_algo_values.js
+
+/**
+ * Users were experiencing a lot of extreme Exp multiplication (https://github.com/lefnire/habitrpg/issues/594).
+ * This sets things straight, and in preparation for another algorithm overhaul
+ */
+db.users.find().forEach(function(user){
+    if (user.stats.exp >= 3580) {
+        user.stats.exp = 0
+    }
+
+    if (user.stats.lvl > 100) {
+        user.stats.lvl = 100
+    }
+
+    _.each(user.tasks, function(task, key){
+        // remove corrupt tasks
+        if (!task) {
+            delete user.tasks[key]
+            return
+        }
+
+        // Fix busted values
+        if (task.value > 21.27) {
+            task.value = 21.27
+        }
+        else if (task.value < -47.27) {
+            task.value = -47.27
+        }
+    });
+
+    try {
+        db.users.update(
+            {_id:user._id},
+            {$set:
+                {
+                'stats.lvl': user.stats.lvl,
+                'stats.exp': user.stats.exp,
+                'tasks' : user.tasks
+                }
+            },
+            {multi:true}
+        );
+    } catch(e) {
+        print(e);
+    }
+})
\ No newline at end of file

From 05bd0fdd520a7a818069a622d6a4216d09a221d3 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Thu, 7 Mar 2013 13:16:47 -0500
Subject: [PATCH 140/220] semi-colons

---
 migrations/20130307_normalize_algo_values.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/migrations/20130307_normalize_algo_values.js b/migrations/20130307_normalize_algo_values.js
index 116627251e..e42faded43 100644
--- a/migrations/20130307_normalize_algo_values.js
+++ b/migrations/20130307_normalize_algo_values.js
@@ -6,26 +6,26 @@
  */
 db.users.find().forEach(function(user){
     if (user.stats.exp >= 3580) {
-        user.stats.exp = 0
+        user.stats.exp = 0;
     }
 
     if (user.stats.lvl > 100) {
-        user.stats.lvl = 100
+        user.stats.lvl = 100;
     }
 
     _.each(user.tasks, function(task, key){
         // remove corrupt tasks
         if (!task) {
-            delete user.tasks[key]
-            return
+            delete user.tasks[key];
+            return;
         }
 
         // Fix busted values
         if (task.value > 21.27) {
-            task.value = 21.27
+            task.value = 21.27;
         }
         else if (task.value < -47.27) {
-            task.value = -47.27
+            task.value = -47.27;
         }
     });
 

From eba727249e1fc95ad40f7f16e6eb2a79848f4e5f Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Thu, 7 Mar 2013 13:32:49 -0500
Subject: [PATCH 141/220] add find_unique_user script for lost user accounts
 (https://github.com/lefnire/habitrpg/wiki/User-ID)

---
 migrations/find_unique_user.js | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 migrations/find_unique_user.js

diff --git a/migrations/find_unique_user.js b/migrations/find_unique_user.js
new file mode 100644
index 0000000000..c72de09f36
--- /dev/null
+++ b/migrations/find_unique_user.js
@@ -0,0 +1,11 @@
+// mongo habitrpg ./node_modules/underscore/underscore.js ./migrations/find_unique_user.js
+
+/**
+ * There are some rare instances of lost user accounts, due to a corrupt user auth variable (see https://github.com/lefnire/habitrpg/wiki/User-ID)
+ * Past in the text of a unique habit here to find the user, then you can restore their UUID
+ */
+
+db.users.find().forEach(function(user){
+    var found = _.findWhere(user.tasks, {text: "Replace Me"})
+    if (found) printjson({id:user._id, auth:user.auth});
+})
\ No newline at end of file

From 1fadb7955abc98c99a9b8d7a9143ea6f8346a89e Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Thu, 7 Mar 2013 14:10:56 -0500
Subject: [PATCH 142/220] add exp overflow migration

---
 migrations/20130307_exp_overflow.js | 39 +++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 migrations/20130307_exp_overflow.js

diff --git a/migrations/20130307_exp_overflow.js b/migrations/20130307_exp_overflow.js
new file mode 100644
index 0000000000..44fb2904b4
--- /dev/null
+++ b/migrations/20130307_exp_overflow.js
@@ -0,0 +1,39 @@
+// mongo habitrpg ./node_modules/underscore/underscore.js ./migrations/20130307_normalize_algo_values.js
+
+/**
+ * Make sure people aren't overflowing their exp with the new system
+ */
+db.users.find().forEach(function(user){
+    function oldTnl(level) {
+        return (Math.pow(level,2)*10)+(level*10)+80
+    }
+
+    function newTnl(level) {
+        var value = 0;
+        if (level >= 100) {
+            value = 0
+        } else {
+            value = Math.round(((Math.pow(level,2)*0.25)+(10 * level) + 139.75)/10)*10; // round to nearest 10
+        }
+        return value
+    }
+
+    var newTnl = newTnl(user.stats.lvl);
+    if (user.stats.exp > newTnl) {
+        var percent = user.stats.exp / oldTnl(user.stats.lvl);
+        percent = (percent>1) ? 1 : percent;
+        user.stats.exp = newTnl * percent;
+
+        try {
+            db.users.update(
+                {_id:user._id},
+                {$set: {'stats.exp': user.stats.exp}},
+                {multi:true}
+            );
+        } catch(e) {
+            print(e);
+        }
+
+    }
+
+})
\ No newline at end of file

From 84f046024e127bc049b722b04a1a0b3bd7137520 Mon Sep 17 00:00:00 2001
From: kyokutei <joe@josephdevon.com>
Date: Thu, 7 Mar 2013 13:08:36 -0800
Subject: [PATCH 143/220] Updated public/splash.html

---
 public/splash.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/splash.html b/public/splash.html
index 2c66d1a255..2b1f15a1bb 100644
--- a/public/splash.html
+++ b/public/splash.html
@@ -39,7 +39,7 @@
         <div class='jumbotron masthead'>
             <div class='container'>            
                 <h1><img src="/img/logo/habitrpg_pixel.png" alt="HabitRPG"/></h1>
-                <p>Habit tracking which treats your goals like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.</p>
+                <p>A habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.</p>
                 <a href="/?play=1" class='btn btn-primary btn-small'>Play</a>
             </div>
         </div>
@@ -82,29 +82,29 @@
                 <div class="page-header">
                     <h1>Habits</h1>
                 </div>
-                <p class="lead">Habits are goals that you constantly track. For some habits, it only makes sense to gain points (eg, "1h Productive Work"). For others, it only makes sense to lose points (like "Eat Junk Food"). For the rest, both gain and loss apply (eg, for "Take The Stairs", stairs is a gain, elevator is a loss).</p>
+                <p class="lead">Habits are situational goals that you constantly track. You can either try to break bad habits or reinforce good ones. You may encounter some habits multiple times a day (like "Floss After Eating"), and some you may not encounter often at all (like "Replace the Toilet Paper When it Runs Out"). For some habits, it only makes sense to gain points (like "Do One Hour of Productive Work"). For others, it only makes sense to lose points (like "Eat Junk Food"). For the rest, both gain and loss apply (like for "Take The Stairs", taking the stairs would be a gain while taking the elevator would be a loss).</p>
             </section>
 
             <section>
                 <div class="page-header">
                     <h1>Dailies</h1>
                 </div>
-                <p class="lead">Dailies are goals that you want to complete once a day. At the end of each day, non-completed Dailies dock you points. If you are doing well, they turn green and are less valuable (experience, gold) and less damaging (HP). This means you can ease up on them for a bit. But if you are doing poorly, they turn red. The worse you do, the more valuable (exp, gold) and more damaging (HP) these goals become. This encourages you to focus on your shortcomings, the reds.</p>
+                <p class="lead">Dailies are goals that you want to complete once a day, building them into your routine (like "Workout for 30 Minutes"). Unlike Habits, Dailies may only be checked off once a day. Also unlike habits, at the end of each day non-completed Dailies will cause damage, making you lose Hit Points. If you are doing well and consistantly check off a Daily day after day, it will turn green and earn less gold and experience, though it will also cause you to lose fewer Hit Points if you skip it. This means you can ease up on it for a bit. Conversely, if you are doing poorly and fail to check something off every day, it will turn red. The worse you do, the more experience and gold that Daily is worth and the more hit points it takes away if left uncompleted. This encourages you to focus on your shortcomings, the reds. Oh, and don't worry. You can make a Daily active only for certain days of the week, so weekday tasks won't pester you on the weekends. Or you can make a Daily active only on Mondays, thus creating a weekly task.</p>
             </section>
 
             <section>
                 <div class="page-header">
                     <h1>Todos</h1>
                 </div>
-                <p class="lead">Todos are one-off goals which need to be completed eventually. Non-completed Todos won’t hurt you, but they will become more valuable over time. This will encourage you to wrap up stale Todos.</p>
+                <p class="lead">Todos are one-time goals which need to be completed eventually (like "Wash the car" or "Buy milk"). Non-completed Todos won’t hurt you, but they will become more valuable over time. This will encourage you to wrap up stale Todos.</p>
             </section>
 
             <section>
                 <div class="page-header">
                     <h1>Rewards</h1>
                 </div>
-                <p class='lead'>As you complete goals, you earn gold to buy rewards. Buy them liberally - rewards are integral in forming good habits. But only buy if you have enough gold - you lose HP otherwise.</p>
-                <p class='lead'>After you’ve played for a while, you unlock the <strong>Item Store</strong> under the rewards column. You can now buy weapons, armor, potions, etc. Armor decreases HP loss (by an increasing amount wich each upgrade). Weapons increase experience gain. Potions recover 15 HP.</p>
+                <p class='lead'>As you complete goals, you earn gold to buy rewards that you create (like "An Hour of Video Games"). Create plenty of rewards and buy them liberally! Rewarding good performance is the best way to reinforce good habits. If you really need a reward but don't have enough gold, you can still make a purchase. But be careful because it will cost you Hit Points!</p>
+                <p class='lead'>After you’ve reached level 3, you unlock the <strong>Item Store</strong> under the rewards column. You can now buy weapons, armor, and potions. Armor keeps you protected by reducing how much damage you take from failed tasks. Weapons increase how much experience you gain for completing a task. Potions recover 15 HP, for when you've piled just a little too much onto your schedule.</p>
             </section>
 
             <section>

From 50c506922498a28a780e7e66a3e5cf6f4bcdf984 Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Fri, 8 Mar 2013 00:10:11 +0000
Subject: [PATCH 144/220] notifications tweak and history fix

---
 src/app/browser.coffee | 2 +-
 src/app/scoring.coffee | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index fcc32647ee..55a6c9229f 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -178,7 +178,7 @@ setupGrowlNotifications = (model) ->
     # unless silent
     num = captures - args
     rounded = Math.abs(num.toFixed(1))
-    if num < 0 and num > -100 # TODO fix hackey negative notification supress
+    if num < 0 and num > -50 # TODO fix hackey negative notification supress
       statsNotification "<i class='icon-star'></i> - #{rounded} XP", 'xp'
     else if num > 0
       statsNotification "<i class='icon-star'></i> + #{rounded} XP", 'xp'
diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index 5cc5a8428c..8664509ad5 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -220,7 +220,7 @@ cron = (model) ->
             batch.set "tasks.#{taskObj.id}.value", newValue
 
           taskObj.history ?= []
-          taskObj.history.push { date: +new Date, value: value }
+          taskObj.history.push { date: +new Date, value: newValue || taskObj.value }
           batch.set "tasks.#{taskObj.id}.history", taskObj.history
           batch.set "tasks.#{taskObj.id}.completed", false
         else
@@ -229,7 +229,7 @@ cron = (model) ->
           todoTally += absVal
       else if type is 'habit' # slowly reset 'onlies' value to 0
         if taskObj.up==false or taskObj.down==false
-          if Math.abs(taskObj.value) < 0.02
+          if Math.abs(taskObj.value) < 0.1
             batch.set "tasks.#{taskObj.id}.value", 0
           else
             batch.set "tasks.#{taskObj.id}.value", taskObj.value / 2

From 24c767776495ae991a15df1894e8185330a4057b Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Fri, 8 Mar 2013 00:20:46 +0000
Subject: [PATCH 145/220] Migration script for removing old dailies histories

---
 migrations/20130307_remove_duff_histories.js | 29 ++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 migrations/20130307_remove_duff_histories.js

diff --git a/migrations/20130307_remove_duff_histories.js b/migrations/20130307_remove_duff_histories.js
new file mode 100644
index 0000000000..a8475f6adb
--- /dev/null
+++ b/migrations/20130307_remove_duff_histories.js
@@ -0,0 +1,29 @@
+// mongo habitrpg ./node_modules/underscore/underscore.js ./migrations/20130307_normalize_algo_values.js
+
+/**
+ * Remove duff histories for dailies
+ */
+db.users.find().forEach(function(user){
+
+
+    _.each(user.tasks, function(task, key){
+        // remove task history 
+        if (task.type === "daily") {
+            task.history = []
+        }
+    });
+
+    try {
+        db.users.update(
+            {_id:user._id},
+            {$set:
+                {
+                'tasks' : user.tasks
+                }
+            },
+            {multi:true}
+        );
+    } catch(e) {
+        print(e);
+    }
+})
\ No newline at end of file

From b6a7d63c21c6a63c19b3d7efe47d2863b47a7b4d Mon Sep 17 00:00:00 2001
From: Philip How <philip.j.how@gmail.com>
Date: Fri, 8 Mar 2013 00:23:08 +0000
Subject: [PATCH 146/220] changed migration comment

---
 migrations/20130307_remove_duff_histories.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/migrations/20130307_remove_duff_histories.js b/migrations/20130307_remove_duff_histories.js
index a8475f6adb..e10889e173 100644
--- a/migrations/20130307_remove_duff_histories.js
+++ b/migrations/20130307_remove_duff_histories.js
@@ -1,5 +1,4 @@
-// mongo habitrpg ./node_modules/underscore/underscore.js ./migrations/20130307_normalize_algo_values.js
-
+// mongo habitrpg ./node_modules/underscore/underscore.js ./migrations/20130307_remove_duff_histories.js
 /**
  * Remove duff histories for dailies
  */

From 75c1a38bebe1e6e5a85a02edcffc15216ce5792d Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 8 Mar 2013 14:33:19 -0500
Subject: [PATCH 147/220] add x-api-user and x-api-key to accpeted headers

---
 src/server/middleware.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee
index e5ada1e5e1..0a16aad85a 100644
--- a/src/server/middleware.coffee
+++ b/src/server/middleware.coffee
@@ -17,5 +17,5 @@ module.exports.view = (req, res, next) ->
 module.exports.allowCrossDomain = (req, res, next) ->
   res.header "Access-Control-Allow-Origin", '*'
   res.header "Access-Control-Allow-Methods", "GET,PUT,POST,DELETE"
-  res.header "Access-Control-Allow-Headers", "Content-Type,x-requested-with"
+  res.header "Access-Control-Allow-Headers", "Content-Type,x-requested-with,x-api-user,x-api-key"
   next()
\ No newline at end of file

From 8cbf7772325939a1fab1e5c6f1ce1518758a9c1d Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 8 Mar 2013 15:34:37 -0500
Subject: [PATCH 148/220] allow OPTIONS, req.headers.origin || *

---
 src/server/middleware.coffee | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee
index 0a16aad85a..902b8f3ec4 100644
--- a/src/server/middleware.coffee
+++ b/src/server/middleware.coffee
@@ -15,7 +15,8 @@ module.exports.view = (req, res, next) ->
 
 #CORS middleware
 module.exports.allowCrossDomain = (req, res, next) ->
-  res.header "Access-Control-Allow-Origin", '*'
-  res.header "Access-Control-Allow-Methods", "GET,PUT,POST,DELETE"
+  console.log req.headers.origin
+  res.header "Access-Control-Allow-Origin", (req.headers.origin || "*")
+  res.header "Access-Control-Allow-Methods", "OPTIONS,GET,PUT,POST,DELETE"
   res.header "Access-Control-Allow-Headers", "Content-Type,x-requested-with,x-api-user,x-api-key"
   next()
\ No newline at end of file

From 1ddd06ce38fe34ea0919452b583a098777e8fa9a Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 8 Mar 2013 15:39:03 -0500
Subject: [PATCH 149/220] remove webkit-agent (thought i already did?)

---
 server.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server.js b/server.js
index 51db9480cf..6412b78225 100644
--- a/server.js
+++ b/server.js
@@ -22,7 +22,7 @@ process.env.SMTP_SERVICE = conf.get("SMTP_SERVICE");
 process.env.STRIPE_API_KEY = conf.get("STRIPE_API_KEY");
 process.env.STRIPE_PUB_KEY = conf.get("STRIPE_PUB_KEY");
 
-var agent;
+/*var agent;
 if (process.env.NODE_ENV === 'development') {
     // Follow these instructions for profiling / debugging leaks
     // * https://developers.google.com/chrome-developer-tools/docs/heap-profiling
@@ -31,7 +31,7 @@ if (process.env.NODE_ENV === 'development') {
     console.log("To debug memory leaks:" +
         "\n\t(1) Run `kill -SIGUSR2 " + process.pid + "`" +
         "\n\t(2) open http://c4milo.github.com/node-webkit-agent/21.0.1180.57/inspector.html?host=localhost:1337&page=0");
-}
+}*/
 
 process.on('uncaughtException', function (error) {
 

From 399e4b9ddafb4174f98e8cb55139e8b74359a57e Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 8 Mar 2013 18:04:57 -0500
Subject: [PATCH 150/220] strange fix to CORS issue - move CORS middleware to
 top, respond with 200 if OPTIONS request

---
 src/server/index.coffee      |  2 +-
 src/server/middleware.coffee | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/server/index.coffee b/src/server/index.coffee
index 8fc29583a8..f09668dee0 100644
--- a/src/server/index.coffee
+++ b/src/server/index.coffee
@@ -57,6 +57,7 @@ auth.store(store, habitrpgStore.customAccessControl)
 
 mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, ->
   expressApp
+    .use(middleware.allowCrossDomain)
     .use(express.favicon("#{publicPath}/favicon.ico"))
     # Gzip static files and serve from memory
     .use(gzippo.staticGzip(publicPath, maxAge: ONE_YEAR))
@@ -74,7 +75,6 @@ mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, ->
     )
     # Adds req.getModel method
     .use(store.modelMiddleware())
-    .use(middleware.allowCrossDomain)
     # API should be hit before all other routes
     .use('/api/v1', require('./api').middleware)
     .use(require('./deprecated').middleware)
diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee
index 902b8f3ec4..56c6bf16fb 100644
--- a/src/server/middleware.coffee
+++ b/src/server/middleware.coffee
@@ -17,6 +17,10 @@ module.exports.view = (req, res, next) ->
 module.exports.allowCrossDomain = (req, res, next) ->
   console.log req.headers.origin
   res.header "Access-Control-Allow-Origin", (req.headers.origin || "*")
-  res.header "Access-Control-Allow-Methods", "OPTIONS,GET,PUT,POST,DELETE"
-  res.header "Access-Control-Allow-Headers", "Content-Type,x-requested-with,x-api-user,x-api-key"
-  next()
\ No newline at end of file
+  res.header "Access-Control-Allow-Methods", "OPTIONS,GET,POST,PUT,HEAD,DELETE"
+  res.header "Access-Control-Allow-Headers", "Content-Type,X-Requested-With,x-api-user,x-api-key"
+
+  if req.method is 'OPTIONS'
+    res.send(200);
+  else
+    next()
\ No newline at end of file

From 1ef32c771b57a842eb3123418a72e0d3b8c8c52a Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 8 Mar 2013 18:10:12 -0500
Subject: [PATCH 151/220] remove console.log(req.headers.origin)

---
 src/server/middleware.coffee | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee
index 56c6bf16fb..9b5beb09c2 100644
--- a/src/server/middleware.coffee
+++ b/src/server/middleware.coffee
@@ -15,7 +15,6 @@ module.exports.view = (req, res, next) ->
 
 #CORS middleware
 module.exports.allowCrossDomain = (req, res, next) ->
-  console.log req.headers.origin
   res.header "Access-Control-Allow-Origin", (req.headers.origin || "*")
   res.header "Access-Control-Allow-Methods", "OPTIONS,GET,POST,PUT,HEAD,DELETE"
   res.header "Access-Control-Allow-Headers", "Content-Type,X-Requested-With,x-api-user,x-api-key"

From 3407565d37190e62bc8447ab6ebb057bfa68da9e Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 8 Mar 2013 18:10:12 -0500
Subject: [PATCH 152/220] remove console.log(req.headers.origin)

---
 src/server/middleware.coffee | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee
index 56c6bf16fb..9b5beb09c2 100644
--- a/src/server/middleware.coffee
+++ b/src/server/middleware.coffee
@@ -15,7 +15,6 @@ module.exports.view = (req, res, next) ->
 
 #CORS middleware
 module.exports.allowCrossDomain = (req, res, next) ->
-  console.log req.headers.origin
   res.header "Access-Control-Allow-Origin", (req.headers.origin || "*")
   res.header "Access-Control-Allow-Methods", "OPTIONS,GET,POST,PUT,HEAD,DELETE"
   res.header "Access-Control-Allow-Headers", "Content-Type,X-Requested-With,x-api-user,x-api-key"

From 5c4f400a2a721f873ac41463cb0f68bc556b31c5 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Fri, 8 Mar 2013 21:01:04 -0500
Subject: [PATCH 153/220] refactor circle and checkmark. maybe better
 cross-browser

---
 styles/app/tasks.styl | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index c1b6c7ae9d..b05065d90a 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -191,22 +191,25 @@ for $stage in $stages
 .action-yesno
   // uncompleted icon
   label:after
-    content: '○'
+    content: '◯'
     display: block
-    font-size: 3em
-    line-height: 0.93
+    height: 1.875em
+    width: 1.875em
+    font-size: 1.6em
+    line-height: 1.875em
     text-align: center
     color: black
-    opacity: 0.2
+    opacity: 0.1
 
   // hint at completed icon
   label:hover:after,
   label:focus:after
     content: '¬'
     font-size: 3em
-    margin-left: -9px
-    line-height: 1.5
-    text-align: left
+    line-height: 1em
+    height: 1em
+    width: 1.2em
+    text-align: center
     transform: rotate(135deg)
     opacity: 0.5 !important
   label:active:after
@@ -215,10 +218,12 @@ for $stage in $stages
   // completed icon
   input[type=checkbox]:checked + label:after
     content: '¬'
+    font-size: 3em
+    line-height: 1em
+    height: 1em
+    width: 1.2em
+    text-align: center
     transform: rotate(135deg)
-    line-height: 1.5
-    margin-left: -9px
-    text-align: left
     opacity: 0.75
 
 

From f89037da535ce0d3b1fa37331c934c967c765627 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Fri, 8 Mar 2013 22:26:01 -0500
Subject: [PATCH 154/220] new drag animation, tiny outline & shadow tweaks

---
 src/app/browser.coffee |  1 -
 styles/app/tasks.styl  | 53 +++++++++++++++++++++++++++---------------
 views/app/tasks.html   |  2 +-
 3 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index fcc32647ee..2c86e7f0ca 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -71,7 +71,6 @@ setupSortable = (model) ->
         dropOnEmpty: false
         cursor: "move"
         items: "li"
-        opacity: 0.4
         scroll: true
         axis: 'y'
         update: (e, ui) ->
diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index b05065d90a..5b23320169 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -61,12 +61,13 @@ for $stage in $stages
   outline: 1px solid rgba(0,0,0,0.15)
   outline-offset: -1px
   background-color: white
+  // box-shadow: 0 0 3px rgba(0,0,0,0.15)
+  position: relative
 
 // the input field
 .addtask-field
-  display: inline-block
-  width: 80% // fallback for Safari 5.1
-  width: calc(unquote('100% - 3em'))
+  display: block
+  width: 100%
   input
     font-family: 'Lato', sans-serif
     border: 0
@@ -78,11 +79,13 @@ for $stage in $stages
     padding: 0 0 0 0.5em
     width: 100%
     &:focus
-      box-shadow: inset 0 0 3px darken($best, 20%)
+      box-shadow: inset 0 0 3px darken($best, 20%),inset -1px 0 1px darken($best, 30%)
 
 // the button
 .addtask-btn
-  display: inline-block
+  position: absolute
+  right: 0
+  top: 0
   // important for overriding bootstrap, remove later
   width: 1.81818em !important
   height: 1.88em
@@ -123,6 +126,12 @@ for $stage in $stages
 .task-text
   display: inline
 
+// when a task is being dragged
+.task.ui-sortable-helper {
+  box-shadow: 0 0 3px rgba(0,0,0,0.15), 0 0 5px rgba(0,0,0,0.1)
+  transform: scale(1.05)
+  outline: 1px solid rgba(0,0,0,0.2)
+}
 
 // primary task commands
 // ----------------------
@@ -193,22 +202,22 @@ for $stage in $stages
   label:after
     content: '◯'
     display: block
-    height: 1.875em
-    width: 1.875em
-    font-size: 1.6em
-    line-height: 1.875em
+    height: 1.714285714em
+    width: 1.714285714em
+    font-size: 1.75em
+    line-height: 1.714285714em
     text-align: center
     color: black
-    opacity: 0.1
+    opacity: 0.2
 
   // hint at completed icon
   label:hover:after,
   label:focus:after
     content: '¬'
-    font-size: 3em
-    line-height: 1em
-    height: 1em
-    width: 1.2em
+    font-size: 3.2em
+    line-height: 0.9375em
+    height: 0.9375em
+    width: 1.15em
     text-align: center
     transform: rotate(135deg)
     opacity: 0.5 !important
@@ -218,10 +227,10 @@ for $stage in $stages
   // completed icon
   input[type=checkbox]:checked + label:after
     content: '¬'
-    font-size: 3em
-    line-height: 1em
-    height: 1em
-    width: 1.2em
+    font-size: 3.2em
+    line-height: 0.9375em
+    height: 0.9375em
+    width: 1.15em
     text-align: center
     transform: rotate(135deg)
     opacity: 0.75
@@ -317,7 +326,12 @@ for $stage in $stages
   &:hover, &:focus
     background-color: lighten($best, 40%)
 
-// todo context switching
+
+
+// todos ui
+// --------
+
+// context switching
 .context-enabled
   .display-context-dependant,
   .task-list li
@@ -331,6 +345,7 @@ for $stage in $stages
     .show-for-uncompleted, .uncompleted
       display: block
 
+
 // nav tabs
 .nav-tabs
   margin-top: 1.5em
diff --git a/views/app/tasks.html b/views/app/tasks.html
index 857ed6793b..2dd39a9e83 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -140,8 +140,8 @@
 <!-- Templates -->
 <newTask:>
     <form class="addtask-form form-inline new-task-form" id="new-{@type}" data-task-type="{@type}" x-bind="submit:addTask">
-        <input class="addtask-btn" type="submit" value="＋">
         <span class="addtask-field"><input value="{@inputValue}" type="text" name="new-task" placeholder="{@placeHolder}"/></span>
+        <input class="addtask-btn" type="submit" value="＋">
     </form>
     <hr>
 

From e5a893a71046806e12c6f7c12325b0357d6d6739 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Sat, 9 Mar 2013 01:34:15 -0500
Subject: [PATCH 155/220] revamp rewards and pets UI. Obv pets is temporary
 pending new pet system

---
 styles/app/items.styl        | 109 ++++++++++++++++++++----------
 styles/app/shop_sprites.styl |   6 +-
 styles/app/tasks.styl        |   9 ++-
 views/app/rewards.html       |  73 ++++++++++-----------
 views/app/tasks.html         | 124 ++++++++++++++++++-----------------
 5 files changed, 185 insertions(+), 136 deletions(-)

diff --git a/styles/app/items.styl b/styles/app/items.styl
index eaf078a71b..b90d2ea53a 100644
--- a/styles/app/items.styl
+++ b/styles/app/items.styl
@@ -1,42 +1,83 @@
-/* ----- Items, Weapons, Armor -----*/
-.item-store-popover img
-  float:left
-  padding-right:7px;
+// money styles
+.money
+  display: inline-block
+  line-height: 1.5em
+  padding-left: 0.75em
 
-.item .task-text img
-  max-height: 16px
+  [class^="shop_"]
+    vertical-align: top
+    display: inline-block
 
-.buy-link, .item-buy-link
-    background-color: #DEE5F2
-    padding: 2px
-    margin-right: 10px
-    border-radius: 5px
+.btn-buy
+  width: 4.5em
+  height: 3em
+  padding: 0.75em 0 0
+  text-align: center
+  vertical-align: top
+  background-color: $better
 
-    img
-      height:20px
+  color: #555
+  &:hover, &:focus
+    background-color: $bad
+    text-decoration: none
 
-  .item-buy-link
-    background-color: #ccffcc
+.rewards
+  margin-bottom: 1.5em
+  padding-bottom: 1.5em
+  border-bottom: 1px solid rgba(0,0,0,0.1)
 
-.item
-    position:relative
+.reward-item
+  background: white
 
-.shop-table
-    position:absolute
-    top: 0
-    left: 50px
+.reward-cost
+  display: inline
 
-#money
-    position:relative
-.shop_gold, .shop_silver, .shop_copper
-    float:right
-.money-table
-    position:absolute
-    top: 0
 
-.shop-pet
-    mouse: pointer
-.shop-pet-owned-check
-    position:absolute
-    right:0px
-    bottom:0px
+// store items
+.btn-reroll
+  background-color: $better
+  cursor: pointer
+  box-shadow: inset -1px -1px 0 rgba(0,0,0,0.1)
+  &:hover, &:focus
+    background-color: $bad
+
+.item-img
+  display: inline-block
+  vertical-align: top
+  // background-color: $bad
+  height: 3em
+  margin-left: -0.5em
+  margin-right: 0.5em
+  // border: 1px solid rgba(0,0,0,0.1)
+  border-top: 0
+  border-bottom: 0
+
+.token-wallet
+  cursor: pointer
+  .tile
+    background-color: darken($neutral, 10%)
+  .add-token-btn
+    opacity: 0
+  &:hover, &:focus
+    .add-token-btn
+      opacity: 1
+      background-color: $good
+    .tile
+      opacity: 1
+
+
+// pets (this will all change when pet system is overhauled)
+.pet-grid
+  padding-top: 1.5em
+  border-top: rgba(0,0,0,0.1)
+  table
+    width: 100%
+  td
+    padding: 0.5em
+    width: 25%
+    &.active-pet
+      background-color: $bad
+      outline: 1px solid rgba(0,0,0,0.1)
+      outline-offset: -1px
+    &:hover, &:focus
+      background-color: darken($better, 10%)
\ No newline at end of file
diff --git a/styles/app/shop_sprites.styl b/styles/app/shop_sprites.styl
index b3abb056c5..b609105fa1 100644
--- a/styles/app/shop_sprites.styl
+++ b/styles/app/shop_sprites.styl
@@ -49,6 +49,6 @@
 .shop_armor_1 {background-position: -800px 0; width: 40px; height: 40px}
 .shop_reroll {background-position: -840px 0; width: 40px; height: 40px}
 .shop_potion {background-position: -880px 0; width: 40px; height: 40px}
-.shop_copper {background-position: -920px 0; width: 40px; height: 40px}
-.shop_silver {background-position: -960px 0; width: 40px; height: 40px}
-.shop_gold {background-position: -1000px 0; width: 40px; height: 40px}
+.shop_copper {background-position: -923px -8px; width: 32px; height: 22px}
+.shop_silver {background-position: -963px -8px; width: 32px; height: 22px}
+.shop_gold {background-position: -1003px -8px; width: 32px; height: 22px}
diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index 5b23320169..0aac92adb2 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -200,6 +200,7 @@ for $stage in $stages
 .action-yesno
   // uncompleted icon
   label:after
+    // content: '▨'
     content: '◯'
     display: block
     height: 1.714285714em
@@ -325,7 +326,13 @@ for $stage in $stages
   background-color: lighten($best, 20%)
   &:hover, &:focus
     background-color: lighten($best, 40%)
-
+.tile.flush
+  margin-left: 0
+  border: 1px solid rgba(0,0,0,0.2)
+  outline: 0
+  line-height: 2em
+  &:first-child
+    border-right: 0
 
 
 // todos ui
diff --git a/views/app/rewards.html b/views/app/rewards.html
index dd4394e625..6a8c0bb4a7 100644
--- a/views/app/rewards.html
+++ b/views/app/rewards.html
@@ -1,7 +1,12 @@
 <rewardsTab:>
+    <!-- add new reward -->
+    <app:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
+
+    {#if _rewardList}        
     <ul class='rewards'>
         {#each _rewardList as :task}<app:task />{/}
     </ul>
+    {/}
 
 
     {#if _user.flags.itemsEnabled}
@@ -16,48 +21,40 @@
     {/}
 
 <pet:>
-    <div class="span3 shop-pet" rel=tooltip title="{.text} - {.value} Tokens">
-        <div style='position:relative'>
-            {#if _user.items.pets[.name]}<i class='icon-ok shop-pet-owned-check'></i>{/}
-            <img x-bind="click:selectPet" data-pet='{.name}' src='img/sprites/{.icon}'/>
-        </div>
-    </div>
+    <td class="{{#if _user.items.pets[.name]}}active-pet{{/}}">
+      <img rel=tooltip title="{.text} - {.value} Tokens" x-bind="click:selectPet" data-pet='{.name}' src='img/sprites/{.icon}'/>
+    </td>
 
 
 <userTokens:>
-    <div class="pull-right">
-        <div class="input-append">
-            <span class="uneditable-input" style="width:auto;">{tokens(_user.balance)}</span>
-            <span class="add-on">Tokens</span>
-        </div>
-    </div>
-    <!--<span class="well pull-right">Tokens: {tokens(_user.balance)}</span>-->
+  <a class="pull-right token-wallet">
+    <span class="task-action-btn tile flush bright add-token-btn">＋</span>
+    <span class="task-action-btn tile flush neutral">{tokens(_user.balance)} Tokens</span>
+  </a>
 
 
 
 <item:>
-    {#unless :item.hide}
-    <li class="task reward item">
-      <div class="task-meta-controls">
-          <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:item.notes}" data-original-title="{:item.text}" class='task-notes'><i class="icon-comment"></i></span>
-      </div>
-      <div class="task-controls">
-          {#if @reroll}
-          <a href="#" data-toggle="modal" data-target="#reroll-modal" class="item-buy-link" style='cursor:pointer'><i class=icon-retweet></i></a>
-          {else}
-          <a x-bind=click:buyItem class="item-buy-link" data-type={:item.type} data-value={:item.value} data-index={:item.index}>{:item.value}<img src="/img/coin_single_gold.png"/></a>
-          {/}
-      </div>
-      <div class="task-text">
-          {#if :item.icon}
-          <img src="/img/sprites/{:item.icon}" /> {:item.text}
-          {else}
-          <table class='shop-table'><tr>
-              <td><div class="shop_{:item.classes} shop-sprite"></div></td>
-              <td>{:item.text}</td>
-          </tr></table>
-          {/}
-
-      </div>
-    </li>
-    {/}
\ No newline at end of file
+  {#unless :item.hide}
+  <li class="task reward-item">
+    <!-- right-hand side control buttons -->
+    <div class="task-meta-controls">
+        <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:item.notes}" data-original-title="{:item.text}" class='task-notes'><i class="icon-comment"></i></span>
+    </div>
+    
+    <!-- left-hand size commands -->
+    <div class="task-controls">
+      {#if @reroll}
+        <a class="task-action-btn btn-reroll" data-toggle="modal" data-target="#reroll-modal">⟲</a>
+      {else}
+        <a class="money btn-buy item-btn" x-bind=click:buyItem data-type={:item.type} data-value={:item.value} data-index={:item.index}>
+            <span class="reward-cost">{:item.value}</span>
+            <span class='shop_gold'></span>
+        </a>
+      {/}
+    </div>
+    <!-- main content -->
+    <span class="shop_{:item.classes} shop-sprite item-img"></span>
+    <p class="task-text">{:item.text}</p>
+  </li>
+  {/}
\ No newline at end of file
diff --git a/views/app/tasks.html b/views/app/tasks.html
index 2dd39a9e83..c038cfdb8d 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -56,85 +56,84 @@
     <!-- Rewards Column -->
     <div class="module">
         <div class="task-column rewards">
-            <!--Title -->
-            <div class="row-fluid">
-                <div class="span6"><h2 class="task-column_title">Rewards</h2></div>
-                <div class="span6">
-                    {#unless _view.activeTabPets}
-                    <table><tr>
-                        <td>{gold(_user.stats.gp)} </td>
-                        <td><div class='shop_gold' rel='tooltip' title='Gold'></div></td>
-                        <td>{silver(_user.stats.gp)} </td>
-                        <td><div class='shop_silver' rel='tooltip' title='Silver'></div></td>
-                        <!--<td>{copper(_user.stats.gp)} </td>
-                        <td><div class='shop_copper' rel='tooltip' title='shop_copper'></div></td>-->
-                    </tr></table>
-                    {else}
-                    <app:userTokens />
-                    {/}
+            <!-- cash or tokens -->
+            <span class='option-box pull-right wallet'>
+                {#unless _view.activeTabPets}
+                <div class="money">
+                    {gold(_user.stats.gp)}
+                    <span class='shop_gold' rel='tooltip' title='Gold'></span>
                 </div>
-            </div>
-            <app:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
+                <div class="money">
+                    {silver(_user.stats.gp)}
+                    <span class='shop_silver' rel='tooltip' title='Silver'></span>
+                </div>
+                <!-- <div class="money">
+                    {copper(_user.stats.gp)}
+                    <span class='shop_copper' rel='tooltip' title='Copper'></span>
+                </div> -->
+                {else}
+                <app:userTokens />
+                {/}
+            </span>
+            <h2 class="task-column_title">Rewards</h2>
 
+            <!-- if pets are enabled, make tabs -->
             {#if equal(_user.flags.petsEnabled,true)}
                 <div class='tabbable tabs-below'>
-
                     <div class="tab-content">
                         <div class="tab-pane active" id="rewards-tab">
                             <app:rewardsTab />
                         </div>
-
-                        <div class="tab-pane" id="pets-tab">
+                        
+                        <!-- pets pane -->
+                        <div class="tab-pane pet-grid" id="pets-tab">
                             {#with _view.items.pets as :pets}
-
-                            <div class="row-fluid">
-                                {#with :pets[0]}<app:pet />{/}
-                                {#with :pets[1]}<app:pet />{/}
-                                {#with :pets[2]}<app:pet />{/}
-                                {#with :pets[3]}<app:pet />{/}
-                            </div>
-
-                            <div class="row-fluid">
-                                {#with :pets[4]}<app:pet />{/}
-                                {#with :pets[5]}<app:pet />{/}
-                                {#with :pets[6]}<app:pet />{/}
-                                {#with :pets[7]}<app:pet />{/}
-                            </div>
-
-                            <div class="row-fluid">
-                                {#with :pets[8]}<app:pet />{/}
-                                {#with :pets[9]}<app:pet />{/}
-                                {#with :pets[10]}<app:pet />{/}
-                                {#with :pets[11]}<app:pet />{/}
-                            </div>
-
-                            <div class="row-fluid">
-                                {#with :pets[12]}<app:pet />{/}
-                                {#with :pets[13]}<app:pet />{/}
-                                {#with :pets[14]}<app:pet />{/}
-                                {#with :pets[15]}<app:pet />{/}
-                            </div>
-
-                            <div class="row-fluid">
-                                {#with :pets[16]}<app:pet />{/}
-                            </div>
-
-
+                            <table>
+                                <tr>
+                                    {#with :pets[0]}<app:pet />{/}
+                                    {#with :pets[1]}<app:pet />{/}
+                                    {#with :pets[2]}<app:pet />{/}
+                                    {#with :pets[3]}<app:pet />{/}
+                                </tr>
+                                <tr>
+                                    {#with :pets[4]}<app:pet />{/}
+                                    {#with :pets[5]}<app:pet />{/}
+                                    {#with :pets[6]}<app:pet />{/}
+                                    {#with :pets[7]}<app:pet />{/}
+                                </tr>
+                                <tr>
+                                    {#with :pets[8]}<app:pet />{/}
+                                    {#with :pets[9]}<app:pet />{/}
+                                    {#with :pets[10]}<app:pet />{/}
+                                    {#with :pets[11]}<app:pet />{/}
+                                </tr>
+                                <tr>
+                                    {#with :pets[12]}<app:pet />{/}
+                                    {#with :pets[13]}<app:pet />{/}
+                                    {#with :pets[14]}<app:pet />{/}
+                                    {#with :pets[15]}<app:pet />{/}
+                                </tr>
+                                <tr>
+                                    {#with :pets[16]}<app:pet />{/}
+                                </tr>
+                            </table>
                             {/}
                         </div>
                         <!--<div class="tab-pane" id="mounts-tab">...</div>-->
                     </div>
 
-
                     <ul class="nav nav-tabs" id="rewardsTabs">
                         <li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
                         <li><a href="#pets-tab" id='pets-tab' data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
                         <!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
                     </ul>
                 </div>
+
+            <!-- if pets are disabled, just do rewards tab -->
             {else}
                 <app:rewardsTab />
-            {/}</div>
+            {/}
+        </div>
     </div>
 
 <!-- Templates -->
@@ -170,11 +169,16 @@
         <div class="task-controls">
             <!-- Habits -->
             {#if equal(:task.type, 'habit')}
-            {#if :task.up}<a class="task-action-btn btn-plus" data-direction=up x-bind=click:score>＋</a>{/}
-            {#if :task.down}<a class="task-action-btn btn-minus" data-direction=down x-bind=click:score>−</a>{/}
+            {#if :task.up}<a class="task-action-btn" data-direction=up x-bind=click:score>＋</a>{/}
+            {#if :task.down}<a class="task-action-btn" data-direction=down x-bind=click:score>−</a>{/}
+            
             <!-- Rewards -->
             {else if equal(:task.type, 'reward')}
-            <a class="task-action-btn action-buy" x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
+            <a class="money btn-buy" x-bind=click:score data-direction=down>
+                <span class="reward-cost">{:task.value}</span>
+                <span class='shop_gold'></span>
+            </a>
+            
             <!-- Daily & Todos -->
             {else}
             <span class="task-checker action-yesno">

From fb3cd788df1ff168ef343679442c82126cbc3e18 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Sat, 9 Mar 2013 01:51:39 -0500
Subject: [PATCH 156/220] remove body scrollbar, only on task lists

---
 styles/app/scrollbars.styl | 66 ++++++++++++--------------------------
 1 file changed, 21 insertions(+), 45 deletions(-)

diff --git a/styles/app/scrollbars.styl b/styles/app/scrollbars.styl
index 1d87ff4c15..8b366133bf 100644
--- a/styles/app/scrollbars.styl
+++ b/styles/app/scrollbars.styl
@@ -1,45 +1,45 @@
 /* Gmail style scrollbar */
-::-webkit-scrollbar {
+.task-column::-webkit-scrollbar {
     width: 12px
 }
-::-webkit-scrollbar-thumb {
+.task-column::-webkit-scrollbar-thumb {
     border-width: 1px 1px 1px 2px
 }
-::-webkit-scrollbar-track {
+.task-column::-webkit-scrollbar-track {
     border-width: 0
 }
-::-webkit-scrollbar {
+.task-column::-webkit-scrollbar {
     height: 16px;
     overflow: visible;
     width: 16px;
 }
-::-webkit-scrollbar-button {
+.task-column::-webkit-scrollbar-button {
     height: 0;
     width: 0;
 }
-::-webkit-scrollbar-track {
+.task-column::-webkit-scrollbar-track {
     background-clip: padding-box;
     border: solid transparent;
     border-width: 0 0 0 4px;
 }
-::-webkit-scrollbar-track:horizontal {
+.task-column::-webkit-scrollbar-track:horizontal {
     border-width: 4px 0 0
 }
-::-webkit-scrollbar-track:hover {
+.task-column::-webkit-scrollbar-track:hover {
     background-color: rgba(150,150,150,.05);
     box-shadow: inset 1px 0 0 rgba(150,150,150,.1);
 }
-::-webkit-scrollbar-track:horizontal:hover {
+.task-column::-webkit-scrollbar-track:horizontal:hover {
     box-shadow: inset 0 1px 0 rgba(150,150,150,.1)
 }
-::-webkit-scrollbar-track:active {
+.task-column::-webkit-scrollbar-track:active {
     background-color: rgba(150,150,150,.05);
     box-shadow: inset 1px 0 0 rgba(150,150,150,.14),inset -1px 0 0 rgba(150,150,150,.07);
 }
-::-webkit-scrollbar-track:horizontal:active {
+.task-column::-webkit-scrollbar-track:horizontal:active {
     box-shadow: inset 0 1px 0 rgba(150,150,150,.14),inset 0 -1px 0 rgba(150,150,150,.07)
 }
-::-webkit-scrollbar-thumb {
+.task-column::-webkit-scrollbar-thumb {
     background-color: rgba(150,150,150,.2);
     background-clip: padding-box;
     border: solid transparent;
@@ -48,59 +48,35 @@
     padding: 100px 0 0;
     box-shadow: inset 1px 1px 0 rgba(150,150,150,.1),inset 0 -1px 0 rgba(150,150,150,.07);
 }
-::-webkit-scrollbar-thumb:horizontal {
+.task-column::-webkit-scrollbar-thumb:horizontal {
     border-width: 6px 1px 1px;
     padding: 0 0 0 100px;
     box-shadow: inset 1px 1px 0 rgba(150,150,150,.1),inset -1px 0 0 rgba(150,150,150,.07);
 }
-::-webkit-scrollbar-thumb:hover {
+.task-column::-webkit-scrollbar-thumb:hover {
     background-color: rgba(150,150,150,.4);
     box-shadow: inset 1px 1px 1px rgba(150,150,150,.25);
 }
-::-webkit-scrollbar-thumb:active {
+.task-column::-webkit-scrollbar-thumb:active {
     background-color: rgba(150,150,150,0.5);
     box-shadow: inset 1px 1px 3px rgba(150,150,150,0.35);
 }
-::-webkit-scrollbar-track {
+.task-column::-webkit-scrollbar-track {
     border-width: 0 1px 0 6px
 }
-::-webkit-scrollbar-track:horizontal {
+.task-column::-webkit-scrollbar-track:horizontal {
     border-width: 6px 0 1px
 }
-::-webkit-scrollbar-track:hover {
+.task-column::-webkit-scrollbar-track:hover {
     background-color: rgba(150,150,150,.035);
     box-shadow: inset 1px 1px 0 rgba(150,150,150,.14),inset -1px -1px 0 rgba(150,150,150,.07);
 }
-::-webkit-scrollbar-thumb {
+.task-column::-webkit-scrollbar-thumb {
     border-width: 0 1px 0 6px
 }
-::-webkit-scrollbar-thumb:horizontal {
+.task-column::-webkit-scrollbar-thumb:horizontal {
     border-width: 6px 0 1px
 }
-::-webkit-scrollbar-corner {
+.task-column::-webkit-scrollbar-corner {
     background: transparent
-}
-body::-webkit-scrollbar-track-piece {
-    background-clip: padding-box;
-    background-color: #f5f5f5;
-    border: solid #fff;
-    border-width: 0 0 0 3px;
-    box-shadow: inset 1px 0 0 rgba(150,150,150,.14),inset -1px 0 0 rgba(150,150,150,.07);
-}
-body::-webkit-scrollbar-track-piece:horizontal {
-    border-width: 3px 0 0;
-    box-shadow: inset 0 1px 0 rgba(150,150,150,.14),inset 0 -1px 0 rgba(150,150,150,.07);
-}
-body::-webkit-scrollbar-thumb {
-    border-width: 1px 1px 1px 5px
-}
-body::-webkit-scrollbar-thumb:horizontal {
-    border-width: 5px 1px 1px
-}
-body::-webkit-scrollbar-corner {
-    background-clip: padding-box;
-    background-color: #f5f5f5;
-    border: solid #fff;
-    border-width: 3px 0 0 3px;
-    box-shadow: inset 1px 1px 0 rgba(150,150,150,.14);
 }
\ No newline at end of file

From 2b8f2f48c16f2584dcfd4fd0d93de4c74d6a9e09 Mon Sep 17 00:00:00 2001
From: Rob Scanlon <robscanlon@gmail.com>
Date: Sat, 9 Mar 2013 02:08:20 -0500
Subject: [PATCH 157/220] Delete task for the API

---
 src/server/api.coffee | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 6bdc0699c4..f337b4964b 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -60,7 +60,7 @@ validateTask = (req, res, next) ->
   newTask = { type, text, notes, value, up, down, completed } = req.body
 
   # If we're updating, get the task from the user
-  if req.method is 'PUT'
+  if req.method is 'PUT' or req.method is 'DELETE'
     task = req.userObj?.tasks[req.params.id]
     return res.json 400, err: "No task found." if !task || _.isEmpty(task)
     # Strip for now
@@ -90,6 +90,14 @@ router.put '/user/task/:id', auth, validateTask, (req, res) ->
 
   res.json 200, req.task
 
+router.delete '/user/task/:id', auth, validateTask, (req, res) ->
+  taskIds = req.user.get("#{req.task.type}Ids")
+  taskIds.splice(taskIds.indexOf(req.task.id),1)
+  req.user.set "#{req.task.type}Ids", taskIds
+  req.user.del "tasks.#{req.task.id}"
+
+  res.send 204
+
 router.post '/user/task', auth, validateTask, (req, res) ->
   task = req.task
   type = task.type

From 2111cca09a8ee2ddebceb03f63fb92aa04bd16cc Mon Sep 17 00:00:00 2001
From: Rob Scanlon <robscanlon@gmail.com>
Date: Sat, 9 Mar 2013 02:08:50 -0500
Subject: [PATCH 158/220] Delete task for the API tests

---
 test/api.mocha.coffee | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 4b0adfebe5..eed81aedac 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -245,3 +245,29 @@ describe 'API', ->
             # Ensure that the two sets are equal
             expect(_.difference(_.pluck(res.body,'id'), _.pluck(tasks,'id')).length).to.equal 0
             done()
+
+    it 'DELETE /api/v1/user/task/:id', (done) ->
+      tid = currentUser.habitIds[2]
+      request.del("#{baseURL}/user/task/#{tid}")
+        .set('Accept', 'application/json')
+        .set('X-API-User', currentUser.id)
+        .set('X-API-Key', currentUser.apiToken)
+        .end (res) ->
+          expect(res.body.err).to.be undefined
+          expect(res.statusCode).to.be 204
+          query = model.query('users').withIdAndToken(currentUser.id, currentUser.apiToken)
+          query.fetch (err, user) ->
+            expect(user.get().habitIds.indexOf(tid)).to.be -1
+            expect(user.get().tasks[tid]).to.be undefined
+            done()
+
+    it 'DELETE /api/v1/user/task/:id (no task found)', (done) ->
+      tid = "adsfasdfjunkshouldntbeatask"
+      request.del("#{baseURL}/user/task/#{tid}")
+        .set('Accept', 'application/json')
+        .set('X-API-User', currentUser.id)
+        .set('X-API-Key', currentUser.apiToken)
+        .end (res) ->
+          expect(res.statusCode).to.be 400
+          expect(res.body.err).to.be 'No task found.'
+          done()

From fd01da4f71ea9b49da7d50eae191d259cfa7ad8e Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Sat, 9 Mar 2013 02:10:33 -0500
Subject: [PATCH 159/220] layer shaded box AND check on completed task

---
 styles/app/tasks.styl | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index 0aac92adb2..b8dd2d11e7 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -198,10 +198,11 @@ for $stage in $stages
 
 // yes/no checkbox
 .action-yesno
+  position: relative
   // uncompleted icon
-  label:after
-    // content: '▨'
-    content: '◯'
+  label:after, label:before
+    content: '▨'
+    // content: '◯'
     display: block
     height: 1.714285714em
     width: 1.714285714em
@@ -211,6 +212,9 @@ for $stage in $stages
     color: black
     opacity: 0.2
 
+  label:before
+    position: absolute
+    left: 0
   // hint at completed icon
   label:hover:after,
   label:focus:after

From 188e4ff2710464386b672afc54722506aba412aa Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Sat, 9 Mar 2013 09:14:07 -0500
Subject: [PATCH 160/220] Remove one id from array of typeIds instead of
 rewriting whole array

---
 src/server/api.coffee | 8 ++++----
 test/api.mocha.coffee | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index f337b4964b..4c2fa2984a 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -91,10 +91,11 @@ router.put '/user/task/:id', auth, validateTask, (req, res) ->
   res.json 200, req.task
 
 router.delete '/user/task/:id', auth, validateTask, (req, res) ->
-  taskIds = req.user.get("#{req.task.type}Ids")
-  taskIds.splice(taskIds.indexOf(req.task.id),1)
-  req.user.set "#{req.task.type}Ids", taskIds
+  taskIds = req.user.get "#{req.task.type}Ids"
+
   req.user.del "tasks.#{req.task.id}"
+  # Remove one id from array of typeIds
+  req.user.remove "#{req.task.type}Ids", taskIds.indexOf(req.task.id), 1
 
   res.send 204
 
@@ -164,4 +165,3 @@ router.post '/user/tasks/:taskId/:direction', auth, scoreTask
 module.exports = router
 module.exports.auth = auth
 module.exports.scoreTask = scoreTask # export so deprecated can call it
-
diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index eed81aedac..0d01854733 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -257,8 +257,8 @@ describe 'API', ->
           expect(res.statusCode).to.be 204
           query = model.query('users').withIdAndToken(currentUser.id, currentUser.apiToken)
           query.fetch (err, user) ->
-            expect(user.get().habitIds.indexOf(tid)).to.be -1
-            expect(user.get().tasks[tid]).to.be undefined
+            expect(user.get('habitIds').indexOf(tid)).to.be -1
+            expect(user.get("tasks.#{tid}")).to.be undefined
             done()
 
     it 'DELETE /api/v1/user/task/:id (no task found)', (done) ->

From 155747bfd063372b6ad4ca6fa78bc13da53fd78e Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sat, 9 Mar 2013 10:26:08 -0500
Subject: [PATCH 161/220] fix to 401 user not found (can't use @byId)

---
 src/server/middleware.coffee | 1 +
 src/server/store.coffee      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee
index 9b5beb09c2..47ccaad07b 100644
--- a/src/server/middleware.coffee
+++ b/src/server/middleware.coffee
@@ -19,6 +19,7 @@ module.exports.allowCrossDomain = (req, res, next) ->
   res.header "Access-Control-Allow-Methods", "OPTIONS,GET,POST,PUT,HEAD,DELETE"
   res.header "Access-Control-Allow-Headers", "Content-Type,X-Requested-With,x-api-user,x-api-key"
 
+  # wtf is this for?
   if req.method is 'OPTIONS'
     res.send(200);
   else
diff --git a/src/server/store.coffee b/src/server/store.coffee
index ad463ecbaa..b83ef268a4 100644
--- a/src/server/store.coffee
+++ b/src/server/store.coffee
@@ -70,7 +70,7 @@ userAccess = (store) ->
 ###
 REST = (store) ->
   store.query.expose "users", "withIdAndToken", (uid, token) ->
-    @byId(uid)
+    @where("id").equals(uid)
       .where('apiToken').equals(token)
       .findOne()
 

From 9aac271b605c78567e3ac3d03ec511e23d8f5cec Mon Sep 17 00:00:00 2001
From: Tobias Leugger <leugger.tobias@web.de>
Date: Sat, 9 Mar 2013 20:06:53 +0100
Subject: [PATCH 162/220] Improving readability of the statements for setting
 the colour of a task

---
 src/app/tasks.coffee | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index 16d17257b7..2d3aa66b94 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -14,14 +14,20 @@ module.exports.view = (view) ->
     else
       classes += " uncompleted"
 
-    switch
-      when value<-20 then classes += ' color-worst'
-      when value>=-20 and value<-10 then classes += ' color-worse'
-      when value>=-10 and value<-1 then classes += ' color-bad'
-      when value>=-1 and value<1 then classes += ' color-neutral'
-      when value>=1 and value<5 then classes += ' color-good'
-      when value>=5 and value<10 then classes += ' color-better'
-      when value>=10 then classes += ' color-best'
+    if value < -20
+      classes += ' color-worst'
+    else if value < -10
+      classes += ' color-worse'
+    else if value < -1
+      classes += ' color-bad'
+    else if value < 1
+      classes += ' color-neutral'
+    else if value < 5
+      classes += ' color-good'
+    else if value < 10
+      classes += ' color-better'
+    else
+      classes += ' color-best'
     return classes
 
 module.exports.app = (appExports, model) ->
@@ -135,9 +141,9 @@ module.exports.app = (appExports, model) ->
     data = google.visualization.arrayToDataTable matrix
 
     options = {
-    title: 'History'
-    #TODO use current background color: $(el).css('background-color), but convert to hex (see http://goo.gl/ql5pR)
-    backgroundColor: 'whiteSmoke'
+      title: 'History'
+      #TODO use current background color: $(el).css('background-color), but convert to hex (see http://goo.gl/ql5pR)
+      backgroundColor: 'whiteSmoke'
     }
 
     chart = new google.visualization.LineChart(document.getElementById( chartSelector ))

From cbbfdaa542c35b52ed0985cbccfc44fe5cee9301 Mon Sep 17 00:00:00 2001
From: Tobias Leugger <leugger.tobias@web.de>
Date: Sat, 9 Mar 2013 20:14:42 +0100
Subject: [PATCH 163/220] Changing expModifier and hpModifier algo to be less
 influenced by level. For high lvls (~50), you actually get HP instead of
 losing them with the current formula. This now doesn't happen anymore (at
 least for levels up to 100, which is the current max).

---
 src/app/algos.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/algos.coffee b/src/app/algos.coffee
index 0ba65e1c45..fff6cf5a7a 100644
--- a/src/app/algos.coffee
+++ b/src/app/algos.coffee
@@ -23,7 +23,7 @@ module.exports.tnl = (level) ->
   {priority} user-defined priority multiplier
 ###
 module.exports.expModifier = (value, weaponStr, level, priority='!') ->
-  str = (level-1) * 2 # ultimately get this from user
+  str = (level-1) / 2 # ultimately get this from user
   totalStr = (str + weaponStr) / 100
   strMod = 1 + totalStr
   exp = value * XP * strMod * priorityValue(priority)
@@ -38,7 +38,7 @@ module.exports.expModifier = (value, weaponStr, level, priority='!') ->
   {priority} user-defined priority multiplier
 ###
 module.exports.hpModifier = (value, armorDef, helmDef, shieldDef, level, priority='!') ->
-  def = (level-1) * 2 # ultimately get this from user?
+  def = (level-1) / 2 # ultimately get this from user?
   totalDef = (def + armorDef + helmDef + shieldDef) / 100 #ultimate get this from user
   defMod = 1 - totalDef
   hp = value * HP * defMod * priorityValue(priority)

From 72e81b8891ea21897d65b4abdaeb871307f39da2 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 10 Mar 2013 11:40:58 -0400
Subject: [PATCH 164/220] #315 fixes: newValue not accessible at scope, only
 remove duff history  entries, not all

---
 migrations/20130307_remove_duff_histories.js | 6 +++---
 src/app/scoring.coffee                       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/migrations/20130307_remove_duff_histories.js b/migrations/20130307_remove_duff_histories.js
index e10889e173..6211693a1f 100644
--- a/migrations/20130307_remove_duff_histories.js
+++ b/migrations/20130307_remove_duff_histories.js
@@ -1,14 +1,14 @@
-// mongo habitrpg ./node_modules/underscore/underscore.js ./migrations/20130307_remove_duff_histories.js
 /**
  * Remove duff histories for dailies
  */
+// mongo habitrpg ./node_modules/underscore/underscore.js ./migrations/20130307_remove_duff_histories.js
 db.users.find().forEach(function(user){
 
 
     _.each(user.tasks, function(task, key){
-        // remove task history 
         if (task.type === "daily") {
-            task.history = []
+            // remove busted history entries
+            task.history = _.filter(task.history, function(h){return !!h.value})
         }
     });
 
diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index 8664509ad5..1030ca133a 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -220,7 +220,7 @@ cron = (model) ->
             batch.set "tasks.#{taskObj.id}.value", newValue
 
           taskObj.history ?= []
-          taskObj.history.push { date: +new Date, value: newValue || taskObj.value }
+          taskObj.history.push { date: +new Date, value: taskObj.value }
           batch.set "tasks.#{taskObj.id}.history", taskObj.history
           batch.set "tasks.#{taskObj.id}.completed", false
         else

From a534eec548799825a754bcc5692e8be525e0cc8f Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 10 Mar 2013 12:21:30 -0400
Subject: [PATCH 165/220] [documentation] level 2 unlocks items

---
 public/splash.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/splash.html b/public/splash.html
index 2b1f15a1bb..51f5c78f72 100644
--- a/public/splash.html
+++ b/public/splash.html
@@ -104,7 +104,7 @@
                     <h1>Rewards</h1>
                 </div>
                 <p class='lead'>As you complete goals, you earn gold to buy rewards that you create (like "An Hour of Video Games"). Create plenty of rewards and buy them liberally! Rewarding good performance is the best way to reinforce good habits. If you really need a reward but don't have enough gold, you can still make a purchase. But be careful because it will cost you Hit Points!</p>
-                <p class='lead'>After you’ve reached level 3, you unlock the <strong>Item Store</strong> under the rewards column. You can now buy weapons, armor, and potions. Armor keeps you protected by reducing how much damage you take from failed tasks. Weapons increase how much experience you gain for completing a task. Potions recover 15 HP, for when you've piled just a little too much onto your schedule.</p>
+                <p class='lead'>After you’ve reached level 2, you unlock the <strong>Item Store</strong> under the rewards column. You can now buy weapons, armor, and potions. Armor keeps you protected by reducing how much damage you take from failed tasks. Weapons increase how much experience you gain for completing a task. Potions recover 15 HP, for when you've piled just a little too much onto your schedule.</p>
             </section>
 
             <section>

From b34bfc886dd44be29bed2163c925bbffc98acbe4 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 11 Mar 2013 01:32:24 -0400
Subject: [PATCH 166/220] start static-pages redesign

---
 public/addons-extensions.html |   0
 public/copy.css               |  17 +++++
 public/faq.html               |   0
 public/splash.html            |  47 +++++++------
 public/team.html              | 125 ++++++++++++++++++++++++++++++++++
 5 files changed, 169 insertions(+), 20 deletions(-)
 create mode 100644 public/addons-extensions.html
 create mode 100644 public/copy.css
 create mode 100644 public/faq.html
 create mode 100644 public/team.html

diff --git a/public/addons-extensions.html b/public/addons-extensions.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/public/copy.css b/public/copy.css
new file mode 100644
index 0000000000..cd3f93626e
--- /dev/null
+++ b/public/copy.css
@@ -0,0 +1,17 @@
+.jumbotron {
+    background-color: #1b1b1b;
+    background-image: -moz-linear-gradient(top, #222222, #111111);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
+    background-image: -webkit-linear-gradient(top, #222222, #111111);
+    background-image: -o-linear-gradient(top, #222222, #111111);
+    background-image: linear-gradient(to bottom, #222222, #111111);
+    background-repeat: repeat-x;
+    border-color: #252525;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
+    background:none;
+    color:black;
+
+}
+body {
+    padding-top:0px;
+}
\ No newline at end of file
diff --git a/public/faq.html b/public/faq.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/public/splash.html b/public/splash.html
index 51f5c78f72..a48ddaef86 100644
--- a/public/splash.html
+++ b/public/splash.html
@@ -8,34 +8,41 @@
         <link href="/vendor/bootstrap/docs/assets/css/bootstrap.css" rel="stylesheet">
         <link href="/vendor/bootstrap/docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
         <link href="/vendor/bootstrap/docs/assets/css/docs.css" rel="stylesheet">
+        <link href="/copy.css" rel="stylesheet">
 
         <script type="text/javascript" src="vendor/jquery-ui/jquery-1.9.1.js"></script>
         <script type="text/javascript">
             $.getScript("https://s7.addthis.com/js/250/addthis_widget.js#pubid=lefnire");
         </script>
-
-        <style type="text/css">
-            .jumbotron {
-                background-color: #1b1b1b;
-                background-image: -moz-linear-gradient(top, #222222, #111111);
-                background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
-                background-image: -webkit-linear-gradient(top, #222222, #111111);
-                background-image: -o-linear-gradient(top, #222222, #111111);
-                background-image: linear-gradient(to bottom, #222222, #111111);
-                background-repeat: repeat-x;
-                border-color: #252525;
-                filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
-                background:none;
-                color:black;
-
-            }
-            body {
-                padding-top:0px;
-            }
-        </style>
     </head>
 
     <body>
+    <div class="navbar navbar-inverse navbar-fixed-top">
+        <div class="navbar-inner">
+            <div class="container">
+                <a class="brand" href="/splash.html">HabitRPG</a>
+                <div class="nav-collapse collapse">
+                    <ul class="nav">
+                        <li class="">
+                            <a href="/splash.html">About</a>
+                        </li>
+                        <li class="">
+                            <a href="/team.html">Team</a>
+                        </li>
+                        <li class="">
+                            <a href="/splash.html">Addons / Extensions</a>
+                        </li>
+                        <li class="">
+                            <a href="/faq.html">FAQ</a>
+                        </li>
+                        <li class="">
+                            <a href="/contact.html">Contact</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
         <div class='jumbotron masthead'>
             <div class='container'>            
                 <h1><img src="/img/logo/habitrpg_pixel.png" alt="HabitRPG"/></h1>
diff --git a/public/team.html b/public/team.html
new file mode 100644
index 0000000000..ace3708906
--- /dev/null
+++ b/public/team.html
@@ -0,0 +1,125 @@
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>HabitRPG | Team</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+        <!-- Le styles -->
+        <link href="/vendor/bootstrap/docs/assets/css/bootstrap.css" rel="stylesheet">
+        <link href="/vendor/bootstrap/docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
+        <link href="/vendor/bootstrap/docs/assets/css/docs.css" rel="stylesheet">
+        <link href="/copy.css" rel="stylesheet">
+
+        <script type="text/javascript" src="vendor/jquery-ui/jquery-1.9.1.js"></script>
+        <script src="/vendor/bootstrap/js/bootstrap-scrollspy.js"></script>
+    </head>
+
+    <body data-spy="scroll" data-target=".bs-docs-sidebar">
+
+        <div class="navbar navbar-inverse navbar-fixed-top">
+            <div class="navbar-inner">
+                <div class="container">
+                    <a class="brand" href="/splash.html">HabitRPG</a>
+                    <div class="nav-collapse collapse">
+                        <ul class="nav">
+                            <li class="">
+                                <a href="/splash.html">About</a>
+                            </li>
+                            <li class="">
+                                <a href="/splash.html">Blog</a>
+                            </li>
+                            <li class="">
+                                <a href="/team.html">Team</a>
+                            </li>
+                            <li class="">
+                                <a href="/splash.html">Addons / Extensions</a>
+                            </li>
+                            <li class="">
+                                <a href="/faq.html">FAQ</a>
+                            </li>
+                            <li class="">
+                                <a href="/faq.html">API</a>
+                            </li>
+                            <li class="">
+                                <a href="/contact.html">Contact</a>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <header class="jumbotron subhead" id="overview">
+            <div class="container">
+                <h1>Team</h1>
+                <p class="lead">The HabitRPG team has developed organically in a meritocratic fashion. We're still figuring it all out, but the members we have listed here have contributed greatly.  If you want to be part of the team, contribute to the repository, and if you're a big asset we'll likely adopt you :) See the <a href="https://github.com/lefnire/habitrpg/wiki/Business-Model">Count Me In</a></p>
+            </div>
+        </header>
+        <div class='container'>
+            <div class='row'>
+                <div class="span3 bs-docs-sidebar">
+                    <ul class="nav nav-list bs-docs-sidenav affix-top">
+                        <li><a href="#developers"><i class="icon-chevron-right"></i> Developers</a></li>
+                        <li><a href="#pixel-artists"><i class="icon-chevron-right"></i> Pixel Artists</a></li>
+                        <li><a href="#mobile-developers"><i class="icon-chevron-right"></i> Mobile Developers</a></li>
+                        <li><a href="#designers"><i class="icon-chevron-right"></i> Designers</a></li>
+                        <li><a href="#community-managers"><i class="icon-chevron-right"></i> Community Managers</a></li>
+                    </ul>
+                </div>
+
+                <div class='span9'>
+                    <section>
+                        <div class="page-header">
+                            <h1 id="developers">Developers</h1>
+                            <ul>
+                                <li><a href="https://github.com/lefnire">Tyler Renelle</a></li>
+                                <li><a href="https://github.com/switz">Daniel Saewitz</a></li>
+                                <li><a href="https://github.com/SlappyBag">Stan Lindsey</a></li>
+                                <li><a href="https://github.com/MrConcept">Philip How</a></li>
+                            </ul>
+                        </div>
+                    </section>
+
+                    <section>
+                        <div class="page-header">
+                            <h1 id="pixel-artists">Pixel Artists</h1>
+                            <ul>
+                                <li><a href="https://github.com/pandoro">Alex Hermans</a></li>
+                                <li><a href="https://github.com/Shaners">Shane Listers</a></li>
+                            </ul>
+                        </div>
+                    </section>
+
+                    <section>
+                        <div class="page-header">
+                            <h1 id="mobile-developers">Mobile Developers</h1>
+                            <ul>
+                                <li><a href="https://github.com/litenull">Tomaz Korenika</a></li>
+                                <li><a href="https://github.com/lefnire">Tyler Renelle</a></li>
+                            </ul>
+                        </div>
+                    </section>
+
+                    <section>
+                        <div class="page-header">
+                            <h1 id="designers">Designers</h1>
+                            <ul>
+                                <li><a href="https://github.com/zakkain">Zachary Kain</a></li>
+                            </ul>
+                        </div>
+                    </section>
+
+                    <section>
+                        <div class="page-header">
+                            <h1 id="community-managers">Community Management</h1>
+                            <ul>
+                                <li><a href="https://github.com/wc8">@wc8</a></li>
+                                <li><a href="https://github.com/horusofoz">Jeff Smith</a></li>
+                            </ul>
+                        </div>
+                    </section>
+                 </div>
+            </div>
+        </div>
+
+    </body>
+</html>

From bb57eddec136063e5ba12ec1fb8f8c2d163a4c74 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 12 Mar 2013 10:05:18 -0400
Subject: [PATCH 167/220] divide exp gain by 2, temporary hack since people are
 leveling way too fast.

---
 src/app/scoring.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index 1030ca133a..f6a5dd2e15 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -52,7 +52,7 @@ score = (model, taskId, direction, times, batch, cron) ->
   addPoints = ->
     level = user.get('stats.lvl')
     weaponStrength = items.items.weapon[user.get('items.weapon')].strength
-    exp += algos.expModifier(delta,weaponStrength,level, priority)
+    exp += algos.expModifier(delta,weaponStrength,level, priority) / 2 # / 2 hack for now bcause people leveling too fast
     gp += algos.gpModifier(delta, 1, priority)
 
   subtractPoints = ->

From e51cf0089e671de72dfc237d2c574e4ff820b7aa Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 12 Mar 2013 17:52:44 -0700
Subject: [PATCH 168/220] typo test/api.mocha.coffee

---
 test/api.mocha.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 0d01854733..e243322bd9 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -11,7 +11,7 @@ conf.argv().env().file({file: __dirname + '../config.json'}).defaults
 process.env.BASE_URL = conf.get("BASE_URL")
 process.env.FACEBOOK_KEY = conf.get("FACEBOOK_KEY")
 process.env.FACEBOOK_SECRET = conf.get("FACEBOOK_SECRET")
-process.env.NODE_DB_URI = 'mongodb://localhost/habirpg'
+process.env.NODE_DB_URI = 'mongodb://localhost/habitrpg'
 
 ## monkey-patch expect.js for better diffs on mocha
 ## see: https://github.com/LearnBoost/expect.js/pull/34

From 905719725e8d7f63ae3dda53059fcd103fefe876 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Thu, 14 Mar 2013 14:17:10 -0400
Subject: [PATCH 169/220] use Unroll-Me/derby#master

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a80458cca0..d4a96c9dbe 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.0-150",
   "main": "./server.js",
   "dependencies": {
-    "derby": "git://github.com/lefnire/derby#habitrpg",
+    "derby": "git://github.com/Unroll-Me/derby#master",
     "racer": "git://github.com/lefnire/racer#habitrpg",
     "racer-db-mongo": "git://github.com/lefnire/racer-db-mongo#habitrpg",
     "derby-ui-boot": "git://github.com/codeparty/derby-ui-boot#master",

From 646deb2cdd5915ada5ad7b97dc2574790c4e605a Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Thu, 14 Mar 2013 15:51:29 -0400
Subject: [PATCH 170/220] protocol-agnostic fonts

---
 views/app/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/app/index.html b/views/app/index.html
index b27d2563ee..032412e3a3 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -15,7 +15,7 @@
   <meta name="viewport" content="width=device-width">
   <meta name="apple-mobile-web-app-capable" content="yes">
   <!-- webfonts -->
-  <link href='http://fonts.googleapis.com/css?family=Lato:300,400,700,400italic,700italic' rel='stylesheet' type='text/css'>
+  <link href='//fonts.googleapis.com/css?family=Lato:300,400,700,400italic,700italic' rel='stylesheet' type='text/css'>
 
 <Header:>
   <app:modals:modals />

From 644a23cc57ab6f144419e48ba5aef2d2214cc8aa Mon Sep 17 00:00:00 2001
From: Shane Lister <Shane@atramentous.com>
Date: Thu, 14 Mar 2013 21:57:08 -0700
Subject: [PATCH 171/220] Pet Egg Sprite Sheet and CSS

---
 public/img/sprites/Egg_Sprite_Sheet.png | Bin 0 -> 3332 bytes
 public/img/sprites/PetEggs.css          |  17 +++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 public/img/sprites/Egg_Sprite_Sheet.png
 create mode 100644 public/img/sprites/PetEggs.css

diff --git a/public/img/sprites/Egg_Sprite_Sheet.png b/public/img/sprites/Egg_Sprite_Sheet.png
new file mode 100644
index 0000000000000000000000000000000000000000..2258af3255b73868daa0c54ca86c5007b01ad7c5
GIT binary patch
literal 3332
zcmX|Edpy(YALr=I+-j?>#ZoqNX>M7}+=?$_Q=DOQa*5o^Wt3Z5l43jNKD8o-rsXcm
z<+!Cpj1W1??Sx2D$)%!;%Ws|Y`~CiUp68$U>-D^!_vP~>Q5<X)WR+wkBqS8bBx@(}
zdQd__asvz!?>wZoT*ZrGB=LBp^O;kT(ca<y5|(~veEe0&A>OC`o&3H17-8N1W)c$e
zMPzGB>iMw`d2yWUG{vq(;)xL${-l+w&GFrlDm+J<Q`y?#cG-PN`;!&ytPTohm<l+H
zzk&!hITh<d{+BK`Tna}%wp07&LiLLVsGqLYo(5($q~lZvKv#-?w6F=C+n9*%ubJb;
zF0$5I)_$x<t)87&n@IfBI624YH(zU+Kc;?dWwhyznURTw^jit#TT+=HdM>^U5OPp>
zsDA9du&GCq{TArGB-?HlB$pgLd0V+=u_}hvJp0m|(Uk;d6a)AX?d&7J*JbI(*_f)Q
zID<Zp`t#Tv1eQ5Mf7wJcwE>7u0*J#27Y#Hw+e2u>AV?8eoV1mOvEG}9>Nd(<DxZT0
zR1Ercoh-ksp-drtvVJ3jcg0WD?;3Vai^N~KrLgrGyzry@4KWbSeJe(26GY}<xfteO
z8nHuqUWQmFlze$j1zI1mB8Sp0tg*B%-=|l3arwU14rubV*$O!n9`*EXI9x{KSneHO
zmkp!Z%S{yx+ygYZZo$rfQwA%QeG}~7j@1U5L07h;kUU^0q$Sfn)Hgxl=ehqUDUp}A
z4@l}If7e_cg(lQNmp3xPH!~V$QyV!<`x9RRMP6U(ltdF3Dw>0yF#=pC!qC73iaF9!
ze=dEfZl{A*{??6pC#08o3Rq2*Lk`;Y<o<|?gW@g+Yfb$|2<SlVi>%-@UokImA^n#d
zTKGLeOuK|e$dU>$Q3@&axlQ6-DI}IajDO?qO>*x~#v-QWA^fd58w9cjY1i!0l44o?
zJ*?QHWV2iPrrfu3prI@^aB1#)URY1on07T^R;>u#Zm&H2rQtHcKeEw|*p8l&t2M^%
zxGTphJA{VC!LQ<5|0sgHNZxg+WZcduUA?7vG_{23^fq#^-(oq$*a{A~o1IBow$Vad
zYG?O!u(Z;8te7oU>_h+6Oyr~H!immvTR*tT@p=^}%9U&4B4Qn;T1El_0;c3)r*$#j
zhl0lpM6Ii3<<yvk<y~bPxzdZzOdYI+rtquPnRE}=-$aKWd<_&``joloCvjBA%_#PM
zDp<{m)%xv2gd&1YVQqd}?kYPmd4XbjIOST9-qyDZ8ay_IP6JEbNJHVB;sPgEEHcM3
zB0yIYIo!F6zY+4};WoHjeJ{6fyF~eMi!gE~oAa;{;-gZUW?-XKphpyIpoc{d-zOu3
zY=3v`F=+6ytgd@q*i%;=7KbEG%fobl5;J@w1!h%edF@3yn=_1MN(Q(w3UsCQ4CMWG
zI#5xI;d~0J07P`!u+lgd{+QeoC*UQ%2U=AzX;0rKf8_5{FNzEx@0NAy3H4g91^j(P
zQ}R$d0{|7}l=s7E7@38J!fPE|ik+>6T1>*fG7}qdr|VziBWdln1oPt&UQhS+OGKbL
z-t6c*6WnFccJ97yYxBWH0u;3f0qCK7%Z}*8iJGFa<TcQ*e-)dN^asIE2I-;3!_y}_
z3tP{J^MO4^trsc*M{XC5MTe1P&sq!R;DG$8iRgl%^Zgc%r5t+}{7KH<xDN@*TpB9W
z_^79@-))ldj9m318~ntcwKQ3q{5n}-taYP}teg_Jgo)r!JMxRb5Aj4gK`O}>d}Q90
zXqSKscv`P{Jtu7if?E7V@gpK<{pPqJSoWT22U|hvX7m+p0SP~p*DZ|=XfUyduK=w7
zUHB2Tu)I^*{g@is=hH`1y}&MmO%uZHwO2XL|3pk8#Am1>kn>J&!H`xLv!)#0eHIOP
zs$fd{x>u##=wsVK!CUYIL=Y6Xc6K_wvap8*K~e>pVnok!N`Gt8<oy0uQB5=OkR#X(
zm=F`8ASS>R-qROR6b@o@1ZIY!1vk22U3%g5sC&G=THLt{R!7QotccGyVfkPNA1Ka<
zEg1{meavNH{-{wv*HK@Haqagzl5V>Ye-|$Nb_e9lYOx~4KL7p0-Vz!{28rZhtmsPP
zQuNMMbD`DatC@0!M$y~iz$3SUuCL1F!`7A%o#CM5dUX4dL$~D1B03&v)r#XFW_y8A
zs|=Y@T>!s{z+&>2U^y>NMm3qAPThrlzEKJ!$@o1_*9mNb>U7g7mc0$WPv2W~D*iW`
zOgPzM1O5yoiZy*HMW!~QZ_8<c@ldn-ACEC1x%)58(p661KJ4F84-soe4-!tx<&k6p
z$i5g}!>o2@<3Ob^k``k-b6kTupj*3v*u)N|zq)a#iYEM0vah3CokM=3G{vU)U~wJo
z>UseDoy)RJ(NH%9Ma_?ju1D&%ZYH@@%907AB?I5yOfl@`w$lU_EHN|#8~OTP*;K}O
zc`BBhyCo<AlBlS4BMl;83L+34^Y2^_v16z|xO5dPjxJlb{%vi+=c8x7UOH1BR5dFP
zb0-$j1Qj^KE58KsTk$=_iu7U$bWZaF6|zmahdO28^P5zD$2MHx)0+k_jRRy(CCK`8
z>YVnJ#)+f5VH?qWEQF?7r@e3S5?<QXIn;`oY$vX=Ne8dH$~6(g4x;>fYsLT9S?!v!
zDDGovM(XhHU;Z^zkg83OZA{7P_*&?2dgj^bQyF4`(JN-|?w~dgcLt}<G>*0h!>@9s
zX++$C5^t4jy@rpV{EiZiy)KNHSps;LP`JFVP6`WxGU$+jC*_*AxS-@cOYlw)(}<4y
z(6H0uBHKs_ej}aCeb<C0_o$+nJvA3bh8eA#hgfEL54%m6YkST$6GIP=chjM18p9Q*
zxsv_^(=Z~7!gv={q&a)@M6>6YtbzlMi{9?<`wgJUcVt<ub9V24u{+l!%3e9qR;6=e
z(yZ^R4||)E&yeCrDr!F#xBh49Q);0TS)CuBY!El>HgllL6)rXw)epa8$1$s0WF$P$
z*A7sdjaQ%vQ#?pLDJJ@=JK0zI%+=^@PBb_S^v}E?uEwv~4#-OX=`0$oCGO8n#NGz$
z#`!<&LedRdHVx5K9vFqM%6MLIU}O5#$zH+Qb}|9V_bVPcL(Onr=$bIi*Y{Rcoc=uH
zyfuj3Y1FFj#KO>XBoiF{&C}Kx566#Ce_Xl0$-Wk5oC#(mQd}6dE6fpUq@MmXb7T0#
z+o~rAt~c5IXo@zVzcTu=3Bs+n_8OiX-G=Kv_=r5-D;DhYdCe>G@TB=jA1X=K)9K`6
zix=nKRD`W>4;Y_{)cV_2Hpp7j1q?@@Zv^3nZ`m+?;KKX{zK8u#UY~RtL5$SVX~Tfz
zB0w$&5i3S{owrT*OPC#O7}<887&qx%A*?PCLq8AX9iE5k+y;S8OVU0M6r5KtwTJzr
z39bm@x+adp9FVyQiGdTMXBPuJ1Bh;;Unll2aciazysNR)(V5Dee^*y3XYOpR8P*6n
zeR(^K#KLGP#;`t{XVq`fXBgrdR>8a)lmP`@oE`Ko`!sO*!MCO(&=m((ZQ0el3nJr>
z-*Txjy`l%Sm{G6zL{)0P$SXH|{aij+O`Q`P_hpZ0b0hJ)^xo9FCS_x1%nyOXaAmuo
zD@uII*}*b<*!%34dXGwVDH<IIe(X!NOani0WeK<qQ#3S9=+4B<-jg}*_`y2#a)c8G
z4Kso_dGrkVi|aE>nGejFIfe@ypT<jh=af$j7804$w}3F`eg4ne5n}BNhTQj!RgU?p
zAj0eZbdx5eEz+WUOGh+-Fbh&M&Vvz|{jO`aZIBi^|M_}lG3|#3Es*P>*>3U1N@WNu
zp)2+AvWI`KV7=qP;fSrG*p~xt5Ghw}`}HEv?-Q~jnd0VWub%~rKs0ayOeyqG`*0t+
zBe^%2DF{vth;j-kUDm)GD8{w*RJmSD=InCI`;1HjGtz$YJ0SUU+`X(vjP?AGE*V=3
zT_#m+9<Pp=(SlyB4kUclTF5r?94#EH2_B9%u2Tm*RhgpE>>D^$ym7X@f&-~M;nF(8
z7Z&wT4|#v888a-~5arBwZuV7yhF^$|b*Gp>`6FoVZL`w*M_2z?ifYt-osje%z%$az
zy*)9ChjrLpxbwy0PL@u{@*CbBZaUg)lgXx3P=z!Gz1s4JbHrInFEgeS*`?<OGcy72
z_qAp2bp8u51~l(36_=mj@VqFYYfcRT%-+-QWzq9*keELIPJRdPej>42{P1n%Z%?TV
z{x2-JRap7!#TPnftc7080VNl`$MY@-k4Y#m>+3@C8v;LG{a0-?cMlW8yJ6M@lvA&c
kzQ*H6Abi5;*0wzoB!bb)8)Z2r;%|)vndo4B7dRRJ9~%!2YXATM

literal 0
HcmV?d00001

diff --git a/public/img/sprites/PetEggs.css b/public/img/sprites/PetEggs.css
new file mode 100644
index 0000000000..347891779d
--- /dev/null
+++ b/public/img/sprites/PetEggs.css
@@ -0,0 +1,17 @@
+#PetEggs {
+    /* egg sprite size */
+    width: 48px;
+    height: 51px;
+    /* link to sprite sheet image */
+    background-image: url(Egg_Sprite_Sheet.png);
+}
+/* defines where in the sheet the eggs are */
+.WolfEgg{background-position: 0px 0px;}
+.TigerEgg{background-position: 0px -51px;}
+.PolarBearEgg{background-position: 0px -102px;}
+.PandaEgg{background-position: 0px -153px;}
+.LionEgg{background-position: 0px -204px;}
+.FlyingPigEgg{background-position: 0px -255px;}
+.DrakeEgg{background-position: 0px -306px;}
+.CactusEgg{background-position: 0px -357px;}
+.BearEgg{background-position: 0px -408px;}
\ No newline at end of file

From 2f372124b30eb732752c7e8ab3bf99ced235f867 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 11:15:35 -0400
Subject: [PATCH 172/220] start moving javascript loading functionality back to
 <Scripts:> so we can utilize CDNs

---
 src/app/browser.coffee | 22 ++++------------------
 views/app/index.html   | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index ead5f06f33..7d5836227a 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -20,41 +20,27 @@ restoreRefs = module.exports.restoreRefs = (model) ->
 
 ###
   Loads JavaScript files from (1) public/js/* and (2) external sources
-  We use this file (instead of <Scripts:> or <Tail:> inside .html) so we can utilize require() to concatinate for
-  faster page load, and $.getScript for asyncronous external script loading
+  If a library is available in a CDN, we put it in <Scripts:> (index.html) for better caching. If not, we use
+  this function to utilize require() to concatinate for faster page load, and $.getScript for asyncronous external script loading
 ###
 loadJavaScripts = (model) ->
 
-  require '../../public/vendor/jquery-ui/jquery-1.9.1'
   unless model.get('_view.mobileDevice')
     require '../../public/vendor/jquery-ui/ui/jquery.ui.core'
     require '../../public/vendor/jquery-ui/ui/jquery.ui.widget'
     require '../../public/vendor/jquery-ui/ui/jquery.ui.mouse'
     require '../../public/vendor/jquery-ui/ui/jquery.ui.sortable'
 
-  # Bootstrap
-  require '../../public/vendor/bootstrap/docs/assets/js/bootstrap'
-#  require '../../public/vendor/bootstrap/js/bootstrap-tooltip'
-#  require '../../public/vendor/bootstrap/js/bootstrap-tab'
-#  require '../../public/vendor/bootstrap/js/bootstrap-popover'
-#  require '../../public/vendor/bootstrap/js/bootstrap-modal'
-#  require '../../public/vendor/bootstrap/js/bootstrap-dropdown'
-
-
-  require '../../public/vendor/jquery-cookie/jquery.cookie'
   require '../../public/vendor/bootstrap-tour/bootstrap-tour'
-  require '../../public/vendor/bootstrap-datepicker/js/bootstrap-datepicker'
-  require '../../public/vendor/bootstrap-growl/jquery.bootstrap-growl.min'
-
 
   # JS files not needed right away (google charts) or entirely optional (analytics)
   # Each file getsload asyncronously via $.getScript, so it doesn't bog page-load
   unless model.get('_view.mobileDevice')
 
-    $.getScript("https://s7.addthis.com/js/250/addthis_widget.js#pubid=lefnire");
+    $.getScript("//s7.addthis.com/js/250/addthis_widget.js#pubid=lefnire");
 
     # Google Charts
-    $.getScript "https://www.google.com/jsapi", ->
+    $.getScript "//www.google.com/jsapi", ->
       # Specifying callback in options param is vital! Otherwise you get blank screen, see http://stackoverflow.com/a/12200566/362790
       google.load "visualization", "1", {packages:["corechart"], callback: ->}
 
diff --git a/views/app/index.html b/views/app/index.html
index 032412e3a3..be6ef0ebf9 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -38,9 +38,19 @@
   <app:footer:footer />
 
 <Scripts:>
-    <!-- scripts go in /src/app/browser.coffee, that way we can get min/concat -->
-    <!-- only the ones that are remote and can't be done async are here -->
+    <!-- we load as many CDN-available javascript files here as possible. For the rest,
+        we use /src/app/browser.coffee -> loadJavaScripts() which concats/minifies /public/vendor javascript libraries,
+        as well as runs async loads -->
+
+    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.3.1/jquery.cookie.min.js"></script>
+
+    <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/js/bootstrap.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-growl/1.0.0/jquery.bootstrap-growl.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.0.0/js/bootstrap-datepicker.min.js"></script>
+
     <script src="https://checkout.stripe.com/v2/checkout.js"></script>
+
     {#if equal(_view.nodeEnv,"production")}
         <!-- Google Analytics -->
         <script type="text/javascript">

From d2837afbd464536a4225ad064c43e6d8ee0d6c19 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 12:00:47 -0400
Subject: [PATCH 173/220] move tnl to a view function instead of model
 function, beging adding party stats visuals (hp & exp presently)

---
 src/app/browser.coffee   | 10 ----------
 src/app/character.coffee |  4 ++++
 src/app/debug.coffee     |  3 ++-
 src/app/scoring.coffee   |  2 +-
 views/app/header.html    | 24 ++++++++++++++++--------
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index ead5f06f33..e10340ac17 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -4,16 +4,6 @@ moment = require 'moment'
 
 
 restoreRefs = module.exports.restoreRefs = (model) ->
-  # tnl function
-  model.fn '_tnl', '_user.stats.lvl', (lvl) ->
-    # see https://github.com/lefnire/habitrpg/issues/4
-    # also update in scoring.coffee. TODO create a function accessible in both locations
-    #TODO find a method of calling algos.tnl()
-    if lvl==100
-      0
-    else
-      Math.round(((Math.pow(lvl,2)*0.25)+(10 * lvl) + 139.75)/10)*10
-
   #refLists
   _.each ['habit', 'daily', 'todo', 'reward'], (type) ->
     model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
diff --git a/src/app/character.coffee b/src/app/character.coffee
index 2fe875e563..1089645404 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -1,6 +1,7 @@
 character = require './character'
 browser = require './browser'
 items = require './items'
+algos = require './algos'
 
 moment = require 'moment'
 _ = require 'underscore'
@@ -21,6 +22,9 @@ module.exports.username = username = (auth) ->
 module.exports.view = (view) ->
   view.fn "username", (auth) -> username(auth)
 
+  view.fn "tnl", (level) -> algos.tnl(level)
+
+
 module.exports.app = (appExports, model) ->
   user = model.at '_user'
 
diff --git a/src/app/debug.coffee b/src/app/debug.coffee
index 1f2172d272..1017118a9f 100644
--- a/src/app/debug.coffee
+++ b/src/app/debug.coffee
@@ -1,4 +1,5 @@
 moment = require 'moment'
+algos = require './algos'
 
 module.exports.app = (appExports, model) ->
   user = model.at('_user')
@@ -14,7 +15,7 @@ module.exports.app = (appExports, model) ->
     window.location.reload()
 
   appExports.cheat = ->
-    user.incr 'stats.exp', model.get '_tnl'
+    user.incr 'stats.exp', algos.tnl(user.get('stats.lvl'))
     user.incr 'stats.gp', 1000
 
   appExports.reset = ->
diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index f6a5dd2e15..4a4882c02d 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -136,7 +136,7 @@ updateStats = (model, newStats, batch) ->
       obj.stats.hp = newStats.hp
 
   if newStats.exp?
-    tnl = model.get '_tnl'
+    tnl = algos.tnl(obj.stats.lvl)
     #silent = false
     # if we're at level 100, turn xp to gold
     if obj.stats.lvl >= 100
diff --git a/views/app/header.html b/views/app/header.html
index d7bc716b3e..b3ce77e220 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -8,13 +8,21 @@
             </figure>
 
             <!-- party -->
-            {#each _partyMembers as :member}
-                {#unless equal(:member.id, _userId)}
-                    <figure class="party-avatar-wrap" rel="tooltip" title="{username(:member.auth)}" data-placement="bottom">
-                        <app:avatar:avatar profile={:member} party="true" />
+            {{#each _partyMembers as :member}}
+                {{#unless equal(:member.id, _userId)}}
+                    <figure class="party-avatar-wrap" rel="tooltip" title="{{username(:member.auth)}}" data-placement="bottom">
+                        <app:avatar:avatar profile={{:member}} party="true" />
+                        <div>
+                            <div class="progress progress-danger" style="height:5px; margin:5px">
+                                <div class="bar" style="height: 5px; width: {percent(:member.stats.hp, 50)}%;"></div>
+                            </div>
+                            <div class="progress progress-warning" style="height:5px; margin:5px">
+                                <div class="bar" style="height: 5px; width: {percent(:member.stats.exp, tnl(:member.stats.lvl))}%;"></div>
+                            </div>
+                        </div>
                     </figure>
-                {/}
-            {/}
+                {{/}}
+            {{/}}
 
             <!-- progress bars -->
             <div class="progress-bars">
@@ -24,12 +32,12 @@
                 </div>
 
                 <div class="progress progress-warning" rel=tooltip data-placement=bottom title="Experience">
-                    <div class="bar" style="width: {percent(_user.stats.exp,_tnl)}%;"></div>
+                    <div class="bar" style="width: {percent(_user.stats.exp,tnl(_user.stats.lvl))}%;"></div>
                 <span class="progress-text">
                   {#if _user.history.exp}
                     <a x-bind=click:toggleChart data-toggle-id="exp-chart" data-history-path="_user.history.exp" rel=tooltip title="Progress"><i class=icon-signal></i></a>&nbsp;
                   {/}
-                  <i class=icon-star></i> {floor(_user.stats.exp)} / {_tnl}
+                  <i class=icon-star></i> {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)}
                 </span>
                 </div>
                 <div id="exp-chart" style="display:none;"></div>

From b76b1a33f545902b596ca4d85a3f8bab9971f5cc Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 12:06:38 -0400
Subject: [PATCH 174/220] cleaner view.fn "tnl"

---
 src/app/character.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/character.coffee b/src/app/character.coffee
index 1089645404..926d9a5e22 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -22,7 +22,7 @@ module.exports.username = username = (auth) ->
 module.exports.view = (view) ->
   view.fn "username", (auth) -> username(auth)
 
-  view.fn "tnl", (level) -> algos.tnl(level)
+  view.fn "tnl", algos.tnl
 
 
 module.exports.app = (appExports, model) ->

From 916ac57917f1db794b0fbc05f7fedb9fe91de486 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Fri, 15 Mar 2013 12:18:57 -0400
Subject: [PATCH 175/220] FIX Firefox outline freakout on tasks

---
 styles/app/tasks.styl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index b8dd2d11e7..789f8182b2 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -109,6 +109,7 @@ for $stage in $stages
 // an individual task entry
 // ------------------------
 .task
+  overflow: hidden
   list-style: none
   clear: both
   padding: 0 0.5em 0 0.5em

From eeec3cf1bcb499d405ef9b57d72f18383bcdd636 Mon Sep 17 00:00:00 2001
From: Zachary Kain <zakkain@gmail.com>
Date: Fri, 15 Mar 2013 12:21:27 -0400
Subject: [PATCH 176/220] FIX Firefox task hover checkbox bug

---
 styles/app/tasks.styl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl
index 789f8182b2..d02012c28c 100644
--- a/styles/app/tasks.styl
+++ b/styles/app/tasks.styl
@@ -202,8 +202,8 @@ for $stage in $stages
   position: relative
   // uncompleted icon
   label:after, label:before
-    content: '▨'
     // content: '◯'
+    content: ''
     display: block
     height: 1.714285714em
     width: 1.714285714em
@@ -213,10 +213,15 @@ for $stage in $stages
     color: black
     opacity: 0.2
 
+  label:after
+    content: '▨'
   label:before
     position: absolute
     left: 0
   // hint at completed icon
+  label:hover:before,
+  label:focus:before
+    content: ''
   label:hover:after,
   label:focus:after
     content: '¬'

From a7de94f180622e38b36c4d8a84995644cccb56c4 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 12:24:30 -0400
Subject: [PATCH 177/220] move party stats to a modal

---
 views/app/header.html | 17 ++++++++++-------
 views/app/party.html  |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/views/app/header.html b/views/app/header.html
index b3ce77e220..39ba259fdc 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -10,16 +10,19 @@
             <!-- party -->
             {{#each _partyMembers as :member}}
                 {{#unless equal(:member.id, _userId)}}
-                    <figure class="party-avatar-wrap" rel="tooltip" title="{{username(:member.auth)}}" data-placement="bottom">
-                        <app:avatar:avatar profile={{:member}} party="true" />
-                        <div>
-                            <div class="progress progress-danger" style="height:5px; margin:5px">
-                                <div class="bar" style="height: 5px; width: {percent(:member.stats.hp, 50)}%;"></div>
+                    <figure class="party-avatar-wrap" rel="popover" data-title="{{username(:member.auth)}}" data-placement="bottom" data-trigger="hover" data-html="true" data-content="
+                         <div>
+                            <div class='progress progress-danger' style='height:5px;'>
+                                <div class='bar' style='height: 5px; width: {percent(:member.stats.hp, 50)}%;'></div>
                             </div>
-                            <div class="progress progress-warning" style="height:5px; margin:5px">
-                                <div class="bar" style="height: 5px; width: {percent(:member.stats.exp, tnl(:member.stats.lvl))}%;"></div>
+                            <div class='progress progress-warning' style='height:5px;'>
+                                <div class='bar' style='height: 5px; width: {percent(:member.stats.exp, tnl(:member.stats.lvl))}%;'></div>
                             </div>
+                            <div>GP: {{floor(:member.stats.gp)}}</div>
                         </div>
+                    ">
+                        <!-- Yes that would have been way cleaner as a derby template `<app:party:member-stats profile={{:member}} />`, but I couldn't get it working -->
+                        <app:avatar:avatar profile={{:member}} party="true" />
                     </figure>
                 {{/}}
             {{/}}
diff --git a/views/app/party.html b/views/app/party.html
index 0427883c7f..aa632630b7 100644
--- a/views/app/party.html
+++ b/views/app/party.html
@@ -43,4 +43,4 @@
         <@footer>
             <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
         </@footer>
-    </app:modals:modal>
\ No newline at end of file
+    </app:modals:modal>

From d8918790e52a26a872b9429b03b8c700e305dad8 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 12:27:22 -0400
Subject: [PATCH 178/220] update comment

---
 views/app/header.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/app/header.html b/views/app/header.html
index 39ba259fdc..c88f3cf06e 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -21,7 +21,8 @@
                             <div>GP: {{floor(:member.stats.gp)}}</div>
                         </div>
                     ">
-                        <!-- Yes that would have been way cleaner as a derby template `<app:party:member-stats profile={{:member}} />`, but I couldn't get it working -->
+                    <!-- Would be way cleaner as a Derby template `data-content="<app:party:member-stats profile={{:member}} />"`, but it was just printing HTML as text -->
+
                         <app:avatar:avatar profile={{:member}} party="true" />
                     </figure>
                 {{/}}

From 823f524d57c37e4344ae15323033987db3a632d1 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 16:47:48 -0400
Subject: [PATCH 179/220] begin adding toggle-header

---
 src/app/character.coffee |  3 ++
 views/app/header.html    | 85 +++++++++++++++++++++-------------------
 2 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/src/app/character.coffee b/src/app/character.coffee
index 926d9a5e22..6496a1a631 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -89,6 +89,9 @@ module.exports.app = (appExports, model) ->
       batch.set $(this).attr('data-for'), parseInt($(this).val() || 1)
     batch.commit()
 
+  appExports.toggleHeader = (e, el) ->
+    user.set 'preferences.hideHeader', !user.get('preferences.hideHeader')
+
   user.on 'set', 'flags.customizationsNotification', (captures, args) ->
     return unless captures == true
     $('.main-avatar').popover('destroy') #remove previous popovers
diff --git a/views/app/header.html b/views/app/header.html
index c88f3cf06e..077ec5b31a 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -1,52 +1,55 @@
 <header:>
-    <div class="row-fluid">
-        <div class='char-status {#if gt(_partyMembers.length,1)}span8 offset2 has-party{else}span6 offset3{/}'>
+    <a x-bind="click:toggleHeader">[toggle header]</a>
+    {#unless _user.preferences.hideHeader}
+        <div class="row-fluid">
+            <div class='char-status {#if gt(_partyMembers.length,1)}span8 offset2 has-party{else}span6 offset3{/}'>
 
-            <!-- avatar -->
-            <figure class="main-avatar-wrap">
-                <app:avatar:avatar profile={_user} main="true" />
-            </figure>
+                <!-- avatar -->
+                <figure class="main-avatar-wrap">
+                    <app:avatar:avatar profile={_user} main="true" />
+                </figure>
 
-            <!-- party -->
-            {{#each _partyMembers as :member}}
-                {{#unless equal(:member.id, _userId)}}
-                    <figure class="party-avatar-wrap" rel="popover" data-title="{{username(:member.auth)}}" data-placement="bottom" data-trigger="hover" data-html="true" data-content="
-                         <div>
-                            <div class='progress progress-danger' style='height:5px;'>
-                                <div class='bar' style='height: 5px; width: {percent(:member.stats.hp, 50)}%;'></div>
+                <!-- party -->
+                {{#each _partyMembers as :member}}
+                    {{#unless equal(:member.id, _userId)}}
+                        <figure class="party-avatar-wrap" rel="popover" data-title="{{username(:member.auth)}}" data-placement="bottom" data-trigger="hover" data-html="true" data-content="
+                             <div>
+                                <div class='progress progress-danger' style='height:5px;'>
+                                    <div class='bar' style='height: 5px; width: {percent(:member.stats.hp, 50)}%;'></div>
+                                </div>
+                                <div class='progress progress-warning' style='height:5px;'>
+                                    <div class='bar' style='height: 5px; width: {percent(:member.stats.exp, tnl(:member.stats.lvl))}%;'></div>
+                                </div>
+                                <div>GP: {{floor(:member.stats.gp)}}</div>
                             </div>
-                            <div class='progress progress-warning' style='height:5px;'>
-                                <div class='bar' style='height: 5px; width: {percent(:member.stats.exp, tnl(:member.stats.lvl))}%;'></div>
-                            </div>
-                            <div>GP: {{floor(:member.stats.gp)}}</div>
-                        </div>
-                    ">
-                    <!-- Would be way cleaner as a Derby template `data-content="<app:party:member-stats profile={{:member}} />"`, but it was just printing HTML as text -->
+                        ">
+                        <!-- Would be way cleaner as a Derby template `data-content="<app:party:member-stats profile={{:member}} />"`, but it was just printing HTML as text -->
 
-                        <app:avatar:avatar profile={{:member}} party="true" />
-                    </figure>
+                            <app:avatar:avatar profile={{:member}} party="true" />
+                        </figure>
+                    {{/}}
                 {{/}}
-            {{/}}
 
-            <!-- progress bars -->
-            <div class="progress-bars">
-                <div class="progress progress-danger" rel=tooltip data-placement=bottom title="Health">
-                    <div class="bar" style="width: {percent(_user.stats.hp, 50)}%;"></div>
-                    <span class="progress-text"><i class=icon-heart></i> {ceil(_user.stats.hp)} / 50</span>
-                </div>
+                <!-- progress bars -->
+                <div class="progress-bars">
+                    <div class="progress progress-danger" rel=tooltip data-placement=bottom title="Health">
+                        <div class="bar" style="width: {percent(_user.stats.hp, 50)}%;"></div>
+                        <span class="progress-text"><i class=icon-heart></i> {ceil(_user.stats.hp)} / 50</span>
+                    </div>
 
-                <div class="progress progress-warning" rel=tooltip data-placement=bottom title="Experience">
-                    <div class="bar" style="width: {percent(_user.stats.exp,tnl(_user.stats.lvl))}%;"></div>
-                <span class="progress-text">
-                  {#if _user.history.exp}
-                    <a x-bind=click:toggleChart data-toggle-id="exp-chart" data-history-path="_user.history.exp" rel=tooltip title="Progress"><i class=icon-signal></i></a>&nbsp;
-                  {/}
-                  <i class=icon-star></i> {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)}
-                </span>
+                    <div class="progress progress-warning" rel=tooltip data-placement=bottom title="Experience">
+                        <div class="bar" style="width: {percent(_user.stats.exp,tnl(_user.stats.lvl))}%;"></div>
+                    <span class="progress-text">
+                      {#if _user.history.exp}
+                        <a x-bind=click:toggleChart data-toggle-id="exp-chart" data-history-path="_user.history.exp" rel=tooltip title="Progress"><i class=icon-signal></i></a>&nbsp;
+                      {/}
+                      <i class=icon-star></i> {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)}
+                    </span>
+                    </div>
+                    <div id="exp-chart" style="display:none;"></div>
                 </div>
-                <div id="exp-chart" style="display:none;"></div>
+                <!-- end .char-status -->
             </div>
-            <!-- end .char-status -->
+            <!-- end .row-fluid -->
         </div>
-        <!-- end .row-fluid -->
-    </div>
\ No newline at end of file
+    {/}
\ No newline at end of file

From ae96dc8ddbdca0836447d78b11d26bbd32f71bc2 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 16:53:39 -0400
Subject: [PATCH 180/220] add toggle header to settings dialog

---
 views/app/header.html   | 1 -
 views/app/settings.html | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/app/header.html b/views/app/header.html
index 077ec5b31a..ede91560a4 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -1,5 +1,4 @@
 <header:>
-    <a x-bind="click:toggleHeader">[toggle header]</a>
     {#unless _user.preferences.hideHeader}
         <div class="row-fluid">
             <div class='char-status {#if gt(_partyMembers.length,1)}span8 offset2 has-party{else}span6 offset3{/}'>
diff --git a/views/app/settings.html b/views/app/settings.html
index d9715751f2..c05a5fa6ac 100644
--- a/views/app/settings.html
+++ b/views/app/settings.html
@@ -19,6 +19,10 @@
                 <small>Habit defaults to check and reset your dailies at midnight each day. You can customize that here (Enter number between 0 and 24).</small>
             </div>
 
+            <hr/>
+            <h4>Toggle Header</h4>
+            <button x-bind="click:toggleHeader">{#if _user.preferences.hideHeader}Show{else}Hide{/}</button>
+
             {{#if _user.auth.local}}
                 <hr/>
                 <h4>Change Password</h4>

From 12274e2f34af1a846ca43bd0efb8f5b8587cb817 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 16:58:07 -0400
Subject: [PATCH 181/220] move settings and API into tabs

---
 views/app/settings.html | 64 +++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/views/app/settings.html b/views/app/settings.html
index c05a5fa6ac..b1684b4aad 100644
--- a/views/app/settings.html
+++ b/views/app/settings.html
@@ -1,37 +1,45 @@
 <modals:>
     {{#if _loggedIn}}
         <app:modals:modal modalId="settings-modal" header="Settings">
-            <h4>API</h4>
-            <small>Copy these for use in third party applications.</small>
-            <h6>User ID</h6>
-            <pre class=prettyprint>{_user.id}</pre>
+            <ul class="nav nav-tabs">
+                <li class="active"><a data-toggle="tab" href="#" data-target="#settings-settings">General</a></li>
+                <li><a data-toggle="tab" href="#" data-target="#settings-api">API</a></li>
+            </ul>
 
-            <h6>API Token</h6>
-            <pre class=prettyprint>{_user.apiToken}</pre>
+            <div class="tab-content">
+                <div class="tab-pane active" id="settings-settings">
+                    <h4>Custom Day Start</h4>
+                    <div class="input-append">
+                        <input class="span2" type="number" min=0 max=24 value={_user.preferences.dayStart} />
+                        <span class="add-on">:00 (24h)</span>
+                    </div>
+                    <div>
+                        <small>Habit defaults to check and reset your dailies at midnight each day. You can customize that here (Enter number between 0 and 24).</small>
+                    </div>
 
-            <hr/>
-            <h4>Custom Day Start</h4>
-            <div class="input-append">
-                <input class="span2" type="number" min=0 max=24 value={_user.preferences.dayStart} />
-                <span class="add-on">:00 (24h)</span>
+                    <hr/>
+                    <h4>Toggle Header</h4>
+                    <button x-bind="click:toggleHeader">{#if _user.preferences.hideHeader}Show{else}Hide{/}</button>
+
+                    {{#if _user.auth.local}}
+                        <hr/>
+                        <h4>Change Password</h4>
+                        <derby-auth:changePassword />
+                    {{/}}
+
+                    <hr/>
+                    <a class='btn btn-danger' data-target="#reset-modal" data-toggle="modal" rel=tooltip title="Resets your entire account (dangerous).">Reset</a>
+                    &nbsp;<a class='btn btn-danger' data-target="#restore-modal" data-toggle="modal" rel=tooltip title="Restores attributes to your character.">Restore</a>
+                </div>
+                <div class="tab-pane" id="settings-api">
+                    <small>Copy these for use in third party applications.</small>
+                    <h6>User ID</h6>
+                    <pre class=prettyprint>{_user.id}</pre>
+
+                    <h6>API Token</h6>
+                    <pre class=prettyprint>{_user.apiToken}</pre>
+                </div>
             </div>
-            <div>
-                <small>Habit defaults to check and reset your dailies at midnight each day. You can customize that here (Enter number between 0 and 24).</small>
-            </div>
-
-            <hr/>
-            <h4>Toggle Header</h4>
-            <button x-bind="click:toggleHeader">{#if _user.preferences.hideHeader}Show{else}Hide{/}</button>
-
-            {{#if _user.auth.local}}
-                <hr/>
-                <h4>Change Password</h4>
-                <derby-auth:changePassword />
-            {{/}}
-
-            <hr/>
-            <a class='btn btn-danger' data-target="#reset-modal" data-toggle="modal" rel=tooltip title="Resets your entire account (dangerous).">Reset</a>
-            &nbsp;<a class='btn btn-danger' data-target="#restore-modal" data-toggle="modal" rel=tooltip title="Restores attributes to your character.">Restore</a>
 
             <@footer>
                 <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>

From f2faf8c968ada2b7c743d0e11e4a3bc283102ae3 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 17:20:01 -0400
Subject: [PATCH 182/220] add 'show helm' option

---
 src/app/character.coffee |  2 +-
 views/app/avatar.html    | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/app/character.coffee b/src/app/character.coffee
index 6496a1a631..320791fa31 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -112,7 +112,7 @@ userSchema =
   stats: { gp: 0, exp: 0, lvl: 1, hp: 50 }
   party: { current: null, invitation: null }
   items: { weapon: 0, armor: 0, head: 0, shield: 0 }
-  preferences: { gender: 'm', skin: 'white', hair: 'blond', armorSet: 'v1', dayStart:0 }
+  preferences: { gender: 'm', skin: 'white', hair: 'blond', armorSet: 'v1', dayStart:0, showHelm: true }
   habitIds: []
   dailyIds: []
   todoIds: []
diff --git a/views/app/avatar.html b/views/app/avatar.html
index 8cf756a837..d39b5c57f4 100644
--- a/views/app/avatar.html
+++ b/views/app/avatar.html
@@ -31,7 +31,11 @@
             <span class='{:p.gender}_skin_{:p.skin}'></span>
             <span class='{:p.gender}_hair_{:p.hair}'></span>
             <span class="{equipped(@profile, 'armor')}"></span>
-            <span class="{equipped(@profile, 'head')}"></span>
+            {#if :p.showHelm}
+                <span class="{equipped(@profile, 'head')}"></span>
+            {else}
+                <span class="{:p.gender}_head_0"></span>
+            {/}
             <span class='{:p.gender}_shield_{@profile.items.shield}'></span>
             <span class='{:p.gender}_weapon_{@profile.items.weapon}'></span>
             {/}
@@ -52,10 +56,14 @@
     <menu type="list">
         <!-- gender -->
         <li class="customize-menu">
-            <menu label="Gender">
+            <menu label="Head">
                 <button type="button" class="m_head_0 customize-option" data-value="m" x-bind="click:customizeGender"></button>
                 <button type="button" class="f_head_0 customize-option" data-value="f" x-bind="click:customizeGender"></button>
             </menu>
+            <label class="checkbox">
+                <input type=checkbox checked="{_user.preferences.showHelm}" /> Show Helm
+            </label>
+
         </li>
 
         <!-- hair -->

From 3fa6aaceed84587b8f38d4ca1989981edf32a762 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 17:20:01 -0400
Subject: [PATCH 183/220] add 'show helm' option

---
 src/app/character.coffee |  2 +-
 views/app/avatar.html    | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/app/character.coffee b/src/app/character.coffee
index 2fe875e563..9846811aa8 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -105,7 +105,7 @@ userSchema =
   stats: { gp: 0, exp: 0, lvl: 1, hp: 50 }
   party: { current: null, invitation: null }
   items: { weapon: 0, armor: 0, head: 0, shield: 0 }
-  preferences: { gender: 'm', skin: 'white', hair: 'blond', armorSet: 'v1', dayStart:0 }
+  preferences: { gender: 'm', skin: 'white', hair: 'blond', armorSet: 'v1', dayStart:0, showHelm: true }
   habitIds: []
   dailyIds: []
   todoIds: []
diff --git a/views/app/avatar.html b/views/app/avatar.html
index 8cf756a837..d39b5c57f4 100644
--- a/views/app/avatar.html
+++ b/views/app/avatar.html
@@ -31,7 +31,11 @@
             <span class='{:p.gender}_skin_{:p.skin}'></span>
             <span class='{:p.gender}_hair_{:p.hair}'></span>
             <span class="{equipped(@profile, 'armor')}"></span>
-            <span class="{equipped(@profile, 'head')}"></span>
+            {#if :p.showHelm}
+                <span class="{equipped(@profile, 'head')}"></span>
+            {else}
+                <span class="{:p.gender}_head_0"></span>
+            {/}
             <span class='{:p.gender}_shield_{@profile.items.shield}'></span>
             <span class='{:p.gender}_weapon_{@profile.items.weapon}'></span>
             {/}
@@ -52,10 +56,14 @@
     <menu type="list">
         <!-- gender -->
         <li class="customize-menu">
-            <menu label="Gender">
+            <menu label="Head">
                 <button type="button" class="m_head_0 customize-option" data-value="m" x-bind="click:customizeGender"></button>
                 <button type="button" class="f_head_0 customize-option" data-value="f" x-bind="click:customizeGender"></button>
             </menu>
+            <label class="checkbox">
+                <input type=checkbox checked="{_user.preferences.showHelm}" /> Show Helm
+            </label>
+
         </li>
 
         <!-- hair -->

From 7f93b525c0de3c0966df29b758ab8a4a136da682 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 12:00:47 -0400
Subject: [PATCH 184/220] move tnl to a view function instead of model
 function, beging adding party stats visuals (hp & exp presently)

---
 src/app/browser.coffee   | 10 ----------
 src/app/character.coffee |  4 ++++
 src/app/debug.coffee     |  3 ++-
 src/app/scoring.coffee   |  2 +-
 views/app/header.html    | 24 ++++++++++++++++--------
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index 55a6c9229f..f12ab9832f 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -4,16 +4,6 @@ moment = require 'moment'
 
 
 restoreRefs = module.exports.restoreRefs = (model) ->
-  # tnl function
-  model.fn '_tnl', '_user.stats.lvl', (lvl) ->
-    # see https://github.com/lefnire/habitrpg/issues/4
-    # also update in scoring.coffee. TODO create a function accessible in both locations
-    #TODO find a method of calling algos.tnl()
-    if lvl==100
-      0
-    else
-      Math.round(((Math.pow(lvl,2)*0.25)+(10 * lvl) + 139.75)/10)*10
-
   #refLists
   _.each ['habit', 'daily', 'todo', 'reward'], (type) ->
     model.refList "_#{type}List", "_user.tasks", "_user.#{type}Ids"
diff --git a/src/app/character.coffee b/src/app/character.coffee
index 9846811aa8..047005baa5 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -1,6 +1,7 @@
 character = require './character'
 browser = require './browser'
 items = require './items'
+algos = require './algos'
 
 moment = require 'moment'
 _ = require 'underscore'
@@ -21,6 +22,9 @@ module.exports.username = username = (auth) ->
 module.exports.view = (view) ->
   view.fn "username", (auth) -> username(auth)
 
+  view.fn "tnl", (level) -> algos.tnl(level)
+
+
 module.exports.app = (appExports, model) ->
   user = model.at '_user'
 
diff --git a/src/app/debug.coffee b/src/app/debug.coffee
index 1f2172d272..1017118a9f 100644
--- a/src/app/debug.coffee
+++ b/src/app/debug.coffee
@@ -1,4 +1,5 @@
 moment = require 'moment'
+algos = require './algos'
 
 module.exports.app = (appExports, model) ->
   user = model.at('_user')
@@ -14,7 +15,7 @@ module.exports.app = (appExports, model) ->
     window.location.reload()
 
   appExports.cheat = ->
-    user.incr 'stats.exp', model.get '_tnl'
+    user.incr 'stats.exp', algos.tnl(user.get('stats.lvl'))
     user.incr 'stats.gp', 1000
 
   appExports.reset = ->
diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee
index f6a5dd2e15..4a4882c02d 100644
--- a/src/app/scoring.coffee
+++ b/src/app/scoring.coffee
@@ -136,7 +136,7 @@ updateStats = (model, newStats, batch) ->
       obj.stats.hp = newStats.hp
 
   if newStats.exp?
-    tnl = model.get '_tnl'
+    tnl = algos.tnl(obj.stats.lvl)
     #silent = false
     # if we're at level 100, turn xp to gold
     if obj.stats.lvl >= 100
diff --git a/views/app/header.html b/views/app/header.html
index d7bc716b3e..b3ce77e220 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -8,13 +8,21 @@
             </figure>
 
             <!-- party -->
-            {#each _partyMembers as :member}
-                {#unless equal(:member.id, _userId)}
-                    <figure class="party-avatar-wrap" rel="tooltip" title="{username(:member.auth)}" data-placement="bottom">
-                        <app:avatar:avatar profile={:member} party="true" />
+            {{#each _partyMembers as :member}}
+                {{#unless equal(:member.id, _userId)}}
+                    <figure class="party-avatar-wrap" rel="tooltip" title="{{username(:member.auth)}}" data-placement="bottom">
+                        <app:avatar:avatar profile={{:member}} party="true" />
+                        <div>
+                            <div class="progress progress-danger" style="height:5px; margin:5px">
+                                <div class="bar" style="height: 5px; width: {percent(:member.stats.hp, 50)}%;"></div>
+                            </div>
+                            <div class="progress progress-warning" style="height:5px; margin:5px">
+                                <div class="bar" style="height: 5px; width: {percent(:member.stats.exp, tnl(:member.stats.lvl))}%;"></div>
+                            </div>
+                        </div>
                     </figure>
-                {/}
-            {/}
+                {{/}}
+            {{/}}
 
             <!-- progress bars -->
             <div class="progress-bars">
@@ -24,12 +32,12 @@
                 </div>
 
                 <div class="progress progress-warning" rel=tooltip data-placement=bottom title="Experience">
-                    <div class="bar" style="width: {percent(_user.stats.exp,_tnl)}%;"></div>
+                    <div class="bar" style="width: {percent(_user.stats.exp,tnl(_user.stats.lvl))}%;"></div>
                 <span class="progress-text">
                   {#if _user.history.exp}
                     <a x-bind=click:toggleChart data-toggle-id="exp-chart" data-history-path="_user.history.exp" rel=tooltip title="Progress"><i class=icon-signal></i></a>&nbsp;
                   {/}
-                  <i class=icon-star></i> {floor(_user.stats.exp)} / {_tnl}
+                  <i class=icon-star></i> {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)}
                 </span>
                 </div>
                 <div id="exp-chart" style="display:none;"></div>

From 174a0d23628fa2a5b90faa625a9fa9b58f13ab0e Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 12:06:38 -0400
Subject: [PATCH 185/220] cleaner view.fn "tnl"

---
 src/app/character.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/character.coffee b/src/app/character.coffee
index 047005baa5..ae0b2f4d1a 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -22,7 +22,7 @@ module.exports.username = username = (auth) ->
 module.exports.view = (view) ->
   view.fn "username", (auth) -> username(auth)
 
-  view.fn "tnl", (level) -> algos.tnl(level)
+  view.fn "tnl", algos.tnl
 
 
 module.exports.app = (appExports, model) ->

From b7425f4964d0098ab05bf17358d6de4d61d23029 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 12:24:30 -0400
Subject: [PATCH 186/220] move party stats to a modal

---
 views/app/header.html | 17 ++++++++++-------
 views/app/party.html  |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/views/app/header.html b/views/app/header.html
index b3ce77e220..39ba259fdc 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -10,16 +10,19 @@
             <!-- party -->
             {{#each _partyMembers as :member}}
                 {{#unless equal(:member.id, _userId)}}
-                    <figure class="party-avatar-wrap" rel="tooltip" title="{{username(:member.auth)}}" data-placement="bottom">
-                        <app:avatar:avatar profile={{:member}} party="true" />
-                        <div>
-                            <div class="progress progress-danger" style="height:5px; margin:5px">
-                                <div class="bar" style="height: 5px; width: {percent(:member.stats.hp, 50)}%;"></div>
+                    <figure class="party-avatar-wrap" rel="popover" data-title="{{username(:member.auth)}}" data-placement="bottom" data-trigger="hover" data-html="true" data-content="
+                         <div>
+                            <div class='progress progress-danger' style='height:5px;'>
+                                <div class='bar' style='height: 5px; width: {percent(:member.stats.hp, 50)}%;'></div>
                             </div>
-                            <div class="progress progress-warning" style="height:5px; margin:5px">
-                                <div class="bar" style="height: 5px; width: {percent(:member.stats.exp, tnl(:member.stats.lvl))}%;"></div>
+                            <div class='progress progress-warning' style='height:5px;'>
+                                <div class='bar' style='height: 5px; width: {percent(:member.stats.exp, tnl(:member.stats.lvl))}%;'></div>
                             </div>
+                            <div>GP: {{floor(:member.stats.gp)}}</div>
                         </div>
+                    ">
+                        <!-- Yes that would have been way cleaner as a derby template `<app:party:member-stats profile={{:member}} />`, but I couldn't get it working -->
+                        <app:avatar:avatar profile={{:member}} party="true" />
                     </figure>
                 {{/}}
             {{/}}
diff --git a/views/app/party.html b/views/app/party.html
index 0427883c7f..aa632630b7 100644
--- a/views/app/party.html
+++ b/views/app/party.html
@@ -43,4 +43,4 @@
         <@footer>
             <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
         </@footer>
-    </app:modals:modal>
\ No newline at end of file
+    </app:modals:modal>

From 054cf03614358e0075e4d72708b25e53bc29d7fa Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 12:27:22 -0400
Subject: [PATCH 187/220] update comment

---
 views/app/header.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/app/header.html b/views/app/header.html
index 39ba259fdc..c88f3cf06e 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -21,7 +21,8 @@
                             <div>GP: {{floor(:member.stats.gp)}}</div>
                         </div>
                     ">
-                        <!-- Yes that would have been way cleaner as a derby template `<app:party:member-stats profile={{:member}} />`, but I couldn't get it working -->
+                    <!-- Would be way cleaner as a Derby template `data-content="<app:party:member-stats profile={{:member}} />"`, but it was just printing HTML as text -->
+
                         <app:avatar:avatar profile={{:member}} party="true" />
                     </figure>
                 {{/}}

From 325d90670836049eb0d6c52d65e6b46002129f8c Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 16:47:48 -0400
Subject: [PATCH 188/220] begin adding toggle-header

---
 src/app/character.coffee |  3 ++
 views/app/header.html    | 85 +++++++++++++++++++++-------------------
 2 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/src/app/character.coffee b/src/app/character.coffee
index ae0b2f4d1a..320791fa31 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -89,6 +89,9 @@ module.exports.app = (appExports, model) ->
       batch.set $(this).attr('data-for'), parseInt($(this).val() || 1)
     batch.commit()
 
+  appExports.toggleHeader = (e, el) ->
+    user.set 'preferences.hideHeader', !user.get('preferences.hideHeader')
+
   user.on 'set', 'flags.customizationsNotification', (captures, args) ->
     return unless captures == true
     $('.main-avatar').popover('destroy') #remove previous popovers
diff --git a/views/app/header.html b/views/app/header.html
index c88f3cf06e..077ec5b31a 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -1,52 +1,55 @@
 <header:>
-    <div class="row-fluid">
-        <div class='char-status {#if gt(_partyMembers.length,1)}span8 offset2 has-party{else}span6 offset3{/}'>
+    <a x-bind="click:toggleHeader">[toggle header]</a>
+    {#unless _user.preferences.hideHeader}
+        <div class="row-fluid">
+            <div class='char-status {#if gt(_partyMembers.length,1)}span8 offset2 has-party{else}span6 offset3{/}'>
 
-            <!-- avatar -->
-            <figure class="main-avatar-wrap">
-                <app:avatar:avatar profile={_user} main="true" />
-            </figure>
+                <!-- avatar -->
+                <figure class="main-avatar-wrap">
+                    <app:avatar:avatar profile={_user} main="true" />
+                </figure>
 
-            <!-- party -->
-            {{#each _partyMembers as :member}}
-                {{#unless equal(:member.id, _userId)}}
-                    <figure class="party-avatar-wrap" rel="popover" data-title="{{username(:member.auth)}}" data-placement="bottom" data-trigger="hover" data-html="true" data-content="
-                         <div>
-                            <div class='progress progress-danger' style='height:5px;'>
-                                <div class='bar' style='height: 5px; width: {percent(:member.stats.hp, 50)}%;'></div>
+                <!-- party -->
+                {{#each _partyMembers as :member}}
+                    {{#unless equal(:member.id, _userId)}}
+                        <figure class="party-avatar-wrap" rel="popover" data-title="{{username(:member.auth)}}" data-placement="bottom" data-trigger="hover" data-html="true" data-content="
+                             <div>
+                                <div class='progress progress-danger' style='height:5px;'>
+                                    <div class='bar' style='height: 5px; width: {percent(:member.stats.hp, 50)}%;'></div>
+                                </div>
+                                <div class='progress progress-warning' style='height:5px;'>
+                                    <div class='bar' style='height: 5px; width: {percent(:member.stats.exp, tnl(:member.stats.lvl))}%;'></div>
+                                </div>
+                                <div>GP: {{floor(:member.stats.gp)}}</div>
                             </div>
-                            <div class='progress progress-warning' style='height:5px;'>
-                                <div class='bar' style='height: 5px; width: {percent(:member.stats.exp, tnl(:member.stats.lvl))}%;'></div>
-                            </div>
-                            <div>GP: {{floor(:member.stats.gp)}}</div>
-                        </div>
-                    ">
-                    <!-- Would be way cleaner as a Derby template `data-content="<app:party:member-stats profile={{:member}} />"`, but it was just printing HTML as text -->
+                        ">
+                        <!-- Would be way cleaner as a Derby template `data-content="<app:party:member-stats profile={{:member}} />"`, but it was just printing HTML as text -->
 
-                        <app:avatar:avatar profile={{:member}} party="true" />
-                    </figure>
+                            <app:avatar:avatar profile={{:member}} party="true" />
+                        </figure>
+                    {{/}}
                 {{/}}
-            {{/}}
 
-            <!-- progress bars -->
-            <div class="progress-bars">
-                <div class="progress progress-danger" rel=tooltip data-placement=bottom title="Health">
-                    <div class="bar" style="width: {percent(_user.stats.hp, 50)}%;"></div>
-                    <span class="progress-text"><i class=icon-heart></i> {ceil(_user.stats.hp)} / 50</span>
-                </div>
+                <!-- progress bars -->
+                <div class="progress-bars">
+                    <div class="progress progress-danger" rel=tooltip data-placement=bottom title="Health">
+                        <div class="bar" style="width: {percent(_user.stats.hp, 50)}%;"></div>
+                        <span class="progress-text"><i class=icon-heart></i> {ceil(_user.stats.hp)} / 50</span>
+                    </div>
 
-                <div class="progress progress-warning" rel=tooltip data-placement=bottom title="Experience">
-                    <div class="bar" style="width: {percent(_user.stats.exp,tnl(_user.stats.lvl))}%;"></div>
-                <span class="progress-text">
-                  {#if _user.history.exp}
-                    <a x-bind=click:toggleChart data-toggle-id="exp-chart" data-history-path="_user.history.exp" rel=tooltip title="Progress"><i class=icon-signal></i></a>&nbsp;
-                  {/}
-                  <i class=icon-star></i> {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)}
-                </span>
+                    <div class="progress progress-warning" rel=tooltip data-placement=bottom title="Experience">
+                        <div class="bar" style="width: {percent(_user.stats.exp,tnl(_user.stats.lvl))}%;"></div>
+                    <span class="progress-text">
+                      {#if _user.history.exp}
+                        <a x-bind=click:toggleChart data-toggle-id="exp-chart" data-history-path="_user.history.exp" rel=tooltip title="Progress"><i class=icon-signal></i></a>&nbsp;
+                      {/}
+                      <i class=icon-star></i> {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)}
+                    </span>
+                    </div>
+                    <div id="exp-chart" style="display:none;"></div>
                 </div>
-                <div id="exp-chart" style="display:none;"></div>
+                <!-- end .char-status -->
             </div>
-            <!-- end .char-status -->
+            <!-- end .row-fluid -->
         </div>
-        <!-- end .row-fluid -->
-    </div>
\ No newline at end of file
+    {/}
\ No newline at end of file

From 281502499bedf76ace3c7aa1cf438fd8084b6768 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 16:53:39 -0400
Subject: [PATCH 189/220] add toggle header to settings dialog

---
 views/app/header.html   | 1 -
 views/app/settings.html | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/app/header.html b/views/app/header.html
index 077ec5b31a..ede91560a4 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -1,5 +1,4 @@
 <header:>
-    <a x-bind="click:toggleHeader">[toggle header]</a>
     {#unless _user.preferences.hideHeader}
         <div class="row-fluid">
             <div class='char-status {#if gt(_partyMembers.length,1)}span8 offset2 has-party{else}span6 offset3{/}'>
diff --git a/views/app/settings.html b/views/app/settings.html
index d9715751f2..c05a5fa6ac 100644
--- a/views/app/settings.html
+++ b/views/app/settings.html
@@ -19,6 +19,10 @@
                 <small>Habit defaults to check and reset your dailies at midnight each day. You can customize that here (Enter number between 0 and 24).</small>
             </div>
 
+            <hr/>
+            <h4>Toggle Header</h4>
+            <button x-bind="click:toggleHeader">{#if _user.preferences.hideHeader}Show{else}Hide{/}</button>
+
             {{#if _user.auth.local}}
                 <hr/>
                 <h4>Change Password</h4>

From 37901ef4f4051e08021a645097b178ac540be79a Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 16:58:07 -0400
Subject: [PATCH 190/220] move settings and API into tabs

---
 views/app/settings.html | 64 +++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/views/app/settings.html b/views/app/settings.html
index c05a5fa6ac..b1684b4aad 100644
--- a/views/app/settings.html
+++ b/views/app/settings.html
@@ -1,37 +1,45 @@
 <modals:>
     {{#if _loggedIn}}
         <app:modals:modal modalId="settings-modal" header="Settings">
-            <h4>API</h4>
-            <small>Copy these for use in third party applications.</small>
-            <h6>User ID</h6>
-            <pre class=prettyprint>{_user.id}</pre>
+            <ul class="nav nav-tabs">
+                <li class="active"><a data-toggle="tab" href="#" data-target="#settings-settings">General</a></li>
+                <li><a data-toggle="tab" href="#" data-target="#settings-api">API</a></li>
+            </ul>
 
-            <h6>API Token</h6>
-            <pre class=prettyprint>{_user.apiToken}</pre>
+            <div class="tab-content">
+                <div class="tab-pane active" id="settings-settings">
+                    <h4>Custom Day Start</h4>
+                    <div class="input-append">
+                        <input class="span2" type="number" min=0 max=24 value={_user.preferences.dayStart} />
+                        <span class="add-on">:00 (24h)</span>
+                    </div>
+                    <div>
+                        <small>Habit defaults to check and reset your dailies at midnight each day. You can customize that here (Enter number between 0 and 24).</small>
+                    </div>
 
-            <hr/>
-            <h4>Custom Day Start</h4>
-            <div class="input-append">
-                <input class="span2" type="number" min=0 max=24 value={_user.preferences.dayStart} />
-                <span class="add-on">:00 (24h)</span>
+                    <hr/>
+                    <h4>Toggle Header</h4>
+                    <button x-bind="click:toggleHeader">{#if _user.preferences.hideHeader}Show{else}Hide{/}</button>
+
+                    {{#if _user.auth.local}}
+                        <hr/>
+                        <h4>Change Password</h4>
+                        <derby-auth:changePassword />
+                    {{/}}
+
+                    <hr/>
+                    <a class='btn btn-danger' data-target="#reset-modal" data-toggle="modal" rel=tooltip title="Resets your entire account (dangerous).">Reset</a>
+                    &nbsp;<a class='btn btn-danger' data-target="#restore-modal" data-toggle="modal" rel=tooltip title="Restores attributes to your character.">Restore</a>
+                </div>
+                <div class="tab-pane" id="settings-api">
+                    <small>Copy these for use in third party applications.</small>
+                    <h6>User ID</h6>
+                    <pre class=prettyprint>{_user.id}</pre>
+
+                    <h6>API Token</h6>
+                    <pre class=prettyprint>{_user.apiToken}</pre>
+                </div>
             </div>
-            <div>
-                <small>Habit defaults to check and reset your dailies at midnight each day. You can customize that here (Enter number between 0 and 24).</small>
-            </div>
-
-            <hr/>
-            <h4>Toggle Header</h4>
-            <button x-bind="click:toggleHeader">{#if _user.preferences.hideHeader}Show{else}Hide{/}</button>
-
-            {{#if _user.auth.local}}
-                <hr/>
-                <h4>Change Password</h4>
-                <derby-auth:changePassword />
-            {{/}}
-
-            <hr/>
-            <a class='btn btn-danger' data-target="#reset-modal" data-toggle="modal" rel=tooltip title="Resets your entire account (dangerous).">Reset</a>
-            &nbsp;<a class='btn btn-danger' data-target="#restore-modal" data-toggle="modal" rel=tooltip title="Restores attributes to your character.">Restore</a>
 
             <@footer>
                 <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>

From 566f1aa230922eeb17a3b40d581098c2a7d7f997 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 17:47:42 -0400
Subject: [PATCH 191/220] add change for mutlipel subdomain GA tracking

---
 views/app/index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/app/index.html b/views/app/index.html
index 032412e3a3..549cbbe348 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -41,11 +41,13 @@
     <!-- scripts go in /src/app/browser.coffee, that way we can get min/concat -->
     <!-- only the ones that are remote and can't be done async are here -->
     <script src="https://checkout.stripe.com/v2/checkout.js"></script>
+
     {#if equal(_view.nodeEnv,"production")}
         <!-- Google Analytics -->
         <script type="text/javascript">
             var _gaq = _gaq || [];
             _gaq.push(['_setAccount', 'UA-33510635-1']);
+            _gaq.push(['_setDomainName', 'habitrpg.com']);
             _gaq.push(['_trackPageview']);
 
             (function() {

From 6c61c0f7dbd65735d16301482dfdded71f15bdd2 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 17:58:37 -0400
Subject: [PATCH 192/220] add delete account functionality (*sigh*, y'all asked
 for it)

---
 src/app/character.coffee |  4 ++++
 views/app/settings.html  | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/app/character.coffee b/src/app/character.coffee
index 320791fa31..7595f386d4 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -92,6 +92,10 @@ module.exports.app = (appExports, model) ->
   appExports.toggleHeader = (e, el) ->
     user.set 'preferences.hideHeader', !user.get('preferences.hideHeader')
 
+  appExports.deleteAccount = (e, el) ->
+    model.del "users.#{user.get('id')}", ->
+      window.location.href = "/logout"
+
   user.on 'set', 'flags.customizationsNotification', (captures, args) ->
     return unless captures == true
     $('.main-avatar').popover('destroy') #remove previous popovers
diff --git a/views/app/settings.html b/views/app/settings.html
index b1684b4aad..e3571514ce 100644
--- a/views/app/settings.html
+++ b/views/app/settings.html
@@ -28,8 +28,10 @@
                     {{/}}
 
                     <hr/>
+                    <h4>Danger Zone</h4>
                     <a class='btn btn-danger' data-target="#reset-modal" data-toggle="modal" rel=tooltip title="Resets your entire account (dangerous).">Reset</a>
                     &nbsp;<a class='btn btn-danger' data-target="#restore-modal" data-toggle="modal" rel=tooltip title="Restores attributes to your character.">Restore</a>
+                    &nbsp;<a class='btn btn-danger' data-target="#delete-modal" data-toggle="modal" rel=tooltip title="Delete your account.">Delete</a>
                 </div>
                 <div class="tab-pane" id="settings-api">
                     <small>Copy these for use in third party applications.</small>
@@ -104,6 +106,16 @@
             </@footer>
         </app:modals:modal>
 
+        <app:modals:modal modalId="delete-modal" header="Delete Account">
+            <p>Woa woa woa! Are you sure? This will seriously delete your account forever, and it can never be restored. (Seriously, I don't know why people want this feature - but it was highly requested, so here it is).</p>
+            <p>If you're absolutely certain, type <strong>DELETE</strong> into the text-box below.</p>
+            <p><input type="text" value="{_deleteAccount}" /></p>
+            <@footer>
+                <button class="btn btn-large" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                <button data-dismiss="modal" x-bind="click:deleteAccount" class="btn btn-danger btn-small {#unless equal(_deleteAccount,'DELETE')}disabled{/}">Delete Account</button>
+            </@footer>
+        </app:modals:modal>
+
     {{else}}
         <app:modals:modal modalId="login-modal" header="Login / Register">
             <a href="/auth/facebook"><img src='/img/facebook-login-register.jpeg' alt="Login / Register With Facebook"/></a>

From 7a7c96ca57ecd508a1f0039bfa7e782c67089a92 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 17:47:42 -0400
Subject: [PATCH 193/220] add change for mutlipel subdomain GA tracking

---
 views/app/index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/views/app/index.html b/views/app/index.html
index 9d66e2fd2b..d9af998d76 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -39,11 +39,13 @@
     <!-- scripts go in /src/app/browser.coffee, that way we can get min/concat -->
     <!-- only the ones that are remote and can't be done async are here -->
     <script src="https://checkout.stripe.com/v2/checkout.js"></script>
+
     {#if equal(_view.nodeEnv,"production")}
         <!-- Google Analytics -->
         <script type="text/javascript">
             var _gaq = _gaq || [];
             _gaq.push(['_setAccount', 'UA-33510635-1']);
+            _gaq.push(['_setDomainName', 'habitrpg.com']);
             _gaq.push(['_trackPageview']);
 
             (function() {

From 368748b67a68fa41afbaec441a2e71ff14fd45cf Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 17:58:37 -0400
Subject: [PATCH 194/220] add delete account functionality (*sigh*, y'all asked
 for it)

---
 src/app/character.coffee |  4 ++++
 views/app/settings.html  | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/app/character.coffee b/src/app/character.coffee
index 320791fa31..7595f386d4 100644
--- a/src/app/character.coffee
+++ b/src/app/character.coffee
@@ -92,6 +92,10 @@ module.exports.app = (appExports, model) ->
   appExports.toggleHeader = (e, el) ->
     user.set 'preferences.hideHeader', !user.get('preferences.hideHeader')
 
+  appExports.deleteAccount = (e, el) ->
+    model.del "users.#{user.get('id')}", ->
+      window.location.href = "/logout"
+
   user.on 'set', 'flags.customizationsNotification', (captures, args) ->
     return unless captures == true
     $('.main-avatar').popover('destroy') #remove previous popovers
diff --git a/views/app/settings.html b/views/app/settings.html
index b1684b4aad..e3571514ce 100644
--- a/views/app/settings.html
+++ b/views/app/settings.html
@@ -28,8 +28,10 @@
                     {{/}}
 
                     <hr/>
+                    <h4>Danger Zone</h4>
                     <a class='btn btn-danger' data-target="#reset-modal" data-toggle="modal" rel=tooltip title="Resets your entire account (dangerous).">Reset</a>
                     &nbsp;<a class='btn btn-danger' data-target="#restore-modal" data-toggle="modal" rel=tooltip title="Restores attributes to your character.">Restore</a>
+                    &nbsp;<a class='btn btn-danger' data-target="#delete-modal" data-toggle="modal" rel=tooltip title="Delete your account.">Delete</a>
                 </div>
                 <div class="tab-pane" id="settings-api">
                     <small>Copy these for use in third party applications.</small>
@@ -104,6 +106,16 @@
             </@footer>
         </app:modals:modal>
 
+        <app:modals:modal modalId="delete-modal" header="Delete Account">
+            <p>Woa woa woa! Are you sure? This will seriously delete your account forever, and it can never be restored. (Seriously, I don't know why people want this feature - but it was highly requested, so here it is).</p>
+            <p>If you're absolutely certain, type <strong>DELETE</strong> into the text-box below.</p>
+            <p><input type="text" value="{_deleteAccount}" /></p>
+            <@footer>
+                <button class="btn btn-large" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                <button data-dismiss="modal" x-bind="click:deleteAccount" class="btn btn-danger btn-small {#unless equal(_deleteAccount,'DELETE')}disabled{/}">Delete Account</button>
+            </@footer>
+        </app:modals:modal>
+
     {{else}}
         <app:modals:modal modalId="login-modal" header="Login / Register">
             <a href="/auth/facebook"><img src='/img/facebook-login-register.jpeg' alt="Login / Register With Facebook"/></a>

From 4ec94e4ed897d15ec978854404032c32abcd04f5 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 18:26:40 -0400
Subject: [PATCH 195/220] remove snark

---
 views/app/settings.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/views/app/settings.html b/views/app/settings.html
index e3571514ce..6bdd3b06c4 100644
--- a/views/app/settings.html
+++ b/views/app/settings.html
@@ -107,8 +107,7 @@
         </app:modals:modal>
 
         <app:modals:modal modalId="delete-modal" header="Delete Account">
-            <p>Woa woa woa! Are you sure? This will seriously delete your account forever, and it can never be restored. (Seriously, I don't know why people want this feature - but it was highly requested, so here it is).</p>
-            <p>If you're absolutely certain, type <strong>DELETE</strong> into the text-box below.</p>
+            <p>Woa woa woa! Are you sure? This will seriously delete your account forever, and it can never be restored. If you're absolutely certain, type <strong>DELETE</strong> into the text-box below.</p>
             <p><input type="text" value="{_deleteAccount}" /></p>
             <@footer>
                 <button class="btn btn-large" data-dismiss="modal" aria-hidden="true">Cancel</button>

From 14babdbf243e33a9a42d27f0c242669f4eca09c7 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 18:26:40 -0400
Subject: [PATCH 196/220] remove snark

---
 views/app/settings.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/views/app/settings.html b/views/app/settings.html
index e3571514ce..6bdd3b06c4 100644
--- a/views/app/settings.html
+++ b/views/app/settings.html
@@ -107,8 +107,7 @@
         </app:modals:modal>
 
         <app:modals:modal modalId="delete-modal" header="Delete Account">
-            <p>Woa woa woa! Are you sure? This will seriously delete your account forever, and it can never be restored. (Seriously, I don't know why people want this feature - but it was highly requested, so here it is).</p>
-            <p>If you're absolutely certain, type <strong>DELETE</strong> into the text-box below.</p>
+            <p>Woa woa woa! Are you sure? This will seriously delete your account forever, and it can never be restored. If you're absolutely certain, type <strong>DELETE</strong> into the text-box below.</p>
             <p><input type="text" value="{_deleteAccount}" /></p>
             <@footer>
                 <button class="btn btn-large" data-dismiss="modal" aria-hidden="true">Cancel</button>

From 545e5fc2a49e00e2d96656d9e2ceb1b2eac48e62 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Mar 2013 18:39:39 -0400
Subject: [PATCH 197/220] allow manually unlocking party system

---
 src/app/party.coffee    | 11 +++++++++--
 views/app/settings.html |  5 +++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/app/party.coffee b/src/app/party.coffee
index fe5f795277..30592b5557 100644
--- a/src/app/party.coffee
+++ b/src/app/party.coffee
@@ -71,8 +71,7 @@ module.exports.partySubscribe = partySubscribe = (page, model, params, next, cb)
 module.exports.app = (appExports, model) ->
   user = model.at('_user')
 
-  user.on 'set', 'flags.partyEnabled', (captures, args) ->
-    return unless captures == true
+  unlockPartiesNotification = ->
     $('.main-avatar').popover('destroy') #remove previous popovers
     html = """
            <div class='party-system-popover'>
@@ -89,6 +88,14 @@ module.exports.app = (appExports, model) ->
       content: html
     $('.main-avatar').popover 'show'
 
+  appExports.manuallyUnlockParties = ->
+    $("#settings-modal").modal("hide")
+    user.set('flags.partyEnabled', true)
+    unlockPartiesNotification()
+
+  user.on 'set', 'flags.partyEnabled', (captures, args) ->
+    unlockPartiesNotification() if captures == true
+
   #TODO implement this when we have unsubscribe working properly
   model.on 'set', '_user.party.invitation', (after, before) ->
     if !before? and after? # they just got invited
diff --git a/views/app/settings.html b/views/app/settings.html
index 6bdd3b06c4..5ac441c627 100644
--- a/views/app/settings.html
+++ b/views/app/settings.html
@@ -18,8 +18,9 @@
                     </div>
 
                     <hr/>
-                    <h4>Toggle Header</h4>
-                    <button x-bind="click:toggleHeader">{#if _user.preferences.hideHeader}Show{else}Hide{/}</button>
+                    <h4>Misc</h4>
+                    <button x-bind="click:toggleHeader">{#if _user.preferences.hideHeader}Show Header{else}Hide Header{/}</button>
+                    {#unless _user.flags.partyEnabled}&nbsp;<button x-bind="click:manuallyUnlockParties" data-dismiss='modal' rel=tooltip title="Parties are unlocked automatically for usability reasons, but you can override that here.">Enable Parties</button>{/}
 
                     {{#if _user.auth.local}}
                         <hr/>

From 14a892043aa08f38048d02c3acbc99b436472e3b Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sat, 16 Mar 2013 11:50:02 -0400
Subject: [PATCH 198/220] add some api comments (just so i can visually
 separate the functions for now)

---
 src/server/api.coffee | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 4c2fa2984a..d5ea019f8e 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -20,9 +20,15 @@ NO_USER_FOUND = err: "No user found."
   $ mocha test/api.mocha.coffee
 ###
 
+###
+  API Status
+###
 router.get '/status', (req, res) ->
   res.json status: 'up'
 
+###
+  beforeEach auth interceptor
+###
 auth = (req, res, next) ->
   uid = req.headers['x-api-user']
   token = req.headers['x-api-key']
@@ -38,7 +44,9 @@ auth = (req, res, next) ->
     return res.json 401, NO_USER_FOUND if !req.userObj || _.isEmpty(req.userObj)
     req._isServer = true
     next()
-
+###
+  GET /user
+###
 router.get '/user', auth, (req, res) ->
   user = req.userObj
 
@@ -49,12 +57,18 @@ router.get '/user', auth, (req, res) ->
 
   res.json user
 
+###
+  GET /user/task/:id
+###
 router.get '/user/task/:id', auth, (req, res) ->
   task = req.userObj.tasks[req.params.id]
   return res.json 400, err: "No task found." if !task || _.isEmpty(task)
 
   res.json 200, task
 
+###
+  validate task
+###
 validateTask = (req, res, next) ->
   task = {}
   newTask = { type, text, notes, value, up, down, completed } = req.body
@@ -85,11 +99,17 @@ validateTask = (req, res, next) ->
   req.task = task
   next()
 
+###
+  PUT /user/task/:id
+###
 router.put '/user/task/:id', auth, validateTask, (req, res) ->
   req.user.set "tasks.#{req.task.id}", req.task
 
   res.json 200, req.task
 
+###
+  DELETE /user/task/:id
+###
 router.delete '/user/task/:id', auth, validateTask, (req, res) ->
   taskIds = req.user.get "#{req.task.type}Ids"
 
@@ -99,6 +119,9 @@ router.delete '/user/task/:id', auth, validateTask, (req, res) ->
 
   res.send 204
 
+###
+  POST /user/task/
+###
 router.post '/user/task', auth, validateTask, (req, res) ->
   task = req.task
   type = task.type
@@ -110,6 +133,9 @@ router.post '/user/task', auth, validateTask, (req, res) ->
 
   res.json 201, task
 
+###
+  GET /user/tasks
+###
 router.get '/user/tasks', auth, (req, res) ->
   user = req.userObj
   return res.json 400, NO_USER_FOUND if !user || _.isEmpty(user)

From 081c5c656f1edd55e64f6a96a96cab988f9c5eb5 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sat, 16 Mar 2013 16:02:15 -0400
Subject: [PATCH 199/220] another strange derby truthy issue

---
 views/app/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/app/header.html b/views/app/header.html
index ede91560a4..d7c7ab9b83 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -1,5 +1,5 @@
 <header:>
-    {#unless _user.preferences.hideHeader}
+    {#unless equal(_user.preferences.hideHeader,true)}
         <div class="row-fluid">
             <div class='char-status {#if gt(_partyMembers.length,1)}span8 offset2 has-party{else}span6 offset3{/}'>
 

From 903479af5a975be6b2c26ae61a9a2ed1fe03e0a4 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sat, 16 Mar 2013 19:10:40 -0400
Subject: [PATCH 200/220] add view functions and(), or(), notEqual()

---
 src/app/helpers.coffee | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/app/helpers.coffee b/src/app/helpers.coffee
index b6389bfba9..363f0b7ada 100644
--- a/src/app/helpers.coffee
+++ b/src/app/helpers.coffee
@@ -1,4 +1,5 @@
-moment = require('moment')
+moment = require 'moment'
+_ = require 'underscore'
 
 # Absolute diff between two dates
 module.exports.daysBetween = (yesterday, now, dayStart) ->
@@ -37,4 +38,8 @@ module.exports.viewHelpers = (view) ->
     loc = window?.location.host or process.env.BASE_URL
     encodeURIComponent "http://#{loc}/v1/users/#{uid}/calendar.ics?apiToken=#{apiToken}"
 
+  view.fn "notEqual", (a, b) -> (a != b)
+  view.fn "and", -> _.reduce arguments, (cumm, curr) -> cumm && curr
+  view.fn "or", -> _.reduce arguments, (cumm, curr) -> cumm || curr
+
 

From 9501e67661f58547720b54711c77720c262ee619 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sat, 16 Mar 2013 19:21:27 -0400
Subject: [PATCH 201/220] add missing namespaces for rewards & tasks for
 consistency & organization

---
 views/app/index.html   |  6 ++---
 views/app/modals.html  |  4 ++--
 views/app/rewards.html | 16 ++++++-------
 views/app/tasks.html   | 54 +++++++++++++++++++++---------------------
 4 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/views/app/index.html b/views/app/index.html
index 549cbbe348..8664b784a0 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -1,9 +1,9 @@
 <import: src="modals">
-<import: src="tasks" ns="">
+<import: src="tasks">
 <import: src="header">
 <import: src="alerts">
 <import: src="avatar">
-<import: src="rewards" ns="">
+<import: src="rewards">
 <import: src="footer">
 <import: src="settings">
 <import: src="party">
@@ -31,7 +31,7 @@
   <div id="wrap">
     <app:alerts:alerts />
     <div id=main class="grid">
-      <app:taskLists />
+      <app:tasks:taskLists />
     </div>
   </div>
   
diff --git a/views/app/modals.html b/views/app/modals.html
index 5b0b26792f..aa6d010a1d 100644
--- a/views/app/modals.html
+++ b/views/app/modals.html
@@ -17,7 +17,7 @@
 
     <!-- Re-Roll modal -->
     <app:modals:modal modalId='reroll-modal' header="Reset Your Tasks">
-        <app:userTokens/>
+        <app:rewards:userTokens/>
         <p>Highly discouraged because red tasks provide good incentive to improve (<a target="_blank" href="https://github.com/lefnire/habitrpg#all-my-tasks-are-red-im-dying-too-fast">read more</a>). However, this becomes necessary after long bouts of bad habits.</p>
         <@footer>
             {#if lt(_user.balance,1)}
@@ -30,7 +30,7 @@
 
     <!-- Buy more tokens modal -->
     <app:modals:modal modalId='more-tokens-modal' header="Out Of Tokens">
-        <app:userTokens/>
+        <app:rewards:userTokens/>
         <p>You're out of tokens, which are used to buy pets and mounts.</p>
         <@footer>
         <a data-dismiss="modal" x-bind="click:showStripe" class="btn btn-success btn-large">Buy More Tokens</a><span class='token-cost'>Not enough tokens</span>
diff --git a/views/app/rewards.html b/views/app/rewards.html
index 6a8c0bb4a7..340882a36b 100644
--- a/views/app/rewards.html
+++ b/views/app/rewards.html
@@ -1,22 +1,22 @@
 <rewardsTab:>
     <!-- add new reward -->
-    <app:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
+    <app:tasks:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
 
     {#if _rewardList}        
     <ul class='rewards'>
-        {#each _rewardList as :task}<app:task />{/}
+        {#each _rewardList as :task}<app:tasks:task />{/}
     </ul>
     {/}
 
 
     {#if _user.flags.itemsEnabled}
     <ul class='items'>
-        {#with _view.items.weapon as :item}<app:item />{/}
-        {#with _view.items.armor as :item}<app:item />{/}
-        {#with _view.items.head as :item}<app:item />{/}
-        {#with _view.items.shield as :item}<app:item />{/}
-        {#with _view.items.potion as :item}<app:item />{/}
-        {#with _view.items.reroll as :item}<app:item reroll=true />{/}
+        {#with _view.items.weapon as :item}<app:rewards:item />{/}
+        {#with _view.items.armor as :item}<app:rewards:item />{/}
+        {#with _view.items.head as :item}<app:rewards:item />{/}
+        {#with _view.items.shield as :item}<app:rewards:item />{/}
+        {#with _view.items.potion as :item}<app:rewards:item />{/}
+        {#with _view.items.reroll as :item}<app:rewards:item reroll=true />{/}
     </ul>
     {/}
 
diff --git a/views/app/tasks.html b/views/app/tasks.html
index c038cfdb8d..1290268b4c 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -5,8 +5,8 @@
     <div class="module">
         <div class="task-column habits">
             <h2 class="task-column_title">Habits</h2>
-            <app:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
-            <ul class="habits">{#each _habitList as :task}<app:task />{/}</ul>
+            <app:tasks:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
+            <ul class="habits">{#each _habitList as :task}<app:tasks:task />{/}</ul>
         </div>
     </div>
 
@@ -14,8 +14,8 @@
     <div class="module">
         <div class="task-column dailys">
             <h2 class="task-column_title">Daily</h2>
-            <app:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
-            <ul class='dailys'>{#each _dailyList as :task}<app:task />{/}</ul>
+            <app:tasks:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
+            <ul class='dailys'>{#each _dailyList as :task}<app:tasks:task />{/}</ul>
         </div>
     </div>
 
@@ -34,12 +34,12 @@
 
             <!-- create new todo -->
             <div class="display-context-dependant show-for-uncompleted">
-                <app:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
+                <app:tasks:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
             </div>
 
             <!-- list of all the todos -->
             <ul class='todos task-list'>
-                {#each _todoList as :task}<app:task />{/}
+                {#each _todoList as :task}<app:tasks:task />{/}
             </ul>
             
             <button class='task-action-btn tile spacious bright display-context-dependant show-for-completed' x-bind=click:clearCompleted>Clear Completed</button>
@@ -72,7 +72,7 @@
                     <span class='shop_copper' rel='tooltip' title='Copper'></span>
                 </div> -->
                 {else}
-                <app:userTokens />
+                <app:rewards:userTokens />
                 {/}
             </span>
             <h2 class="task-column_title">Rewards</h2>
@@ -82,7 +82,7 @@
                 <div class='tabbable tabs-below'>
                     <div class="tab-content">
                         <div class="tab-pane active" id="rewards-tab">
-                            <app:rewardsTab />
+                            <app:rewards:rewardsTab />
                         </div>
                         
                         <!-- pets pane -->
@@ -90,31 +90,31 @@
                             {#with _view.items.pets as :pets}
                             <table>
                                 <tr>
-                                    {#with :pets[0]}<app:pet />{/}
-                                    {#with :pets[1]}<app:pet />{/}
-                                    {#with :pets[2]}<app:pet />{/}
-                                    {#with :pets[3]}<app:pet />{/}
+                                    {#with :pets[0]}<app:rewards:pet />{/}
+                                    {#with :pets[1]}<app:rewards:pet />{/}
+                                    {#with :pets[2]}<app:rewards:pet />{/}
+                                    {#with :pets[3]}<app:rewards:pet />{/}
                                 </tr>
                                 <tr>
-                                    {#with :pets[4]}<app:pet />{/}
-                                    {#with :pets[5]}<app:pet />{/}
-                                    {#with :pets[6]}<app:pet />{/}
-                                    {#with :pets[7]}<app:pet />{/}
+                                    {#with :pets[4]}<app:rewards:pet />{/}
+                                    {#with :pets[5]}<app:rewards:pet />{/}
+                                    {#with :pets[6]}<app:rewards:pet />{/}
+                                    {#with :pets[7]}<app:rewards:pet />{/}
                                 </tr>
                                 <tr>
-                                    {#with :pets[8]}<app:pet />{/}
-                                    {#with :pets[9]}<app:pet />{/}
-                                    {#with :pets[10]}<app:pet />{/}
-                                    {#with :pets[11]}<app:pet />{/}
+                                    {#with :pets[8]}<app:rewards:pet />{/}
+                                    {#with :pets[9]}<app:rewards:pet />{/}
+                                    {#with :pets[10]}<app:rewards:pet />{/}
+                                    {#with :pets[11]}<app:rewards:pet />{/}
                                 </tr>
                                 <tr>
-                                    {#with :pets[12]}<app:pet />{/}
-                                    {#with :pets[13]}<app:pet />{/}
-                                    {#with :pets[14]}<app:pet />{/}
-                                    {#with :pets[15]}<app:pet />{/}
+                                    {#with :pets[12]}<app:rewards:pet />{/}
+                                    {#with :pets[13]}<app:rewards:pet />{/}
+                                    {#with :pets[14]}<app:rewards:pet />{/}
+                                    {#with :pets[15]}<app:rewards:pet />{/}
                                 </tr>
                                 <tr>
-                                    {#with :pets[16]}<app:pet />{/}
+                                    {#with :pets[16]}<app:rewards:pet />{/}
                                 </tr>
                             </table>
                             {/}
@@ -131,7 +131,7 @@
 
             <!-- if pets are disabled, just do rewards tab -->
             {else}
-                <app:rewardsTab />
+                <app:rewards:rewardsTab />
             {/}
         </div>
     </div>
@@ -192,7 +192,7 @@
         <p class="task-text">{:task.text}</p>
 
         <!-- edit/options dialog -->
-        <app:taskMeta />
+        <app:tasks:taskMeta />
     </li>
 
 <!-- task edit/options -->

From dbc3906eb3f7afa4350fc10acecac22650c4251a Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sat, 16 Mar 2013 20:02:01 -0400
Subject: [PATCH 202/220] possible fix to dom losing functions after
 model.resetDom()

---
 src/app/browser.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/browser.coffee b/src/app/browser.coffee
index e10340ac17..b0f6300a6b 100644
--- a/src/app/browser.coffee
+++ b/src/app/browser.coffee
@@ -194,8 +194,8 @@ setupGrowlNotifications = (model) ->
 
 
 module.exports.resetDom = (model) ->
-  window.DERBY.app.dom.clear()
-  window.DERBY.app.view.render(model)
+  DERBY.app.dom.clear()
+  DERBY.app.view.render(model, DERBY.app.view._lastRender.ns, DERBY.app.view._lastRender.context);
 
 module.exports.app = (appExports, model, app) ->
   loadJavaScripts(model)

From ee9e6064b2c015d36cecaf2f5811cb1d6cd24d45 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sat, 16 Mar 2013 23:03:59 -0400
Subject: [PATCH 203/220] add a ton of static page, beef up the footer, make
 this website look official! @zakkain, I hope I didn't break anything!

---
 README.md                                 |  12 +-
 public/addons-extensions.html             |   0
 public/css/footer.css                     |  76 +++
 public/{copy.css => css/static-pages.css} |   0
 public/faq.html                           |   0
 public/splash.html                        | 129 -----
 public/team.html                          | 125 -----
 src/server/middleware.coffee              |   5 +-
 src/server/static.coffee                  |  16 +-
 styles/app/index.styl                     |  10 -
 views/app/footer.html                     | 102 ++--
 views/privacy.html                        | 336 -----------
 views/static/about.html                   |  68 +++
 views/static/extensions.html              |  43 ++
 views/static/faq.html                     |  55 ++
 views/static/front.html                   |  28 +
 views/static/head.html                    |  15 +
 views/static/header.html                  |  33 ++
 views/static/privacy.html                 | 347 ++++++++++++
 views/static/team.html                    |  74 +++
 views/static/terms.html                   | 646 ++++++++++++++++++++++
 views/terms.html                          | 636 ---------------------
 22 files changed, 1468 insertions(+), 1288 deletions(-)
 delete mode 100644 public/addons-extensions.html
 create mode 100644 public/css/footer.css
 rename public/{copy.css => css/static-pages.css} (100%)
 delete mode 100644 public/faq.html
 delete mode 100644 public/splash.html
 delete mode 100644 public/team.html
 delete mode 100644 views/privacy.html
 create mode 100644 views/static/about.html
 create mode 100644 views/static/extensions.html
 create mode 100644 views/static/faq.html
 create mode 100644 views/static/front.html
 create mode 100644 views/static/head.html
 create mode 100644 views/static/header.html
 create mode 100644 views/static/privacy.html
 create mode 100644 views/static/team.html
 create mode 100644 views/static/terms.html
 delete mode 100644 views/terms.html

diff --git a/README.md b/README.md
index cb809a92e5..10aeab7503 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,11 @@
 #[HabitRPG](http://habitrpg.com/)
 
-[HabitRPG](http://habitrpg.com/) is a habit tracker app which treats your goals like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.
+HabitRPG is a habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.
+
+[Read more](https://habitrpg.com/static/about)
 
 ![Screenshot](https://raw.github.com/lefnire/habitrpg/master/public/img/screenshot.jpeg "Screenshot")
 
-###[About](https://habitrpg.com/splash.html)
-###[Running Locally](https://github.com/lefnire/habitrpg/wiki/Running-Locally)
-###[API](https://github.com/lefnire/habitrpg/wiki/API)
-
-##Contact
-###[Bugs](https://github.com/lefnire/habitrpg/issues)
-###[New Features](https://trello.com/board/habitrpg/50e5d3684fe3a7266b0036d6)
-
 ##License
 Code is licensed under GNU GPL v3. Content is licensed under CC-BY-SA 3.0.
 See the LICENSE file for details.
diff --git a/public/addons-extensions.html b/public/addons-extensions.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/public/css/footer.css b/public/css/footer.css
new file mode 100644
index 0000000000..751d4d01a4
--- /dev/null
+++ b/public/css/footer.css
@@ -0,0 +1,76 @@
+/* Sticky footer styles
+-------------------------------------------------- */
+
+html,
+body {
+    height: 100%;
+    /* The html and body elements cannot have any padding or margin. */
+}
+
+/* Wrapper for page content to push down footer */
+#wrap {
+    min-height: 100%;
+    height: auto !important;
+    height: 100%;
+    /* Negative indent footer by it's height */
+    margin: 0 auto -60px;
+}
+
+/* Set the fixed height of the footer here */
+#push,
+#footer {
+    height: 60px;
+}
+#footer {
+    background-color: #f5f5f5;
+}
+
+/* Lastly, apply responsive CSS fixes as necessary */
+@media (max-width: 767px) {
+    #footer {
+        margin-left: -20px;
+        margin-right: -20px;
+        padding-left: 20px;
+        padding-right: 20px;
+    }
+}
+
+
+
+/* Custom page CSS
+-------------------------------------------------- */
+/* Not required for template or sticky footer method. */
+
+#wrap > .container {
+    padding-top: 60px;
+}
+.container .credit {
+    margin: 20px 0;
+}
+
+code {
+    font-size: 80%;
+}
+
+
+
+/* HabitRPG Custom CSS
+-------------------------------------------------- */
+
+.footer {
+    /*padding: 70px 0;*/
+    border-top: 1px solid #e5e5e5;
+    background-color: #f5f5f5;
+}
+
+.footer li {
+    text-align: left;
+}
+
+.footer h4 {
+    text-align: left;
+}
+
+.footer td {
+    align: left !important;
+}
\ No newline at end of file
diff --git a/public/copy.css b/public/css/static-pages.css
similarity index 100%
rename from public/copy.css
rename to public/css/static-pages.css
diff --git a/public/faq.html b/public/faq.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/public/splash.html b/public/splash.html
deleted file mode 100644
index a48ddaef86..0000000000
--- a/public/splash.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<html>
-    <head>
-        <meta charset="utf-8">
-        <title>HabitRPG | Gamify Your Life</title>
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-        <!-- Le styles -->
-        <link href="/vendor/bootstrap/docs/assets/css/bootstrap.css" rel="stylesheet">
-        <link href="/vendor/bootstrap/docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
-        <link href="/vendor/bootstrap/docs/assets/css/docs.css" rel="stylesheet">
-        <link href="/copy.css" rel="stylesheet">
-
-        <script type="text/javascript" src="vendor/jquery-ui/jquery-1.9.1.js"></script>
-        <script type="text/javascript">
-            $.getScript("https://s7.addthis.com/js/250/addthis_widget.js#pubid=lefnire");
-        </script>
-    </head>
-
-    <body>
-    <div class="navbar navbar-inverse navbar-fixed-top">
-        <div class="navbar-inner">
-            <div class="container">
-                <a class="brand" href="/splash.html">HabitRPG</a>
-                <div class="nav-collapse collapse">
-                    <ul class="nav">
-                        <li class="">
-                            <a href="/splash.html">About</a>
-                        </li>
-                        <li class="">
-                            <a href="/team.html">Team</a>
-                        </li>
-                        <li class="">
-                            <a href="/splash.html">Addons / Extensions</a>
-                        </li>
-                        <li class="">
-                            <a href="/faq.html">FAQ</a>
-                        </li>
-                        <li class="">
-                            <a href="/contact.html">Contact</a>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-        <div class='jumbotron masthead'>
-            <div class='container'>            
-                <h1><img src="/img/logo/habitrpg_pixel.png" alt="HabitRPG"/></h1>
-                <p>A habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.</p>
-                <a href="/?play=1" class='btn btn-primary btn-small'>Play</a>
-            </div>
-        </div>
-        <div class="bs-docs-social">
-            <div class="container">
-                <ul class="bs-docs-social-buttons">
-                    <li>
-                        <table>
-                            <tr>
-                                <td><!-- Github -->
-                                    <iframe src="/vendor/github-buttons/github-btn.html?user=lefnire&repo=habitrpg&type=watch&count=true"
-                                            allowtransparency="true" frameborder="0" scrolling="0" width="85px" height="20px"></iframe>
-                                </td>
-                                <td>
-                                    <div class="addthis_toolbox addthis_default_style "
-                                         addthis:url="https://habitrpg.com"
-                                         addthis:title="HabitRPG: Role Playing Game for Self Improvement">
-                                        <a class="addthis_button_facebook_like" fb:like:layout="button_count"></a>
-                                        <a class="addthis_button_tweet" tw:via="habitrpg"></a>
-                                    </div>
-                                </td>
-                                <td><a href="http://habitrpg.tumblr.com/">Blog</a>&nbsp;-&nbsp;</td>
-                                <td><a href="https://github.com/lefnire/habitrpg/wiki/FAQ">FAQ</a>&nbsp;-&nbsp;</td>
-                                <td><a href="https://github.com/lefnire/habitrpg/wiki/API">API</a>&nbsp;-&nbsp;</td>
-                                <td><a href="https://github.com/lefnire/habitrpg#contact">Contact</a></td>
-                            </tr>
-
-                        </table>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        <div class='container'>
-            <div class='marketing'>
-                <p>&nbsp;</p>
-                <p><iframe src="http://player.vimeo.com/video/57639356" width="960" height="539" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe></p>
-            </div>
-
-            <section>
-                <div class="page-header">
-                    <h1>Habits</h1>
-                </div>
-                <p class="lead">Habits are situational goals that you constantly track. You can either try to break bad habits or reinforce good ones. You may encounter some habits multiple times a day (like "Floss After Eating"), and some you may not encounter often at all (like "Replace the Toilet Paper When it Runs Out"). For some habits, it only makes sense to gain points (like "Do One Hour of Productive Work"). For others, it only makes sense to lose points (like "Eat Junk Food"). For the rest, both gain and loss apply (like for "Take The Stairs", taking the stairs would be a gain while taking the elevator would be a loss).</p>
-            </section>
-
-            <section>
-                <div class="page-header">
-                    <h1>Dailies</h1>
-                </div>
-                <p class="lead">Dailies are goals that you want to complete once a day, building them into your routine (like "Workout for 30 Minutes"). Unlike Habits, Dailies may only be checked off once a day. Also unlike habits, at the end of each day non-completed Dailies will cause damage, making you lose Hit Points. If you are doing well and consistantly check off a Daily day after day, it will turn green and earn less gold and experience, though it will also cause you to lose fewer Hit Points if you skip it. This means you can ease up on it for a bit. Conversely, if you are doing poorly and fail to check something off every day, it will turn red. The worse you do, the more experience and gold that Daily is worth and the more hit points it takes away if left uncompleted. This encourages you to focus on your shortcomings, the reds. Oh, and don't worry. You can make a Daily active only for certain days of the week, so weekday tasks won't pester you on the weekends. Or you can make a Daily active only on Mondays, thus creating a weekly task.</p>
-            </section>
-
-            <section>
-                <div class="page-header">
-                    <h1>Todos</h1>
-                </div>
-                <p class="lead">Todos are one-time goals which need to be completed eventually (like "Wash the car" or "Buy milk"). Non-completed Todos won’t hurt you, but they will become more valuable over time. This will encourage you to wrap up stale Todos.</p>
-            </section>
-
-            <section>
-                <div class="page-header">
-                    <h1>Rewards</h1>
-                </div>
-                <p class='lead'>As you complete goals, you earn gold to buy rewards that you create (like "An Hour of Video Games"). Create plenty of rewards and buy them liberally! Rewarding good performance is the best way to reinforce good habits. If you really need a reward but don't have enough gold, you can still make a purchase. But be careful because it will cost you Hit Points!</p>
-                <p class='lead'>After you’ve reached level 2, you unlock the <strong>Item Store</strong> under the rewards column. You can now buy weapons, armor, and potions. Armor keeps you protected by reducing how much damage you take from failed tasks. Weapons increase how much experience you gain for completing a task. Potions recover 15 HP, for when you've piled just a little too much onto your schedule.</p>
-            </section>
-
-            <section>
-                <div class="page-header">
-                    <h1>License & Credits</h1>
-                </div>
-                <p class='lead'>Code is licensed under GNU GPL v3. Content is licensed under CC-BY-SA 3.0. See the LICENSE file for details.</p>
-
-                <p class='lead'>Content and assets comes from Mozilla’s <a href="http://browserquest.mozilla.org/">BrowserQuest</a> (<a href="http://mozilla.org">Mozilla</a>, <a href="http://www.littleworkshop.fr">Little Workshop</a>). They seriously rock.
-                </p>
-            </section>
-
-        </div>
-    </body>
-</html>
diff --git a/public/team.html b/public/team.html
deleted file mode 100644
index ace3708906..0000000000
--- a/public/team.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<html>
-    <head>
-        <meta charset="utf-8">
-        <title>HabitRPG | Team</title>
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-        <!-- Le styles -->
-        <link href="/vendor/bootstrap/docs/assets/css/bootstrap.css" rel="stylesheet">
-        <link href="/vendor/bootstrap/docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
-        <link href="/vendor/bootstrap/docs/assets/css/docs.css" rel="stylesheet">
-        <link href="/copy.css" rel="stylesheet">
-
-        <script type="text/javascript" src="vendor/jquery-ui/jquery-1.9.1.js"></script>
-        <script src="/vendor/bootstrap/js/bootstrap-scrollspy.js"></script>
-    </head>
-
-    <body data-spy="scroll" data-target=".bs-docs-sidebar">
-
-        <div class="navbar navbar-inverse navbar-fixed-top">
-            <div class="navbar-inner">
-                <div class="container">
-                    <a class="brand" href="/splash.html">HabitRPG</a>
-                    <div class="nav-collapse collapse">
-                        <ul class="nav">
-                            <li class="">
-                                <a href="/splash.html">About</a>
-                            </li>
-                            <li class="">
-                                <a href="/splash.html">Blog</a>
-                            </li>
-                            <li class="">
-                                <a href="/team.html">Team</a>
-                            </li>
-                            <li class="">
-                                <a href="/splash.html">Addons / Extensions</a>
-                            </li>
-                            <li class="">
-                                <a href="/faq.html">FAQ</a>
-                            </li>
-                            <li class="">
-                                <a href="/faq.html">API</a>
-                            </li>
-                            <li class="">
-                                <a href="/contact.html">Contact</a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <header class="jumbotron subhead" id="overview">
-            <div class="container">
-                <h1>Team</h1>
-                <p class="lead">The HabitRPG team has developed organically in a meritocratic fashion. We're still figuring it all out, but the members we have listed here have contributed greatly.  If you want to be part of the team, contribute to the repository, and if you're a big asset we'll likely adopt you :) See the <a href="https://github.com/lefnire/habitrpg/wiki/Business-Model">Count Me In</a></p>
-            </div>
-        </header>
-        <div class='container'>
-            <div class='row'>
-                <div class="span3 bs-docs-sidebar">
-                    <ul class="nav nav-list bs-docs-sidenav affix-top">
-                        <li><a href="#developers"><i class="icon-chevron-right"></i> Developers</a></li>
-                        <li><a href="#pixel-artists"><i class="icon-chevron-right"></i> Pixel Artists</a></li>
-                        <li><a href="#mobile-developers"><i class="icon-chevron-right"></i> Mobile Developers</a></li>
-                        <li><a href="#designers"><i class="icon-chevron-right"></i> Designers</a></li>
-                        <li><a href="#community-managers"><i class="icon-chevron-right"></i> Community Managers</a></li>
-                    </ul>
-                </div>
-
-                <div class='span9'>
-                    <section>
-                        <div class="page-header">
-                            <h1 id="developers">Developers</h1>
-                            <ul>
-                                <li><a href="https://github.com/lefnire">Tyler Renelle</a></li>
-                                <li><a href="https://github.com/switz">Daniel Saewitz</a></li>
-                                <li><a href="https://github.com/SlappyBag">Stan Lindsey</a></li>
-                                <li><a href="https://github.com/MrConcept">Philip How</a></li>
-                            </ul>
-                        </div>
-                    </section>
-
-                    <section>
-                        <div class="page-header">
-                            <h1 id="pixel-artists">Pixel Artists</h1>
-                            <ul>
-                                <li><a href="https://github.com/pandoro">Alex Hermans</a></li>
-                                <li><a href="https://github.com/Shaners">Shane Listers</a></li>
-                            </ul>
-                        </div>
-                    </section>
-
-                    <section>
-                        <div class="page-header">
-                            <h1 id="mobile-developers">Mobile Developers</h1>
-                            <ul>
-                                <li><a href="https://github.com/litenull">Tomaz Korenika</a></li>
-                                <li><a href="https://github.com/lefnire">Tyler Renelle</a></li>
-                            </ul>
-                        </div>
-                    </section>
-
-                    <section>
-                        <div class="page-header">
-                            <h1 id="designers">Designers</h1>
-                            <ul>
-                                <li><a href="https://github.com/zakkain">Zachary Kain</a></li>
-                            </ul>
-                        </div>
-                    </section>
-
-                    <section>
-                        <div class="page-header">
-                            <h1 id="community-managers">Community Management</h1>
-                            <ul>
-                                <li><a href="https://github.com/wc8">@wc8</a></li>
-                                <li><a href="https://github.com/horusofoz">Jeff Smith</a></li>
-                            </ul>
-                        </div>
-                    </section>
-                 </div>
-            </div>
-        </div>
-
-    </body>
-</html>
diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee
index 47ccaad07b..60a392faee 100644
--- a/src/server/middleware.coffee
+++ b/src/server/middleware.coffee
@@ -1,6 +1,7 @@
 module.exports.splash = (req, res, next) ->
-  unless req.query?.play? or req.getModel().get('_userId')
-    res.redirect('/splash.html')
+  isStatic = req.url.split('/')[1] is 'static'
+  unless req.query?.play? or req.getModel().get('_userId') or isStatic
+    res.redirect('/static/front')
   else
     next()
 
diff --git a/src/server/static.coffee b/src/server/static.coffee
index 1d5124f35e..6ed41a41c4 100644
--- a/src/server/static.coffee
+++ b/src/server/static.coffee
@@ -7,10 +7,18 @@ derby = require 'derby'
 # ---------- Static Pages ------------
 staticPages = derby.createStatic path.dirname(path.dirname(__dirname))
 
-router.get '/privacy', (req, res) ->
-  staticPages.render 'privacy', res
+beforeEach = (req, res, next) ->
+  req.getModel().set '_view', {nodeEnv: 'production'} # we don't want cheat buttons on static pages
+  next()
 
-router.get '/terms', (req, res) ->
-  staticPages.render 'terms', res
+router.get '/splash.html', (req, res) -> return res.redirect('/static/front')
+router.get '/static/front',   beforeEach, (req, res) -> staticPages.render 'static/front', res
+router.get '/static/about',   beforeEach, (req, res) -> staticPages.render 'static/about', res
+router.get '/static/team',    beforeEach, (req, res) -> staticPages.render 'static/team', res
+router.get '/static/extensions',    beforeEach, (req, res) -> staticPages.render 'static/extensions', res
+router.get '/static/faq',    beforeEach, (req, res) -> staticPages.render 'static/faq', res
+
+router.get '/static/privacy', beforeEach, (req, res) -> staticPages.render 'static/privacy', res
+router.get '/static/terms',   beforeEach, (req, res) -> staticPages.render 'static/terms', res
 
 module.exports = router
diff --git a/styles/app/index.styl b/styles/app/index.styl
index 24a8261cce..f3b02898dd 100644
--- a/styles/app/index.styl
+++ b/styles/app/index.styl
@@ -115,16 +115,6 @@ hr
 /* Footer
 -------------------------------------------------- */
 
-.footer ul li
-  list-style:none
-  float:left
-.footer ul li:after
-  content: "\00A0\00A0|\00A0\00A0"
-.footer ul li:last-child:after
-  content: ""
-.footer table td                                                                                                                                                                                                                        
-  vertical-align: top 
-  
 /* Bootstrap website boilerplate */
 .footer {
   padding: 70px 0;
diff --git a/views/app/footer.html b/views/app/footer.html
index bd7626f248..5b671f3108 100644
--- a/views/app/footer.html
+++ b/views/app/footer.html
@@ -1,43 +1,71 @@
 <footer:>
     <footer class=footer>
         <div class=container>
-            {#if equal(_view.nodeEnv, 'production')}
-            <table class=pull-right><tr>
-                <td><!-- Github -->
-                    <iframe src="/vendor/github-buttons/github-btn.html?user=lefnire&repo=habitrpg&type=watch&count=true"
-                            allowtransparency="true" frameborder="0" scrolling="0" width="85px" height="20px"></iframe>
-                </td>
-                <td>
-                    <div class="addthis_toolbox addthis_default_style "
-                         addthis:url="https://habitrpg.com"
-                         addthis:title="HabitRPG - Gamify Your Life">
-                        <a class="addthis_button_facebook_like" fb:like:layout="button_count"></a>
-                        <a class="addthis_button_tweet" tw:via="habitrpg"></a>
-                    </div>
-                </td>
-            </tr></table>
-            {else}
-            <div class='pull-right'>
-                <button class='btn' x-bind="click:emulateNextDay">Emulate Next Day</button>
-                <button class='btn' x-bind="click:emulateTenDays">Emulate 10 Days</button>
-                <button class='btn' x-bind="click:cheat">Insta Level</button>
-                <button class='btn' x-bind='click:reset'>Reset Level</button>
-            </div>
-            {/}
-            <div>
-                <ul>
-                    <li>Copyright &copy; 2012 OCDevel LLC</li>
-                    <li><a href="/splash.html">About</a></li>
-                    <li><a target="_blank" href="http://habitrpg.tumblr.com/">Blog</a></li>
-                    <li><a target="_blank" href="https://github.com/lefnire/habitrpg/issues?state=open">Bugs</a></li>
-                    <li><a target="_blank" href="https://trello.com/board/habitrpg/50e5d3684fe3a7266b0036d6">Features</a></li>
-                    <li><a target="_blank" href="https://github.com/lefnire/habitrpg/wiki/FAQ">FAQ</a></li>
-                    <li><a target="_blank" href="https://github.com/lefnire/habitrpg/wiki/API">API</a></li>
-                    <li><a target="_blank" href="https://github.com/lefnire/habitrpg/wiki/Add-ons-and-Extensions">Add-ons / Extensions</a></li>
-                    <li><a target="_blank" href="https://github.com/lefnire/habitrpg#contact">Contact</a></li>
-                    <li><a href="/privacy">Privacy</a></li>
-                    <li><a href="/terms">Terms</a></li>
-                </ul>
+            <div class='row'>
+
+                <div class='span3'>
+                    <h4>Company</h4>
+                    <ul class='unstyled'>
+                        <li><a href="/static/about">About</a></li>
+                        <li><a target="_blank" href="http://habitrpg.tumblr.com/">Blog</a></li>
+                        <li><a href="/static/team">Team</a></li>
+                        <li><a href="/static/extensions">Extensions</a></li>
+                        <li><a href="/static/faq">FAQ</a></li>
+                    </ul>
+                </div>
+
+                <div class='span3'>
+                    <h4>Legal</h4>
+                    <ul class='unstyled'>
+                        <li><a href="/static/privacy">Privacy</a></li>
+                        <li><a href="/static/terms">Terms</a></li>
+                        <li><strong>&copy; 2012 OCDevel LLC</strong></li>
+                    </ul>
+                </div>
+
+                <div class='span3'>
+                    <h4>Community</h4>
+                    <ul class='unstyled'>
+                        <li><a target="_blank" href="https://github.com/lefnire/habitrpg/issues?state=open">Submit Bug</a></li>
+                        <li><a target="_blank" href="https://trello.com/board/habitrpg/50e5d3684fe3a7266b0036d6">Request Feature</a></li>
+                        <li><a target="_blank" href="https://github.com/lefnire/habitrpg/wiki/API">API</a></li>
+                        <li><a target="_blank" href="https://github.com/lefnire/habitrpg/wiki/Add-ons-and-Extensions">Add-ons / Extensions</a></li>
+                        <li><a target="_blank" href="http://www.kickstarter.com/projects/lefnire/habitrpg-mobile">Kickstarter</a></li>
+                        <li><a target="_blank" href="https://www.facebook.com/Habitrpg">Facebook Page</a></li>
+                        <li><a target="_blank" href="http://www.reddit.com/r/habitrpg/">Reddit</a></li>
+                    </ul>
+
+
+                </div>
+
+                <div class='span3'>
+                    {{#if equal(_view.nodeEnv, 'development')}}
+                        <h4>Cheat</h4>
+                        <ul class='unstyled'>
+                            <li><button class='btn' x-bind="click:emulateNextDay">Emulate Next Day</button></li>
+                            <li><button class='btn' x-bind="click:emulateTenDays">Emulate 10 Days</button></li>
+                            <li><button class='btn' x-bind="click:cheat">Insta Level</button></li>
+                            <li><button class='btn' x-bind='click:reset'>Reset Level</button></li>
+                        </ul>
+                    {{else}}
+                        <h4>Social</h4>
+                        <div class="addthis_toolbox addthis_default_style "
+                             addthis:url="https://habitrpg.com"
+                             addthis:title="HabitRPG - Gamify Your Life">
+                            <table>
+                                <tr><td><a class="addthis_button_facebook_like" fb:like:layout="button_count"></a></td></tr>
+                                <tr><td><a class="addthis_button_tweet" tw:via="habitrpg"></a></td></tr>
+                                <tr><td align='left'>
+                                    <iframe src="/vendor/github-buttons/github-btn.html?user=lefnire&repo=habitrpg&type=watch&count=true"
+                                            allowtransparency="true" frameborder="0" scrolling="0" width="85px" height="20px" ></iframe>
+                                </td></tr>
+                                <tr><td><a class="addthis_button_google_plusone" g:plusone:size="medium"></a> </td></tr>
+                            </table>
+                        </div>
+                    {{/}}
+
+                </div>
+
             </div>
         </div>
     </footer>
\ No newline at end of file
diff --git a/views/privacy.html b/views/privacy.html
deleted file mode 100644
index 9d6faeec80..0000000000
--- a/views/privacy.html
+++ /dev/null
@@ -1,336 +0,0 @@
-<Title:>
-  Privacy Policy
-
-<Body:>
-  <div class="well">
-    <a href="/">&laquo; Back</a>
-    <div class="page-header">
-      <h1>Privacy Policy</h1>
-    </div>
-    <p class="pagemeta">
-      Last updated September 02, 2012
-    </p>
-    <p>
-      <strong>PLEASE READ THIS PRIVACY POLICY CAREFULLY.</strong>
-      <br>
-      By accessing or otherwise using habitrpg.com or any sub domains thereto ("the Sites"), 
-      or using a habitrpg.com or HabitRPG application on a mobile device ("the Applications"), 
-      you agree to be bound contractually by this Privacy Policy. Individually 
-      or collectively, the Applications and the Sites may be referred to as 
-      the "Services."
-    </p>
-    <p>
-      To review material modifications and their effective dates scroll 
-      to the bottom of the page.
-    </p>
-    <p>
-      <strong> 1. Privacy Statement; Collection of Personal 
-      Information. </strong>
-      <br>
-      1.1 OCDevel owns and operates this business. All 
-      references to "we", "us", shall be construed to mean OCDevel.
-    </p>
-    <p>
-      1.2 We understand that visitors to this website are concerned 
-      about the privacy of information. The following describes our privacy 
-      policy regarding information, including personal information, that we 
-      collect through this website.
-    </p>
-    <p>
-      <strong>2. Modification of Privacy Policy.</strong>
-      <br>
-      We reserve the right to modify this Privacy Policy at any time, 
-      and without prior notice, by posting an amended Privacy Policy that is 
-      always accessible by clicking on the "Privacy Policy" link on this 
-      site's home page. Your continued use of this site indicates your 
-      acceptance of the amended Privacy Policy. You should check the Privacy 
-      Policy through this link periodically for modifications by clicking on 
-      the link provided near the top of the Privacy Policy for a listing of 
-      material modifications and their effective dates. Regarding personal 
-      information, if any modifications are materially less restrictive on our 
-      use or disclosure of the personal information previously disclosed by 
-      you, we will obtain your consent before implementing such revisions with 
-      respect to such information.
-    </p>
-    <p>
-      <strong>3. Collection of Anonymous, Passive Information.</strong>
-      <br>
-      We reserve the right to monitor your use of the services. As you 
-      navigate through the services, certain anonymous information may be 
-      passively collected (that is, gathered without your actively providing 
-      the information) using various technologies, such as cookies, Internet 
-      tags or web beacons, and navigational data collection (log files, server 
-      logs, clickstream). The following is a listing and a brief explanation 
-      of passive information collection methodologies which we may use from 
-      time to time to better understand how the Services are being used.
-    </p>
-    <p>
-      3.1 A "cookie" is a text file that this site sends to your 
-      browser in the form of a text file The information generated by the 
-      cookie about your use of this site (including your IP address) will be 
-      transmitted to and stored. Most browsers automatically accept cookies, 
-      but they usually can be modified to decline cookies if you prefer; 
-      however, certain features of this site might not work without cookies. 
-    </p>
-    <p>
-      3.2 "Session" cookies are temporary bits of information that are 
-      used to improve navigation, block visitors from providing information 
-      where inappropriate (the Services "remembers" previous entries of age or 
-      country of origin that were outside the specified parameters and blocks 
-      subsequent changes), and collect aggregate statistical information on 
-      the Services. They are erased once you exit your Web browser or 
-      otherwise turn off your computer.
-    </p>
-    <p>
-      3.3 "Persistent" cookies are more permanent bits of information 
-      that are placed on the hard drive of your computer and stay there unless 
-      you delete the cookie. Persistent cookies store information on your 
-      computer for a number of purposes, such as retrieving certain 
-      information you have previously provided, helping to determine what 
-      areas of the Services you may find most valuable, and customizing the 
-      Services based on your preferences on an ongoing basis. Persistent 
-      cookies placed by this site in your computer do not hold personal 
-      information.
-    </p>
-    <p>
-      3.4 You can set your browser to accept all cookies, to reject all 
-      cookies, or to notify you whenever a cookie is offered so that you can 
-      decide each time whether to accept it. To learn more about cookies and 
-      how to specify your preferences, please search for "cookie" in the 
-      "Help" portion of your browser.
-    </p>
-    <p>
-      3.5 An Internet Protocol (IP) address is a number assigned to 
-      your computer by your Internet service provider so you can access the 
-      Internet and is generally considered to be non-personally identifiable 
-      information, because in most cases an IP address is dynamic (changing 
-      each time you connect to the Internet), rather than static (unique to a 
-      particular user's computer). The IP address can be used to diagnose 
-      problems with a server, report aggregate information, determine the 
-      fastest route for your computer to use in connecting to a site, and 
-      administer and improve the Services.
-    </p>
-    <p>
-      3.6 "Internet tags" (also known as Web Beacons, single-pixel 
-      GIFs, clear GIFs, invisible GIFs, and 1-by-1 GIFs) are smaller than 
-      cookies and tell the Web site server information such as the IP address 
-      and browser type related to the visitor's computer. Tags may be placed 
-      both on online advertisements that bring people to the Services and on 
-      different pages of the Services. Such tags indicate how many times a 
-      page is opened and which information is consulted.
-    </p>
-    <p>
-      3.7 "Navigational data" (log files, server logs, and clickstream 
-      data) are used for system management, to improve the content of the 
-      Services, market research purposes, and to communicate information to 
-      visitors.
-    </p>
-    <p>
-      <strong>4. Use and Sharing of Anonymous, Passive Information.</strong>
-      <br>
-      The Services may make full use of passively collected anonymous 
-      information, including without limitation the right to use such 
-      information to provide better service to Service users, customize the 
-      Services based on your preferences, compile and analyze statistics and 
-      trends, and otherwise administer and improve the Services for your use. We 
-      reserve the right to share this anonymous, passive information in 
-      aggregated form.
-    </p>
-    <p>
-      <strong>5. 3rd Party Behavioral Ads; Google's AdSense Network.</strong>
-      <br>
-      5.1 We reserve the right to use anonymous, passive information 
-      about your visits to this and other websites (not including your name, 
-      address, email address or telephone number) for purposes of serving our 
-      ads and third party ads that are targeted to your interests ("3rd Party 
-      Behavioral Ads"). We reserve the right to share anonymous, passive 
-      information collected on the services with third parties for purposes of 
-      serving 3rd Party Behavioral Ads. These 3rd Party Behavioral Ads do not 
-      identify you personally. Instead, they associate your behavioral data on 
-      visited sites with your browser, so that the ads your computer sees on 
-      this site are more likely to be relevant to your interests. 3rd Party 
-      Behavioral Ads require that that you be served with a cookie containing 
-      a tracking code. You may refuse the use of cookies by selecting the 
-      appropriate settings on your browser; however, please note that if you 
-      do this you may not be able to use the full functionality of this site.
-    </p>
-    <p>
-      5.2 We reserve the right to participate in Google's AdSense 
-      network for purposes of serving 3rd Party Behavioral Ads. Google uses 
-      DoubleClick's DART cookie for serving 3rd Party Behavioral Ads over the 
-      AdSense network. You may opt out of the use of the DART cookie. For 
-      information regarding how to opt out, go to
-      http://www.google.com/privacy_ads.html.
-    </p>
-    <p>
-      <strong>6. Use of 3rd Party Analytics.</strong>
-      <br>
-      We reserve the right to use analytics services provided by 
-      third parties. These services use 3rd party cookies to collect 
-      anonymous, passive information about your use of this site (see 
-      explanation of cookies in Collection of Anonymous, Passive Information 
-      above). We use this information for the purpose of evaluating your use 
-      of the Services, compiling reports on activity, and providing other 
-      services. These web analytics services may also transfer this 
-      information to third parties where required to do so by law, or where 
-      such third parties process the information on the service's behalf.
-    </p>
-    <p>
-      <strong>7. Collection of Personal Information; Categories.</strong>
-      <br>
-      We will ask you for personal information when you sign up for any 
-      specific benefit or purpose that requires registration. Personal 
-      information that we collect may vary with the each registration, and it 
-      may include one or more of the following categories: name, physical 
-      address, an email address, phone number, and credit card information 
-      including credit card number, expiration date, and billing address, 
-      emergency contact information, current medications, allergies, medical 
-      insurance information.
-    </p>
-    <p>
-      <strong> 8. Use And Sharing of Personal Information: General 
-      Policy And Exceptions. </strong>
-      <br>
-      Our general policy is that we will use your personal information, 
-      including combining your personal information with passive information 
-      collected from this site, only for: the performance of the services or 
-      transaction for which it was given, our private, internal reporting for 
-      this site, and security assessments for this site, and we will not 
-      share, sell, or rent your personal information to others. The only 
-      exceptions to this general policy: (i) are described in the subsections 
-      below, and (ii) if you explicitly approve through our site.
-    </p>
-    <p>
-      8.1 Affiliates And Service Providers. We reserve the right to 
-      provide such information to our affiliates or subsidiaries, or trusted 
-      service providers for the purpose of hosting our servers or processing 
-      or archiving personal information for us. We require that these parties 
-      agree to privacy and security safeguards for this information that are 
-      consistent with this Privacy Policy.
-    </p>
-    <p>
-      8.2 Acquisition; Bankruptcy. In the event that we are acquired by 
-      or merged with a third party entity, we reserve the right to transfer 
-      such information as part of such merger, acquisition, sale, or other 
-      change of control. In the unlikely event of our bankruptcy, insolvency, 
-      reorganization, receivership, or assignment for the benefit of 
-      creditors, or the application of laws or equitable principles affecting 
-      creditors' rights generally, we reserve the right to transfer such 
-      information to protect our rights or as required by law.
-    </p>
-    <p>
-      8.3 Enforcement; Legal Process. We reserve the right to transfer 
-      such information if we have a good faith belief that access, use, 
-      preservation or disclosure of such information is reasonably necessary 
-      (i) to satisfy any applicable law, regulation, legal process or 
-      enforceable governmental request, or (ii) to investigate or enforce 
-      violations of our rights or the security of this site.
-    </p>
-    <p>
-      8.4 Miscellaneous. We reserve the right to share personal 
-      information with the following additional parties: online organizers 
-      using our tools and resellers of our products and services from whose 
-      site the sale originated (even though the sale originates at site of the 
-      reseller, registration and collection of personal information occurs at 
-      this site).
-    </p>
-    <p>
-      <strong> 9. Onward Transfer of Personal Information Outside Your 
-      Country of Residence. </strong>
-      <br>
-      Any personal information which we may collect on this site will 
-      be stored and processed in our servers located only in the United 
-      States. By using this site, if you reside outside the United States, you 
-      consent to the transfer of personal information outside your country of 
-      residence to the United States.
-    </p>
-    <p>
-      <strong>10. Security of Personal Information.</strong>
-      <br>
-      We follow reasonable and appropriate industry standards to 
-      protect your personal information and data. Unfortunately, no data 
-      transmission over the Internet or method of data storage can be 
-      guaranteed 100% secure. Therefore, while we strive to protect your 
-      personal information by following generally accepted industry standards, 
-      we cannot ensure or warrant the absolute security of any information you 
-      transmit to us or archive at this site.
-    </p>
-    <p>
-      <strong>11. Changing And Updating Personal Information.</strong>
-      <br>
-      Upon request, we will permit you to request or make changes or 
-      updates to your personal information for legitimate purposes. We request 
-      identification prior to approving such requests. We reserve the right to 
-      decline any requests that are unreasonably repetitive or systematic, 
-      require unreasonable time or effort of our technical or administrative 
-      personnel, or undermine the privacy rights of others. We reserve the 
-      right to permit you to access your personal information in any account 
-      you establish with this site for purposes of making your own changes or 
-      updates, and in such case, instructions for making such changes or 
-      updates will be provided where necessary.
-    </p>
-    <p>
-      <strong>12. Email From This Site; Opt-Out Rights.</strong>
-      <br>
-      If you supply us with your e-mail address you may receive 
-      periodic messages from us with information specific to the Services and 
-      required for the normal functioning of the Services as well as for new 
-      products or services or upcoming events. If you prefer not to receive 
-      periodic email messages, you may opt-out by following the instructions 
-      on the email.
-    </p>
-    <p>
-      <strong>13. Children's Online Policy.</strong>
-      <br>
-      We are committed to preserving online privacy for all of its 
-      website visitors, including children. This site is a general audience 
-      site. Consistent with the Children's Online Privacy Protection Act 
-      (COPPA), we will not knowingly collect any information from, or sell to, 
-      children under the age of 13. If you are a parent or guardian who has 
-      discovered that your child under the age of 13 has submitted his or her 
-      personally identifiable information without your permission or consent, 
-      we will remove the information from our active list, at your request. To 
-      request the removal of your child's information, please send contact our 
-      site as provided below under “Contact Us”, and be sure to include in 
-      your message the same login information that your child submitted.
-    </p>
-    <p>
-      <strong> 14. Email And Other Messages Through This Site; ECPA 
-      Notice. </strong>
-      <br>
-      This site treats email messages and other electronic messages 
-      that are sent through this site and not viewable by others as 
-      confidential and private, except as required by law, including without 
-      limitation, the Electronic Communications Privacy Act of 1986, 18 U.S.C. 
-      Sections 2701-2711 (the "ECPA"). The ECPA permits this site's limited 
-      ability to intercept and/or disclose electronic messages, for example 
-      (i) as necessary to operate our system or to protect our rights or 
-      property, (ii) upon legal demand (court orders, warrants, subpoenas), or 
-      (iii) where we receive information inadvertently which appears to 
-      pertain to the commission of a crime. This site is not considered a 
-      "secure communications medium" under the ECPA.
-    </p>
-    <p>
-      <strong>15. Contact Us.</strong>
-      <br>
-      If you have any questions regarding this Privacy Policy, please 
-      contact the owner and operator of this website business:
-    </p>
-    <address>
-      <strong>OCDevel</strong>
-      <br>
-      98 Morrison Ave #2
-      <br>
-      Somerville, MA 02144
-      <br>
-      Email:
-      <a href="mailto:tylerrenelle@gmail.com">tylerrenelle@gmail.com</a>
-      <br>
-      Telephone: 1-805-975-5236
-    </address>
-    <p></p>
-    <div id="home_static_footer">
-      © 2012 OCDevel
-    </div>
-
-  </div>
diff --git a/views/static/about.html b/views/static/about.html
new file mode 100644
index 0000000000..7caddc48ce
--- /dev/null
+++ b/views/static/about.html
@@ -0,0 +1,68 @@
+<import: src="head">
+<import: src="header">
+<import: src="../app/footer">
+
+<Title:>
+    HabitRPG | About
+
+<Head:>
+    <app:head:head active="about"/>
+
+<Body:>
+    <div id="wrap">
+        <app:header:header />
+        <div class='container'>
+            <section>
+                <div class="page-header">
+                    <h1>About</h1>
+                </div>
+                <p class="lead">HabitRPG is a habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.</p>
+            </section>
+
+            <div class='marketing'>
+                <p>&nbsp;</p>
+                <p><iframe src="http://player.vimeo.com/video/57654086" width="960" height="539" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe></p>
+            </div>
+
+            <section>
+                <div class="page-header">
+                    <h2>Habits</h2>
+                </div>
+                <p class="lead">Habits are situational goals that you constantly track. You can either try to break bad habits or reinforce good ones. You may encounter some habits multiple times a day (like "Floss After Eating"), and some you may not encounter often at all (like "Replace the Toilet Paper When it Runs Out"). For some habits, it only makes sense to gain points (like "Do One Hour of Productive Work"). For others, it only makes sense to lose points (like "Eat Junk Food"). For the rest, both gain and loss apply (like for "Take The Stairs", taking the stairs would be a gain while taking the elevator would be a loss).</p>
+            </section>
+
+            <section>
+                <div class="page-header">
+                    <h2>Dailies</h2>
+                </div>
+                <p class="lead">Dailies are goals that you want to complete once a day, building them into your routine (like "Workout for 30 Minutes"). Unlike Habits, Dailies may only be checked off once a day. Also unlike habits, at the end of each day non-completed Dailies will cause damage, making you lose Hit Points. If you are doing well and consistantly check off a Daily day after day, it will turn green and earn less gold and experience, though it will also cause you to lose fewer Hit Points if you skip it. This means you can ease up on it for a bit. Conversely, if you are doing poorly and fail to check something off every day, it will turn red. The worse you do, the more experience and gold that Daily is worth and the more hit points it takes away if left uncompleted. This encourages you to focus on your shortcomings, the reds. Oh, and don't worry. You can make a Daily active only for certain days of the week, so weekday tasks won't pester you on the weekends. Or you can make a Daily active only on Mondays, thus creating a weekly task.</p>
+            </section>
+
+            <section>
+                <div class="page-header">
+                    <h2>Todos</h2>
+                </div>
+                <p class="lead">Todos are one-time goals which need to be completed eventually (like "Wash the car" or "Buy milk"). Non-completed Todos won’t hurt you, but they will become more valuable over time. This will encourage you to wrap up stale Todos.</p>
+            </section>
+
+            <section>
+                <div class="page-header">
+                    <h2>Rewards</h2>
+                </div>
+                <p class='lead'>As you complete goals, you earn gold to buy rewards that you create (like "An Hour of Video Games"). Create plenty of rewards and buy them liberally! Rewarding good performance is the best way to reinforce good habits. If you really need a reward but don't have enough gold, you can still make a purchase. But be careful because it will cost you Hit Points!</p>
+                <p class='lead'>After you’ve reached level 2, you unlock the <strong>Item Store</strong> under the rewards column. You can now buy weapons, armor, and potions. Armor keeps you protected by reducing how much damage you take from failed tasks. Weapons increase how much experience you gain for completing a task. Potions recover 15 HP, for when you've piled just a little too much onto your schedule.</p>
+            </section>
+
+            <section>
+                <div class="page-header">
+                    <h2>License & Credits</h2>
+                </div>
+                <p class='lead'>Code is licensed under GNU GPL v3. Content is licensed under CC-BY-SA 3.0. See the LICENSE file for details.</p>
+
+                <p class='lead'>Content and assets comes from Mozilla’s <a href="http://browserquest.mozilla.org/">BrowserQuest</a> (<a href="http://mozilla.org">Mozilla</a>, <a href="http://www.littleworkshop.fr">Little Workshop</a>). They seriously rock.
+                </p>
+            </section>
+
+        </div>
+    </div>
+    <app:footer:footer />
\ No newline at end of file
diff --git a/views/static/extensions.html b/views/static/extensions.html
new file mode 100644
index 0000000000..e2623c0b4c
--- /dev/null
+++ b/views/static/extensions.html
@@ -0,0 +1,43 @@
+<import: src="head">
+<import: src="header">
+<import: src="../app/footer">
+
+<Title:>
+    HabitRPG | Add-ons & Extensions
+
+<Head:>
+    <app:head:head active="about"/>
+
+<Body:>
+    <div id="wrap">
+        <app:header:header />
+        <div class='container'>
+            <section>
+                <div class="page-header">
+                    <h1>Add-ons & Extensions</h1>
+                </div>
+            </section>
+
+            <h2 id="chrome-extension"><a href="https://chrome.google.com/webstore/detail/habitrpg/pidkmpibnnnhneohdgjclfdjpijggmjj">Chrome Extension</a></h2>
+            <p>Monitors your browsing habits to divvy points to your HabitRPG character. Think Stayfocusd for HabitRPG (http://habitrpg.com).</p>
+            <p>Lose HP for lingering on bad websites, gain Exp and GP for hanging out on good websites. Set the hours and days of the week you want to be productive and integrate your browsing habits with HabitRPG to improve your overall productivity.</p>
+            <p>To use, enter your HabitRPG User ID and API Token in the options page (User -&gt; Settings, see the screenshot). Hit me up with suggestions</p>
+            <h2 id="pomodoro">Pomodoro</h2>
+            <p>I use Ugo Landini's Pomodoro, which allows start / stop custom scripts: <code>shell do shell script &quot;curl -X POST -H 'Content-Type:application/json' https://habitrpg.com/v1/users/.../tasks/productivity/up -d '{\\&quot;apiToken\\&quot;:\\&quot;...\\&quot;}&quot;</code></p>
+            <h2 id="anki"><a href="https://github.com/Pherr/HabitRPG-Anki-Addon">Anki</a></h2>
+            <p>A HabitRPG addon for Anki.</p>
+            <h2 id="habitrpg-mobile"><a href="https://github.com/HabitRPG/habitrpg-mobile">HabitRPG Mobile</a></h2>
+            <p>HabitRPG mobile application under development. Angular + PhoneGap</p>
+            <h2 id="habitrpg-ncurses"><a href="https://github.com/arscan/habitrpg-ncurses">habitrpg-ncurses</a></h2>
+            <p>node + ncurses interface for habitRPG.</p>
+            <p>This is set up to meet my general task workflow and my preferences. Todo lists are simple enought that I feel like investing time into making something that works exactly how I want it to work is worthwhile. Plus I felt like learning ncurses. At this point, attempt to use at your own risk.</p>
+            <p>Apparently the ncurses binding doesn't seem to work properly when loaded from npm. Grabbing the master branch from https://github.com/mscdex/node-ncurses works for me.</p>
+            <h2 id="pyhabit"><a href="https://github.com/elssar/pyhabit">pyhabit</a></h2>
+            <p>Python command line app for HabitRPG (http://habitrpg.com)</p>
+            <h2 id="php-api"><a href="http://github.com/ruddfawcett/HabitRPG_PHP">PHP API</a></h2>
+            <p>A PHP class for the HabitRPG API. Will be expanded when more features become available in the API.</p>
+            <h2 id="suggest-an-add-on-extension">Suggest an Add-on / Extension</h2>
+            <p><a href="mailto:tylerrenelle@gmail.com">Email me</a> to have something listed here</p>
+        </div>
+    </div>
+    <app:footer:footer />
\ No newline at end of file
diff --git a/views/static/faq.html b/views/static/faq.html
new file mode 100644
index 0000000000..1e389c50fb
--- /dev/null
+++ b/views/static/faq.html
@@ -0,0 +1,55 @@
+<import: src="head">
+<import: src="header">
+<import: src="../app/footer">
+
+<Title:>
+    HabitRPG | FAQ
+
+<Head:>
+    <app:head:head active="about"/>
+
+<Body:>
+    <div id="wrap">
+        <app:header:header />
+        <div class='container'>
+            <section>
+                <div class="page-header">
+                    <h1>FAQ</h1>
+                </div>
+            </section>
+            <h2 id="what-is-habit-tracking">What is habit tracking?</h2>
+            <p>Habit tracking is keeping tabs on all your habits to help you improve. It is to life what calorie-counting is to diets (and calorie-counting falls under the habit-tracking umbrella). See <a href="http://blog.beeminder.com/trackhack/">Trackers vs Lifehackers</a> for more information and website examples.</p>
+            <p>There are many habit-tracking apps, but HabitRPG takes a different spin: treating your goals and habits like a Role Playing Game (RPG). If you've played RPGs growing up, this app will make sense to you; otherwise, it may be overwhelming at first. Be sure to follow the tutorial when you first load the website. If it's still not your cup of tea, checkout <a href="http://blog.beeminder.com/trackhack/">Trackers vs Lifehackers</a> for alternatives.</p>
+            <h2 id="how-does-it-work">How does it work?</h2>
+            <p>See the <a href="https://habitrpg.com/splash.html">About page</a></p>
+            <h2 id="browser-support">Browser Support</h2>
+            <p>Everything except Internet Explorer. Derby doesn't currently support IE (see <a href="https://github.com/codeparty/derby/issues/126">this thread</a>), though support is <a href="https://github.com/codeparty/saddle">eventually planned</a>. Use Chrome for best results.</p>
+            <h2 id="should-this-task-be-a-habit-daily-or-todo">Should this task be a Habit, Daily, or Todo?</h2>
+            <p>See <a href="https://habitrpg.com/splash.html">About</a> on task type definitions, but think of it like this. * Habits you track many times per day. Taking the stairs, eating candy, biting your nails, etc. They're sort of micro-tasks. They're also the dumping ground for 3rd-party tasks, created via API calls - for example, when you visit vice websites (Reddit, 9gag) while using the <a href="https://chrome.google.com/webstore/detail/habitrpg/pidkmpibnnnhneohdgjclfdjpijggmjj">Chrome extension</a> - that's updated as a habit. * Dailies are things you track once or twice a day. Exercising, 1h Reading, Anki Session, etc. They reset at the end of each day, and must be completed each day. The confusion is usually between Dailies and Habits, and it usually goes like this: &quot;Should I have a Daily called <em>1h Reading</em> (I want to read 1 hour each day), or a Habit called <em>1h Reading</em> that I up-score for every hour I read in a day?&quot;. My answer - Daily. If it's a decently difficult task that you want to become a good habit, make it a Daily - you're more likely to do it when it loses points at the end of each day than if it sits. * Todos are things you'll do once and only once. <em>Call Mom</em>, <em>Send eBay Package</em>, <em>Pay Doctor Bill</em>, etc. Pretty straight forward.</p>
+            <h2 id="what-are-tokens">What are tokens?</h2>
+            <p>In the days of yore, arcade machines ran on tokens or quarters, and were known to gobble such nuggets with avaricious glee. HabitRPG has no wish to drain your pocket change, but those who use and appreciate it can support the project by turning real-world quarters into tokens, and using the tokens in turn to reroll your tasks, spruce up their character, and tame fearsome mounts to impress friend and foe alike!</p>
+            <h2 id="how-do-i-reset">How do I reset?</h2>
+            <p>Many people have requested the ability to start completely from scratch. This is highly discouraged because you'll lose historical data, which is useful for graphing your progress over time. However, some people find it useful in the beginning after playing with the app for a while - once they've become accustomed to how things work, they want to start playing &quot;for real&quot;. To do this, make sure you're logged in and click the profile drop-down in the top-right corner, then click &quot;Reset&quot;.</p>
+            <h2 id="how-do-i-undo">How do I undo?</h2>
+            <p>Undoing actions is not yet support, but is in the works. See <a href="https://github.com/lefnire/habitrpg/issues/6">issue #6</a></p>
+            <h2 id="how-do-i-heal">How do I heal?</h2>
+            <p>After you play for a while you unlock the Item Store from which you can buy health potions. Also, HP resets upon leveling up (of course!).</p>
+            <h2 id="how-do-i-customize-a-tasks-value">How do I customize a task's value?</h2>
+            <p>Some tasks are more valuable to you than others. Finishing your research paper, for example, should be worth more points than flossing your teeth. Instead of customizing value upon task-creation, HabitRPG calculates a task's value automatically over time. The longer something sits without being completed (Dailies and Todos), the more valuable it becomes; and the more frequently you complete Dailies, the less valuable they become. Trust in the system's machine-learning of task-values.</p>
+            <p>If you <em>absolutely</em> must customize a task's value, there's a &quot;difficulty&quot; setting under the Advanced section of task-editing.</p>
+            <h2 id="all-my-tasks-are-red-im-dying-too-fast">All my tasks are red, I'm dying too fast</h2>
+            <p>Good! Your red tasks provide the most incentive. The worse you are at a task, the more valuable it becomes in Exp &amp; GP, which will push you to focus on the harder tasks. However, if you <em>really</em> need a bail-out, you can &quot;Re-Roll&quot; from the item store, which resets all your tasks to a clean slate. You have to use your quarters, which will prevent you from re-rolling frequently.</p>
+            <p>Again, try as hard as you can to avoid using re-roll. The point of red tasks is to push you to try harder.</p>
+            <h2 id="im-going-on-vacation-how-can-i-disable-my-dailies">I'm going on vacation, how can I disable my Dailies?</h2>
+            <p>Dailies have a &quot;Repeat&quot; field, which specifies which week days this item is due. When you on go vacation, just set each Daily's repeats such that they aren't due on any week days at all. <a href="https://www.evernote.com/shard/s17/sh/e362a4ec-97aa-4c35-8a09-74dc5c16a0fe/a9e895c1f93f4398c56eedef0e58c6fe/res/a44859e5-726e-4e1f-817a-d4f37adbc6f9/skitch.png?resizeSmall&amp;width=832">See this screenshot</a>. As for Todos, they will still gain value but they won't hurt you.</p>
+            <h2 id="what-algorithms-are-used">What algorithms are used?</h2>
+            <p>See <a href="https://github.com/lefnire/habitrpg/wiki/Algorithms">algorithms page</a>.</p>
+            <h2 id="browserquest-art">BrowserQuest Art</h2>
+            <p>We're currently using the pixel art from <a href="https://github.com/mozilla/BrowserQuest">Mozilla BrowserQuest</a>. Some have been opposed because they've played BQ themselves, and don't like design recycling, but here's my reasoning:</p>
+            <p>It is licensed under CC-BY-SA 3.0 (so we can use it). Fortunately for us (but sadly for Mozilla), BQ is mothballed. That has two implications. First, only those in-the-know will recognize it - which is mostly developers &amp; designers who have been keeping abreast HTML5's progress. Second, it's absolutely superb in design and nostalgia - it does an excellent job of bringing back SNES, and it would be a shame to see it go to waste. Also, it's free, and will get pretty far before we need to start customizing.</p>
+            <h2 id="how-can-i-get-involved">How can I get involved?</h2>
+            <p>Contribute to the GitHub repo and get a slice of the pie! See <a href="https://github.com/lefnire/habitrpg/wiki/Business-Model">Business Model</a>, and contact me if you're interested.</p>
+
+        </div>
+    </div>
+    <app:footer:footer />
\ No newline at end of file
diff --git a/views/static/front.html b/views/static/front.html
new file mode 100644
index 0000000000..587fb09495
--- /dev/null
+++ b/views/static/front.html
@@ -0,0 +1,28 @@
+<import: src="head">
+<import: src="header">
+<import: src="../app/footer">
+
+<Title:>
+    HabitRPG | Gamify Your Life
+
+<Head:>
+    <app:head:head active="front"/>
+
+<Body:>
+    <div id="wrap">
+        <app:header:header />
+
+
+        <div class='jumbotron masthead'>
+        <div class='container'>
+            <h1><img src="/img/logo/habitrpg_pixel.png" alt="HabitRPG"/></h1>
+            <p>A habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.</p>
+            <a href="/?play=1" class='btn btn-primary btn-small'>Play</a>
+        </div>
+        </div>
+        <div class='container'>
+            <p style="height:600;"><iframe src="http://player.vimeo.com/video/57639356" width="960" height="539" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe></p>
+
+        </div>
+    </div>
+    <app:footer:footer />
\ No newline at end of file
diff --git a/views/static/head.html b/views/static/head.html
new file mode 100644
index 0000000000..92092cb757
--- /dev/null
+++ b/views/static/head.html
@@ -0,0 +1,15 @@
+<head:>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css" rel="stylesheet">
+    <link href="/vendor/bootstrap/docs/assets/css/docs.css" rel="stylesheet">
+    <link href="/css/static-pages.css" rel="stylesheet">
+    <link href="/css/footer.css" rel="stylesheet">
+
+    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+    <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js"></script>
+
+    <script type="text/javascript">
+        $.getScript("//s7.addthis.com/js/250/addthis_widget.js#pubid=lefnire");
+    </script>
\ No newline at end of file
diff --git a/views/static/header.html b/views/static/header.html
new file mode 100644
index 0000000000..cbfb5a1ff2
--- /dev/null
+++ b/views/static/header.html
@@ -0,0 +1,33 @@
+<header:>
+    <div class="navbar navbar-inverse navbar-fixed-top">
+        <div class="navbar-inner">
+            <div class="container">
+                <a class="brand {{#if equal(@active,'front')}}active{{/}}" href="/static/front">HabitRPG</a>
+                <div class="nav-collapse collapse">
+                    <ul class="nav">
+
+                        <li class="{{#if equal(@active,'about')}}active{{/}}">
+                            <a href="/static/about">About</a>
+                        </li>
+
+                        <li class="">
+                            <a target="_blank" href="http://habitrpg.tumblr.com/">Blog</a>
+                        </li>
+
+                        <li class="{{#if equal(@active,'team')}}team{{/}}">
+                            <a href="/static/team">Team</a>
+                        </li>
+
+                        <li class="{{#if equal(@active,'extensions')}}active{{/}}">
+                            <a href="/static/extensions">Extensions</a>
+                        </li>
+
+                        <li class="{{#if equal(@active,'faq')}}active{{/}}">
+                            <a href="/static/faq">FAQ</a>
+                        </li>
+
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
\ No newline at end of file
diff --git a/views/static/privacy.html b/views/static/privacy.html
new file mode 100644
index 0000000000..fa0be97dc1
--- /dev/null
+++ b/views/static/privacy.html
@@ -0,0 +1,347 @@
+<import: src="head">
+<import: src="header">
+<import: src="../app/footer">
+
+<Title:>
+    HabitRPG | About
+
+<Head:>
+    <app:head:head active="about"/>
+
+<Body:>
+    <div id="wrap">
+        <app:header:header />
+        <div class='container'>
+
+            <div class="page-header">
+                <h1>Privacy Policy</h1>
+            </div>
+            <p class="pagemeta">
+                Last updated September 02, 2012
+            </p>
+            <p>
+                <strong>PLEASE READ THIS PRIVACY POLICY CAREFULLY.</strong>
+                <br>
+                By accessing or otherwise using habitrpg.com or any sub domains thereto ("the Sites"),
+                or using a habitrpg.com or HabitRPG application on a mobile device ("the Applications"),
+                you agree to be bound contractually by this Privacy Policy. Individually
+                or collectively, the Applications and the Sites may be referred to as
+                the "Services."
+            </p>
+            <p>
+                To review material modifications and their effective dates scroll
+                to the bottom of the page.
+            </p>
+            <p>
+                <strong> 1. Privacy Statement; Collection of Personal
+                    Information. </strong>
+                <br>
+                1.1 OCDevel owns and operates this business. All
+                references to "we", "us", shall be construed to mean OCDevel.
+            </p>
+            <p>
+                1.2 We understand that visitors to this website are concerned
+                about the privacy of information. The following describes our privacy
+                policy regarding information, including personal information, that we
+                collect through this website.
+            </p>
+            <p>
+                <strong>2. Modification of Privacy Policy.</strong>
+                <br>
+                We reserve the right to modify this Privacy Policy at any time,
+                and without prior notice, by posting an amended Privacy Policy that is
+                always accessible by clicking on the "Privacy Policy" link on this
+                site's home page. Your continued use of this site indicates your
+                acceptance of the amended Privacy Policy. You should check the Privacy
+                Policy through this link periodically for modifications by clicking on
+                the link provided near the top of the Privacy Policy for a listing of
+                material modifications and their effective dates. Regarding personal
+                information, if any modifications are materially less restrictive on our
+                use or disclosure of the personal information previously disclosed by
+                you, we will obtain your consent before implementing such revisions with
+                respect to such information.
+            </p>
+            <p>
+                <strong>3. Collection of Anonymous, Passive Information.</strong>
+                <br>
+                We reserve the right to monitor your use of the services. As you
+                navigate through the services, certain anonymous information may be
+                passively collected (that is, gathered without your actively providing
+                the information) using various technologies, such as cookies, Internet
+                tags or web beacons, and navigational data collection (log files, server
+                logs, clickstream). The following is a listing and a brief explanation
+                of passive information collection methodologies which we may use from
+                time to time to better understand how the Services are being used.
+            </p>
+            <p>
+                3.1 A "cookie" is a text file that this site sends to your
+                browser in the form of a text file The information generated by the
+                cookie about your use of this site (including your IP address) will be
+                transmitted to and stored. Most browsers automatically accept cookies,
+                but they usually can be modified to decline cookies if you prefer;
+                however, certain features of this site might not work without cookies.
+            </p>
+            <p>
+                3.2 "Session" cookies are temporary bits of information that are
+                used to improve navigation, block visitors from providing information
+                where inappropriate (the Services "remembers" previous entries of age or
+                country of origin that were outside the specified parameters and blocks
+                subsequent changes), and collect aggregate statistical information on
+                the Services. They are erased once you exit your Web browser or
+                otherwise turn off your computer.
+            </p>
+            <p>
+                3.3 "Persistent" cookies are more permanent bits of information
+                that are placed on the hard drive of your computer and stay there unless
+                you delete the cookie. Persistent cookies store information on your
+                computer for a number of purposes, such as retrieving certain
+                information you have previously provided, helping to determine what
+                areas of the Services you may find most valuable, and customizing the
+                Services based on your preferences on an ongoing basis. Persistent
+                cookies placed by this site in your computer do not hold personal
+                information.
+            </p>
+            <p>
+                3.4 You can set your browser to accept all cookies, to reject all
+                cookies, or to notify you whenever a cookie is offered so that you can
+                decide each time whether to accept it. To learn more about cookies and
+                how to specify your preferences, please search for "cookie" in the
+                "Help" portion of your browser.
+            </p>
+            <p>
+                3.5 An Internet Protocol (IP) address is a number assigned to
+                your computer by your Internet service provider so you can access the
+                Internet and is generally considered to be non-personally identifiable
+                information, because in most cases an IP address is dynamic (changing
+                each time you connect to the Internet), rather than static (unique to a
+                particular user's computer). The IP address can be used to diagnose
+                problems with a server, report aggregate information, determine the
+                fastest route for your computer to use in connecting to a site, and
+                administer and improve the Services.
+            </p>
+            <p>
+                3.6 "Internet tags" (also known as Web Beacons, single-pixel
+                GIFs, clear GIFs, invisible GIFs, and 1-by-1 GIFs) are smaller than
+                cookies and tell the Web site server information such as the IP address
+                and browser type related to the visitor's computer. Tags may be placed
+                both on online advertisements that bring people to the Services and on
+                different pages of the Services. Such tags indicate how many times a
+                page is opened and which information is consulted.
+            </p>
+            <p>
+                3.7 "Navigational data" (log files, server logs, and clickstream
+                data) are used for system management, to improve the content of the
+                Services, market research purposes, and to communicate information to
+                visitors.
+            </p>
+            <p>
+                <strong>4. Use and Sharing of Anonymous, Passive Information.</strong>
+                <br>
+                The Services may make full use of passively collected anonymous
+                information, including without limitation the right to use such
+                information to provide better service to Service users, customize the
+                Services based on your preferences, compile and analyze statistics and
+                trends, and otherwise administer and improve the Services for your use. We
+                reserve the right to share this anonymous, passive information in
+                aggregated form.
+            </p>
+            <p>
+                <strong>5. 3rd Party Behavioral Ads; Google's AdSense Network.</strong>
+                <br>
+                5.1 We reserve the right to use anonymous, passive information
+                about your visits to this and other websites (not including your name,
+                address, email address or telephone number) for purposes of serving our
+                ads and third party ads that are targeted to your interests ("3rd Party
+                Behavioral Ads"). We reserve the right to share anonymous, passive
+                information collected on the services with third parties for purposes of
+                serving 3rd Party Behavioral Ads. These 3rd Party Behavioral Ads do not
+                identify you personally. Instead, they associate your behavioral data on
+                visited sites with your browser, so that the ads your computer sees on
+                this site are more likely to be relevant to your interests. 3rd Party
+                Behavioral Ads require that that you be served with a cookie containing
+                a tracking code. You may refuse the use of cookies by selecting the
+                appropriate settings on your browser; however, please note that if you
+                do this you may not be able to use the full functionality of this site.
+            </p>
+            <p>
+                5.2 We reserve the right to participate in Google's AdSense
+                network for purposes of serving 3rd Party Behavioral Ads. Google uses
+                DoubleClick's DART cookie for serving 3rd Party Behavioral Ads over the
+                AdSense network. You may opt out of the use of the DART cookie. For
+                information regarding how to opt out, go to
+                http://www.google.com/privacy_ads.html.
+            </p>
+            <p>
+                <strong>6. Use of 3rd Party Analytics.</strong>
+                <br>
+                We reserve the right to use analytics services provided by
+                third parties. These services use 3rd party cookies to collect
+                anonymous, passive information about your use of this site (see
+                explanation of cookies in Collection of Anonymous, Passive Information
+                above). We use this information for the purpose of evaluating your use
+                of the Services, compiling reports on activity, and providing other
+                services. These web analytics services may also transfer this
+                information to third parties where required to do so by law, or where
+                such third parties process the information on the service's behalf.
+            </p>
+            <p>
+                <strong>7. Collection of Personal Information; Categories.</strong>
+                <br>
+                We will ask you for personal information when you sign up for any
+                specific benefit or purpose that requires registration. Personal
+                information that we collect may vary with the each registration, and it
+                may include one or more of the following categories: name, physical
+                address, an email address, phone number, and credit card information
+                including credit card number, expiration date, and billing address,
+                emergency contact information, current medications, allergies, medical
+                insurance information.
+            </p>
+            <p>
+                <strong> 8. Use And Sharing of Personal Information: General
+                    Policy And Exceptions. </strong>
+                <br>
+                Our general policy is that we will use your personal information,
+                including combining your personal information with passive information
+                collected from this site, only for: the performance of the services or
+                transaction for which it was given, our private, internal reporting for
+                this site, and security assessments for this site, and we will not
+                share, sell, or rent your personal information to others. The only
+                exceptions to this general policy: (i) are described in the subsections
+                below, and (ii) if you explicitly approve through our site.
+            </p>
+            <p>
+                8.1 Affiliates And Service Providers. We reserve the right to
+                provide such information to our affiliates or subsidiaries, or trusted
+                service providers for the purpose of hosting our servers or processing
+                or archiving personal information for us. We require that these parties
+                agree to privacy and security safeguards for this information that are
+                consistent with this Privacy Policy.
+            </p>
+            <p>
+                8.2 Acquisition; Bankruptcy. In the event that we are acquired by
+                or merged with a third party entity, we reserve the right to transfer
+                such information as part of such merger, acquisition, sale, or other
+                change of control. In the unlikely event of our bankruptcy, insolvency,
+                reorganization, receivership, or assignment for the benefit of
+                creditors, or the application of laws or equitable principles affecting
+                creditors' rights generally, we reserve the right to transfer such
+                information to protect our rights or as required by law.
+            </p>
+            <p>
+                8.3 Enforcement; Legal Process. We reserve the right to transfer
+                such information if we have a good faith belief that access, use,
+                preservation or disclosure of such information is reasonably necessary
+                (i) to satisfy any applicable law, regulation, legal process or
+                enforceable governmental request, or (ii) to investigate or enforce
+                violations of our rights or the security of this site.
+            </p>
+            <p>
+                8.4 Miscellaneous. We reserve the right to share personal
+                information with the following additional parties: online organizers
+                using our tools and resellers of our products and services from whose
+                site the sale originated (even though the sale originates at site of the
+                reseller, registration and collection of personal information occurs at
+                this site).
+            </p>
+            <p>
+                <strong> 9. Onward Transfer of Personal Information Outside Your
+                    Country of Residence. </strong>
+                <br>
+                Any personal information which we may collect on this site will
+                be stored and processed in our servers located only in the United
+                States. By using this site, if you reside outside the United States, you
+                consent to the transfer of personal information outside your country of
+                residence to the United States.
+            </p>
+            <p>
+                <strong>10. Security of Personal Information.</strong>
+                <br>
+                We follow reasonable and appropriate industry standards to
+                protect your personal information and data. Unfortunately, no data
+                transmission over the Internet or method of data storage can be
+                guaranteed 100% secure. Therefore, while we strive to protect your
+                personal information by following generally accepted industry standards,
+                we cannot ensure or warrant the absolute security of any information you
+                transmit to us or archive at this site.
+            </p>
+            <p>
+                <strong>11. Changing And Updating Personal Information.</strong>
+                <br>
+                Upon request, we will permit you to request or make changes or
+                updates to your personal information for legitimate purposes. We request
+                identification prior to approving such requests. We reserve the right to
+                decline any requests that are unreasonably repetitive or systematic,
+                require unreasonable time or effort of our technical or administrative
+                personnel, or undermine the privacy rights of others. We reserve the
+                right to permit you to access your personal information in any account
+                you establish with this site for purposes of making your own changes or
+                updates, and in such case, instructions for making such changes or
+                updates will be provided where necessary.
+            </p>
+            <p>
+                <strong>12. Email From This Site; Opt-Out Rights.</strong>
+                <br>
+                If you supply us with your e-mail address you may receive
+                periodic messages from us with information specific to the Services and
+                required for the normal functioning of the Services as well as for new
+                products or services or upcoming events. If you prefer not to receive
+                periodic email messages, you may opt-out by following the instructions
+                on the email.
+            </p>
+            <p>
+                <strong>13. Children's Online Policy.</strong>
+                <br>
+                We are committed to preserving online privacy for all of its
+                website visitors, including children. This site is a general audience
+                site. Consistent with the Children's Online Privacy Protection Act
+                (COPPA), we will not knowingly collect any information from, or sell to,
+                children under the age of 13. If you are a parent or guardian who has
+                discovered that your child under the age of 13 has submitted his or her
+                personally identifiable information without your permission or consent,
+                we will remove the information from our active list, at your request. To
+                request the removal of your child's information, please send contact our
+                site as provided below under “Contact Us”, and be sure to include in
+                your message the same login information that your child submitted.
+            </p>
+            <p>
+                <strong> 14. Email And Other Messages Through This Site; ECPA
+                    Notice. </strong>
+                <br>
+                This site treats email messages and other electronic messages
+                that are sent through this site and not viewable by others as
+                confidential and private, except as required by law, including without
+                limitation, the Electronic Communications Privacy Act of 1986, 18 U.S.C.
+                Sections 2701-2711 (the "ECPA"). The ECPA permits this site's limited
+                ability to intercept and/or disclose electronic messages, for example
+                (i) as necessary to operate our system or to protect our rights or
+                property, (ii) upon legal demand (court orders, warrants, subpoenas), or
+                (iii) where we receive information inadvertently which appears to
+                pertain to the commission of a crime. This site is not considered a
+                "secure communications medium" under the ECPA.
+            </p>
+            <p>
+                <strong>15. Contact Us.</strong>
+                <br>
+                If you have any questions regarding this Privacy Policy, please
+                contact the owner and operator of this website business:
+            </p>
+            <address>
+                <strong>OCDevel</strong>
+                <br>
+                98 Morrison Ave #2
+                <br>
+                Somerville, MA 02144
+                <br>
+                Email:
+                <a href="mailto:tylerrenelle@gmail.com">tylerrenelle@gmail.com</a>
+                <br>
+                Telephone: 1-805-975-5236
+            </address>
+            <p></p>
+            <div id="home_static_footer">
+                © 2012 OCDevel
+            </div>
+
+        </div>
+    </div>
+    <app:footer:footer />
\ No newline at end of file
diff --git a/views/static/team.html b/views/static/team.html
new file mode 100644
index 0000000000..b26e51b053
--- /dev/null
+++ b/views/static/team.html
@@ -0,0 +1,74 @@
+<import: src="head">
+<import: src="header">
+<import: src="../app/footer">
+
+<Title:>
+    HabitRPG | Team
+
+<Head:>
+    <app:head:head active="team" />
+
+<Body:>
+    <div id="wrap">
+        <app:header:header />
+        <div class='container'>
+            <section>
+                <div class="page-header">
+                    <h1>Team</h1>
+                    <p class="lead">The HabitRPG team has developed organically in a meritocratic fashion. We're still figuring it all out, but the members we have listed here have contributed greatly.  If you want to be part of the team, contribute to the repository, and if you're a big asset we'll likely adopt you :) See the <a href="https://github.com/lefnire/habitrpg/wiki/Business-Model">Count Me In</a></p>
+                </div>
+            </section>
+
+            <section>
+                <div class="page-header">
+                    <h2 id="developers">Developers</h2>
+                    <ul>
+                        <li><a href="https://github.com/lefnire">Tyler Renelle</a></li>
+                        <li><a href="https://github.com/switz">Daniel Saewitz</a></li>
+                        <li><a href="https://github.com/SlappyBag">Stan Lindsey</a></li>
+                        <li><a href="https://github.com/MrConcept">Philip How</a></li>
+                    </ul>
+                </div>
+            </section>
+
+            <section>
+                <div class="page-header">
+                    <h2 id="pixel-artists">Pixel Artists</h2>
+                    <ul>
+                        <li><a href="https://github.com/pandoro">Alex Hermans</a></li>
+                        <li><a href="https://github.com/Shaners">Shane Listers</a></li>
+                    </ul>
+                </div>
+            </section>
+
+            <section>
+                <div class="page-header">
+                    <h2 id="mobile-developers">Mobile Developers</h2>
+                    <ul>
+                        <li><a href="https://github.com/litenull">Tomaz Korenika</a></li>
+                        <li><a href="https://github.com/lefnire">Tyler Renelle</a></li>
+                    </ul>
+                </div>
+            </section>
+
+            <section>
+                <div class="page-header">
+                    <h2 id="designers">Designers</h2>
+                    <ul>
+                        <li><a href="https://github.com/zakkain">Zachary Kain</a></li>
+                    </ul>
+                </div>
+            </section>
+
+            <section>
+                <div class="page-header">
+                    <h2 id="community-managers">Community Management</h2>
+                    <ul>
+                        <li><a href="https://github.com/wc8">@wc8</a></li>
+                        <li><a href="https://github.com/horusofoz">Jeff Smith</a></li>
+                    </ul>
+                </div>
+            </section>
+        </div>
+    </div>
+    <app:footer:footer />
\ No newline at end of file
diff --git a/views/static/terms.html b/views/static/terms.html
new file mode 100644
index 0000000000..b4f71e1e19
--- /dev/null
+++ b/views/static/terms.html
@@ -0,0 +1,646 @@
+<import: src="head">
+<import: src="header">
+<import: src="../app/footer">
+
+<Title:>
+    HabitRPG | About
+
+<Head:>
+    <app:head:head active="about"/>
+
+<Body:>
+    <div id="wrap">
+        <app:header:header />
+        <div class='container'>
+            <div class="page-header">
+                <h1>Terms of Use</h1>
+            </div>
+            <p>
+                Last updated September 2, 2012
+            </p>
+            <p>
+                HabitRPG (or "we") provides services through our
+                software applications for various devices and platforms ("HabitRPG
+                Applications") and the HabitRPG.com domain, and any sub domains thereto
+                (the "Sites"). Individually or collectively, HabitRPG Applications and
+                Sites may be referred to as the "Services".
+            </p>
+            <p>
+                Please read the following terms and conditions ("Terms of
+                Service") carefully. These Terms of Service govern your access to and
+                use of the Services and HabitRPG Content (defined below) and set forth
+                the legally binding terms for your use of the Services and HabitRPG
+                Content, whether or not you have registered as a Member.
+            </p>
+            <p>
+                Certain areas of the Services (and your access to or use of
+                HabitRPG Content) may have different terms and conditions posted or may
+                require you to agree with and accept additional terms and conditions. If
+                there is a conflict between these Terms of Service and terms and
+                conditions posted for a specific area of the Services or HabitRPG
+                Content, the latter terms and conditions will take precedence with
+                respect to your use of or access to that area of the Services or HabitRPG
+                Content.
+            </p>
+            <p>
+                YOU ACKNOWLEDGE AND AGREE THAT, BY CLICKING ON THE "I AGREE" OR
+                "I ACCEPT" BUTTON, OR BY ACCESSING OR USING THE SERVICES OR BY
+                DOWNLOADING OR POSTING ANY CONTENT FROM OR ON THE SITES OR THROUGH THE
+                SERVICES, YOU ARE INDICATING THAT YOU HAVE READ, UNDERSTAND AND AGREE TO
+                BE BOUND BY THESE TERMS, WHETHER OR NOT YOU HAVE REGISTERED AS A MEMBER,
+                AND AGREE TO OUR PRIVACY POLICY AS DESCRIBED BELOW. IF YOU DO NOT AGREE
+                TO THESE TERMS, THEN YOU HAVE NO RIGHT TO ACCESS OR USE THE SERVICES OR
+                HABITRPG CONTENT.
+            </p>
+            <p>
+                <strong>Modification</strong>
+                <br>
+                HabitRPG reserves the right, at its sole discretion, to modify,
+                discontinue or terminate the Services, including any portion thereof on
+                a global or individual basis, or to modify these Terms of Service, at
+                any time and without prior notice. If we modify these Terms of Service,
+                we will update the "Last Updated Date" above and post the modification
+                on the Sites and perhaps elsewhere within the Services. By continuing to
+                access or use the Services after we have posted a modification to these
+                Terms of Service or have provided you with notice of a modification, you
+                are indicating that you agree to be bound by the modified Terms of
+                Service. If the modified Terms of Service are not acceptable to you,
+                your only recourse is to cease using the Services.
+            </p>
+            <p>
+                <strong>Eligibility and HabitRPG Account Registration</strong>
+                <br>
+                In order to access certain features of the Sites and Services, and to
+                post any Public User Content (defined below) on the Sites or through the
+                Services, you must register to create an account ("HabitRPG Account") and
+                become a "Member". In compliance with privacy laws, we do not allow
+                people below the age of 14 to create accounts; please see our Privacy
+                Policy for further information. During the registration process, you
+                will be required to provide certain information and you will establish a
+                username and a password. You agree to provide accurate, current and
+                complete information during the registration process and to update such
+                information to keep it accurate, current and complete. HabitRPG reserves
+                the right to suspend or terminate your HabitRPG Account if any
+                information provided during the registration process or thereafter
+                proves to be inaccurate, not current or incomplete. If you are not a
+                Member you may browse all areas of the Sites or use the parts of the
+                Services that are not limited to Members only. You are responsible for
+                safeguarding your password. You agree not to disclose your password to
+                any third party and to take sole responsibility for any activities or
+                actions under your HabitRPG Account, whether or not you have authorized
+                such activities or actions. You agree to immediately notify HabitRPG of
+                any unauthorized use of your HabitRPG Account. We are not liable for any
+                damages or losses caused by someone using your account without your
+                permission.
+            </p>
+            <p>
+                <strong>Privacy</strong>
+                <br>
+                See HabitRPG's Privacy Policy at http://www.HabitRPG.com/privacy for
+                information and notices concerning HabitRPG's collection and use of your
+                personal information. If you have any questions about the HabitRPG
+                Privacy Policy, please contact HabitRPG at privacy AT HabitRPG.com. By
+                accessing the Services you are agreeing to the terms of our Privacy
+                Policy.
+            </p>
+            <p>
+                <strong>Content</strong>
+                <br>
+                Certain types of content are made available through the Services.
+                "HabitRPG Content" means, collectively, the text, data, graphics, images,
+                illustrations, forms and look and feel attributes, HabitRPG trademarks
+                and logos and other content made available through the Services,
+                including any technology or code making up the Services, excluding User
+                Content. "Public User Content" means the text, data, graphics, images, photos,
+                video or audiovisual content, hypertext links and any other content uploaded,
+                transmitted or submitted by a Member via the Services with the intent to share
+                with other users. "Private User Content" means data created through the services
+                exclusively for personal use or private sharing.
+                This includes tasks and related data created in HabitRPG Tasks that have not
+                been explicitly shared publicly.
+                You understand that by using any of the Services, you may encounter content
+                that may be deemed offensive, indecent, or objectionable, which content
+                may or may not be identified as having explicit language, and that the
+                results of any search or entering of a particular URL may automatically
+                and unintentionally generate links or references to objectionable
+                material. Nevertheless, you agree to use the Services at your sole risk
+                and that we shall not have any liability to you for content that may be
+                found to be offensive, indecent, or objectionable.
+            </p>
+            <p>
+                <strong>Ownership</strong>
+                <br>
+                The Services and HabitRPG Content are protected by copyright, trademark,
+                and other laws of the United States and foreign countries. Except as
+                expressly provided in these Terms of Service, HabitRPG and its licensors
+                exclusively own all right, title and interest in and to the Services and
+                HabitRPG Content, including all associated intellectual property rights.
+                You will not remove, alter or obscure any copyright, trademark, service
+                mark or other proprietary rights notices incorporated in or accompanying
+                the Services or HabitRPG Content.
+            </p>
+            <p>
+                <strong>HabitRPG License</strong>
+                <br>
+                Subject to your compliance with the terms and conditions of these Terms
+                of Service, HabitRPG grants you a limited, non-exclusive,
+                non-transferable license, without the right to sublicense, to access,
+                use, view, download and print, where applicable, the Services and any
+                HabitRPG Content solely for your personal and non-commercial purposes.
+                You will not use, copy, adapt, modify, prepare derivative works based
+                upon, distribute, license, sell, transfer, publicly display, publicly
+                perform, transmit, stream, broadcast or otherwise exploit the Services
+                or HabitRPG Content, except as expressly permitted in these Terms of
+                Service. No licenses or rights are granted to you by implication or
+                otherwise under any intellectual property rights owned or controlled by
+                HabitRPG or its licensors, except for the licenses and rights expressly
+                granted in these Terms of Service. With respect to HabitRPG Applications,
+                your license is limited to use of such applications on platforms and
+                devices that you own or control, and you may not distribute or make the
+                HabitRPG Applications available over a network where it could be used by
+                multiple devices at the same time.
+            </p>
+            <p>
+                <strong>Public User Content</strong>
+                <br>
+                By making available any Public User Content through the Services, you hereby
+                grant to HabitRPG a worldwide, irrevocable, perpetual, non-exclusive,
+                transferable, royalty-free license, with the right to sublicense, to
+                use, copy, adapt, modify, distribute, license, sell, transfer, publicly
+                display, publicly perform, transmit, stream, broadcast and otherwise
+                exploit such Public User Content only on, through or by means of the Services.
+                HabitRPG does not claim any ownership rights in any such Public User Content and
+                nothing in these Terms of Service will be deemed to restrict any rights
+                that you may have to use and exploit any such Public User Content.
+            </p>
+            <p>
+                You acknowledge and agree that you are solely responsible for all
+                Public User Content that you make available through the Services. Accordingly,
+                you represent and warrant that: (i) you either are the sole and
+                exclusive owner of all Public User Content that you make available through the
+                Services or you have all rights, licenses, consents and releases that
+                are necessary to grant to HabitRPG the rights in such Public User Content, as
+                contemplated under these Terms of Service; and (ii) neither the User
+                Content nor your posting, uploading, publication, submission or
+                transmittal of the Public User Content or HabitRPG's use of the Public User Content (or
+                any portion thereof) on, through or by means of the Services will
+                infringe, misappropriate or violate a third party's patent, copyright,
+                trademark, trade secret, moral rights or other intellectual property
+                rights, or rights of publicity or privacy, or result in the violation of
+                any applicable law or regulation.
+            </p>
+            <p>
+                Copyrighted Materials: No Infringing Use. You will not use the
+                Services to offer, display, distribute, transmit, route, provide
+                connections to or store any material that infringes copyrighted works or
+                otherwise violates or promotes the violation of the intellectual
+                property rights of any third party. HabitRPG has adopted and implemented
+                a policy that provides for the termination in appropriate circumstances
+                of the accounts of users who repeatedly infringe or are believed to be
+                or are charged with repeatedly infringing the rights of copyright
+                holders.
+            </p>
+            <p>
+                <strong>Notify Us of Infringers</strong>
+                <br>
+                If you believe that something on the Services violates your copyright,
+                notify our copyright agent in writing. The contact information for our
+                copyright agent is at the bottom of this section.
+            </p>
+            <p>
+                In order for us to take action, you must do the following in your
+                notice:
+            </p>
+            <p>
+                (1) provide your physical or electronic signature; (2) identify
+                the copyrighted work that you believe is being infringed; (3) identify
+                the item on the Services that you think is infringing your work and
+                include sufficient information about where the material is located on
+                the Services (including which website and URL) so that we can find it;
+                (4) provide us with a way to contact you, such as your address,
+                telephone number, or e-mail; (5) provide a statement that you believe in
+                good faith that the item you have identified as infringing is not
+                authorized by the copyright owner, its agent, or the law to be used on
+                the Services; and (6) provide a statement that the information you
+                provide in your notice is accurate, and that (under penalty of perjury),
+                you are authorized to act on behalf of the copyright owner whose work is
+                being infringed.
+            </p>
+            <p>
+                Here is the contact information for our copyright agent:
+            </p>
+            <p>
+                Copyright Enforcement
+                <br>
+                OCDevel
+                <br>
+                98 Morrison Ave #2
+                <br>
+                Somerville, MA 02144
+                <br>
+                Phone: (805) 975-5236
+                <br>
+                E-Mail: tylerrenelle at gmail dot com
+            </p>
+            <p>
+                Again, we cannot take action unless you give us all the required
+                information.
+            </p>
+            <p>
+                <strong>Ratings and Comments &amp; Feedback.</strong>
+                <br>
+                You can rate and make comments about content made available through the
+                Services ("Comments"). HabitRPG advises you to exercise caution and good
+                judgment when leaving such Comments. Once you complete and submit your
+                Comments to the Services you will not be able to go back and edit your
+                Comments. You should also be aware that you could be held legally
+                responsible for damages to someone's reputation if your Comments are
+                deemed to be defamatory. Without limiting any other terms of this Terms
+                of Service, HabitRPG may, but is under no obligation to, monitor or
+                censor Comments and disclaims any and all liability relating thereto.
+                Notwithstanding the foregoing, HabitRPG does reserve the right, in its
+                sole discretion, to remove any Comments that it deems to be improper,
+                inappropriate or inconsistent with the online activities that are
+                permitted under these Terms of Service. We welcome and encourage you to
+                provide feedback, comments and suggestions for improvements to the
+                Services ("Feedback"). You may submit Feedback by emailing us at support
+                AT HabitRPG.com. You acknowledge and agree that all Comments and Feedback
+                will be the sole and exclusive property of HabitRPG and you hereby
+                irrevocably assign to HabitRPG and agree to irrevocably assign to HabitRPG
+                all of your right, title, and interest in and to all Comments and
+                Feedback, including without limitation all worldwide patent rights,
+                copyright rights, trade secret rights, and other proprietary or
+                intellectual property rights therein. At HabitRPG's request and expense,
+                you will execute documents and take such further acts as HabitRPG may
+                reasonably request to assist HabitRPG to acquire, perfect, and maintain
+                its intellectual property rights and other legal protections for the
+                Comments and Feedback.
+            </p>
+            <p>
+                <strong>Interactions between Users</strong>
+                <br>
+                You are solely responsible for your interactions (including any
+                disputes) with other users. You understand that HabitRPG does not in any
+                way screen HabitRPG users, except to only allow people aged 14 and over
+                to create accounts. You are solely responsible for, and will exercise
+                caution, discretion, common sense and judgment in, using the Services
+                and disclosing personal information to other HabitRPG users. You agree to
+                take reasonable precautions in all interactions with other HabitRPG
+                users, particularly if you decide to meet a HabitRPG user offline, or in
+                person. Your use of the Services, HabitRPG Content and any other content
+                made available through the Services is at your sole risk and discretion
+                and HabitRPG hereby disclaims any and all liability to you or any third
+                party relating thereto. HabitRPG reserves the right to contact Members,
+                in compliance with applicable law, in order to evaluate compliance with
+                the rules and policies in these Terms of Service. You will cooperate
+                fully with HabitRPG to investigate any suspected unlawful, fraudulent or
+                improper activity, including, without limitation, granting authorized
+                HabitRPG representatives access to any password-protected portions of
+                your HabitRPG Account.
+            </p>
+            <p>
+                <strong>General Prohibitions</strong>
+                <br>
+                You agree not to do any of the following while using the Services or
+                HabitRPG Content:
+                <br>
+            </p>
+            <ul>
+                <li>
+                    Post, upload, publish, submit or transmit any text, graphics,
+                    images, software, music, audio, video, information or other material
+                    that: (i) infringes, misappropriates or violates a third party's
+                    patent, copyright, trademark, trade secret, moral rights or other
+                    intellectual property rights, or rights of publicity or privacy; (ii)
+                    violates, or encourages any conduct that would violate, any applicable
+                    law or regulation or would give rise to civil liability; (iii) is
+                    fraudulent, false, misleading or deceptive; (iv) is defamatory,
+                    obscene, pornographic, vulgar or offensive; (v) promotes
+                    discrimination, bigotry, racism, hatred, harassment or harm against any
+                    individual or group; (vi) is violent or threatening or promotes
+                    violence or actions that are threatening to any other person; or (vii)
+                    promotes illegal or harmful activities or substances (including but not
+                    limited to activities that promote or provide instructional information
+                    regarding the manufacture or purchase of illegal weapons or illegal
+                    substances).
+                </li>
+                <li>
+                    Use, display, mirror, frame or utilize framing techniques to
+                    enclose the Services, or any individual element or materials within the
+                    Services, HabitRPG's name, any HabitRPG trademark, logo or other
+                    proprietary information, the content of any text or the layout and
+                    design of any page or form contained on a page, without HabitRPG's
+                    express written consent;
+                </li>
+                <li>
+                    Access, tamper with, or use non-public areas of the Services,
+                    HabitRPG's computer systems, or the technical delivery systems of
+                    HabitRPG's providers;
+                </li>
+                <li>
+                    Attempt to probe, scan, or test the vulnerability of any
+                    HabitRPG system or network or breach any security or authentication
+                    measures;
+                </li>
+                <li>
+                    Avoid, bypass, remove, deactivate, impair, descramble or
+                    otherwise circumvent any technological measure implemented by HabitRPG
+                    or any of HabitRPG's providers or any other third party (including
+                    another user) to protect the Services or HabitRPG Content;
+                </li>
+                <li>
+                    Attempt to access or search the Services or HabitRPG Content or
+                    download HabitRPG Content from the Services through the use of any
+                    engine, software, tool, agent, device or mechanism (including spiders,
+                    robots, crawlers, data mining tools or the like) other than the
+                    software and/or search agents provided by HabitRPG or other generally
+                    available third party web browsers (such as Google Chrome, Microsoft
+                    Internet Explorer, Mozilla Firefox, Safari or Opera);
+                </li>
+                <li>
+                    Send any unsolicited or unauthorized advertising, promotional
+                    materials, email, junk mail, spam, chain letters or other form of
+                    solicitation;
+                </li>
+                <li>
+                    Use any meta tags or other hidden text or metadata utilizing a
+                    HabitRPG trademark, logo URL or product name without HabitRPG's express
+                    written consent;
+                </li>
+                <li>
+                    Use the Services or HabitRPG Content for any commercial purpose
+                    or the benefit of any third party or in any manner not permitted by
+                    these Terms of Service;
+                </li>
+                <li>
+                    Forge any TCP/IP packet header or any part of the header
+                    information in any email or newsgroup posting, or in any way use the
+                    Services or HabitRPG Content to send altered, deceptive or false
+                    source-identifying information;
+                </li>
+                <li>
+                    Attempt to decipher, decompile, disassemble or reverse
+                    engineer any of the software used to provide the Services or HabitRPG
+                    Content;
+                </li>
+                <li>
+                    Interfere with, or attempt to interfere with, the access of
+                    any user, host or network, including, without limitation, sending a
+                    virus, overloading, flooding, spamming, or mail-bombing the Services;
+                </li>
+                <li>
+                    Collect or store any personally identifiable information from
+                    the Services from other users of the Services without their express
+                    permission;
+                </li>
+                <li>
+                    Impersonate or misrepresent your affiliation with any person
+                    or entity; Violate any applicable law or regulation; or
+                </li>
+                <li>
+                    Encourage or enable any other individual to do any of the
+                    foregoing.
+                </li>
+            </ul>
+            <p>
+                HabitRPG will have the right to investigate and prosecute
+                violations of any of the above, including intellectual property rights
+                infringement and Services security issues, to the fullest extent of the
+                law. HabitRPG may involve and cooperate with law enforcement authorities
+                in prosecuting users who violate these Terms of Service. You acknowledge
+                that HabitRPG has no obligation to monitor your access to or use of the
+                Services or HabitRPG Content or to review or edit any Public User Content, but
+                has the right to do so for the purpose of operating the Services, to
+                ensure your compliance with these Terms of Service, or to comply with
+                applicable law or the order or requirement of a court, administrative
+                agency or other governmental body. HabitRPG reserves the right, at any
+                time and without prior notice, to remove or disable access to any
+                HabitRPG Content, including, any Public User Content, that HabitRPG, in its sole
+                discretion, considers to be in violation of these Terms of Service or
+                otherwise harmful to the Services.
+            </p>
+            <p>
+                <strong>Links</strong>
+                <br>
+                The Services may contain links to third-party websites or resources. You
+                acknowledge and agree that HabitRPG is not responsible or liable for: (i)
+                the availability or accuracy of such websites or resources; or (ii) the
+                content, products, or services on or available from such websites or
+                resources. Links to such websites or resources do not imply any
+                endorsement by HabitRPG of such websites or resources or the content,
+                products, or services available from such websites or resources. You
+                acknowledge sole responsibility for and assume all risk arising from
+                your use of any such websites or resources.
+            </p>
+            <p>
+                <strong>Termination and HabitRPG Account; Cancellation</strong>
+                <br>
+                Without limiting other remedies, HabitRPG may at any time suspend or
+                terminate your HabitRPG Account and refuse to provide access to the
+                Services. In addition, HabitRPG may notify authorities or take any
+                actions it deems appropriate, without notice to you, if HabitRPG suspects
+                or determines, in its own discretion, that you may have or there is a
+                significant risk that you have (i) failed to comply with any provision
+                of these Terms of Service or any policies or rules established by
+                HabitRPG; or (ii) engaged in actions relating to or in the course of
+                using the Services that may be illegal or cause liability, harm,
+                embarrassment, harassment, abuse or disruption for you, HabitRPG Users,
+                HabitRPG or any other third parties or the Services.
+            </p>
+            <p>
+                You may terminate your HabitRPG Account at any time and for any
+                reason by sending email to support AT HabitRPG.com. Upon any termination
+                by a Member, the related account will no longer be accessible.
+            </p>
+            <p>
+                After any termination, you understand and acknowledge that we
+                will have no further obligation to provide the Services and all licenses
+                and other rights granted to you by these Terms of Service will
+                immediately cease. HabitRPG will not be liable to you or any third party
+                for termination of the Services or termination of your use of either.
+                UPON ANY TERMINATION OR SUSPENSION, ANY CONTENT, MATERIALS OR
+                INFORMATION (INCLUDING PUBLIC USER CONTENT) THAT YOU HAVE SUBMITTED ON THE
+                SERVICES OR THAT WHICH IS RELATED TO YOUR ACCOUNT MAY NO LONGER BE
+                ACCESSED BY YOU. Furthermore, HabitRPG will have no obligation to
+                maintain any information stored in our database related to your account
+                or to forward any information to you or any third party.
+            </p>
+            <p>
+                Any suspension, termination or cancellation will not affect your
+                obligations to HabitRPG under these Terms of Service (including, without
+                limitation, proprietary rights and ownership, indemnification and
+                limitation of liability), which by their sense and context are intended
+                to survive such suspension, termination or cancellation.
+            </p>
+            <p>
+                <strong>Disclaimers</strong>
+                <br>
+                THE SERVICES, HABITRPG CONTENT AND PUBLIC USER CONTENT ARE PROVIDED "AS IS",
+                WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHOUT
+                LIMITING THE FOREGOING, HABITRPG EXPLICITLY DISCLAIMS ANY WARRANTIES OF
+                MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR
+                NON-INFRINGEMENT, AND ANY WARRANTIES ARISING OUT OF COURSE OF DEALING OR
+                USAGE OF TRADE.
+            </p>
+            <p>
+                HABITRPG MAKES NO WARRANTY THAT THE SERVICES, HABITRPG CONTENT OR
+                PUBLIC USER CONTENT WILL MEET YOUR REQUIREMENTS OR BE AVAILABLE ON AN
+                UNINTERRUPTED, SECURE, OR ERROR-FREE BASIS. HABITRPG MAKES NO WARRANTY
+                REGARDING THE QUALITY OF ANY PRODUCTS, SERVICES OR CONTENT PURCHASED OR
+                OBTAINED THROUGH THE SERVICES OR THE ACCURACY, TIMELINESS, TRUTHFULNESS,
+                COMPLETENESS OR RELIABILITY OF ANY CONTENT OBTAINED THROUGH THE
+                SERVICES.
+            </p>
+            <p>
+                NO ADVICE OR INFORMATION, WHETHER ORAL OR WRITTEN, OBTAINED FROM
+                HABITRPG OR THROUGH THE SERVICES, HABITRPG CONTENT OR PUBLIC USER CONTENT, WILL
+                CREATE ANY WARRANTY NOT EXPRESSLY MADE HEREIN.
+            </p>
+            <p>
+                <strong>Indemnity</strong>
+                <br>
+                You agree to defend, indemnify, and hold HabitRPG, its officers,
+                directors, employees and agents, harmless from and against any claims,
+                liabilities, damages, losses, and expenses, including, without
+                limitation, reasonable legal and accounting fees, arising out of or in
+                any way connected with Public User Content you submit to HabitRPG, your access
+                to or use of the Services or HabitRPG Content, or your violation of these
+                Terms of Service.
+            </p>
+            <p>
+                <strong>Limitation of Liability</strong>
+                <br>
+                YOU ACKNOWLEDGE AND AGREE THAT, TO THE MAXIMUM EXTENT PERMITTED BY LAW,
+                THE ENTIRE RISK ARISING OUT OF YOUR ACCESS TO AND USE OF THE SERVICES
+                AND CONTENT THEREIN REMAINS WITH YOU. NEITHER HABITRPG NOR ANY OTHER
+                PARTY INVOLVED IN CREATING, PRODUCING, OR DELIVERING THE SERVICES OR
+                HABITRPG CONTENT WILL BE LIABLE FOR ANY INCIDENTAL, SPECIAL, EXEMPLARY OR
+                CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, LOSS OF DATA OR LOSS OF
+                GOODWILL, SERVICE INTERRUPTION, COMPUTER DAMAGE OR SYSTEM FAILURE OR THE
+                COST OF SUBSTITUTE PRODUCTS OR SERVICES, ARISING OUT OF OR IN CONNECTION
+                WITH THESE TERMS OR FROM THE USE OF OR INABILITY TO USE THE SERVICES OR
+                CONTENT THEREIN, WHETHER BASED ON WARRANTY, CONTRACT, TORT (INCLUDING
+                NEGLIGENCE), PRODUCT LIABILITY OR ANY OTHER LEGAL THEORY, AND WHETHER OR
+                NOT HABITRPG HAS BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGE, EVEN IF
+                A LIMITED REMEDY SET FORTH HEREIN IS FOUND TO HAVE FAILED OF ITS
+                ESSENTIAL PURPOSE. YOU SPECIFICALLY ACKNOWLEDGE THAT HABITRPG IS NOT
+                LIABLE FOR THE DEFAMATORY, OFFENSIVE OR ILLEGAL CONDUCT OF OTHER USERS
+                OR THIRD PARTIES AND THAT THE RISK OF INJURY FROM THE FOREGOING RESTS
+                ENTIRELY WITH YOU. FURTHER, HABITRPG WILL HAVE NO LIABILITY TO YOU OR TO
+                ANY THIRD PARTY FOR ANY PUBLIC USER CONTENT OR THIRD-PARTY CONTENT UPLOADED
+                ONTO OR DOWNLOADED FROM THE SITES OR THROUGH THE SERVICES.
+            </p>
+            <p>
+                IN NO EVENT WILL HABITRPG'S AGGREGATE LIABILITY ARISING OUT OF OR
+                IN CONNECTION WITH THESE TERMS OF SERVICE OR FROM THE USE OF OR
+                INABILITY TO USE THE SITE, SERVICES OR CONTENT THEREIN EXCEED ONE
+                HUNDRED U.S. DOLLARS ($100). THE LIMITATIONS OF DAMAGES SET FORTH ABOVE
+                ARE FUNDAMENTAL ELEMENTS OF THE BASIS OF THE BARGAIN BETWEEN HABITRPG AND
+                YOU. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF
+                LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, SO THE ABOVE
+                LIMITATION MAY NOT APPLY TO YOU.
+            </p>
+            <p>
+                <strong>Proprietary Rights Notices</strong>
+                <br>
+                All trademarks, service marks, logos, trade names and any other
+                proprietary designations of HabitRPG used herein are trademarks or
+                registered trademarks of HabitRPG. Any other trademarks, service marks,
+                logos, trade names and any other proprietary designations are the
+                trademarks or registered trademarks of their respective parties.
+            </p>
+            <p>
+                <strong>Controlling Law and Jurisdiction</strong>
+                <br>
+                These Terms of Service and any action related thereto will be governed
+                by the laws of the State of California without regard to its conflict of
+                laws provisions. The exclusive jurisdiction and venue of any action with
+                respect to the subject matter of these Terms of Service will be the
+                courts having jurisdiction over disputes arising in Santa Clara County,
+                California, and each of the parties hereto waives any objection to
+                jurisdiction and venue in such courts.
+            </p>
+            <p>
+                YOU AGREE THAT IF YOU WANT TO SUE US, YOU MUST FILE YOUR LAWSUIT
+                WITHIN ONE YEAR AFTER THE EVENT THAT GAVE RISE TO YOUR LAWSUIT.
+                OTHERWISE, YOUR LAWSUIT WILL BE PERMANENTLY BARRED.
+            </p>
+            <p>
+                <strong>Export Control</strong>
+                <br>
+                You may not use or otherwise export or re-export the Services except as
+                authorized by United States law and the laws of the jurisdiction in
+                which the Services were obtained. In particular, but without limitation,
+                the Services may not be exported or re-exported (a) into any U.S.
+                embargoed countries or (b) to anyone on the U.S. Treasury Department's
+                list of Specially Designated Nationals or the U.S. Department of
+                Commerce Denied Person's List or Entity List. By using the Services, you
+                represent and warrant that you are not located in any such country or on
+                any such list. You also agree that you will not use these products for
+                any purposes prohibited by United States law, including, without
+                limitation, the development, design, manufacture or production of
+                nuclear, missiles, or chemical or biological weapons.
+            </p>
+            <p>
+                <strong>Entire Agreement</strong>
+                <br>
+                These Terms of Service constitute the entire and exclusive understanding
+                and agreement between HabitRPG and you regarding the Services and HabitRPG
+                Content, and these Terms of Service supersede and replace any and all
+                prior oral or written understandings or agreements between HabitRPG and
+                you regarding the Services and HabitRPG Content.
+            </p>
+            <p>
+                <strong>Assignment</strong>
+                <br>
+                You may not assign or transfer these Terms of Service, by operation of
+                law or otherwise, without HabitRPG's prior written consent. Any attempt
+                by you to assign or transfer these Terms of Service, without such
+                consent, will be null and of no effect. HabitRPG may freely assign these
+                Terms of Service. Subject to the foregoing, these Terms of Service will
+                bind and inure to the benefit of the parties, their successors and
+                permitted assigns.
+            </p>
+            <p>
+                <strong>Notices</strong>
+                <br>
+                You consent to the use of: (i) electronic means to complete these Terms
+                of Service and to deliver any notices or other communications permitted
+                or required hereunder; and (ii) electronic records to store information
+                related to these Terms of Service or your use of the Services. Any
+                notices or other communications permitted to required hereunder,
+                including those regarding modifications to these Terms of Service, will
+                be in writing and given: (x) by HabitRPG via email (in each case to the
+                address that you provide) or (y) by posting to the Sites or Services.
+                For notices made by e-mail, the date of receipt will be deemed the date
+                on which such notice is transmitted.
+            </p>
+            <p>
+                <strong>General</strong>
+                <br>
+                The failure of HabitRPG to enforce any right or provision of these Terms
+                of Service will not constitute a waiver of future enforcement of that
+                right or provision. The waiver of any such right or provision will be
+                effective only if in writing and signed by a duly authorized
+                representative of HabitRPG. Except as expressly set forth in these Terms
+                of Service, the exercise by either party of any of its remedies under
+                these Terms of Service will be without prejudice to its other remedies
+                under these Terms of Service or otherwise. If for any reason a court of
+                competent jurisdiction finds any provision of these Terms of Service
+                invalid or unenforceable, that provision will be enforced to the maximum
+                extent permissible and the other provisions of these Terms of Service
+                will remain in full force and effect.
+            </p>
+            <p>
+                <strong>Contacting Us</strong>
+                <br>
+                If you have any questions about these Terms of Service, please contact
+                us at tylerrenelle@gmail.com.
+            </p>
+            <div id="home_static_footer">
+                © 2012 OCDevel
+            </div>
+
+        </div>
+    </div>
+    <app:footer:footer />
\ No newline at end of file
diff --git a/views/terms.html b/views/terms.html
deleted file mode 100644
index a83d98885d..0000000000
--- a/views/terms.html
+++ /dev/null
@@ -1,636 +0,0 @@
-<Title:>
-  Terms of Use
-
-<Body:>
-  <div class="well">
-    <a href="/">&laquo; Back</a>
-    <div class="page-header">
-      <h1>Terms of Use</h1>
-    </div>
-    <p>
-      Last updated September 2, 2012
-    </p>
-    <p>
-      HabitRPG (or "we") provides services through our 
-      software applications for various devices and platforms ("HabitRPG 
-      Applications") and the HabitRPG.com domain, and any sub domains thereto
-      (the "Sites"). Individually or collectively, HabitRPG Applications and 
-      Sites may be referred to as the "Services".
-    </p>
-    <p>
-      Please read the following terms and conditions ("Terms of 
-      Service") carefully. These Terms of Service govern your access to and 
-      use of the Services and HabitRPG Content (defined below) and set forth 
-      the legally binding terms for your use of the Services and HabitRPG 
-      Content, whether or not you have registered as a Member.
-    </p>
-    <p>
-      Certain areas of the Services (and your access to or use of 
-      HabitRPG Content) may have different terms and conditions posted or may 
-      require you to agree with and accept additional terms and conditions. If 
-      there is a conflict between these Terms of Service and terms and 
-      conditions posted for a specific area of the Services or HabitRPG 
-      Content, the latter terms and conditions will take precedence with 
-      respect to your use of or access to that area of the Services or HabitRPG 
-      Content.
-    </p>
-    <p>
-      YOU ACKNOWLEDGE AND AGREE THAT, BY CLICKING ON THE "I AGREE" OR 
-      "I ACCEPT" BUTTON, OR BY ACCESSING OR USING THE SERVICES OR BY 
-      DOWNLOADING OR POSTING ANY CONTENT FROM OR ON THE SITES OR THROUGH THE 
-      SERVICES, YOU ARE INDICATING THAT YOU HAVE READ, UNDERSTAND AND AGREE TO 
-      BE BOUND BY THESE TERMS, WHETHER OR NOT YOU HAVE REGISTERED AS A MEMBER, 
-      AND AGREE TO OUR PRIVACY POLICY AS DESCRIBED BELOW. IF YOU DO NOT AGREE 
-      TO THESE TERMS, THEN YOU HAVE NO RIGHT TO ACCESS OR USE THE SERVICES OR 
-      HABITRPG CONTENT.
-    </p>
-    <p>
-      <strong>Modification</strong>
-      <br>
-      HabitRPG reserves the right, at its sole discretion, to modify, 
-      discontinue or terminate the Services, including any portion thereof on 
-      a global or individual basis, or to modify these Terms of Service, at 
-      any time and without prior notice. If we modify these Terms of Service, 
-      we will update the "Last Updated Date" above and post the modification 
-      on the Sites and perhaps elsewhere within the Services. By continuing to 
-      access or use the Services after we have posted a modification to these 
-      Terms of Service or have provided you with notice of a modification, you 
-      are indicating that you agree to be bound by the modified Terms of 
-      Service. If the modified Terms of Service are not acceptable to you, 
-      your only recourse is to cease using the Services.
-    </p>
-    <p>
-      <strong>Eligibility and HabitRPG Account Registration</strong>
-      <br>
-      In order to access certain features of the Sites and Services, and to 
-      post any Public User Content (defined below) on the Sites or through the 
-      Services, you must register to create an account ("HabitRPG Account") and 
-      become a "Member". In compliance with privacy laws, we do not allow 
-      people below the age of 14 to create accounts; please see our Privacy 
-      Policy for further information. During the registration process, you 
-      will be required to provide certain information and you will establish a 
-      username and a password. You agree to provide accurate, current and 
-      complete information during the registration process and to update such 
-      information to keep it accurate, current and complete. HabitRPG reserves 
-      the right to suspend or terminate your HabitRPG Account if any 
-      information provided during the registration process or thereafter 
-      proves to be inaccurate, not current or incomplete. If you are not a 
-      Member you may browse all areas of the Sites or use the parts of the 
-      Services that are not limited to Members only. You are responsible for 
-      safeguarding your password. You agree not to disclose your password to 
-      any third party and to take sole responsibility for any activities or 
-      actions under your HabitRPG Account, whether or not you have authorized 
-      such activities or actions. You agree to immediately notify HabitRPG of 
-      any unauthorized use of your HabitRPG Account. We are not liable for any 
-      damages or losses caused by someone using your account without your 
-      permission.
-    </p>
-    <p>
-      <strong>Privacy</strong>
-      <br>
-      See HabitRPG's Privacy Policy at http://www.HabitRPG.com/privacy for 
-      information and notices concerning HabitRPG's collection and use of your 
-      personal information. If you have any questions about the HabitRPG 
-      Privacy Policy, please contact HabitRPG at privacy AT HabitRPG.com. By 
-      accessing the Services you are agreeing to the terms of our Privacy 
-      Policy.
-    </p>
-    <p>
-      <strong>Content</strong>
-      <br>
-      Certain types of content are made available through the Services. 
-      "HabitRPG Content" means, collectively, the text, data, graphics, images, 
-      illustrations, forms and look and feel attributes, HabitRPG trademarks 
-      and logos and other content made available through the Services, 
-      including any technology or code making up the Services, excluding User 
-      Content. "Public User Content" means the text, data, graphics, images, photos, 
-      video or audiovisual content, hypertext links and any other content uploaded, 
-      transmitted or submitted by a Member via the Services with the intent to share 
-      with other users. "Private User Content" means data created through the services 
-      exclusively for personal use or private sharing.
-      This includes tasks and related data created in HabitRPG Tasks that have not 
-      been explicitly shared publicly.
-      You understand that by using any of the Services, you may encounter content 
-      that may be deemed offensive, indecent, or objectionable, which content 
-      may or may not be identified as having explicit language, and that the 
-      results of any search or entering of a particular URL may automatically 
-      and unintentionally generate links or references to objectionable 
-      material. Nevertheless, you agree to use the Services at your sole risk 
-      and that we shall not have any liability to you for content that may be 
-      found to be offensive, indecent, or objectionable.
-    </p>
-    <p>
-      <strong>Ownership</strong>
-      <br>
-      The Services and HabitRPG Content are protected by copyright, trademark, 
-      and other laws of the United States and foreign countries. Except as 
-      expressly provided in these Terms of Service, HabitRPG and its licensors 
-      exclusively own all right, title and interest in and to the Services and 
-      HabitRPG Content, including all associated intellectual property rights. 
-      You will not remove, alter or obscure any copyright, trademark, service 
-      mark or other proprietary rights notices incorporated in or accompanying 
-      the Services or HabitRPG Content.
-    </p>
-    <p>
-      <strong>HabitRPG License</strong>
-      <br>
-      Subject to your compliance with the terms and conditions of these Terms 
-      of Service, HabitRPG grants you a limited, non-exclusive, 
-      non-transferable license, without the right to sublicense, to access, 
-      use, view, download and print, where applicable, the Services and any 
-      HabitRPG Content solely for your personal and non-commercial purposes. 
-      You will not use, copy, adapt, modify, prepare derivative works based 
-      upon, distribute, license, sell, transfer, publicly display, publicly 
-      perform, transmit, stream, broadcast or otherwise exploit the Services 
-      or HabitRPG Content, except as expressly permitted in these Terms of 
-      Service. No licenses or rights are granted to you by implication or 
-      otherwise under any intellectual property rights owned or controlled by 
-      HabitRPG or its licensors, except for the licenses and rights expressly 
-      granted in these Terms of Service. With respect to HabitRPG Applications, 
-      your license is limited to use of such applications on platforms and 
-      devices that you own or control, and you may not distribute or make the 
-      HabitRPG Applications available over a network where it could be used by 
-      multiple devices at the same time.
-    </p>
-    <p>
-      <strong>Public User Content</strong>
-      <br>
-      By making available any Public User Content through the Services, you hereby 
-      grant to HabitRPG a worldwide, irrevocable, perpetual, non-exclusive, 
-      transferable, royalty-free license, with the right to sublicense, to 
-      use, copy, adapt, modify, distribute, license, sell, transfer, publicly 
-      display, publicly perform, transmit, stream, broadcast and otherwise 
-      exploit such Public User Content only on, through or by means of the Services. 
-      HabitRPG does not claim any ownership rights in any such Public User Content and 
-      nothing in these Terms of Service will be deemed to restrict any rights 
-      that you may have to use and exploit any such Public User Content.
-    </p>
-    <p>
-      You acknowledge and agree that you are solely responsible for all 
-      Public User Content that you make available through the Services. Accordingly, 
-      you represent and warrant that: (i) you either are the sole and 
-      exclusive owner of all Public User Content that you make available through the 
-      Services or you have all rights, licenses, consents and releases that 
-      are necessary to grant to HabitRPG the rights in such Public User Content, as 
-      contemplated under these Terms of Service; and (ii) neither the User 
-      Content nor your posting, uploading, publication, submission or 
-      transmittal of the Public User Content or HabitRPG's use of the Public User Content (or 
-      any portion thereof) on, through or by means of the Services will 
-      infringe, misappropriate or violate a third party's patent, copyright, 
-      trademark, trade secret, moral rights or other intellectual property 
-      rights, or rights of publicity or privacy, or result in the violation of 
-      any applicable law or regulation.
-    </p>
-    <p>
-      Copyrighted Materials: No Infringing Use. You will not use the 
-      Services to offer, display, distribute, transmit, route, provide 
-      connections to or store any material that infringes copyrighted works or 
-      otherwise violates or promotes the violation of the intellectual 
-      property rights of any third party. HabitRPG has adopted and implemented 
-      a policy that provides for the termination in appropriate circumstances 
-      of the accounts of users who repeatedly infringe or are believed to be 
-      or are charged with repeatedly infringing the rights of copyright 
-      holders.
-    </p>
-    <p>
-      <strong>Notify Us of Infringers</strong>
-      <br>
-      If you believe that something on the Services violates your copyright, 
-      notify our copyright agent in writing. The contact information for our 
-      copyright agent is at the bottom of this section.
-    </p>
-    <p>
-      In order for us to take action, you must do the following in your 
-      notice:
-    </p>
-    <p>
-      (1) provide your physical or electronic signature; (2) identify 
-      the copyrighted work that you believe is being infringed; (3) identify 
-      the item on the Services that you think is infringing your work and 
-      include sufficient information about where the material is located on 
-      the Services (including which website and URL) so that we can find it; 
-      (4) provide us with a way to contact you, such as your address, 
-      telephone number, or e-mail; (5) provide a statement that you believe in 
-      good faith that the item you have identified as infringing is not 
-      authorized by the copyright owner, its agent, or the law to be used on 
-      the Services; and (6) provide a statement that the information you 
-      provide in your notice is accurate, and that (under penalty of perjury), 
-      you are authorized to act on behalf of the copyright owner whose work is 
-      being infringed.
-    </p>
-    <p>
-      Here is the contact information for our copyright agent:
-    </p>
-    <p>
-      Copyright Enforcement
-      <br>
-      OCDevel
-      <br>
-      98 Morrison Ave #2
-      <br>
-      Somerville, MA 02144
-      <br>
-      Phone: (805) 975-5236
-      <br>
-      E-Mail: tylerrenelle at gmail dot com
-    </p>
-    <p>
-      Again, we cannot take action unless you give us all the required 
-      information.
-    </p>
-    <p>
-      <strong>Ratings and Comments &amp; Feedback.</strong>
-      <br>
-      You can rate and make comments about content made available through the 
-      Services ("Comments"). HabitRPG advises you to exercise caution and good 
-      judgment when leaving such Comments. Once you complete and submit your 
-      Comments to the Services you will not be able to go back and edit your 
-      Comments. You should also be aware that you could be held legally 
-      responsible for damages to someone's reputation if your Comments are 
-      deemed to be defamatory. Without limiting any other terms of this Terms 
-      of Service, HabitRPG may, but is under no obligation to, monitor or 
-      censor Comments and disclaims any and all liability relating thereto. 
-      Notwithstanding the foregoing, HabitRPG does reserve the right, in its 
-      sole discretion, to remove any Comments that it deems to be improper, 
-      inappropriate or inconsistent with the online activities that are 
-      permitted under these Terms of Service. We welcome and encourage you to 
-      provide feedback, comments and suggestions for improvements to the 
-      Services ("Feedback"). You may submit Feedback by emailing us at support 
-      AT HabitRPG.com. You acknowledge and agree that all Comments and Feedback 
-      will be the sole and exclusive property of HabitRPG and you hereby 
-      irrevocably assign to HabitRPG and agree to irrevocably assign to HabitRPG 
-      all of your right, title, and interest in and to all Comments and 
-      Feedback, including without limitation all worldwide patent rights, 
-      copyright rights, trade secret rights, and other proprietary or 
-      intellectual property rights therein. At HabitRPG's request and expense, 
-      you will execute documents and take such further acts as HabitRPG may 
-      reasonably request to assist HabitRPG to acquire, perfect, and maintain 
-      its intellectual property rights and other legal protections for the 
-      Comments and Feedback.
-    </p>
-    <p>
-      <strong>Interactions between Users</strong>
-      <br>
-      You are solely responsible for your interactions (including any 
-      disputes) with other users. You understand that HabitRPG does not in any 
-      way screen HabitRPG users, except to only allow people aged 14 and over 
-      to create accounts. You are solely responsible for, and will exercise 
-      caution, discretion, common sense and judgment in, using the Services 
-      and disclosing personal information to other HabitRPG users. You agree to 
-      take reasonable precautions in all interactions with other HabitRPG 
-      users, particularly if you decide to meet a HabitRPG user offline, or in 
-      person. Your use of the Services, HabitRPG Content and any other content 
-      made available through the Services is at your sole risk and discretion 
-      and HabitRPG hereby disclaims any and all liability to you or any third 
-      party relating thereto. HabitRPG reserves the right to contact Members, 
-      in compliance with applicable law, in order to evaluate compliance with 
-      the rules and policies in these Terms of Service. You will cooperate 
-      fully with HabitRPG to investigate any suspected unlawful, fraudulent or 
-      improper activity, including, without limitation, granting authorized 
-      HabitRPG representatives access to any password-protected portions of 
-      your HabitRPG Account.
-    </p>
-    <p>
-      <strong>General Prohibitions</strong>
-      <br>
-      You agree not to do any of the following while using the Services or 
-      HabitRPG Content:
-      <br>
-    </p>
-    <ul>
-      <li>
-        Post, upload, publish, submit or transmit any text, graphics, 
-        images, software, music, audio, video, information or other material 
-        that: (i) infringes, misappropriates or violates a third party's 
-        patent, copyright, trademark, trade secret, moral rights or other 
-        intellectual property rights, or rights of publicity or privacy; (ii) 
-        violates, or encourages any conduct that would violate, any applicable 
-        law or regulation or would give rise to civil liability; (iii) is 
-        fraudulent, false, misleading or deceptive; (iv) is defamatory, 
-        obscene, pornographic, vulgar or offensive; (v) promotes 
-        discrimination, bigotry, racism, hatred, harassment or harm against any 
-        individual or group; (vi) is violent or threatening or promotes 
-        violence or actions that are threatening to any other person; or (vii) 
-        promotes illegal or harmful activities or substances (including but not 
-        limited to activities that promote or provide instructional information 
-        regarding the manufacture or purchase of illegal weapons or illegal 
-        substances).
-      </li>
-      <li>
-        Use, display, mirror, frame or utilize framing techniques to 
-        enclose the Services, or any individual element or materials within the 
-        Services, HabitRPG's name, any HabitRPG trademark, logo or other 
-        proprietary information, the content of any text or the layout and 
-        design of any page or form contained on a page, without HabitRPG's 
-        express written consent;
-      </li>
-      <li>
-        Access, tamper with, or use non-public areas of the Services, 
-        HabitRPG's computer systems, or the technical delivery systems of 
-        HabitRPG's providers;
-      </li>
-      <li>
-        Attempt to probe, scan, or test the vulnerability of any 
-        HabitRPG system or network or breach any security or authentication 
-        measures;
-      </li>
-      <li>
-        Avoid, bypass, remove, deactivate, impair, descramble or 
-        otherwise circumvent any technological measure implemented by HabitRPG 
-        or any of HabitRPG's providers or any other third party (including 
-        another user) to protect the Services or HabitRPG Content;
-      </li>
-      <li>
-        Attempt to access or search the Services or HabitRPG Content or 
-        download HabitRPG Content from the Services through the use of any 
-        engine, software, tool, agent, device or mechanism (including spiders, 
-        robots, crawlers, data mining tools or the like) other than the 
-        software and/or search agents provided by HabitRPG or other generally 
-        available third party web browsers (such as Google Chrome, Microsoft 
-        Internet Explorer, Mozilla Firefox, Safari or Opera);
-      </li>
-      <li>
-        Send any unsolicited or unauthorized advertising, promotional 
-        materials, email, junk mail, spam, chain letters or other form of 
-        solicitation;
-      </li>
-      <li>
-        Use any meta tags or other hidden text or metadata utilizing a 
-        HabitRPG trademark, logo URL or product name without HabitRPG's express 
-        written consent;
-      </li>
-      <li>
-        Use the Services or HabitRPG Content for any commercial purpose 
-        or the benefit of any third party or in any manner not permitted by 
-        these Terms of Service;
-      </li>
-      <li>
-        Forge any TCP/IP packet header or any part of the header 
-        information in any email or newsgroup posting, or in any way use the 
-        Services or HabitRPG Content to send altered, deceptive or false 
-        source-identifying information;
-      </li>
-      <li>
-        Attempt to decipher, decompile, disassemble or reverse 
-        engineer any of the software used to provide the Services or HabitRPG 
-        Content;
-      </li>
-      <li>
-        Interfere with, or attempt to interfere with, the access of 
-        any user, host or network, including, without limitation, sending a 
-        virus, overloading, flooding, spamming, or mail-bombing the Services;
-      </li>
-      <li>
-        Collect or store any personally identifiable information from 
-        the Services from other users of the Services without their express 
-        permission;
-      </li>
-      <li>
-        Impersonate or misrepresent your affiliation with any person 
-        or entity; Violate any applicable law or regulation; or
-      </li>
-      <li>
-        Encourage or enable any other individual to do any of the 
-        foregoing.
-      </li>
-    </ul>
-    <p>
-      HabitRPG will have the right to investigate and prosecute 
-      violations of any of the above, including intellectual property rights 
-      infringement and Services security issues, to the fullest extent of the 
-      law. HabitRPG may involve and cooperate with law enforcement authorities 
-      in prosecuting users who violate these Terms of Service. You acknowledge 
-      that HabitRPG has no obligation to monitor your access to or use of the 
-      Services or HabitRPG Content or to review or edit any Public User Content, but 
-      has the right to do so for the purpose of operating the Services, to 
-      ensure your compliance with these Terms of Service, or to comply with 
-      applicable law or the order or requirement of a court, administrative 
-      agency or other governmental body. HabitRPG reserves the right, at any 
-      time and without prior notice, to remove or disable access to any 
-      HabitRPG Content, including, any Public User Content, that HabitRPG, in its sole 
-      discretion, considers to be in violation of these Terms of Service or 
-      otherwise harmful to the Services.
-    </p>
-    <p>
-      <strong>Links</strong>
-      <br>
-      The Services may contain links to third-party websites or resources. You 
-      acknowledge and agree that HabitRPG is not responsible or liable for: (i) 
-      the availability or accuracy of such websites or resources; or (ii) the 
-      content, products, or services on or available from such websites or 
-      resources. Links to such websites or resources do not imply any 
-      endorsement by HabitRPG of such websites or resources or the content, 
-      products, or services available from such websites or resources. You 
-      acknowledge sole responsibility for and assume all risk arising from 
-      your use of any such websites or resources. 
-    </p>
-    <p>
-      <strong>Termination and HabitRPG Account; Cancellation</strong>
-      <br>
-      Without limiting other remedies, HabitRPG may at any time suspend or 
-      terminate your HabitRPG Account and refuse to provide access to the 
-      Services. In addition, HabitRPG may notify authorities or take any 
-      actions it deems appropriate, without notice to you, if HabitRPG suspects 
-      or determines, in its own discretion, that you may have or there is a 
-      significant risk that you have (i) failed to comply with any provision 
-      of these Terms of Service or any policies or rules established by 
-      HabitRPG; or (ii) engaged in actions relating to or in the course of 
-      using the Services that may be illegal or cause liability, harm, 
-      embarrassment, harassment, abuse or disruption for you, HabitRPG Users, 
-      HabitRPG or any other third parties or the Services.
-    </p>
-    <p>
-      You may terminate your HabitRPG Account at any time and for any 
-      reason by sending email to support AT HabitRPG.com. Upon any termination 
-      by a Member, the related account will no longer be accessible.
-    </p>
-    <p>
-      After any termination, you understand and acknowledge that we 
-      will have no further obligation to provide the Services and all licenses 
-      and other rights granted to you by these Terms of Service will 
-      immediately cease. HabitRPG will not be liable to you or any third party 
-      for termination of the Services or termination of your use of either. 
-      UPON ANY TERMINATION OR SUSPENSION, ANY CONTENT, MATERIALS OR 
-      INFORMATION (INCLUDING PUBLIC USER CONTENT) THAT YOU HAVE SUBMITTED ON THE 
-      SERVICES OR THAT WHICH IS RELATED TO YOUR ACCOUNT MAY NO LONGER BE 
-      ACCESSED BY YOU. Furthermore, HabitRPG will have no obligation to 
-      maintain any information stored in our database related to your account 
-      or to forward any information to you or any third party. 
-    </p>
-    <p>
-      Any suspension, termination or cancellation will not affect your 
-      obligations to HabitRPG under these Terms of Service (including, without 
-      limitation, proprietary rights and ownership, indemnification and 
-      limitation of liability), which by their sense and context are intended 
-      to survive such suspension, termination or cancellation.
-    </p>
-    <p>
-      <strong>Disclaimers</strong>
-      <br>
-      THE SERVICES, HABITRPG CONTENT AND PUBLIC USER CONTENT ARE PROVIDED "AS IS", 
-      WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHOUT 
-      LIMITING THE FOREGOING, HABITRPG EXPLICITLY DISCLAIMS ANY WARRANTIES OF 
-      MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR 
-      NON-INFRINGEMENT, AND ANY WARRANTIES ARISING OUT OF COURSE OF DEALING OR 
-      USAGE OF TRADE.
-    </p>
-    <p>
-      HABITRPG MAKES NO WARRANTY THAT THE SERVICES, HABITRPG CONTENT OR 
-      PUBLIC USER CONTENT WILL MEET YOUR REQUIREMENTS OR BE AVAILABLE ON AN 
-      UNINTERRUPTED, SECURE, OR ERROR-FREE BASIS. HABITRPG MAKES NO WARRANTY 
-      REGARDING THE QUALITY OF ANY PRODUCTS, SERVICES OR CONTENT PURCHASED OR 
-      OBTAINED THROUGH THE SERVICES OR THE ACCURACY, TIMELINESS, TRUTHFULNESS, 
-      COMPLETENESS OR RELIABILITY OF ANY CONTENT OBTAINED THROUGH THE 
-      SERVICES.
-    </p>
-    <p>
-      NO ADVICE OR INFORMATION, WHETHER ORAL OR WRITTEN, OBTAINED FROM 
-      HABITRPG OR THROUGH THE SERVICES, HABITRPG CONTENT OR PUBLIC USER CONTENT, WILL 
-      CREATE ANY WARRANTY NOT EXPRESSLY MADE HEREIN.
-    </p>
-    <p>
-      <strong>Indemnity</strong>
-      <br>
-      You agree to defend, indemnify, and hold HabitRPG, its officers, 
-      directors, employees and agents, harmless from and against any claims, 
-      liabilities, damages, losses, and expenses, including, without 
-      limitation, reasonable legal and accounting fees, arising out of or in 
-      any way connected with Public User Content you submit to HabitRPG, your access 
-      to or use of the Services or HabitRPG Content, or your violation of these 
-      Terms of Service.
-    </p>
-    <p>
-      <strong>Limitation of Liability</strong>
-      <br>
-      YOU ACKNOWLEDGE AND AGREE THAT, TO THE MAXIMUM EXTENT PERMITTED BY LAW, 
-      THE ENTIRE RISK ARISING OUT OF YOUR ACCESS TO AND USE OF THE SERVICES 
-      AND CONTENT THEREIN REMAINS WITH YOU. NEITHER HABITRPG NOR ANY OTHER 
-      PARTY INVOLVED IN CREATING, PRODUCING, OR DELIVERING THE SERVICES OR 
-      HABITRPG CONTENT WILL BE LIABLE FOR ANY INCIDENTAL, SPECIAL, EXEMPLARY OR 
-      CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, LOSS OF DATA OR LOSS OF 
-      GOODWILL, SERVICE INTERRUPTION, COMPUTER DAMAGE OR SYSTEM FAILURE OR THE 
-      COST OF SUBSTITUTE PRODUCTS OR SERVICES, ARISING OUT OF OR IN CONNECTION 
-      WITH THESE TERMS OR FROM THE USE OF OR INABILITY TO USE THE SERVICES OR 
-      CONTENT THEREIN, WHETHER BASED ON WARRANTY, CONTRACT, TORT (INCLUDING 
-      NEGLIGENCE), PRODUCT LIABILITY OR ANY OTHER LEGAL THEORY, AND WHETHER OR 
-      NOT HABITRPG HAS BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGE, EVEN IF 
-      A LIMITED REMEDY SET FORTH HEREIN IS FOUND TO HAVE FAILED OF ITS 
-      ESSENTIAL PURPOSE. YOU SPECIFICALLY ACKNOWLEDGE THAT HABITRPG IS NOT 
-      LIABLE FOR THE DEFAMATORY, OFFENSIVE OR ILLEGAL CONDUCT OF OTHER USERS 
-      OR THIRD PARTIES AND THAT THE RISK OF INJURY FROM THE FOREGOING RESTS 
-      ENTIRELY WITH YOU. FURTHER, HABITRPG WILL HAVE NO LIABILITY TO YOU OR TO 
-      ANY THIRD PARTY FOR ANY PUBLIC USER CONTENT OR THIRD-PARTY CONTENT UPLOADED 
-      ONTO OR DOWNLOADED FROM THE SITES OR THROUGH THE SERVICES.
-    </p>
-    <p>
-      IN NO EVENT WILL HABITRPG'S AGGREGATE LIABILITY ARISING OUT OF OR 
-      IN CONNECTION WITH THESE TERMS OF SERVICE OR FROM THE USE OF OR 
-      INABILITY TO USE THE SITE, SERVICES OR CONTENT THEREIN EXCEED ONE 
-      HUNDRED U.S. DOLLARS ($100). THE LIMITATIONS OF DAMAGES SET FORTH ABOVE 
-      ARE FUNDAMENTAL ELEMENTS OF THE BASIS OF THE BARGAIN BETWEEN HABITRPG AND 
-      YOU. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF 
-      LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, SO THE ABOVE 
-      LIMITATION MAY NOT APPLY TO YOU.
-    </p>
-    <p>
-      <strong>Proprietary Rights Notices</strong>
-      <br>
-      All trademarks, service marks, logos, trade names and any other 
-      proprietary designations of HabitRPG used herein are trademarks or 
-      registered trademarks of HabitRPG. Any other trademarks, service marks, 
-      logos, trade names and any other proprietary designations are the 
-      trademarks or registered trademarks of their respective parties.
-    </p>
-    <p>
-      <strong>Controlling Law and Jurisdiction</strong>
-      <br>
-      These Terms of Service and any action related thereto will be governed 
-      by the laws of the State of California without regard to its conflict of 
-      laws provisions. The exclusive jurisdiction and venue of any action with 
-      respect to the subject matter of these Terms of Service will be the 
-      courts having jurisdiction over disputes arising in Santa Clara County, 
-      California, and each of the parties hereto waives any objection to 
-      jurisdiction and venue in such courts.
-    </p>
-    <p>
-      YOU AGREE THAT IF YOU WANT TO SUE US, YOU MUST FILE YOUR LAWSUIT 
-      WITHIN ONE YEAR AFTER THE EVENT THAT GAVE RISE TO YOUR LAWSUIT. 
-      OTHERWISE, YOUR LAWSUIT WILL BE PERMANENTLY BARRED.
-    </p>
-    <p>
-      <strong>Export Control</strong>
-      <br>
-      You may not use or otherwise export or re-export the Services except as 
-      authorized by United States law and the laws of the jurisdiction in 
-      which the Services were obtained. In particular, but without limitation, 
-      the Services may not be exported or re-exported (a) into any U.S. 
-      embargoed countries or (b) to anyone on the U.S. Treasury Department's 
-      list of Specially Designated Nationals or the U.S. Department of 
-      Commerce Denied Person's List or Entity List. By using the Services, you 
-      represent and warrant that you are not located in any such country or on 
-      any such list. You also agree that you will not use these products for 
-      any purposes prohibited by United States law, including, without 
-      limitation, the development, design, manufacture or production of 
-      nuclear, missiles, or chemical or biological weapons.
-    </p>
-    <p>
-      <strong>Entire Agreement</strong>
-      <br>
-      These Terms of Service constitute the entire and exclusive understanding 
-      and agreement between HabitRPG and you regarding the Services and HabitRPG 
-      Content, and these Terms of Service supersede and replace any and all 
-      prior oral or written understandings or agreements between HabitRPG and 
-      you regarding the Services and HabitRPG Content.
-    </p>
-    <p>
-      <strong>Assignment</strong>
-      <br>
-      You may not assign or transfer these Terms of Service, by operation of 
-      law or otherwise, without HabitRPG's prior written consent. Any attempt 
-      by you to assign or transfer these Terms of Service, without such 
-      consent, will be null and of no effect. HabitRPG may freely assign these 
-      Terms of Service. Subject to the foregoing, these Terms of Service will 
-      bind and inure to the benefit of the parties, their successors and 
-      permitted assigns.
-    </p>
-    <p>
-      <strong>Notices</strong>
-      <br>
-      You consent to the use of: (i) electronic means to complete these Terms 
-      of Service and to deliver any notices or other communications permitted 
-      or required hereunder; and (ii) electronic records to store information 
-      related to these Terms of Service or your use of the Services. Any 
-      notices or other communications permitted to required hereunder, 
-      including those regarding modifications to these Terms of Service, will 
-      be in writing and given: (x) by HabitRPG via email (in each case to the 
-      address that you provide) or (y) by posting to the Sites or Services. 
-      For notices made by e-mail, the date of receipt will be deemed the date 
-      on which such notice is transmitted.
-    </p>
-    <p>
-      <strong>General</strong>
-      <br>
-      The failure of HabitRPG to enforce any right or provision of these Terms 
-      of Service will not constitute a waiver of future enforcement of that 
-      right or provision. The waiver of any such right or provision will be 
-      effective only if in writing and signed by a duly authorized 
-      representative of HabitRPG. Except as expressly set forth in these Terms 
-      of Service, the exercise by either party of any of its remedies under 
-      these Terms of Service will be without prejudice to its other remedies 
-      under these Terms of Service or otherwise. If for any reason a court of 
-      competent jurisdiction finds any provision of these Terms of Service 
-      invalid or unenforceable, that provision will be enforced to the maximum 
-      extent permissible and the other provisions of these Terms of Service 
-      will remain in full force and effect.
-    </p>
-    <p>
-      <strong>Contacting Us</strong>
-      <br>
-      If you have any questions about these Terms of Service, please contact 
-      us at tylerrenelle@gmail.com.
-    </p>
-    <div id="home_static_footer">
-      © 2012 OCDevel
-    </div>
-
-  </div>

From 63cda4c5c795353d82ea776f2887ed0ca055d2a6 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sat, 16 Mar 2013 23:11:33 -0400
Subject: [PATCH 204/220] clegsome static-page cleanup

---
 views/app/footer.html   |   2 +-
 views/static/about.html |   3 +-
 views/static/faq.html   | 116 +++++++++++++++++++++++++++++-----------
 3 files changed, 86 insertions(+), 35 deletions(-)

diff --git a/views/app/footer.html b/views/app/footer.html
index 5b671f3108..45c7412873 100644
--- a/views/app/footer.html
+++ b/views/app/footer.html
@@ -29,7 +29,7 @@
                         <li><a target="_blank" href="https://github.com/lefnire/habitrpg/issues?state=open">Submit Bug</a></li>
                         <li><a target="_blank" href="https://trello.com/board/habitrpg/50e5d3684fe3a7266b0036d6">Request Feature</a></li>
                         <li><a target="_blank" href="https://github.com/lefnire/habitrpg/wiki/API">API</a></li>
-                        <li><a target="_blank" href="https://github.com/lefnire/habitrpg/wiki/Add-ons-and-Extensions">Add-ons / Extensions</a></li>
+                        <li><a href="/static/extensions">Add-ons / Extensions</a></li>
                         <li><a target="_blank" href="http://www.kickstarter.com/projects/lefnire/habitrpg-mobile">Kickstarter</a></li>
                         <li><a target="_blank" href="https://www.facebook.com/Habitrpg">Facebook Page</a></li>
                         <li><a target="_blank" href="http://www.reddit.com/r/habitrpg/">Reddit</a></li>
diff --git a/views/static/about.html b/views/static/about.html
index 7caddc48ce..2b7ff7bf27 100644
--- a/views/static/about.html
+++ b/views/static/about.html
@@ -16,11 +16,10 @@
                 <div class="page-header">
                     <h1>About</h1>
                 </div>
-                <p class="lead">HabitRPG is a habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.</p>
+                <p class="lead">HabitRPG is an <a href="https://github.com/lefnire/habitrpg">open source</a> habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.</p>
             </section>
 
             <div class='marketing'>
-                <p>&nbsp;</p>
                 <p><iframe src="http://player.vimeo.com/video/57654086" width="960" height="539" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe></p>
             </div>
 
diff --git a/views/static/faq.html b/views/static/faq.html
index 1e389c50fb..93ce8e2de9 100644
--- a/views/static/faq.html
+++ b/views/static/faq.html
@@ -17,38 +17,90 @@
                     <h1>FAQ</h1>
                 </div>
             </section>
-            <h2 id="what-is-habit-tracking">What is habit tracking?</h2>
-            <p>Habit tracking is keeping tabs on all your habits to help you improve. It is to life what calorie-counting is to diets (and calorie-counting falls under the habit-tracking umbrella). See <a href="http://blog.beeminder.com/trackhack/">Trackers vs Lifehackers</a> for more information and website examples.</p>
-            <p>There are many habit-tracking apps, but HabitRPG takes a different spin: treating your goals and habits like a Role Playing Game (RPG). If you've played RPGs growing up, this app will make sense to you; otherwise, it may be overwhelming at first. Be sure to follow the tutorial when you first load the website. If it's still not your cup of tea, checkout <a href="http://blog.beeminder.com/trackhack/">Trackers vs Lifehackers</a> for alternatives.</p>
-            <h2 id="how-does-it-work">How does it work?</h2>
-            <p>See the <a href="https://habitrpg.com/splash.html">About page</a></p>
-            <h2 id="browser-support">Browser Support</h2>
-            <p>Everything except Internet Explorer. Derby doesn't currently support IE (see <a href="https://github.com/codeparty/derby/issues/126">this thread</a>), though support is <a href="https://github.com/codeparty/saddle">eventually planned</a>. Use Chrome for best results.</p>
-            <h2 id="should-this-task-be-a-habit-daily-or-todo">Should this task be a Habit, Daily, or Todo?</h2>
-            <p>See <a href="https://habitrpg.com/splash.html">About</a> on task type definitions, but think of it like this. * Habits you track many times per day. Taking the stairs, eating candy, biting your nails, etc. They're sort of micro-tasks. They're also the dumping ground for 3rd-party tasks, created via API calls - for example, when you visit vice websites (Reddit, 9gag) while using the <a href="https://chrome.google.com/webstore/detail/habitrpg/pidkmpibnnnhneohdgjclfdjpijggmjj">Chrome extension</a> - that's updated as a habit. * Dailies are things you track once or twice a day. Exercising, 1h Reading, Anki Session, etc. They reset at the end of each day, and must be completed each day. The confusion is usually between Dailies and Habits, and it usually goes like this: &quot;Should I have a Daily called <em>1h Reading</em> (I want to read 1 hour each day), or a Habit called <em>1h Reading</em> that I up-score for every hour I read in a day?&quot;. My answer - Daily. If it's a decently difficult task that you want to become a good habit, make it a Daily - you're more likely to do it when it loses points at the end of each day than if it sits. * Todos are things you'll do once and only once. <em>Call Mom</em>, <em>Send eBay Package</em>, <em>Pay Doctor Bill</em>, etc. Pretty straight forward.</p>
-            <h2 id="what-are-tokens">What are tokens?</h2>
-            <p>In the days of yore, arcade machines ran on tokens or quarters, and were known to gobble such nuggets with avaricious glee. HabitRPG has no wish to drain your pocket change, but those who use and appreciate it can support the project by turning real-world quarters into tokens, and using the tokens in turn to reroll your tasks, spruce up their character, and tame fearsome mounts to impress friend and foe alike!</p>
-            <h2 id="how-do-i-reset">How do I reset?</h2>
-            <p>Many people have requested the ability to start completely from scratch. This is highly discouraged because you'll lose historical data, which is useful for graphing your progress over time. However, some people find it useful in the beginning after playing with the app for a while - once they've become accustomed to how things work, they want to start playing &quot;for real&quot;. To do this, make sure you're logged in and click the profile drop-down in the top-right corner, then click &quot;Reset&quot;.</p>
-            <h2 id="how-do-i-undo">How do I undo?</h2>
-            <p>Undoing actions is not yet support, but is in the works. See <a href="https://github.com/lefnire/habitrpg/issues/6">issue #6</a></p>
-            <h2 id="how-do-i-heal">How do I heal?</h2>
-            <p>After you play for a while you unlock the Item Store from which you can buy health potions. Also, HP resets upon leveling up (of course!).</p>
-            <h2 id="how-do-i-customize-a-tasks-value">How do I customize a task's value?</h2>
-            <p>Some tasks are more valuable to you than others. Finishing your research paper, for example, should be worth more points than flossing your teeth. Instead of customizing value upon task-creation, HabitRPG calculates a task's value automatically over time. The longer something sits without being completed (Dailies and Todos), the more valuable it becomes; and the more frequently you complete Dailies, the less valuable they become. Trust in the system's machine-learning of task-values.</p>
-            <p>If you <em>absolutely</em> must customize a task's value, there's a &quot;difficulty&quot; setting under the Advanced section of task-editing.</p>
-            <h2 id="all-my-tasks-are-red-im-dying-too-fast">All my tasks are red, I'm dying too fast</h2>
-            <p>Good! Your red tasks provide the most incentive. The worse you are at a task, the more valuable it becomes in Exp &amp; GP, which will push you to focus on the harder tasks. However, if you <em>really</em> need a bail-out, you can &quot;Re-Roll&quot; from the item store, which resets all your tasks to a clean slate. You have to use your quarters, which will prevent you from re-rolling frequently.</p>
-            <p>Again, try as hard as you can to avoid using re-roll. The point of red tasks is to push you to try harder.</p>
-            <h2 id="im-going-on-vacation-how-can-i-disable-my-dailies">I'm going on vacation, how can I disable my Dailies?</h2>
-            <p>Dailies have a &quot;Repeat&quot; field, which specifies which week days this item is due. When you on go vacation, just set each Daily's repeats such that they aren't due on any week days at all. <a href="https://www.evernote.com/shard/s17/sh/e362a4ec-97aa-4c35-8a09-74dc5c16a0fe/a9e895c1f93f4398c56eedef0e58c6fe/res/a44859e5-726e-4e1f-817a-d4f37adbc6f9/skitch.png?resizeSmall&amp;width=832">See this screenshot</a>. As for Todos, they will still gain value but they won't hurt you.</p>
-            <h2 id="what-algorithms-are-used">What algorithms are used?</h2>
-            <p>See <a href="https://github.com/lefnire/habitrpg/wiki/Algorithms">algorithms page</a>.</p>
-            <h2 id="browserquest-art">BrowserQuest Art</h2>
-            <p>We're currently using the pixel art from <a href="https://github.com/mozilla/BrowserQuest">Mozilla BrowserQuest</a>. Some have been opposed because they've played BQ themselves, and don't like design recycling, but here's my reasoning:</p>
-            <p>It is licensed under CC-BY-SA 3.0 (so we can use it). Fortunately for us (but sadly for Mozilla), BQ is mothballed. That has two implications. First, only those in-the-know will recognize it - which is mostly developers &amp; designers who have been keeping abreast HTML5's progress. Second, it's absolutely superb in design and nostalgia - it does an excellent job of bringing back SNES, and it would be a shame to see it go to waste. Also, it's free, and will get pretty far before we need to start customizing.</p>
-            <h2 id="how-can-i-get-involved">How can I get involved?</h2>
-            <p>Contribute to the GitHub repo and get a slice of the pie! See <a href="https://github.com/lefnire/habitrpg/wiki/Business-Model">Business Model</a>, and contact me if you're interested.</p>
+
+            <section id="habit-tracking">
+                <div class="page-header">
+                    <h2>What is habit tracking?</h2>
+                </div>
+                <p>Habit tracking is keeping tabs on all your habits to help you improve. It is to life what calorie-counting is to diets (and calorie-counting falls under the habit-tracking umbrella). See <a href="http://blog.beeminder.com/trackhack/">Trackers vs Lifehackers</a> for more information and website examples.</p>
+                <p>There are many habit-tracking apps, but HabitRPG takes a different spin: treating your goals and habits like a Role Playing Game (RPG). If you've played RPGs growing up, this app will make sense to you; otherwise, it may be overwhelming at first. Be sure to follow the tutorial when you first load the website, and if you're still confused watch this <a href="/static/about">video tutorial</a></p>
+            </section>
+
+
+            <section id="which-task-type">
+                <div class="page-header">
+                    <h2>Should this task be a Habit, Daily, or Todo?</h2>
+                </div>
+                <p>See <a href="https://habitrpg.com/static/about">About</a> on task type definitions, but think of it like this.</p>
+                <ul>
+                    <li>Habits you track many times per day. Taking the stairs, eating candy, biting your nails, etc. They're sort of micro-tasks. They're also the dumping ground for 3rd-party tasks, created via API calls - for example, when you visit vice websites (Reddit, 9gag) while using the <a href="https://chrome.google.com/webstore/detail/habitrpg/pidkmpibnnnhneohdgjclfdjpijggmjj">Chrome extension</a> - that's updated as a habit.</li>
+                    <li>Dailies are things you track once or twice a day. Exercising, 1h Reading, Anki Session, etc. They reset at the end of each day, and must be completed each day. The confusion is usually between Dailies and Habits, and it usually goes like this: &quot;Should I have a Daily called <em>1h Reading</em> (I want to read 1 hour each day), or a Habit called <em>1h Reading</em> that I up-score for every hour I read in a day?&quot;. My answer - Daily. If it's a decently difficult task that you want to become a good habit, make it a Daily - you're more likely to do it when it loses points at the end of each day than if it sits.</li>
+                    <li>Todos are things you'll do once and only once. <em>Call Mom</em>, <em>Send eBay Package</em>, <em>Pay Doctor Bill</em>, etc. Pretty straight forward.</li>
+                </ul>
+            </section>
+
+            <section id="what-are-tokens">
+                <div class="page-header">
+                    <h2>What are tokens?</h2>
+                </div>
+                <p>In the days of yore, arcade machines ran on tokens or quarters, and were known to gobble such nuggets with avaricious glee. HabitRPG has no wish to drain your pocket change, but those who use and appreciate it can support the project by turning real-world quarters into tokens, and using the tokens in turn to reroll your tasks, spruce up their character, and tame fearsome pets & mounts to impress friend and foe alike!</p>
+            </section>
+
+            <section id="how-do-i-reset">
+                <div class="page-header">
+                    <h2>How do I reset?</h2>
+                </div>
+                <p>Many people have requested the ability to start completely from scratch. This is highly discouraged because you'll lose historical data, which is useful for graphing your progress over time. However, some people find it useful in the beginning after playing with the app for a while - once they've become accustomed to how things work, they want to start playing &quot;for real&quot;. To do this, make sure you're logged in and click the profile drop-down in the top-right corner, then click &quot;Reset&quot;.</p>
+            </section>
+
+            <section id="how-do-i-customize-a-tasks-value">
+                <div class="page-header">
+                    <h2>How do I customize a task's value?</h2>
+                </div>
+                <p>Some tasks are more valuable to you than others. Finishing your research paper, for example, should be worth more points than flossing your teeth. Instead of customizing value upon task-creation, HabitRPG calculates a task's value automatically over time. The longer something sits without being completed (Dailies and Todos), the more valuable it becomes; and the more frequently you complete Dailies, the less valuable they become. Trust in the system's machine-learning of task-values.</p>
+                <p>If you <em>absolutely</em> must customize a task's value, there's a &quot;difficulty&quot; setting under the Advanced section of task-editing.</p>
+            </section>
+
+            <section id="vacation">
+                <div class="page-header">
+                    <h2>I'm going on vacation, how can I disable my Dailies?</h2>
+                </div>
+                <p>Dailies have a &quot;Repeat&quot; field, which specifies which week days this item is due. When you on go vacation, just set each Daily's repeats such that they aren't due on any week days at all. <a href="https://www.evernote.com/shard/s17/sh/e362a4ec-97aa-4c35-8a09-74dc5c16a0fe/a9e895c1f93f4398c56eedef0e58c6fe/res/a44859e5-726e-4e1f-817a-d4f37adbc6f9/skitch.png?resizeSmall&amp;width=832">See this screenshot</a>. As for Todos, they will still gain value but they won't hurt you.</p>
+            </section>
+
+            <section id="beta-access">
+                <div class="page-header">
+                    <h2>Beta Access</h2>
+                </div>
+                <h3>Release Date</h3>
+                <p>The mobile apps are slated to be released in April / May 2013. We hope sooner than that, but that's our current estimate. For the Kickstarter beta access, here's how we'll handle that:</p>
+                <h3>Website</h3>
+                <p>If you like to live dangerously, you can use <a href="https://beta.habitrpg.com">beta.habitrpg.com</a> instead of the production site, which will introduce new features faster. It tracks the production database, so yes your account will be synced.</p>
+                <h3>Mobile App</h3>
+                <p>We'll post updates on the Kickstarter when we have a beta version of the mobile app that y'all can play with (downloadable files, outside the various app stores), and will post each new beta version update on the KS update section as well.</p>
+            </section>
+
+            <section id="browserquest-art">
+                <div class="page-header">
+                    <h2>BrowserQuest Art</h2>
+                </div>
+                <p>We're currently using the pixel art from <a href="https://github.com/mozilla/BrowserQuest">Mozilla BrowserQuest</a>. Some have been opposed because they've played BQ themselves, and don't like design recycling, but here's my reasoning:</p>
+                <p>It is licensed under CC-BY-SA 3.0 (so we can use it). Fortunately for us (but sadly for Mozilla), BQ is mothballed. That has two implications. First, only those in-the-know will recognize it - which is mostly developers &amp; designers who have been keeping abreast HTML5's progress. Second, it's absolutely superb in design and nostalgia - it does an excellent job of bringing back SNES, and it would be a shame to see it go to waste. Also, it's free, and will get pretty far before we need to start customizing.</p>
+            </section>
+
+            <section id="browser-support">
+                <div class="page-header">
+                    <h2>Browser Support</h2>
+                </div>
+                <p>Everything except Internet Explorer. Derby doesn't currently support IE (see <a href="https://github.com/codeparty/derby/issues/126">this thread</a>), though support is <a href="https://github.com/codeparty/saddle">eventually planned</a>. Use Chrome for best results.</p>
+            </section>
+
+            <section id="how-can-i-get-involved">
+                <div class="page-header">
+                    <h2>How can I get involved?</h2>
+                </div>
+                <p>Check out <a href="https://github.com/lefnire/habitrpg/wiki/Business-Model#count-me-in">"Count Me In!"</a>, we need all the help we can get!</p>
+            </section>
 
         </div>
     </div>

From 49dedf8f2f76dc77ff13189e104e0718c8736c5f Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 17 Mar 2013 00:29:32 -0400
Subject: [PATCH 205/220] add responsive to static pages

---
 views/static/head.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/views/static/head.html b/views/static/head.html
index 92092cb757..18b7adf3a4 100644
--- a/views/static/head.html
+++ b/views/static/head.html
@@ -3,7 +3,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css" rel="stylesheet">
+    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet">
+
     <link href="/vendor/bootstrap/docs/assets/css/docs.css" rel="stylesheet">
+
     <link href="/css/static-pages.css" rel="stylesheet">
     <link href="/css/footer.css" rel="stylesheet">
 

From 0c1151b1238eac6dc7c4324b8a31d271e8c15ae9 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 17 Mar 2013 00:48:00 -0400
Subject: [PATCH 206/220] don't add bootstrap css files in when instantiating
 derby-ui-boostrap, instead compile in with the css. index.coffee directives
 are run against static pages too, which overwrites our bootstrap responsive
 (which we need) with the app's custom responsive styles. We may change this,
 but for now this commit allows us to keep the marketing site and main site
 styles separate

---
 src/app/index.coffee    | 2 +-
 styles/app/index.styl   | 2 ++
 views/static/front.html | 6 +++---
 views/static/head.html  | 4 +---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/index.coffee b/src/app/index.coffee
index d7445536a0..c1a8b48aba 100644
--- a/src/app/index.coffee
+++ b/src/app/index.coffee
@@ -1,7 +1,7 @@
 derby = require 'derby'
 app = derby.createApp module
 {get, view, ready} = app
-derby.use require('derby-ui-boot'), {styles: ['bootstrap']}
+derby.use require('derby-ui-boot'), {styles: []}
 derby.use require '../../ui'
 derby.use require 'derby-auth/components'
 
diff --git a/styles/app/index.styl b/styles/app/index.styl
index f3b02898dd..e46dcad53f 100644
--- a/styles/app/index.styl
+++ b/styles/app/index.styl
@@ -1,4 +1,5 @@
 @import "nib/vendor";
+@import "../../public/vendor/bootstrap/docs/assets/css/bootstrap.css";
 @import "./female_sprites.styl";
 @import "./male_sprites.styl";
 @import "./shop_sprites.styl";
@@ -12,6 +13,7 @@
 
 @import "./scrollbars.styl";
 
+
 @import "../../public/vendor/bootstrap-datepicker/css/datepicker.css";
 
 // fix exploding to very wide for some reason
diff --git a/views/static/front.html b/views/static/front.html
index 587fb09495..c3552dfda1 100644
--- a/views/static/front.html
+++ b/views/static/front.html
@@ -6,11 +6,11 @@
     HabitRPG | Gamify Your Life
 
 <Head:>
-    <app:head:head active="front"/>
+    <app:head:head />
 
 <Body:>
     <div id="wrap">
-        <app:header:header />
+        <app:header:header active="front"/>
 
 
         <div class='jumbotron masthead'>
@@ -21,7 +21,7 @@
         </div>
         </div>
         <div class='container'>
-            <p style="height:600;"><iframe src="http://player.vimeo.com/video/57639356" width="960" height="539" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe></p>
+            <p style="height:600;"><iframe src="http://player.vimeo.com/video/57639356" width="100%" height="539" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe></p>
 
         </div>
     </div>
diff --git a/views/static/head.html b/views/static/head.html
index 18b7adf3a4..882cac29ed 100644
--- a/views/static/head.html
+++ b/views/static/head.html
@@ -2,11 +2,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css" rel="stylesheet">
+    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap.min.css" rel="stylesheet">
     <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet">
-
     <link href="/vendor/bootstrap/docs/assets/css/docs.css" rel="stylesheet">
-
     <link href="/css/static-pages.css" rel="stylesheet">
     <link href="/css/footer.css" rel="stylesheet">
 

From 0bcea534ae1f10bfecd008f1ff526c62ec2bdca3 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 17 Mar 2013 09:13:25 -0400
Subject: [PATCH 207/220] better "reroll" comment

---
 src/app/items.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/items.coffee b/src/app/items.coffee
index 5990a24412..a635efd8b6 100644
--- a/src/app/items.coffee
+++ b/src/app/items.coffee
@@ -35,7 +35,7 @@ items = module.exports.items =
     {index: 5, text: "Golden Shield", classes: 'shield_5', notes:'Decreases HP loss by 8%.', defense: 8, value:90}
   ]
   potion: {type: 'potion', text: "Potion", notes: "Recover 15 HP", value: 25, classes: 'potion'}
-  reroll: {type: 'reroll', text: "Re-Roll", classes: 'reroll', notes: "Resets your tasks. When you're struggling and everything's red, use for a clean slate.", value:0 }
+  reroll: {type: 'reroll', text: "Re-Roll", classes: 'reroll', notes: "Resets your task values back to 0 (yellow). Useful when everything's red and it's hard to stay alive.", value:0 }
 
   pets: [
     {index: 0, text: 'Bear Cub', name: 'bearcub', icon: 'Pet-BearCub-Base.png', value: 3}

From 6182a474c7a3f776ba80502c8a88fb592757a765 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 17 Mar 2013 09:33:14 -0400
Subject: [PATCH 208/220] remoe bootstrap import from .styl, start pulling in
 from CDN (500.html, static, & dynamic pages)

---
 public/500.html        | 23 ++++++-----------------
 styles/app/index.styl  |  2 --
 views/app/index.html   |  5 +++++
 views/static/head.html |  4 ++--
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/public/500.html b/public/500.html
index 60b33284a4..35fb176fac 100644
--- a/public/500.html
+++ b/public/500.html
@@ -1,27 +1,16 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>HabitRPG | Gamify Your Life</title>
+    <title>HabitRPG | Error</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <!-- Le styles -->
-    <link href="/vendor/bootstrap/docs/assets/css/bootstrap.css" rel="stylesheet">
-    <link href="/vendor/bootstrap/docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css" rel="stylesheet">
+    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet">
+
     <link href="/vendor/bootstrap/docs/assets/css/docs.css" rel="stylesheet">
+    <link href="/css/static-pages.css" rel="stylesheet">
 
     <style type="text/css">
-        .jumbotron {
-            background-color: #1b1b1b;
-            background-image: -moz-linear-gradient(top, #222222, #111111);
-            background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
-            background-image: -webkit-linear-gradient(top, #222222, #111111);
-            background-image: -o-linear-gradient(top, #222222, #111111);
-            background-image: linear-gradient(to bottom, #222222, #111111);
-            background-repeat: repeat-x;
-            border-color: #252525;
-            filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
-
-        }
         .rotate-img {
             transform:rotate(90deg);
             -ms-transform:rotate(90deg); /* IE 9 */
@@ -37,7 +26,7 @@
         <div class='marketing'>
             <img class='rotate-img' src="/img/sprites/armor3_m.png" />
             <h2>The server is experiencing issues.</h2>
-            <p><a href="/">Try again</a> in a few, the developer has been notified. The most likely culprit is <a href="https://github.com/lefnire/habitrpg/issues/165">this issue</a> which Tyler is working frantically to fix. (Any memory leak experts?)</p>
+            <p><a href="/">Try again</a> in a few, the developer has been notified. The most likely culprit is <a href="https://github.com/lefnire/habitrpg/issues/165">this issue</a> which Tyler is working to fix. (Any memory leak experts?)</p>
         </div>
     </div>
 </body>
diff --git a/styles/app/index.styl b/styles/app/index.styl
index e46dcad53f..f3b02898dd 100644
--- a/styles/app/index.styl
+++ b/styles/app/index.styl
@@ -1,5 +1,4 @@
 @import "nib/vendor";
-@import "../../public/vendor/bootstrap/docs/assets/css/bootstrap.css";
 @import "./female_sprites.styl";
 @import "./male_sprites.styl";
 @import "./shop_sprites.styl";
@@ -13,7 +12,6 @@
 
 @import "./scrollbars.styl";
 
-
 @import "../../public/vendor/bootstrap-datepicker/css/datepicker.css";
 
 // fix exploding to very wide for some reason
diff --git a/views/app/index.html b/views/app/index.html
index 8664b784a0..3f3a318cfa 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -14,9 +14,14 @@
 <Head:>
   <meta name="viewport" content="width=device-width">
   <meta name="apple-mobile-web-app-capable" content="yes">
+
   <!-- webfonts -->
   <link href='//fonts.googleapis.com/css?family=Lato:300,400,700,400italic,700italic' rel='stylesheet' type='text/css'>
 
+  <!-- CDN -->
+  <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css" rel="stylesheet">
+  <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet">
+
 <Header:>
   <app:modals:modals />
   <ui:connectionAlert>
diff --git a/views/static/head.html b/views/static/head.html
index 882cac29ed..1567ef1d96 100644
--- a/views/static/head.html
+++ b/views/static/head.html
@@ -2,15 +2,15 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap.min.css" rel="stylesheet">
+    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css" rel="stylesheet">
     <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet">
+
     <link href="/vendor/bootstrap/docs/assets/css/docs.css" rel="stylesheet">
     <link href="/css/static-pages.css" rel="stylesheet">
     <link href="/css/footer.css" rel="stylesheet">
 
     <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
     <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js"></script>
-
     <script type="text/javascript">
         $.getScript("//s7.addthis.com/js/250/addthis_widget.js#pubid=lefnire");
     </script>
\ No newline at end of file

From 2276867f6ca3f7d6d0ff05d61433f814a1b517ba Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 17 Mar 2013 09:40:25 -0400
Subject: [PATCH 209/220] use cloudflare cdn for bootstrap too

---
 public/500.html        | 5 +++--
 views/app/index.html   | 4 ++--
 views/static/head.html | 9 +++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/public/500.html b/public/500.html
index 35fb176fac..9d4d7270d1 100644
--- a/public/500.html
+++ b/public/500.html
@@ -4,8 +4,9 @@
     <title>HabitRPG | Error</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css" rel="stylesheet">
-    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet">
+    <!-- CDN -->
+    <link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/css/bootstrap.min.css" rel="stylesheet">
+    <link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet">
 
     <link href="/vendor/bootstrap/docs/assets/css/docs.css" rel="stylesheet">
     <link href="/css/static-pages.css" rel="stylesheet">
diff --git a/views/app/index.html b/views/app/index.html
index d826d011ee..bcb06b775e 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -19,8 +19,8 @@
   <link href='//fonts.googleapis.com/css?family=Lato:300,400,700,400italic,700italic' rel='stylesheet' type='text/css'>
 
   <!-- CDN -->
-  <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css" rel="stylesheet">
-  <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet">
+  <link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/css/bootstrap.min.css" rel="stylesheet">
+  <link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet">
 
 <Header:>
   <app:modals:modals />
diff --git a/views/static/head.html b/views/static/head.html
index 1567ef1d96..dc023c56b7 100644
--- a/views/static/head.html
+++ b/views/static/head.html
@@ -2,15 +2,16 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css" rel="stylesheet">
-    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet">
+    <!-- CDN -->
+    <link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/css/bootstrap.min.css" rel="stylesheet">
+    <link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css" rel="stylesheet">
 
     <link href="/vendor/bootstrap/docs/assets/css/docs.css" rel="stylesheet">
     <link href="/css/static-pages.css" rel="stylesheet">
     <link href="/css/footer.css" rel="stylesheet">
 
-    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-    <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.3.1/js/bootstrap.min.js"></script>
     <script type="text/javascript">
         $.getScript("//s7.addthis.com/js/250/addthis_widget.js#pubid=lefnire");
     </script>
\ No newline at end of file

From 3df22d72d92b39571da25103c8cf869649814b6d Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 17 Mar 2013 09:47:02 -0400
Subject: [PATCH 210/220] privacy & terms page titles

---
 views/static/privacy.html | 2 +-
 views/static/terms.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/static/privacy.html b/views/static/privacy.html
index fa0be97dc1..61253c9da3 100644
--- a/views/static/privacy.html
+++ b/views/static/privacy.html
@@ -3,7 +3,7 @@
 <import: src="../app/footer">
 
 <Title:>
-    HabitRPG | About
+    HabitRPG | Privacy
 
 <Head:>
     <app:head:head active="about"/>
diff --git a/views/static/terms.html b/views/static/terms.html
index b4f71e1e19..ff32271bfe 100644
--- a/views/static/terms.html
+++ b/views/static/terms.html
@@ -3,7 +3,7 @@
 <import: src="../app/footer">
 
 <Title:>
-    HabitRPG | About
+    HabitRPG | Terms
 
 <Head:>
     <app:head:head active="about"/>

From f8be87324159bee02d6c9b83d84d0352db8274c3 Mon Sep 17 00:00:00 2001
From: Rudd Fawcett <rudd.fawcett@gmail.com>
Date: Sun, 17 Mar 2013 15:25:23 -0300
Subject: [PATCH 211/220] Added "btn" class to "Show Header"

---
 views/app/settings.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/app/settings.html b/views/app/settings.html
index 5ac441c627..c60eaf325f 100644
--- a/views/app/settings.html
+++ b/views/app/settings.html
@@ -19,7 +19,7 @@
 
                     <hr/>
                     <h4>Misc</h4>
-                    <button x-bind="click:toggleHeader">{#if _user.preferences.hideHeader}Show Header{else}Hide Header{/}</button>
+                    <button x-bind="click:toggleHeader" class="btn">{#if _user.preferences.hideHeader}Show Header{else}Hide Header{/}</button>
                     {#unless _user.flags.partyEnabled}&nbsp;<button x-bind="click:manuallyUnlockParties" data-dismiss='modal' rel=tooltip title="Parties are unlocked automatically for usability reasons, but you can override that here.">Enable Parties</button>{/}
 
                     {{#if _user.auth.local}}
@@ -157,4 +157,4 @@
             </ul>
         </div>
         {/}
-    </div>
\ No newline at end of file
+    </div>

From 2f3d0fa86a54355a52c15b63b0e77b233baf97ac Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 17 Mar 2013 20:30:54 -0400
Subject: [PATCH 212/220] start adding undo functionality

---
 src/app/tasks.coffee   | 64 +++++++++++++++++++++++++++++++-----------
 styles/app/alerts.styl |  8 +++++-
 views/app/index.html   |  3 ++
 3 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index 9ce05e1c89..a8667dc50b 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -2,6 +2,7 @@ scoring = require './scoring'
 helpers = require './helpers'
 _ = require 'underscore'
 moment = require 'moment'
+character = require './character'
 
 module.exports.view = (view) ->
   view.fn 'taskClasses', (type, completed, value, repeat) ->
@@ -33,17 +34,6 @@ module.exports.view = (view) ->
 module.exports.app = (appExports, model) ->
   user = model.at('_user')
 
-  user.on 'set', 'tasks.*.completed', (i, completed, previous, isLocal, passed) ->
-    return if passed? && passed.cron # Don't do this stuff on cron
-    direction = () ->
-      return 'up' if completed==true and previous == false
-      return 'down' if completed==false and previous == true
-      throw new Error("Direction neither 'up' nor 'down' on checkbox set.")
-
-    # Score the user based on todo task
-    task = user.at("tasks.#{i}")
-    scoring.score(model, i, direction())
-
   appExports.addTask = (e, el, next) ->
     type = $(el).attr('data-task-type')
     list = model.at "_#{type}List"
@@ -172,12 +162,54 @@ module.exports.app = (appExports, model) ->
     target.removeClass(oldContext)
     target.addClass(newContext)
 
-  appExports.score = (e, el, next) ->
+
+
+
+  ###
+    Call scoring functions for habits & rewards (todos & dailies handled below)
+  ###
+  appExports.score = (e, el) ->
+    task= model.at $(el).parents('li')[0]
+    taskObj = task.get()
     direction = $(el).attr('data-direction')
-    direction = 'up' if direction == 'true/'
-    direction = 'down' if direction == 'false/'
-    task = model.at $(el).parents('li')[0]
-    scoring.score(model, task.get('id'), direction)
+
+    # set previous state for undo
+    model.set '_undo',
+        stats: _.clone user.get('stats')
+        task: _.clone taskObj
+
+    scoring.score(model, taskObj.id, direction)
+
+  ###
+    This is how we handle appExports.score for todos & dailies. Due to Derby's special handling of `checked={:task.completd}`,
+    the above function doesn't work so we need a listener here
+  ###
+  user.on 'set', 'tasks.*.completed', (i, completed, previous, isLocal, passed) ->
+    return if passed? && passed.cron # Don't do this stuff on cron
+    direction = if completed then 'up' else 'down'
+
+    # set previous state for undo
+    taskObj = _.clone user.get("tasks.#{i}")
+    taskObj.completed = previous
+    console.log taskObj
+    model.set '_undo',
+        stats: _.clone user.get('stats')
+        task: taskObj
+
+    scoring.score(model, i, direction)
+
+  ###
+    Undo
+  ###
+  appExports.undo = () ->
+    undo = model.get '_undo'
+    batch = character.BatchUpdate(model)
+    batch.startTransaction()
+    _.each undo.stats, (val, key) -> batch.set "stats.#{key}", val
+    taskPath = "tasks.#{undo.task.id}"
+    _.each undo.task, (val, key) -> batch.set "#{taskPath}.#{key}", val
+    batch.commit()
+    model.del '_undo'
 
   appExports.tasksToggleAdvanced = (e, el) ->
     $(el).next('.advanced-option').toggleClass('visuallyhidden')
diff --git a/styles/app/alerts.styl b/styles/app/alerts.styl
index 97f490cf52..4cf63147c9 100644
--- a/styles/app/alerts.styl
+++ b/styles/app/alerts.styl
@@ -60,4 +60,10 @@ borderDarken = 20%
   background-position: center center
   background-size: 14px
   width: 14px
-  height: 14px
\ No newline at end of file
+  height: 14px
+
+
+.undo-button
+  position:absolute
+  left:5px
+  top:5px
\ No newline at end of file
diff --git a/views/app/index.html b/views/app/index.html
index bcb06b775e..6a88e40aab 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -26,6 +26,9 @@
   <app:modals:modals />
   <ui:connectionAlert>
   <div id="head" class="container-fluid">
+
+    {#if _undo}<a x-bind="click:undo" class='label undo-button'>Undo</a>{/}
+
     <app:settings:menu />
     <app:header:header />
   </div>

From 10e9d3eb407dbe18d90502d52a67e24a3978bff3 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 17 Mar 2013 21:43:03 -0400
Subject: [PATCH 213/220] fixed undo on checkboxed items

---
 src/app/tasks.coffee | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index a8667dc50b..f8a2852044 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -207,7 +207,11 @@ module.exports.app = (appExports, model) ->
     batch.startTransaction()
     _.each undo.stats, (val, key) -> batch.set "stats.#{key}", val
     taskPath = "tasks.#{undo.task.id}"
-    _.each undo.task, (val, key) -> batch.set "#{taskPath}.#{key}", val
+    _.each undo.task, (val, key) ->
+      if key is 'completed'
+        user.pass({cron:true}).set("#{taskPath}.completed",val)
+      else
+        batch.set "#{taskPath}.#{key}", val
     batch.commit()
     model.del '_undo'
 

From 903745f7c9124714425c54a459cc4c2d962bd236 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 17 Mar 2013 21:50:02 -0400
Subject: [PATCH 214/220] pass in whole task object to taskClasses

---
 src/app/tasks.coffee | 14 ++++++++------
 views/app/tasks.html |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index f8a2852044..a08f518e64 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -5,15 +5,17 @@ moment = require 'moment'
 character = require './character'
 
 module.exports.view = (view) ->
-  view.fn 'taskClasses', (type, completed, value, repeat) ->
-    #TODO figure out how to just pass in the task model, so i can access all these properties from one object
+  view.fn 'taskClasses', (task) ->
+    {type, completed, value, repeat} = task
+
     classes = type
 
     # show as completed if completed (naturally) or not required for today
-    if completed or (repeat and repeat[helpers.dayMapping[moment().day()]]==false)
-      classes += " completed"
-    else
-      classes += " uncompleted"
+    if type in ['todo', 'daily']
+      if completed or (repeat and repeat[helpers.dayMapping[moment().day()]]==false)
+        classes += " completed"
+      else
+        classes += " uncompleted"
 
     if value < -20
       classes += ' color-worst'
diff --git a/views/app/tasks.html b/views/app/tasks.html
index 1290268b4c..d5cd9525b1 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -146,7 +146,7 @@
 
 <!-- all the parts of a single task -->
 <task:>
-    <li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
+    <li data-id={{:task.id}} class="task {taskClasses(:task)}">
         
         <!-- right-hand side control buttons -->
         <div class="task-meta-controls">

From 07a3a3c3b691417a7e90a6533a8093da2465f983 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 17 Mar 2013 22:02:06 -0400
Subject: [PATCH 215/220] fix to reward issue in undo

---
 src/app/tasks.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index a08f518e64..e22ff524cc 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -210,6 +210,7 @@ module.exports.app = (appExports, model) ->
     _.each undo.stats, (val, key) -> batch.set "stats.#{key}", val
     taskPath = "tasks.#{undo.task.id}"
     _.each undo.task, (val, key) ->
+      return if key in ['id', 'type'] # strange bugs in this world: https://workflowy.com/shared/a53582ea-43d6-bcce-c719-e134f9bf71fd/
       if key is 'completed'
         user.pass({cron:true}).set("#{taskPath}.completed",val)
       else

From de1eca084e343cd76b21f09f4d24d1f7d1a0fea6 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 17 Mar 2013 22:09:33 -0400
Subject: [PATCH 216/220] bugfix to "can't delete task"

---
 src/app/tasks.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index e22ff524cc..0c93fcac08 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -6,6 +6,7 @@ character = require './character'
 
 module.exports.view = (view) ->
   view.fn 'taskClasses', (task) ->
+    return unless task
     {type, completed, value, repeat} = task
 
     classes = type
@@ -67,7 +68,7 @@ module.exports.app = (appExports, model) ->
 
   appExports.del = (e, el) ->
     # Derby extends model.at to support creation from DOM nodes
-    task = model.at(e.target)
+    task = e.at()
     id = task.get('id')
 
     history = task.get('history')

From 5799a155afd806ea2199d842775fb570c7aca491 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 17 Mar 2013 23:15:19 -0400
Subject: [PATCH 217/220] set timeout interval on undo (disappear after 10s)

---
 src/app/tasks.coffee | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index 0c93fcac08..91daac794c 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -166,6 +166,11 @@ module.exports.app = (appExports, model) ->
     target.addClass(newContext)
 
 
+  setUndo = (stats, task) ->
+    previousUndo = model.get('_undo')
+    clearTimeout(previousUndo.timeoutId) if previousUndo?.timeoutId
+    timeoutId = setTimeout (-> model.del('_undo')), 10000
+    model.set '_undo', {stats:stats, task:task, timeoutId: timeoutId}
 
 
   ###
@@ -177,9 +182,7 @@ module.exports.app = (appExports, model) ->
     direction = $(el).attr('data-direction')
 
     # set previous state for undo
-    model.set '_undo',
-        stats: _.clone user.get('stats')
-        task: _.clone taskObj
+    setUndo _.clone(user.get('stats')), _.clone(taskObj)
 
     scoring.score(model, taskObj.id, direction)
 
@@ -194,10 +197,7 @@ module.exports.app = (appExports, model) ->
     # set previous state for undo
     taskObj = _.clone user.get("tasks.#{i}")
     taskObj.completed = previous
-    console.log taskObj
-    model.set '_undo',
-        stats: _.clone user.get('stats')
-        task: taskObj
+    setUndo _.clone(user.get('stats')), taskObj
 
     scoring.score(model, i, direction)
 
@@ -206,8 +206,10 @@ module.exports.app = (appExports, model) ->
   ###
   appExports.undo = () ->
     undo = model.get '_undo'
+    clearTimeout(undo.timeoutId) if undo?.timeoutId
     batch = character.BatchUpdate(model)
     batch.startTransaction()
+    model.del '_undo'
     _.each undo.stats, (val, key) -> batch.set "stats.#{key}", val
     taskPath = "tasks.#{undo.task.id}"
     _.each undo.task, (val, key) ->
@@ -217,7 +219,6 @@ module.exports.app = (appExports, model) ->
       else
         batch.set "#{taskPath}.#{key}", val
     batch.commit()
-    model.del '_undo'
 
   appExports.tasksToggleAdvanced = (e, el) ->
     $(el).next('.advanced-option').toggleClass('visuallyhidden')

From 49db6106029434b736648d48679f2e4f6d4ac762 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 18 Mar 2013 15:43:02 -0400
Subject: [PATCH 218/220] fix to "editing profile" bug. move {#with
 _user.preferences as :p} into minimum allowable depth in HTML hierachy at
 which it's required. Still trying to put my finger on it, but I'm getting
 close

---
 src/app/profile.coffee |   2 +-
 views/app/avatar.html  | 215 +++++++++++++++++++++--------------------
 2 files changed, 111 insertions(+), 106 deletions(-)

diff --git a/src/app/profile.coffee b/src/app/profile.coffee
index d2b78d0aea..1a84de042e 100644
--- a/src/app/profile.coffee
+++ b/src/app/profile.coffee
@@ -20,6 +20,6 @@ module.exports.app = (appExports, model) ->
   appExports.profileChangeActive = (e, el) ->
     uid = $(el).attr('data-uid')
     model.ref '_profileActive', model.at("users.#{uid}")
-    model.set '_profileActiveMain', model.get('_user.id') == uid
+    model.set '_profileActiveMain', user.get('id') is uid
     model.set '_profileActiveUsername', character.username model.get('_profileActive.auth')
 
diff --git a/views/app/avatar.html b/views/app/avatar.html
index d39b5c57f4..2723368c90 100644
--- a/views/app/avatar.html
+++ b/views/app/avatar.html
@@ -1,20 +1,18 @@
 <modals:>
     <app:modals:modal modalId="avatar-modal">
         {#if _profileActiveMain}
-            {#with _user.preferences}
-                <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>
-                </ul>
+            <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>
+            </ul>
 
-                <div class="tab-content">
-                    <div class="tab-pane active" id="profileCustomize">
-                        <app:avatar:customize />
-                    </div>
-
-                    <div class="tab-pane" id="profileEdit"><app:avatar:profile user="{_user}" main="true" /></div>
+            <div class="tab-content">
+                <div class="tab-pane active" id="profileCustomize">
+                    <app:avatar:customize />
                 </div>
-            {/}
+
+                <div class="tab-pane" id="profileEdit"><app:avatar:profile user="{_user}" main="true" /></div>
+            </div>
         {else}
             <app:avatar:profile profile={_profileActive} />
         {/}
@@ -25,23 +23,28 @@
 
 <avatar:>
     <div class="avatar {{#if @main}}main-avatar{{/}} {{#if @party}}party-avatar{{/}}" data-toggle='modal' data-target='#avatar-modal' data-uid="{@profile.id}" x-bind="click:profileChangeActive">
-        {#unless @minimal}{#if @profile.items.pet}<img src='img/sprites/{@profile.items.pet.icon}' />{/}{/}
-        <div class='character-sprites'>
-            {#with @profile.preferences as :p}
-            <span class='{:p.gender}_skin_{:p.skin}'></span>
-            <span class='{:p.gender}_hair_{:p.hair}'></span>
-            <span class="{equipped(@profile, 'armor')}"></span>
-            {#if :p.showHelm}
-                <span class="{equipped(@profile, 'head')}"></span>
-            {else}
-                <span class="{:p.gender}_head_0"></span>
-            {/}
-            <span class='{:p.gender}_shield_{@profile.items.shield}'></span>
-            <span class='{:p.gender}_weapon_{@profile.items.weapon}'></span>
-            {/}
-        </div>
+
+        {#if and(@profile.items.pet, not(@minimal))}
+            <img src='/img/sprites/{@profile.items.pet.icon}' />
+        {/}
+
+        {#with @profile.preferences as :p}
+            <div class='character-sprites'>
+                <span class='{:p.gender}_skin_{:p.skin}'></span>
+                <span class='{:p.gender}_hair_{:p.hair}'></span>
+                <span class="{equipped(@profile, 'armor')}"></span>
+                {#if :p.showHelm}
+                    <span class="{equipped(@profile, 'head')}"></span>
+                {else}
+                    <span class="{:p.gender}_head_0"></span>
+                {/}
+                <span class='{:p.gender}_shield_{@profile.items.shield}'></span>
+                <span class='{:p.gender}_weapon_{@profile.items.weapon}'></span>
+            </div>
+        {/}
+
         {{#unless @minimal}}
-        <div class="lvl"><span class="badge badge-info">Lvl {@profile.stats.lvl}</span></div>
+            <div class="lvl"><span class="badge badge-info">Lvl {@profile.stats.lvl}</span></div>
         {{/}}
     </div>
 
@@ -53,101 +56,103 @@
     </figure>
 
     <!-- customization options -->
-    <menu type="list">
-        <!-- gender -->
-        <li class="customize-menu">
-            <menu label="Head">
-                <button type="button" class="m_head_0 customize-option" data-value="m" x-bind="click:customizeGender"></button>
-                <button type="button" class="f_head_0 customize-option" data-value="f" x-bind="click:customizeGender"></button>
-            </menu>
-            <label class="checkbox">
-                <input type=checkbox checked="{_user.preferences.showHelm}" /> Show Helm
-            </label>
-
-        </li>
-
-        <!-- hair -->
-        <li class="customize-menu">
-            <menu label="Hair">
-                <button type="button" class="{.gender}_hair_blond customize-option" data-value="blond" x-bind="click:customizeHair"></button>
-                <button type="button" class="{.gender}_hair_black customize-option" data-value="black" x-bind="click:customizeHair"></button>
-                <button type="button" class="{.gender}_hair_brown customize-option" data-value="brown" x-bind="click:customizeHair"></button>
-                <button type="button" class="{.gender}_hair_white customize-option" data-value="white" x-bind="click:customizeHair"></button>
-            </menu>
-        </li>
-
-        <!-- skin -->
-        <li class="customize-menu">
-            <menu label="Skin">
-                <button type="button" class='{.gender}_skin_dead customize-option' data-value="dead" x-bind="click:customizeSkin"></button>
-                <button type="button" class='{.gender}_skin_orc customize-option' data-value="orc" x-bind="click:customizeSkin"></button>
-                <button type="button" class='{.gender}_skin_asian customize-option' data-value="asian" x-bind="click:customizeSkin"></button>
-                <button type="button" class='{.gender}_skin_black customize-option' data-value="black" x-bind="click:customizeSkin"></button>
-                <button type="button" class='{.gender}_skin_white customize-option' data-value="white" x-bind="click:customizeSkin"></button>
-            </menu>
-        </li>
-    </menu>
-
-    {#if equal(_user.preferences.gender, 'f')} <!-- Sorry boys -->
+    {#with _user.preferences as :p}
         <menu type="list">
+            <!-- gender -->
             <li class="customize-menu">
-                <menu label="Clothing">
-                    <button type="button" class="f_armor_0_v1 customize-option" data-value="v1" x-bind="click:customizeArmorSet"></button>
-                    <button type="button" class="f_armor_0_v2 customize-option" data-value="v2" x-bind="click:customizeArmorSet"></button>
+                <menu label="Head">
+                    <button type="button" class="m_head_0 customize-option" data-value="m" x-bind="click:customizeGender"></button>
+                    <button type="button" class="f_head_0 customize-option" data-value="f" x-bind="click:customizeGender"></button>
+                </menu>
+                <label class="checkbox">
+                    <input type=checkbox checked="{_user.preferences.showHelm}" /> Show Helm
+                </label>
+
+            </li>
+
+            <!-- hair -->
+            <li class="customize-menu">
+                <menu label="Hair">
+                    <button type="button" class="{:p.gender}_hair_blond customize-option" data-value="blond" x-bind="click:customizeHair"></button>
+                    <button type="button" class="{:p.gender}_hair_black customize-option" data-value="black" x-bind="click:customizeHair"></button>
+                    <button type="button" class="{:p.gender}_hair_brown customize-option" data-value="brown" x-bind="click:customizeHair"></button>
+                    <button type="button" class="{:p.gender}_hair_white customize-option" data-value="white" x-bind="click:customizeHair"></button>
+                </menu>
+            </li>
+
+            <!-- skin -->
+            <li class="customize-menu">
+                <menu label="Skin">
+                    <button type="button" class='{:p.gender}_skin_dead customize-option' data-value="dead" x-bind="click:customizeSkin"></button>
+                    <button type="button" class='{:p.gender}_skin_orc customize-option' data-value="orc" x-bind="click:customizeSkin"></button>
+                    <button type="button" class='{:p.gender}_skin_asian customize-option' data-value="asian" x-bind="click:customizeSkin"></button>
+                    <button type="button" class='{:p.gender}_skin_black customize-option' data-value="black" x-bind="click:customizeSkin"></button>
+                    <button type="button" class='{:p.gender}_skin_white customize-option' data-value="white" x-bind="click:customizeSkin"></button>
                 </menu>
             </li>
         </menu>
+
+        {#if equal(_user.preferences.gender, 'f')} <!-- Sorry boys -->
+            <menu type="list">
+                <li class="customize-menu">
+                    <menu label="Clothing">
+                        <button type="button" class="f_armor_0_v1 customize-option" data-value="v1" x-bind="click:customizeArmorSet"></button>
+                        <button type="button" class="f_armor_0_v2 customize-option" data-value="v2" x-bind="click:customizeArmorSet"></button>
+                    </menu>
+                </li>
+            </menu>
+        {/}
     {/}
 
 <profile:>
     <div class='row-fluid'>
         <div class='span6 well'>
-            {#if _profileEditing}
-                {#if _profileActiveMain}
-                    <a class='btn btn-success' x-bind="click:profileSave">Save</a>
-                    <!-- TODO use photo-upload instead: https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/xMmADvxBOak -->
-                    <div class="control-group">
-                        <label class="control-label" for="profileImageUrl">Photo Url</label>
-                        <div class="controls">
-                            <input type="url" id="profileImageUrl" value="{_user.profile.imageUrl}" placeholder="Image Url"/>
-                        </div>
+            {#if and(_profileEditing, _profileActiveMain)}
+                <a class='btn btn-success' x-bind="click:profileSave">Save</a>
+                <!-- TODO use photo-upload instead: https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/xMmADvxBOak -->
+                <div class="control-group">
+                    <label class="control-label" for="profileImageUrl">Photo Url</label>
+                    <div class="controls">
+                        <input type="url" id="profileImageUrl" value="{_user.profile.imageUrl}" placeholder="Image Url"/>
                     </div>
+                </div>
 
-                    <div class="control-group">
-                        <label class="control-label" for="profileFullName">Full Name</label>
-                        <div class="controls">
-                            <input type="text" id="profileFullName" placeholder="Full Name" value="{_user.profile.name}" />
-                        </div>
+                <div class="control-group">
+                    <label class="control-label" for="profileFullName">Full Name</label>
+                    <div class="controls">
+                        <input type="text" id="profileFullName" placeholder="Full Name" value="{_user.profile.name}" />
                     </div>
+                </div>
 
-                    <div class="control-group">
-                        <label class="control-label" for="profileBlurb">Blurb</label>
-                        <div class="controls">
-                            <textarea id="profileBlurb" placeholder="Blurb" >{_user.profile.blurb}</textarea>
-                        </div>
+                <div class="control-group">
+                    <label class="control-label" for="profileBlurb">Blurb</label>
+                    <div class="controls">
+                        <textarea id="profileBlurb" placeholder="Blurb" >{_user.profile.blurb}</textarea>
                     </div>
+                </div>
 
-                    <div class="control-group">
-                        <label class="control-label" for="profileWebsite">Websites</label>
-                        <div class="controls">
-                            <form x-bind="submit:profileAddWebsite">
-                                <input type="url" id="profileWebsite" value="{_newProfileWebsite}" placeholder="Add Website"/>
-                            </form>
-                        </div>
-                        <ul>
-                            {#each _user.profile.websites as :website}
-                            <!-- would prefer if there were and index in #each, instead using data-website to search with indexOf -->
-                            <li>{:website} <a data-website="{:website}" x-bind="click:profileRemoveWebsite"><i class='icon-remove'></i></a></li>
-                            {/}
-                        </ul>
-
+                <div class="control-group">
+                    <label class="control-label" for="profileWebsite">Websites</label>
+                    <div class="controls">
+                        <form x-bind="submit:profileAddWebsite">
+                            <input type="url" id="profileWebsite" value="{_newProfileWebsite}" placeholder="Add Website"/>
+                        </form>
                     </div>
-                    <a class='btn btn-success' x-bind="click:profileSave">Save</a>
-                {/}
+                    <ul>
+                        {#each _user.profile.websites as :website}
+                        <!-- would prefer if there were and index in #each, instead using data-website to search with indexOf -->
+                        <li>{:website} <a data-website="{:website}" x-bind="click:profileRemoveWebsite"><i class='icon-remove'></i></a></li>
+                        {/}
+                    </ul>
+
+                </div>
+                <a class='btn btn-success' x-bind="click:profileSave">Save</a>
             {else}
                 <h3>
-                    {#if _profileActive.profile.name}{_profileActive.profile.name}
-                    {else}{username(_profileActive.auth)}
+                    {#if _profileActive.profile.name}
+                        {_profileActive.profile.name}
+                    {else}
+                        {username(_profileActive.auth)}
                     {/}
                     {#if _profileActiveMain}<a class='btn pull-right' x-bind="click:profileEdit">Edit</a>{/}
                 </h3>
@@ -160,7 +165,7 @@
                 {#if _profileActive.profile.websites}
                     <ul>
                         {#each _profileActive.profile.websites as :website}
-                        <li>{:website}</li>
+                            <li>{:website}</li>
                         {/}
                     </ul>
                 {/}

From a4cfd9d19c2ff1bad86a4474cc02ae92cada1363 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 18 Mar 2013 15:46:35 -0400
Subject: [PATCH 219/220] wrap avatars with <span>. #each requires an element,
 so #if / #unless blocks nested immediately inside cause issues if they return
 false, see https://github.com/codeparty/derby/issues/215

---
 views/app/header.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/views/app/header.html b/views/app/header.html
index d7c7ab9b83..9d894929c8 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -10,6 +10,9 @@
 
                 <!-- party -->
                 {{#each _partyMembers as :member}}
+                    <!-- #each requires an element, so #if / #unless blocks nested immediately inside cause issues if they return false -->
+                    <!-- see https://github.com/codeparty/derby/issues/215 -->
+                    <span>
                     {{#unless equal(:member.id, _userId)}}
                         <figure class="party-avatar-wrap" rel="popover" data-title="{{username(:member.auth)}}" data-placement="bottom" data-trigger="hover" data-html="true" data-content="
                              <div>
@@ -27,6 +30,7 @@
                             <app:avatar:avatar profile={{:member}} party="true" />
                         </figure>
                     {{/}}
+                    </span>
                 {{/}}
 
                 <!-- progress bars -->

From 70dcd0b88670d4a3f22b76560472353532bc3981 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 18 Mar 2013 16:47:03 -0400
Subject: [PATCH 220/220] move rewards column into rewards rewards.html

---
 views/app/rewards.html | 92 +++++++++++++++++++++++++++++++++++++++---
 views/app/tasks.html   | 81 +------------------------------------
 2 files changed, 88 insertions(+), 85 deletions(-)

diff --git a/views/app/rewards.html b/views/app/rewards.html
index 340882a36b..da0eadecf4 100644
--- a/views/app/rewards.html
+++ b/views/app/rewards.html
@@ -1,3 +1,87 @@
+<rewardsColumn:>
+    <div class="module">
+        <div class="task-column rewards">
+            <!-- cash or tokens -->
+                <span class='option-box pull-right wallet'>
+                    {#unless _view.activeTabPets}
+                    <div class="money">
+                        {gold(_user.stats.gp)}
+                        <span class='shop_gold' rel='tooltip' title='Gold'></span>
+                    </div>
+                    <div class="money">
+                        {silver(_user.stats.gp)}
+                        <span class='shop_silver' rel='tooltip' title='Silver'></span>
+                    </div>
+                    <!-- <div class="money">
+                        {copper(_user.stats.gp)}
+                        <span class='shop_copper' rel='tooltip' title='Copper'></span>
+                    </div> -->
+                    {else}
+                    <app:rewards:userTokens />
+                    {/}
+                </span>
+            <h2 class="task-column_title">Rewards</h2>
+
+            <!-- if pets are enabled, make tabs -->
+            {#if equal(_user.flags.petsEnabled,true)}
+            <div class='tabbable tabs-below'>
+                <div class="tab-content">
+                    <div class="tab-pane active" id="rewards-tab">
+                        <app:rewards:rewardsTab />
+                    </div>
+
+                    <!-- pets pane -->
+                    <div class="tab-pane pet-grid" id="pets-tab">
+                        {#with _view.items.pets as :pets}
+                        <table>
+                            <tr>
+                                {#with :pets[0]}<app:rewards:pet />{/}
+                                {#with :pets[1]}<app:rewards:pet />{/}
+                                {#with :pets[2]}<app:rewards:pet />{/}
+                                {#with :pets[3]}<app:rewards:pet />{/}
+                            </tr>
+                            <tr>
+                                {#with :pets[4]}<app:rewards:pet />{/}
+                                {#with :pets[5]}<app:rewards:pet />{/}
+                                {#with :pets[6]}<app:rewards:pet />{/}
+                                {#with :pets[7]}<app:rewards:pet />{/}
+                            </tr>
+                            <tr>
+                                {#with :pets[8]}<app:rewards:pet />{/}
+                                {#with :pets[9]}<app:rewards:pet />{/}
+                                {#with :pets[10]}<app:rewards:pet />{/}
+                                {#with :pets[11]}<app:rewards:pet />{/}
+                            </tr>
+                            <tr>
+                                {#with :pets[12]}<app:rewards:pet />{/}
+                                {#with :pets[13]}<app:rewards:pet />{/}
+                                {#with :pets[14]}<app:rewards:pet />{/}
+                                {#with :pets[15]}<app:rewards:pet />{/}
+                            </tr>
+                            <tr>
+                                {#with :pets[16]}<app:rewards:pet />{/}
+                            </tr>
+                        </table>
+                        {/}
+                    </div>
+                    <!--<div class="tab-pane" id="mounts-tab">...</div>-->
+                </div>
+
+                <ul class="nav nav-tabs" id="rewardsTabs">
+                    <li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
+                    <li><a href="#pets-tab" data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
+                    <!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
+                </ul>
+            </div>
+
+            <!-- if pets are disabled, just do rewards tab -->
+            {else}
+            <app:rewards:rewardsTab />
+            {/}
+        </div>
+    </div>
+
+
 <rewardsTab:>
     <!-- add new reward -->
     <app:tasks:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
@@ -21,7 +105,7 @@
     {/}
 
 <pet:>
-    <td class="{{#if _user.items.pets[.name]}}active-pet{{/}}">
+    <td class="{#if _user.items.pets[.name]}active-pet{/}">
       <img rel=tooltip title="{.text} - {.value} Tokens" x-bind="click:selectPet" data-pet='{.name}' src='img/sprites/{.icon}'/>
     </td>
 
@@ -35,8 +119,7 @@
 
 
 <item:>
-  {#unless :item.hide}
-  <li class="task reward-item">
+  <li class="task reward-item {#if :item.hide}hide{/}">
     <!-- right-hand side control buttons -->
     <div class="task-meta-controls">
         <span rel="popover" data-trigger="hover" data-placement="left" data-content="{:item.notes}" data-original-title="{:item.text}" class='task-notes'><i class="icon-comment"></i></span>
@@ -56,5 +139,4 @@
     <!-- main content -->
     <span class="shop_{:item.classes} shop-sprite item-img"></span>
     <p class="task-text">{:item.text}</p>
-  </li>
-  {/}
\ No newline at end of file
+  </li>
\ No newline at end of file
diff --git a/views/app/tasks.html b/views/app/tasks.html
index d5cd9525b1..2b61963836 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -54,87 +54,8 @@
     </div>
 
     <!-- Rewards Column -->
-    <div class="module">
-        <div class="task-column rewards">
-            <!-- cash or tokens -->
-            <span class='option-box pull-right wallet'>
-                {#unless _view.activeTabPets}
-                <div class="money">
-                    {gold(_user.stats.gp)}
-                    <span class='shop_gold' rel='tooltip' title='Gold'></span>
-                </div>
-                <div class="money">
-                    {silver(_user.stats.gp)}
-                    <span class='shop_silver' rel='tooltip' title='Silver'></span>
-                </div>
-                <!-- <div class="money">
-                    {copper(_user.stats.gp)}
-                    <span class='shop_copper' rel='tooltip' title='Copper'></span>
-                </div> -->
-                {else}
-                <app:rewards:userTokens />
-                {/}
-            </span>
-            <h2 class="task-column_title">Rewards</h2>
+    <app:rewards:rewardsColumn />
 
-            <!-- if pets are enabled, make tabs -->
-            {#if equal(_user.flags.petsEnabled,true)}
-                <div class='tabbable tabs-below'>
-                    <div class="tab-content">
-                        <div class="tab-pane active" id="rewards-tab">
-                            <app:rewards:rewardsTab />
-                        </div>
-                        
-                        <!-- pets pane -->
-                        <div class="tab-pane pet-grid" id="pets-tab">
-                            {#with _view.items.pets as :pets}
-                            <table>
-                                <tr>
-                                    {#with :pets[0]}<app:rewards:pet />{/}
-                                    {#with :pets[1]}<app:rewards:pet />{/}
-                                    {#with :pets[2]}<app:rewards:pet />{/}
-                                    {#with :pets[3]}<app:rewards:pet />{/}
-                                </tr>
-                                <tr>
-                                    {#with :pets[4]}<app:rewards:pet />{/}
-                                    {#with :pets[5]}<app:rewards:pet />{/}
-                                    {#with :pets[6]}<app:rewards:pet />{/}
-                                    {#with :pets[7]}<app:rewards:pet />{/}
-                                </tr>
-                                <tr>
-                                    {#with :pets[8]}<app:rewards:pet />{/}
-                                    {#with :pets[9]}<app:rewards:pet />{/}
-                                    {#with :pets[10]}<app:rewards:pet />{/}
-                                    {#with :pets[11]}<app:rewards:pet />{/}
-                                </tr>
-                                <tr>
-                                    {#with :pets[12]}<app:rewards:pet />{/}
-                                    {#with :pets[13]}<app:rewards:pet />{/}
-                                    {#with :pets[14]}<app:rewards:pet />{/}
-                                    {#with :pets[15]}<app:rewards:pet />{/}
-                                </tr>
-                                <tr>
-                                    {#with :pets[16]}<app:rewards:pet />{/}
-                                </tr>
-                            </table>
-                            {/}
-                        </div>
-                        <!--<div class="tab-pane" id="mounts-tab">...</div>-->
-                    </div>
-
-                    <ul class="nav nav-tabs" id="rewardsTabs">
-                        <li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
-                        <li><a href="#pets-tab" id='pets-tab' data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
-                        <!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
-                    </ul>
-                </div>
-
-            <!-- if pets are disabled, just do rewards tab -->
-            {else}
-                <app:rewards:rewardsTab />
-            {/}
-        </div>
-    </div>
 
 <!-- Templates -->
 <newTask:>