From 037c2570b6b1e8c426c3cea1a39ed6428e432707 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 9 Oct 2012 11:05:25 +0530 Subject: [PATCH] multi-line todo --- utilities/page/todo/todo.css | 27 ++++++++++++++------------- utilities/page/todo/todo.js | 17 ++++++++++------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/utilities/page/todo/todo.css b/utilities/page/todo/todo.css index 088f60e199..f67f729c4f 100644 --- a/utilities/page/todo/todo.css +++ b/utilities/page/todo/todo.css @@ -3,13 +3,23 @@ clear: both; } +.todoitem div { + float: left; + display: inline-block; + padding: 3px; +} + .todoitem .label { width: 50px; - display: inline-block; - text-align: center; margin-right: 11px; margin-top: 3px; - float: left; + text-align: center; +} + +.todoitem .todo-date { + margin-top: -2px; + margin-right: 7px; + color: #aaa; } .todoitem .close { @@ -18,18 +28,9 @@ } .todoitem .close-span { - display: inline-block; float: right; } -.todoitem .description { - padding: 3px 0px; -} - -#todo-list { - -} - .todo-separator { border-bottom: 1px solid #DEB85F; margin-bottom: 5px; @@ -45,6 +46,6 @@ min-height: 300px; } -.popup-on-click { +.todoitem .popup-on-click { margin: 0px 6px; } \ No newline at end of file diff --git a/utilities/page/todo/todo.js b/utilities/page/todo/todo.js index 2032b31335..0617b4e292 100644 --- a/utilities/page/todo/todo.js +++ b/utilities/page/todo/todo.js @@ -80,17 +80,20 @@ erpnext.todo.ToDoItem = Class.extend({ todo.link = ''; } if(!todo.description) todo.description = ''; + todo.description_display = todo.description.replace(/\n\n/g, "
").trim(); $(parent_list).append(repl('\
\ - %(priority)s\ - [edit]\ - \ - %(userdate)s\ - %(fullname)s: %(description)s\ +
%(priority)s
\ + \ +
\ +
%(userdate)s
\ + %(fullname)s:\ +
\ +
%(description_display)s\ %(link)s\ - \ - ×\ +
\ + \
\
', todo)); $todo = $(parent_list + ' div.todoitem:last');