From f28a542aa446521ddf28593b46f7d18a8cf0b37a Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Sun, 12 May 2013 12:39:54 +0100 Subject: [PATCH 1/2] small cleanup --- views/app/game-pane.html | 2 +- views/app/modals.html | 4 ++-- views/app/rewards.html | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/views/app/game-pane.html b/views/app/game-pane.html index be060fd3d1..f4b6871af5 100644 --- a/views/app/game-pane.html +++ b/views/app/game-pane.html @@ -2,7 +2,7 @@
- + <@ads>Drive: The Surprising Truth About What Motivates Us @@ -43,7 +43,7 @@ - + ＋
{gems(_user.balance)} Gems From bb1ea755f1a0db574ae82021f5f1348787a0c7da Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Sun, 12 May 2013 13:11:27 +0100 Subject: [PATCH 2/2] tasks / rewards.html - pass in the actual list, and whether booleans @editable and @main, which will allow for challenges lists & mngr accounts / public lists --- views/app/index.html | 14 ++++++-- views/app/rewards.html | 35 ------------------ views/app/tasks.html | 81 +++++++++++++++++++++++++++++++++++++++--- 3 files changed, 88 insertions(+), 42 deletions(-) diff --git a/views/app/index.html b/views/app/index.html index 01094210f4..3e1c2b834f 100644 --- a/views/app/index.html +++ b/views/app/index.html @@ -42,8 +42,18 @@
-
-
+
+ +
+
+ +
diff --git a/views/app/rewards.html b/views/app/rewards.html index 21dab841e5..d00b91b2ff 100644 --- a/views/app/rewards.html +++ b/views/app/rewards.html @@ -8,41 +8,6 @@ - - -
-
- - -
- {gold(floor(_user.stats.gp))} - -
-
- {silver(_user.stats.gp)} - -
- - - - <@extra> - -
    - - - - - - -
- - <@ads>Drive: The Surprising Truth About What Motivates Us - -
-
- - - ＋ diff --git a/views/app/tasks.html b/views/app/tasks.html index 27be0ed5d9..3be2c35f98 100644 --- a/views/app/tasks.html +++ b/views/app/tasks.html @@ -14,7 +14,15 @@
- + <@ads>The Power of Habit: Why We Do What We Do in Life and Business
@@ -23,7 +31,15 @@
- + <@ads>Getting Things Done: The Art of Stress-Free Productivity
@@ -32,6 +48,8 @@
+ + {{#if @main}} {#if _user.history.todos} @@ -40,9 +58,18 @@ + {{/}} - + <@ads>The Checklist Manifesto: How to Get Things Right @@ -57,7 +84,49 @@
- +
+
+ + {{#if @main}} + + +
+ {gold(floor(_user.stats.gp))} + +
+
+ {silver(_user.stats.gp)} + +
+ + {{/}} + + + <@extra> + {{#if @main}} + +
    + + + + + + +
+ {{/}} + + <@ads>Drive: The Surprising Truth About What Motivates Us + +
+
@@ -65,18 +134,20 @@ {{#if equal(@type,'todo')}}{{/}} + {{#if @editable}}
+ {{/}}
    {#each @list as :task}{/}
{{@extra}}
- {{#if and( _loggedIn, notEqual(_user.flags.ads,'hide') )}} + {{#if and( _loggedIn, notEqual(_user.flags.ads,'hide'), @main )}}