From 78f187f87aa42e60f425cc9e839f2890b248371d Mon Sep 17 00:00:00 2001
From: Marcel O'Neil <marcel@marceloneil.com>
Date: Mon, 13 Feb 2017 05:02:27 -0500
Subject: [PATCH] Task edit screen changes [fixes #8474]

move Dailies repeats out of Advanced Options; enlarge Notes; reduce spacings
---
 website/client-old/css/tasks.styl                      |  6 ------
 website/views/shared/tasks/edit/advanced_options.jade  | 10 ----------
 .../shared/tasks/edit/dailies/repeat_options.jade      |  8 +++++++-
 website/views/shared/tasks/edit/index.jade             |  4 +---
 website/views/shared/tasks/edit/text_notes.jade        |  2 +-
 5 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/website/client-old/css/tasks.styl b/website/client-old/css/tasks.styl
index 0074da2f5f..13eec39624 100644
--- a/website/client-old/css/tasks.styl
+++ b/website/client-old/css/tasks.styl
@@ -552,7 +552,6 @@ form
       &:last-of-type
         margin-right: 0
   .repeat-days
-    padding-bottom: 1em
     li
       button
         min-width: 2.5em
@@ -564,11 +563,6 @@ form
   h2#task-edit-title
     margin-top: 1em
 
-// Dailies
-.dailies
-  .repeat-weekly
-    padding-bottom: 1em
-
 // Habits – task button styles (+ -)
 .habits
   .task-actions
diff --git a/website/views/shared/tasks/edit/advanced_options.jade b/website/views/shared/tasks/edit/advanced_options.jade
index f95ae582db..9549b12874 100644
--- a/website/views/shared/tasks/edit/advanced_options.jade
+++ b/website/views/shared/tasks/edit/advanced_options.jade
@@ -25,16 +25,6 @@ div(ng-if='(task.type !== "reward") || (!obj.auth && obj.purchased && obj.purcha
 
       hr
 
-      .form-group
-        legend.option-title=env.t('repeat')
-        select.form-control(ng-model='task._edit.frequency', ng-disabled='!canEdit(task)')
-          option(value='weekly')=env.t('repeatWeek')
-          option(value='daily')=env.t('repeatDays')
-
-      include ./dailies/repeat_options
-
-      hr
-
   fieldset.option-group.advanced-option(ng-show="task._edit._advanced")
 
     legend.option-title
diff --git a/website/views/shared/tasks/edit/dailies/repeat_options.jade b/website/views/shared/tasks/edit/dailies/repeat_options.jade
index 48c17d7631..0e0303001e 100644
--- a/website/views/shared/tasks/edit/dailies/repeat_options.jade
+++ b/website/views/shared/tasks/edit/dailies/repeat_options.jade
@@ -1,3 +1,9 @@
+.form-group
+  legend.option-title=env.t('repeat')
+  select.form-control(ng-model='task._edit.frequency', ng-disabled='!canEdit(task)')
+    option(value='weekly')=env.t('repeatWeek')
+    option(value='daily')=env.t('repeatDays')
+
 legend.option-title
   span.hint(popover-trigger='mouseenter', popover-title=env.t('repeatHelpTitle'),
     popover='{{env.t(task._edit.frequency + "RepeatHelpContent")}}')=env.t('repeatEvery')
@@ -9,7 +15,7 @@ ng-form.form-group(name='everyX', ng-if='task._edit.frequency=="daily"')
     span.input-group-addon {{task._edit.everyX == 1 ? env.t('day') : env.t('days')}}
 
 // If frequency is weekly
-.form-group(ng-if='task._edit.frequency=="weekly"')
+ng-form.form-group(ng-if='task._edit.frequency=="weekly"')
   ul.repeat-days
     // note, does not use data-toggle="buttons-checkbox" - it would interfere with our own click binding
     mixin dayOfWeek(day, num)
diff --git a/website/views/shared/tasks/edit/index.jade b/website/views/shared/tasks/edit/index.jade
index 3af8dde93b..25c85a2bf2 100644
--- a/website/views/shared/tasks/edit/index.jade
+++ b/website/views/shared/tasks/edit/index.jade
@@ -7,7 +7,7 @@ div(ng-if='task._editing')
 
     br
 
-    h2#task-edit-title
+    h3#task-edit-title
       markdown(text="task._edit.text")
 
     // Broken Challenge
@@ -60,8 +60,6 @@ div(ng-if='task._editing')
         include ./advanced_options
       
       .col-md-12
-        hr
-        
         .save-close
           button(type='submit', ng-click='saveTask(task,false,true); $close()')=env.t('saveAndClose')
         .save-close
diff --git a/website/views/shared/tasks/edit/text_notes.jade b/website/views/shared/tasks/edit/text_notes.jade
index 4043c6ddeb..7689eb49cf 100644
--- a/website/views/shared/tasks/edit/text_notes.jade
+++ b/website/views/shared/tasks/edit/text_notes.jade
@@ -4,4 +4,4 @@ fieldset.option-group
 
 fieldset.option-group
   label.option-title=env.t('extraNotes')
-  textarea.form-control.task-extra-notes(rows='3', ng-model='task._edit.notes')
+  textarea.form-control.task-extra-notes(rows='5', ng-model='task._edit.notes')