From 4563d22bf0c3a7a80e527345e1ad703f67a00380 Mon Sep 17 00:00:00 2001 From: Bill Parrott Date: Tue, 17 Feb 2015 14:05:09 -0600 Subject: [PATCH] minor updates from code review --- common/locales/en/tasks.json | 2 ++ website/views/shared/tasks/lists.jade | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/common/locales/en/tasks.json b/common/locales/en/tasks.json index 5aabb60ce3..5c1603e26f 100644 --- a/common/locales/en/tasks.json +++ b/common/locales/en/tasks.json @@ -3,6 +3,8 @@ "lotOfToDos": "Completed To-Dos are automatically archived after 3 days. You can access them from Settings > Export.", "deleteToDosExplanation": "If you click the button below, all of your completed To-Dos and archived To-Dos will be permanently deleted. Export them first if you want to keep a record of them.", "beeminderDeleteWarning": "Beeminder users: First read Deleting Completed To-Dos Without Confusing Beeminder!", + "addmultiple": "Add Multiple", + "addsingle": "Add Single", "habits": "Habits", "newHabit": "New Habit", "newHabitBulk": "New Habits (one per line)", diff --git a/website/views/shared/tasks/lists.jade b/website/views/shared/tasks/lists.jade index b148f412be..afc2b579fe 100644 --- a/website/views/shared/tasks/lists.jade +++ b/website/views/shared/tasks/lists.jade @@ -24,14 +24,13 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template") // Add New form.task-add(name='new{{list.type}}form', ng-hide='obj._locked', ng-submit='addTask(obj[list.type+"s"],list)') - textarea(rows='6', ng-model='list.newTask', placeholder='{{list.placeHolderBulk}}', ng-if='list.bulk', required) + textarea(rows='6', ng-model='list.newTask', placeholder='{{list.placeHolderBulk}}', ng-if='list.bulk', ui-keydown='{"meta-enter ctrl-enter":"addTask(obj[list.type+\'s\'],list)"}', required) input(type='text', ng-model='list.newTask', placeholder='{{list.placeHolder}}', ng-if='!list.bulk', required) button(type='submit', ng-disabled='new{{list.type}}form.$invalid') span.glyphicon.glyphicon-plus - span.help-block - a(ng-click='toggleBulk(list)') - span.add-multiple(ng-if='!list.bulk') Add Multiple - span.add-single(ng-if='list.bulk') Add Single + small.help-block.btn-link.pull-right(ng-click='toggleBulk(list)') + span(ng-if='!list.bulk')=env.t('addmultiple') + span(ng-if='list.bulk')=env.t('addsingle') mixin taskColumnTabs(position) // Habits Tabs