From cc674f57cd04f62f40ef22c3f80e40d43ae7f77b Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Tue, 7 Apr 2015 19:51:27 -0500 Subject: [PATCH] Revert "Sorted dated todos by date." --- common/locales/en/tasks.json | 1 + website/views/shared/tasks/lists.jade | 2 +- website/views/shared/tasks/task.jade | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/locales/en/tasks.json b/common/locales/en/tasks.json index 0e683a91a4..8ee8d1cd50 100644 --- a/common/locales/en/tasks.json +++ b/common/locales/en/tasks.json @@ -44,6 +44,7 @@ "remaining": "Active", "complete": "Done", "dated": "Dated", + "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.", "due": "Due", "grey": "Grey", "score": "Score", diff --git a/website/views/shared/tasks/lists.jade b/website/views/shared/tasks/lists.jade index b4487d690e..b1cf70c740 100644 --- a/website/views/shared/tasks/lists.jade +++ b/website/views/shared/tasks/lists.jade @@ -66,7 +66,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template") ul.task-filter li(ng-class='{active: list.view == "remaining"}') a(ng-click='list.view = "remaining"')=env.t('remaining') - li(ng-class='{active: list.view == "dated"}') + li(ng-class='{active: list.view == "dated"}', tooltip=env.t('datedNotSorted')) a(ng-click='list.view = "dated"')=env.t('dated') li(ng-class='{active: list.view == "complete"}') a(ng-click='list.view = "complete"')=env.t('complete') diff --git a/website/views/shared/tasks/task.jade b/website/views/shared/tasks/task.jade index 0a9d4290a6..13e810e092 100644 --- a/website/views/shared/tasks/task.jade +++ b/website/views/shared/tasks/task.jade @@ -1,4 +1,4 @@ -li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s"] | orderBy:(list.view == "dated" ? "date" : null)', class='task {{Shared.taskClasses(task, user.filters, user.preferences.dayStart, user.lastCron, list.showCompleted, main)}}', ng-click='spell && (list.type != "reward") && castEnd(task, "task", $event)', ng-class='{"cast-target":spell && (list.type != "reward"), "locked-task":obj._locked === true}', popover-trigger='mouseenter', data-popover-html="{{task.notes | markdown}}", popover-placement="top", popover-append-to-body='{{::modal ? "false":"true"}}', ng-show='shouldShow(task, list, user.preferences)') +li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s"]', class='task {{Shared.taskClasses(task, user.filters, user.preferences.dayStart, user.lastCron, list.showCompleted, main)}}', ng-click='spell && (list.type != "reward") && castEnd(task, "task", $event)', ng-class='{"cast-target":spell && (list.type != "reward"), "locked-task":obj._locked === true}', popover-trigger='mouseenter', data-popover-html="{{task.notes | markdown}}", popover-placement="top", popover-append-to-body='{{::modal ? "false":"true"}}', ng-show='shouldShow(task, list, user.preferences)') // right-hand side control buttons .task-meta-controls