Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multi-line todo

Browse Source
This commit is contained in:
Anand Doshi 2012-10-09 11:05:25 +05:30
parent a49475dc72
commit 037c2570b6
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
utilities/page/todo/todo.css
View File

@ -3,13 +3,23 @@
clear: both; clear: both;
} }
.todoitem div {
float: left;
display: inline-block;
padding: 3px;
}
.todoitem .label { .todoitem .label {
width: 50px; width: 50px;
display: inline-block;
text-align: center;
margin-right: 11px; margin-right: 11px;
margin-top: 3px; margin-top: 3px;
float: left; text-align: center;
}
.todoitem .todo-date {
margin-top: -2px;
margin-right: 7px;
color: #aaa;
} }
.todoitem .close { .todoitem .close {
@ -18,18 +28,9 @@
} }
.todoitem .close-span { .todoitem .close-span {
display: inline-block;
float: right; float: right;
} }
.todoitem .description {
padding: 3px 0px;
}
#todo-list {
}
.todo-separator { .todo-separator {
border-bottom: 1px solid #DEB85F; border-bottom: 1px solid #DEB85F;
margin-bottom: 5px; margin-bottom: 5px;
@ -45,6 +46,6 @@
min-height: 300px; min-height: 300px;
} }
.popup-on-click { .todoitem .popup-on-click {
margin: 0px 6px; margin: 0px 6px;
} }

17
utilities/page/todo/todo.js
View File

@ -80,17 +80,20 @@ erpnext.todo.ToDoItem = Class.extend({
todo.link = ''; todo.link = '';
} }
if(!todo.description) todo.description = ''; if(!todo.description) todo.description = '';
todo.description_display = todo.description.replace(/\n\n/g, "<br>").trim();
$(parent_list).append(repl('\ $(parent_list).append(repl('\
<div class="todoitem">\ <div class="todoitem">\
<span class="label %(labelclass)s">%(priority)s</span>\ <div class="label %(labelclass)s">%(priority)s</div>\
<span class="popup-on-click"><a href="#">[edit]</a></span>\ <div class="popup-on-click"><a href="#">[edit]</a></div>\
<span class="description">\ <div class="todo-date-fullname">\
<span class="help" style="margin-right: 7px">%(userdate)s</span>\ <div class="todo-date">%(userdate)s</div>\
%(fullname)s: %(description)s\ %(fullname)s:\
</div>\
<div class="description">%(description_display)s\
<span class="ref_link">%(link)s</span>\ <span class="ref_link">%(link)s</span>\
</span>\ </div>\
<span class="close-span"><a href="#" class="close">&times;</a></span>\ <div class="close-span"><a href="#" class="close">&times;</a></div>\
</div>\ </div>\
<div class="todo-separator"></div>', todo)); <div class="todo-separator"></div>', todo));
$todo = $(parent_list + ' div.todoitem:last'); $todo = $(parent_list + ' div.todoitem:last');