From bace2f594ea1e8e409ad52284b71d04262de46ee Mon Sep 17 00:00:00 2001 From: "J. Ozymandias Fallick" Date: Thu, 12 Sep 2013 13:30:36 -0400 Subject: [PATCH 1/3] Fixed possible typo --- src/middleware.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/middleware.js b/src/middleware.js index 67afee8461..f3180f737f 100644 --- a/src/middleware.js +++ b/src/middleware.js @@ -57,7 +57,7 @@ var getBuildUrl = function(url){ console.log("CALLED ", url) if(buildFiles[url]) return buildFiles[url]; - return filename; + return url; } module.exports.locals = function(req, res, next) { @@ -76,4 +76,4 @@ module.exports.locals = function(req, res, next) { // # Set locale to bg on dev // #model.set '_i18n.locale', 'bg' if process.env.NODE_ENV is "development" // next() - */ \ No newline at end of file + */ From 4d451265a09ca6e1cb153891669f115e05ac2b00 Mon Sep 17 00:00:00 2001 From: "J. Ozymandias Fallick" Date: Thu, 12 Sep 2013 14:32:17 -0400 Subject: [PATCH 2/3] Added Due Date as a basic label --- views/tasks/task.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/tasks/task.jade b/views/tasks/task.jade index 8572424f3f..0a75718f69 100644 --- a/views/tasks/task.jade +++ b/views/tasks/task.jade @@ -67,7 +67,7 @@ li(ng-repeat='task in user[list.type + "s"]', class='task {{taskClasses(task,use // {{#if taskInChallenge(task)}} // {{taskAttrFromChallenge(task,'text')}} // {{else}} - | {{task.text}} + | {{task.text}} {{task.date}} // {{/}} // edit/options dialog @@ -123,7 +123,7 @@ li(ng-repeat='task in user[list.type + "s"]', class='task {{taskClasses(task,use // if Todos, the due date fieldset.option-group(ng-if='task.type=="todo"') legend.option-title Due Date - input.option-content.datepicker(type='text', value='{{task.date}}', data-date-format='mm/dd/yyyy') + input.option-content.datepicker(type='text', data-date-format='mm/dd/yyyy', ng-model='task.date') fieldset.option-group(ng-if='list.main') legend.option-title Tags From 5457bfb2e590c2b0fc02f2d00f8ee4a3b77caf24 Mon Sep 17 00:00:00 2001 From: "J. Ozymandias Fallick" Date: Thu, 12 Sep 2013 17:04:52 -0400 Subject: [PATCH 3/3] Better due date placement and formatting --- public/css/tasks.styl | 4 ++++ views/tasks/task.jade | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/public/css/tasks.styl b/public/css/tasks.styl index 73894b3372..680fd1ce65 100644 --- a/public/css/tasks.styl +++ b/public/css/tasks.styl @@ -119,6 +119,10 @@ for $stage in $stages line-height: 1.4 word-wrap: break-word +// task due date (for to-dos) +.task-date + font-size: 70% + .habit-wide .task-text padding-left: 7em diff --git a/views/tasks/task.jade b/views/tasks/task.jade index 0a75718f69..266a7861d6 100644 --- a/views/tasks/task.jade +++ b/views/tasks/task.jade @@ -1,6 +1,9 @@ li(ng-repeat='task in user[list.type + "s"]', class='task {{taskClasses(task,user.filters,user.preferences.dayStart,user.lastCron,list.showCompleted,list.main)}}', data-id='{{task.id}}') // right-hand side control buttons .task-meta-controls + // Due Date + span.task-date(ng-if='task.type=="todo" && task.date') + | {{task.date}} // Streak span(ng-show='task.streak') {{task.streak}} span(tooltip='Streak Counter') @@ -67,7 +70,7 @@ li(ng-repeat='task in user[list.type + "s"]', class='task {{taskClasses(task,use // {{#if taskInChallenge(task)}} // {{taskAttrFromChallenge(task,'text')}} // {{else}} - | {{task.text}} {{task.date}} + | {{task.text}} // {{/}} // edit/options dialog