schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate

Browse Source 
Conflicts:
	version.num
This commit is contained in:
Rushabh Mehta
2012-03-22 06:35:35 +01:00
parent aaac794a8e f1eb1b1508
commit a12a28bec6
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/utilities/page/todo/todo.css
View File

@@ -21,7 +21,7 @@
.todoitem .ref_link {
float: left;
margin-left: 14px;
margin-left: 10px;
display: inline-block;
line-height: 18px;
}
@@ -29,4 +29,4 @@
.todoitem .description {
cursor: pointer;
float: left;
}
}

7
erpnext/utilities/page/todo/todo.js
View File

@@ -46,6 +46,11 @@ erpnext.todo.ToDoItem = Class.extend({
}
todo.labelclass = label_map[todo.priority];
todo.userdate = dateutil.str_to_user(todo.date) || '';
if(todo.assigned_by) {
todo.fullname = repl("[By %(fullname)s] ", {
fullname: wn.boot.user_info[todo.assigned_by].fullname
})
}
if(todo.reference_name && todo.reference_type) {
todo.link = repl('<a href="#!Form/%(reference_type)s/%(reference_name)s">\
%(reference_type)s: %(reference_name)s</a>', todo);
@@ -59,7 +64,7 @@ erpnext.todo.ToDoItem = Class.extend({
<span class="description">\
<span class="label %(labelclass)s">%(priority)s</span>\
<span class="help" style="margin-right: 7px">%(userdate)s</span>\
%(description)s</span>\
%(fullname)s%(description)s</span>\
<span class="ref_link">&rarr; &nbsp;\
%(link)s</span>\
<a href="#" class="close">&times;</a>\