From 7f03a30fd59f3c42be4b0bad2f0a40e36c4ffe53 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 3 Mar 2013 21:38:21 -0500
Subject: [PATCH] remove "advanced" section, clean up the task-edit form a bit

---
 src/app/tasks.coffee |  6 +----
 views/app/tasks.html | 58 +++++++++++++++++++++++---------------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index 02ee38901f..32afa0699f 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -178,11 +178,7 @@ module.exports.app = (appExports, model) ->
     $('[rel=tooltip]').tooltip()
     $('[rel=popover]').popover()
 
-  appExports.tasksToggleAdvanced = (e, el) ->
-    $(el).next('.advanced').toggle()
-
   appExports.tasksSetMultiplier = (e, el) ->
     dataId = $(el).parent('[data-id]').attr('data-id')
     #"_user.tasks.#{dataId}"
-    model.at(e.target).set 'multiplier', parseInt($(el).attr('data-multiplier'))
-    debugger
\ No newline at end of file
+    model.at(e.target).set 'multiplier', parseInt($(el).attr('data-multiplier'))
\ No newline at end of file
diff --git a/views/app/tasks.html b/views/app/tasks.html
index b3b6b7e88e..112dfc4aaa 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -176,31 +176,36 @@
                 <label>Notes</label><textarea rows=3>{:task.notes}</textarea>
             </div>
             {#if equal(:task.type, 'habit')}
-            <div class="control-group">
-                <label class="checkbox inline"><input type=checkbox checked={:task.up}>Up</label>
-                <label class="checkbox inline"><input type=checkbox checked={:task.down}>Down</label>
-            </div>
+                <hr/>
+                <label>Direction</label>
+                <div class="control-group">
+                    <label class="checkbox inline"><input type=checkbox checked={:task.up}>Up</label>
+                    <label class="checkbox inline"><input type=checkbox checked={:task.down}>Down</label>
+                </div>
             {else if equal(:task.type, 'daily')}
-            <label>Repeat</label>
-            <div class="control-group btn-group repeat-days">
-                <!-- note, does not use  data-toggle="buttons-checkbox" - it would interfere with our own click binding -->
-                <button type="button" class="btn btn-info {#if :task.repeat.su}active{/}" data-day='su' x-bind=click:toggleDay>Su</button>
-                <button type="button" class="btn btn-info {#if :task.repeat.m}active{/}" data-day='m' x-bind=click:toggleDay>M</button>
-                <button type="button" class="btn btn-info {#if :task.repeat.t}active{/}" data-day='t' x-bind=click:toggleDay>T</button>
-                <button type="button" class="btn btn-info {#if :task.repeat.w}active{/}" data-day='w' x-bind=click:toggleDay>W</button>
-                <button type="button" class="btn btn-info {#if :task.repeat.th}active{/}" data-day='th' x-bind=click:toggleDay>Th</button>
-                <button type="button" class="btn btn-info {#if :task.repeat.f}active{/}" data-day='f' x-bind=click:toggleDay>F</button>
-                <button type="button" class="btn btn-info {#if :task.repeat.s}active{/}" data-day='s' x-bind=click:toggleDay>S</button>
-            </div>
+                <hr/>
+                <label>Repeat</label>
+                <div class="control-group btn-group repeat-days">
+                    <!-- note, does not use  data-toggle="buttons-checkbox" - it would interfere with our own click binding -->
+                    <button type="button" class="btn btn-info {#if :task.repeat.su}active{/}" data-day='su' x-bind=click:toggleDay>Su</button>
+                    <button type="button" class="btn btn-info {#if :task.repeat.m}active{/}" data-day='m' x-bind=click:toggleDay>M</button>
+                    <button type="button" class="btn btn-info {#if :task.repeat.t}active{/}" data-day='t' x-bind=click:toggleDay>T</button>
+                    <button type="button" class="btn btn-info {#if :task.repeat.w}active{/}" data-day='w' x-bind=click:toggleDay>W</button>
+                    <button type="button" class="btn btn-info {#if :task.repeat.th}active{/}" data-day='th' x-bind=click:toggleDay>Th</button>
+                    <button type="button" class="btn btn-info {#if :task.repeat.f}active{/}" data-day='f' x-bind=click:toggleDay>F</button>
+                    <button type="button" class="btn btn-info {#if :task.repeat.s}active{/}" data-day='s' x-bind=click:toggleDay>S</button>
+                </div>
             {else if equal(:task.type, 'reward')}
-            <div class=control-group>
-                <label>Price
+                <hr/>
+                <div class=control-group>
+                    <label>Price</label>
                     <div class="input-append">
                         <input class="span5" size="16" type="number" min="0" value={:task.value}><span class="add-on">Gold</span>
                     </div>
-                </label>
-            </div>
+
+                </div>
             {else if equal(:task.type, 'todo')}
+                <hr/>
                 <div class=control-group>
                     <label>Due Date</label>
                     <input type="text" value="{:task.date}" data-date-format="mm/dd/yyyy" class="datepicker" />
@@ -209,18 +214,17 @@
             {/}
 
             {#unless equal(:task.type, 'reward')}
+                <hr/>
                 <div>
-                    <div>
-                        <a x-bind="click:tasksToggleAdvanced">Advanced</a>
-                        <div class="control-group btn-group priority-multiplier hide advanced" data-id="{{:task.id}}">
-                            <label>Multiplier <a href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a></label>
-                            <button type="button" class="btn btn-info {#if equal(:task.multiplier,1)}active{/}{#unless :task.multiplier}active{/}" data-multiplier='1' x-bind=click:tasksSetMultiplier>1</button>
-                            <button type="button" class="btn btn-info {#if equal(:task.multiplier,2)}active{/}" data-multiplier='2' x-bind=click:tasksSetMultiplier>2</button>
-                            <button type="button" class="btn btn-info {#if equal(:task.multiplier,3)}active{/}" data-multiplier='3' x-bind=click:tasksSetMultiplier>3</button>
-                        </div>
+                    <div class="control-group btn-group priority-multiplier" data-id="{{:task.id}}">
+                        <label>Multiplier <a href="https://trello.com/card/priority-multiplier/50e5d3684fe3a7266b0036d6/17" target="_blank"><i class='icon-question-sign'></i></a></label>
+                        <button type="button" class="btn btn-info {#if equal(:task.multiplier,1)}active{/}{#unless :task.multiplier}active{/}" data-multiplier='1' x-bind=click:tasksSetMultiplier>1</button>
+                        <button type="button" class="btn btn-info {#if equal(:task.multiplier,2)}active{/}" data-multiplier='2' x-bind=click:tasksSetMultiplier>2</button>
+                        <button type="button" class="btn btn-info {#if equal(:task.multiplier,3)}active{/}" data-multiplier='3' x-bind=click:tasksSetMultiplier>3</button>
                     </div>
                 </div>
             {/}
+            <hr/>
             <button type=submit class="btn" x-bind="click:tasksSaveAndClose">Save & Close</button>
         </form>
     </div>