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