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

fixes to profile update

Browse Source
This commit is contained in:
Rushabh Mehta 2012-03-02 11:29:09 +05:30
parent 1e9b15eb5d
commit 37f531b6da
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/home/page/profile_settings/profile_settings.js
View File

@ -31,8 +31,8 @@ MyProfile = function(wrapper) {
this.tab = make_table($a(this.wrapper, 'div', '', {marginTop:'19px'}),
1, 2, '90%', ['50%', '50%'], {padding:'11px'})
this.img = $a($td(this.tab, 0, 0), 'img');
set_user_img(this.img, user);
this.img = $a($td(this.tab, 0, 0), 'img', '', {width: '120px', maxHeight:'200px'});
this.img.src = wn.user_info(user).image;
$btn($a($td(this.tab, 0, 0), 'div', '', {marginTop:'11px'}), 'Change Image', this.change_image);
@ -135,14 +135,18 @@ MyProfile = function(wrapper) {
}
pscript.background_change = function(fid) {
//erpnext.set_background_image(fid);
pscript.open_dialog.hide();
msgprint('File Uploaded');
if(fid) {
erpnext.set_user_background(fid);
pscript.open_dialog.hide();
}
}
pscript.user_image_upload = function(fid) {
msgprint('File Uploaded');
if(fid) {
pscript.open_dialog.hide();
set_user_img(pscript.myprofile.img, user, null, fid);
wn.boot.user_info[user].image = 'files/' + fid;
pscript.myprofile.img.src = 'files/' + fid;
}
}

2
erpnext/startup/startup.js
View File

@ -147,7 +147,7 @@ erpnext.startup.set_periodic_updates = function() {
}
erpnext.set_user_background = function(src) {
set_style(repl('body { background: url("files/%(src)s") repeat !important;}', {src:src}))
set_style(repl('body { background: url("files/%(src)s") repeat;}', {src:src}))
}
// start

2
js/all-app.js
View File

@ -2233,7 +2233,7 @@ if(!reset){$c_page('home','event_updates','get_unread_messages',null,function(r,
if(circle){if(r.message.length){circle.find('span:first').text(r.message.length);circle.toggle(true);}else{circle.toggle(false);}}}else{clearInterval(wn.updates.id);}});}else{page_body.wntoolbar.set_new_comments(0);$('#msg_count').toggle(false);}}
erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);}
wn.updates.id=setInterval(update_messages,60000);}
erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat !important;}',{src:src}))}
erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat;}',{src:src}))}
$(document).bind('startup',function(){erpnext.startup.start();});
/*
* erpnext/startup/js/modules.js

2
js/all-web.js
View File

@ -1081,7 +1081,7 @@ if(!reset){$c_page('home','event_updates','get_unread_messages',null,function(r,
if(circle){if(r.message.length){circle.find('span:first').text(r.message.length);circle.toggle(true);}else{circle.toggle(false);}}}else{clearInterval(wn.updates.id);}});}else{page_body.wntoolbar.set_new_comments(0);$('#msg_count').toggle(false);}}
erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);}
wn.updates.id=setInterval(update_messages,60000);}
erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat !important;}',{src:src}))}
erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat;}',{src:src}))}
$(document).bind('startup',function(){erpnext.startup.start();});
/*
* erpnext/website/js/topbar.js

2
version.num
View File

@ -1 +1 @@
814
815