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

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

Browse Source
This commit is contained in:
Anand Doshi 2012-03-01 12:21:16 +05:30
commit fba591cbb3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/home/page/activity/activity.js
View File

@ -15,7 +15,8 @@ erpnext.ActivityFeed = Class.extend({
this.scrub_data(data); this.scrub_data(data);
this.add_date_separator(row, data); this.add_date_separator(row, data);
$(row).append(sprintf('<div style="margin: 0px">\ $(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>\ <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)); %(link)s %(subject)s <span class="user-info">%(by)s</span></div>', data));
}, },