From 9c0a640f9f935461a6430211b8232c7897a10630 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sat, 16 Mar 2013 19:10:58 -0400
Subject: [PATCH 1/2] add ads back in

---
 src/server/private.coffee |  2 +-
 views/app/modals.html     |  9 +++++++++
 views/app/tasks.html      | 37 +++++++++++++++++++++++++++++++++++--
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/server/private.coffee b/src/server/private.coffee
index 3f7bc8e5cc..a016ede9a4 100644
--- a/src/server/private.coffee
+++ b/src/server/private.coffee
@@ -25,7 +25,7 @@ module.exports.app = (appExports, model) ->
       address: false
       amount: 500
       name: "Checkout"
-      description: "Purchase 20 Tokens."
+      description: "Purchase 20 Tokens, Disable Ads."
       panelLabel: "Checkout"
       token: token
 
diff --git a/views/app/modals.html b/views/app/modals.html
index 5b0b26792f..e46cf671a9 100644
--- a/views/app/modals.html
+++ b/views/app/modals.html
@@ -37,6 +37,15 @@
     </@footer>
     </app:modals:modal>
 
+    <app:modals:modal modalId="why-ads-modal" header="Why Ads?">
+        <p>
+            Habit an open source project, and can use all the help it can get - consider this a donation to the contributors. You also get 20 tokens from the purchase, which you can use to buy special items.
+        </p>
+        <@footer>
+            <button data-dismiss="modal" class="btn btn-success">Ok</button>
+        </@footer>
+    </app:modals:modal>
+
 
 
 <!-- $modal-template -->
diff --git a/views/app/tasks.html b/views/app/tasks.html
index c038cfdb8d..6a254f49ba 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -1,3 +1,26 @@
+<ads:>
+    {{#if and( _loggedIn, notEqual(_user.flags.ads,'hide') )}}
+        <span class='pull-right'>
+            <a x-bind="click:showStripe" rel='tooltip' title='Remove Ads'><i class='icon-remove'></i></a><br/>
+            <a href="#" data-target="#why-ads-modal" data-toggle="modal" rel='tooltip' title='Why Ads?'><i class='icon-question-sign'></i></a>
+        </span>
+
+        <script type="text/javascript" x-no-minify>
+            <!--
+            google_ad_client = "ca-pub-3242350243827794";
+            /* Test */
+            google_ad_slot = "5883123375";
+            google_ad_width = 234;
+            google_ad_height = 60;
+            //-->
+        </script>
+        <script type="text/javascript"
+                src="https://pagead2.googlesyndication.com/pagead/show_ads.js" x-no-minify>
+        </script>
+    {{/}}
+
+
+
 <taskLists:>
     <!--helpTitle & helpContent moved to tour -->
 
@@ -6,7 +29,11 @@
         <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>
+            <ul class="habits">
+                {#each _habitList as :task}<app:task />{/}
+            </ul>
+            <br/>
+            <app:ads />
         </div>
     </div>
 
@@ -15,7 +42,11 @@
         <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>
+            <ul class='dailys'>
+                {#each _dailyList as :task}<app:task />{/}
+            </ul>
+            <br/>
+            <app:ads />
         </div>
     </div>
 
@@ -41,6 +72,8 @@
             <ul class='todos task-list'>
                 {#each _todoList as :task}<app:task />{/}
             </ul>
+            <br/>
+            <app:ads />
             
             <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>

From 00db85dff6653733a085f2c998f8e258b536db09 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sat, 16 Mar 2013 19:48:15 -0400
Subject: [PATCH 2/2] protocol agnostic ads

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

diff --git a/views/app/tasks.html b/views/app/tasks.html
index da1af0d18a..feba91b9ee 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -15,12 +15,10 @@
             //-->
         </script>
         <script type="text/javascript"
-                src="https://pagead2.googlesyndication.com/pagead/show_ads.js" x-no-minify>
+                src="//pagead2.googlesyndication.com/pagead/show_ads.js" x-no-minify>
         </script>
     {{/}}
 
-
-
 <taskLists:>
     <!--helpTitle & helpContent moved to tour -->