Change in top toolbar. It will not include profile link. The home right sidebar will have the profile settings link
diff --git a/erpnext/home/page/event_updates/event_updates.js b/erpnext/home/page/event_updates/event_updates.js
index b58a0c0..ee348e6 100644
--- a/erpnext/home/page/event_updates/event_updates.js
+++ b/erpnext/home/page/event_updates/event_updates.js
@@ -583,7 +583,11 @@
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) {
diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js
index 07c1629..5a66ec6 100644
--- a/erpnext/startup/startup.js
+++ b/erpnext/startup/startup.js
@@ -432,16 +432,17 @@
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 @@
}
}
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);
}
diff --git a/index.html b/index.html
index b04284a..02b3b1a 100644
--- a/index.html
+++ b/index.html
@@ -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]={}}
diff --git a/versions-master.db b/versions-master.db
index 799c9af..19b21c8 100644
--- a/versions-master.db
+++ b/versions-master.db
Binary files differ