From 0fc61a9fe74dd13a5f7feb8b55df857e8aa5ef86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 8 Nov 2016 13:34:44 +0100 Subject: [PATCH] Using | pretty_date for task due dates, rather than MomentJS. --- src/templates/attract/tasks/for_project.jade | 10 +--------- src/templates/attract/tasks/for_user.jade | 8 -------- src/templates/attract/tasks/task_list_for_user.jade | 2 +- src/templates/attract/tasks/view_task_embed.jade | 2 +- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/templates/attract/tasks/for_project.jade b/src/templates/attract/tasks/for_project.jade index 5a48286..558ac62 100644 --- a/src/templates/attract/tasks/for_project.jade +++ b/src/templates/attract/tasks/for_project.jade @@ -23,7 +23,7 @@ span.shotname(title="Shot {{ task._parent_info.name }}") {{ task._parent_info.name }} | {% endif %} span.name {{ task.name }} - span.due_date {{ task.properties.due_date | hide_none }} + span.due_date {{ task.properties.due_date | pretty_date | hide_none }} | {% endfor %} .col-splitter @@ -58,12 +58,4 @@ script. $('#task-list').css({'height': window_height}); $('#item-details').css({'height': window_height}); }); - - $('#task-list .task-list-item span.due_date').each(function(){ - var current = $(this).text(); - if (current){ - $(this).html(moment().to(current)); - } - }); - | {% endblock %} diff --git a/src/templates/attract/tasks/for_user.jade b/src/templates/attract/tasks/for_user.jade index 511612a..7a39c39 100644 --- a/src/templates/attract/tasks/for_user.jade +++ b/src/templates/attract/tasks/for_user.jade @@ -30,12 +30,4 @@ script. resizeHeight: false }); - $('#task-list .task-list-item span.due_date').each(function(){ - var current = $(this).text(); - if (current){ - $(this).html(moment().to(current)); - } - }); - | {% endblock %} - diff --git a/src/templates/attract/tasks/task_list_for_user.jade b/src/templates/attract/tasks/task_list_for_user.jade index 2805166..93842a0 100644 --- a/src/templates/attract/tasks/task_list_for_user.jade +++ b/src/templates/attract/tasks/task_list_for_user.jade @@ -14,7 +14,7 @@ span.shotname {{ task._parent_info.name }} | {% endif %} span.name {{ task.name }} - span.due_date {{ task.properties.due_date }} + span.due_date {{ task.properties.due_date | pretty_date | hide_none }} | {% else %} .col-list-item.empty span.no-tasks diff --git a/src/templates/attract/tasks/view_task_embed.jade b/src/templates/attract/tasks/view_task_embed.jade index b4a4ca4..eb95817 100644 --- a/src/templates/attract/tasks/view_task_embed.jade +++ b/src/templates/attract/tasks/view_task_embed.jade @@ -133,7 +133,7 @@ .table-cell Due Date .table-cell | {% if task.properties.due_date %} - span.due_date {{ task.properties.due_date }} + span.due_date {{ task.properties.due_date | pretty_date_time }} | {% else %} span.hint No date set | {% endif %}