cleaned up item, fixed bug in dependency, removed legacy Listing, re-layed out DocField, refactored build.json for web, added featured_item and item_website_specification

This commit is contained in:
Rushabh Mehta
2012-12-07 15:47:32 +05:30
parent 9b924ce695
commit 0db74a7ebd
9 changed files with 230 additions and 130 deletions

View File

@@ -25,7 +25,7 @@ erpnext.ActivityFeed = Class.extend({
init: function(row, data) {
this.scrub_data(data);
this.add_date_separator(row, data);
$(row).append(sprintf('<div style="margin: 0px">\
$(row).append(repl('<div style="margin: 0px">\
<span class="avatar avatar-small"><img src="%(imgsrc)s" /></span> \
<span %(onclick)s class="label %(add_class)s">%(feed_type)s</span>\
%(link)s %(subject)s <span class="user-info">%(by)s</span></div>', data));
@@ -53,6 +53,8 @@ erpnext.ActivityFeed = Class.extend({
// link
if(data.doc_name && data.feed_type!='Login') {
data.link = repl('<a href="#!Form/%(doc_type)s/%(doc_name)s">%(doc_name)s</a>', data)
} else {
data.link = "";
}
},
add_date_separator: function(row, data) {