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

activty images, website heading fix

Browse Source
This commit is contained in:
Rushabh Mehta 2012-03-01 11:49:54 +05:30
parent ffb25fc36b
commit b4a2f4c98f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,12 +14,14 @@ erpnext.ActivityFeed = Class.extend({
init: function(row, data) {
this.scrub_data(data);
this.add_date_separator(row, data);
$(row).append(sprintf('<span %(onclick)s\
class="label %(add_class)s">%(feed_type)s</span>\
%(link)s %(subject)s <span class="user-info">%(by)s</span>', data));
$(row).append(sprintf('<div style="margin: 0px">\
<img src="%(imgsrc)s" style= "height: 24px; margin-bottom: -7px; 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));
},
scrub_data: function(data) {
data.by = wn.user_info(data.owner).fullname;
data.imgsrc = wn.user_info(data.owner).image;
// feedtype
if(!data.feed_type) {

2
erpnext/website/page/website_home/website_home.html
View File

@ -1,7 +1,7 @@
<div class="layout-wrapper layout-wrapper-background">
<div class="layout-main-section">
<a class="close" onclick="window.history.back();">&times;</a>
<h1>Support</h1>
<h1>Website</h1>
<hr>
<div style="width: 48%; float: left;">
<h4><a href="#!List/Web Page">Web Page</a></h4>