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

Change in top toolbar. It will not include profile link. The home right sidebar will have the profile settings link

Browse Source
This commit is contained in:
Anand Doshi 2012-01-06 16:27:54 +05:30
parent 58455c9d8e
commit a31fd1080b
4 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/home/page/event_updates/event_updates.js
View File

@ -583,7 +583,11 @@ HomeStatusBar = function() {
this.render = function(r) {
this.wrapper.innerHTML = '';
this.span = $a(this.wrapper, 'span', 'link_type', {fontWeight:'bold'});
this.profile_settings = $a($a(this.wrapper, 'p'), 'span', 'link_type', {fontWeight:'bold'});
this.profile_settings.innerHTML = user_fullname + ' (Profile Settings)';
this.profile_settings.onclick = function() { loadpage('profile-settings'); }
this.span = $a($a(this.wrapper, 'p'), 'span', 'link_type', {fontWeight:'bold'});
this.span.onclick = function() { loadpage('My Company') }
if(r.unread_messages) {

29
erpnext/startup/startup.js
View File

@ -432,16 +432,17 @@ pscript.startup_set_module_order = function() {
pscript.startup_setup_toolbar = function() {
var menu_tab = page_body.wntoolbar.menu_table_right;
// Profile
// ---------
$td(menu_tab,0,0).innerHTML = '<a style="font-weight: bold; color: #FFF" href="javascript:'+"loadpage('profile-settings')"+'">'+user_fullname+'</a>';
// help
// ----
$td(menu_tab,0,0).innerHTML = '<a style="font-weight: bold; color: #FFF" href="http://erpnext.blogspot.com/2011/03/erpnext-help.html" target="_blank">Help</a>';
$td(menu_tab,0,1).innerHTML = '<a style="font-weight: bold; color: #FFF" href="http://groups.google.com/group/erpnext-user-forum" target="_blank">Forum</a>';
if(pscript.is_erpnext_saas){
// Help
// --------------
//var help_url = login_file + '#!helpdesk'
$td(menu_tab,0,1).innerHTML = '<a style="font-weight: bold; color: #FFF" href="http://groups.google.com/group/erpnext-user-forum" target="_blank">Forum</a>';
// Live Chat Help
// --------------
$td(menu_tab,0,2).innerHTML = '<a style="font-weight: bold; color: #FFF" href="http://www.providesupport.com?messenger=iwebnotes" target="_blank">Chat</a>';
// Manage account
// --------------
if(is_system_manager) {
@ -449,18 +450,10 @@ pscript.startup_setup_toolbar = function() {
}
}
else{
$dh($td(menu_tab,0,1));
$dh($td(menu_tab,0,2));
$dh($td(menu_tab,0,3));
}
// Live Chat Help
// --------------
$td(menu_tab,0,2).innerHTML = '<a style="font-weight: bold; color: #FFF" href="http://www.providesupport.com?messenger=iwebnotes" target="_blank">Chat</a>';
// help
// ----
var cell = menu_tab.rows[0].insertCell(3);
cell.innerHTML = '<a style="font-weight: bold; color: #FFF" href="http://erpnext.blogspot.com/2011/03/erpnext-help.html" target="_blank">Help</a>';
$y(cell, page_body.wntoolbar.right_table_style);
}

2
index.html
View File

@ -3,7 +3,7 @@
<meta charset="utf-8">
<title>ERPNext</title>
<meta name="author" content="">
<script type="text/javascript">window._version_number="348"
<script type="text/javascript">window._version_number="356"
wn={}
wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}

BIN
versions-master.db
View File

Binary file not shown.