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] 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 -->