diff --git a/common/locales/en/tasks.json b/common/locales/en/tasks.json index 463c47894a..f36c485725 100644 --- a/common/locales/en/tasks.json +++ b/common/locales/en/tasks.json @@ -16,8 +16,7 @@ "checklist": "Checklist", "checklistText": "For Dailies, partially completed checklists reduce damage. For example, a 4-item checklist with 3 completed reduces damage for that incomplete Daily to 25%. Completed checklist items on a To-Do add a multiplier: 3 checks means +3x (total 4x) the Experience, Gold, and Mana.", "expandCollapse": "Expand/Collapse", - "text": "Text", - "title": "Title", + "text": "Title", "extraNotes": "Extra Notes", "direction/Actions": "Direction/Actions", "advancedOptions": "Advanced Options", diff --git a/website/views/shared/tasks/task.jade b/website/views/shared/tasks/task.jade index bae8c724fc..2b09a5fce3 100644 --- a/website/views/shared/tasks/task.jade +++ b/website/views/shared/tasks/task.jade @@ -138,16 +138,17 @@ li(bindonce='list', bo-id='"task-"+task.id', ng-repeat='task in obj[list.type+"s span.glyphicon.glyphicon-tasks span=env.t('addChecklist') form.checklist-form(ng-if='task.checklist') - legend.option-title(ng-if='task.checklist[0]') - span.hint(popover=env.t('checklistText'),popover-trigger='mouseenter',popover-placement='bottom')=env.t('checklist') - ul(hrpg-sort-checklist) - li(ng-repeat='item in task.checklist') - //input(type='checkbox',ng-model='item.completed',ng-change='saveTask(task,true)') - //-,ng-blur='saveTask(task,true)') - span.checklist-icon.glyphicon.glyphicon-resize-vertical() - input(type='text',ng-model='item.text',ui-keydown="{'8 46':'removeChecklistItem(task,$event,$index)'}",ui-keyup="{'13':'addChecklistItem(task,$event,$index)','38 40':'navigateChecklist(task,$index,$event)'}") - a(ng-click='removeChecklistItem(task,$event,$index,true)') - span.glyphicon.glyphicon-trash(tooltip=env.t('delete')) + fieldset.option-group(ng-if='!$state.includes("options.social.challenges")') + legend.option-title(ng-if='task.checklist[0]') + span.hint(popover=env.t('checklistText'),popover-trigger='mouseenter',popover-placement='bottom')=env.t('checklist') + ul(hrpg-sort-checklist) + li(ng-repeat='item in task.checklist') + //input(type='checkbox',ng-model='item.completed',ng-change='saveTask(task,true)') + //-,ng-blur='saveTask(task,true)') + span.checklist-icon.glyphicon.glyphicon-resize-vertical() + input(type='text',ng-model='item.text',ui-keydown="{'8 46':'removeChecklistItem(task,$event,$index)'}",ui-keyup="{'13':'addChecklistItem(task,$event,$index)','38 40':'navigateChecklist(task,$index,$event)'}") + a(ng-click='removeChecklistItem(task,$event,$index,true)') + span.glyphicon.glyphicon-trash(tooltip=env.t('delete')) form(ng-submit='saveTask(task,false,true)') // Notes text input