Merge branch 'ads' into pets

m4tuna · Mar 28, 2013 · 6d6085e · 6d6085e
2 parents 157f040 + 00db85d
commit 6d6085e
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 3 deletions.
diff --git 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
@@ -38,6 +38,15 @@ <h3 class="notification-message">You died! Game Over.</h3>
     </@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
@@ -1,3 +1,24 @@
+<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="//pagead2.googlesyndication.com/pagead/show_ads.js" x-no-minify>
+        </script>
+    {{/}}
+
 <taskLists:>
     <!--helpTitle & helpContent moved to tour -->
 
@@ -6,7 +27,11 @@
         <div class="task-column habits">
             <h2 class="task-column_title">{{t("Habits")}}</h2>
             <app:tasks:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
-            <ul class="habits">{#each _habitList as :task}<app:tasks:task />{/}</ul>
+            <ul class="habits">
+                {#each _habitList as :task}<app:tasks:task />{/}
+            </ul>
+            <br/>
+            <app:tasks:ads />
         </div>
     </div>
 
@@ -15,7 +40,11 @@ <h2 class="task-column_title">{{t("Habits")}}</h2>
         <div class="task-column dailys">
             <h2 class="task-column_title">{{t("Daily")}}</h2>
             <app:tasks:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
-            <ul class='dailys'>{#each _dailyList as :task}<app:tasks:task />{/}</ul>
+            <ul class='dailys'>
+                {#each _dailyList as :task}<app:tasks:task />{/}
+            </ul>
+            <br/>
+            <app:tasks:ads />
         </div>
     </div>
 
@@ -42,6 +71,8 @@ <h2 class="task-column_title">{{t("Todos")}}</h2>
             <ul class='todos task-list'>
                 {#each _todoList as :task}<app:tasks:task />{/}
             </ul>
+            <br/>
+            <app:tasks:ads />
 
             <button class='task-action-btn tile spacious bright display-context-dependant show-for-completed' x-bind=click:clearCompleted>Clear Completed</button>