Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
This commit is contained in:
commit
fba591cbb3
@ -15,7 +15,8 @@ erpnext.ActivityFeed = Class.extend({
|
||||
this.scrub_data(data);
|
||||
this.add_date_separator(row, data);
|
||||
$(row).append(sprintf('<div style="margin: 0px">\
|
||||
<img src="%(imgsrc)s" style= "height: 24px; margin-bottom: -7px; margin-right: 5px"> \
|
||||
<img src="%(imgsrc)s" style= "height: 24px; margin-bottom: -7px; \
|
||||
max-width: 24px; margin-right: 5px"> \
|
||||
<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));
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user