sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-03 04:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Task edit screen changes [fixes #8474]

Browse source 
move Dailies repeats out of Advanced Options; enlarge Notes; reduce spacings
This commit is contained in:
Marcel O'Neil 2017-02-13 05:02:27 -05:00 committed by Alys
parent af047d3c82
commit 78f187f87a
5 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
website/client-old/css/tasks.styl
View file

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

10
website/views/shared/tasks/edit/advanced_options.jade
View file

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

8
website/views/shared/tasks/edit/dailies/repeat_options.jade
View file

@ -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)

4
website/views/shared/tasks/edit/index.jade
View file

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

2
website/views/shared/tasks/edit/text_notes.jade
View file

@ -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')