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 01/17] 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 02/17] 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 03/17] 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 04/17] 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 05/17] 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 06/17] 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 07/17] 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 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 08/17] 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 09/17] 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 10/17] 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 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 11/17] <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 12/17] 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 13/17] 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 14/17] 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 15/17] 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 16/17] 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 17/17] 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:>