From c9d1ac41126054ac57a8901f37ca9cb79558d59e Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 17 Apr 2012 13:54:53 +0530 Subject: [PATCH] fix - show about of application --- erpnext/startup/startup.js | 3 ++- js/all-app.js | 6 +++--- js/all-web.js | 6 +++--- js/app.js | 18 +++++++++++------- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index e550b013e70..456b1cf5791 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -89,6 +89,8 @@ erpnext.startup.start = function() { } + erpnext.set_about(); + $('#startup_div').toggle(false); } @@ -172,4 +174,3 @@ erpnext.set_user_background = function(src) { $(document).bind('startup', function() { erpnext.startup.start(); }); - diff --git a/js/all-app.js b/js/all-app.js index fca0919b614..5d8bbe34d75 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -472,7 +472,7 @@ wn.request.call({args:args,success:opts.callback,error:opts.error,btn:opts.btn,f * lib/js/core.js */ if(!console){var console={log:function(txt){alert(txt);}}} -wn.versions.check();$(document).bind('ready',function(){wn.app=new wn.Application();}); +wn.versions.check();$(document).bind('ready',function(){wn.provide('wn.app');$.extend(wn.app,new wn.Application());}); /* * lib/js/legacy/globals.js @@ -2155,7 +2155,7 @@ $(favicon).appendTo('head');}}) /* * js/app.js */ -wn.app={name:'ERPNext',license:'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is',source:'https://github.com/webnotes/erpnext',publisher:'Web Notes Technologies Pvt Ltd, Mumbai',copyright:'© Web Notes Technologies Pvt Ltd',version:'2.'+window._version_number} +wn.provide('erpnext');wn.provide('wn.app');erpnext.set_about=function(){$.extend(wn.app,{name:'ERPNext',license:'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is',source:'https://github.com/webnotes/erpnext',publisher:'Web Notes Technologies Pvt Ltd, Mumbai',copyright:'© Web Notes Technologies Pvt Ltd',version:'2.'+window._version_number});} wn.modules_path='erpnext';$(document).bind('toolbar_setup',function(){$('.brand').html('erpnext\ ').hover(function(){$(this).find('.icon-home').addClass('navbar-icon-home-hover');},function(){$(this).find('.icon-home').removeClass('navbar-icon-home-hover');});}); /* @@ -2170,7 +2170,7 @@ if(user=='Guest'){if(wn.boot.custom_css){set_style(wn.boot.custom_css);} if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages']) if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');} erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} -$('#startup_div').toggle(false);} +erpnext.set_about();$('#startup_div').toggle(false);} show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);} else if(nm=='Accounts Browser') pscript.make_chart(chart_type);} diff --git a/js/all-web.js b/js/all-web.js index 29b46ffffc3..1247a2ed38f 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -359,7 +359,7 @@ wn.request.call({args:args,success:opts.callback,error:opts.error,btn:opts.btn,f * lib/js/core.js */ if(!console){var console={log:function(txt){alert(txt);}}} -wn.versions.check();$(document).bind('ready',function(){wn.app=new wn.Application();}); +wn.versions.check();$(document).bind('ready',function(){wn.provide('wn.app');$.extend(wn.app,new wn.Application());}); /* * lib/js/legacy/globals.js @@ -855,7 +855,7 @@ $(favicon).appendTo('head');}}) /* * js/app.js */ -wn.app={name:'ERPNext',license:'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is',source:'https://github.com/webnotes/erpnext',publisher:'Web Notes Technologies Pvt Ltd, Mumbai',copyright:'© Web Notes Technologies Pvt Ltd',version:'2.'+window._version_number} +wn.provide('erpnext');wn.provide('wn.app');erpnext.set_about=function(){$.extend(wn.app,{name:'ERPNext',license:'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is',source:'https://github.com/webnotes/erpnext',publisher:'Web Notes Technologies Pvt Ltd, Mumbai',copyright:'© Web Notes Technologies Pvt Ltd',version:'2.'+window._version_number});} wn.modules_path='erpnext';$(document).bind('toolbar_setup',function(){$('.brand').html('erpnext\ ').hover(function(){$(this).find('.icon-home').addClass('navbar-icon-home-hover');},function(){$(this).find('.icon-home').removeClass('navbar-icon-home-hover');});}); /* @@ -870,7 +870,7 @@ if(user=='Guest'){if(wn.boot.custom_css){set_style(wn.boot.custom_css);} if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages']) if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');} erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} -$('#startup_div').toggle(false);} +erpnext.set_about();$('#startup_div').toggle(false);} show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);} else if(nm=='Accounts Browser') pscript.make_chart(chart_type);} diff --git a/js/app.js b/js/app.js index e0716ececa4..b8b772edbe8 100644 --- a/js/app.js +++ b/js/app.js @@ -1,10 +1,14 @@ -wn.app = { - name: 'ERPNext', - license: 'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is', - source: 'https://github.com/webnotes/erpnext', - publisher: 'Web Notes Technologies Pvt Ltd, Mumbai', - copyright: '© Web Notes Technologies Pvt Ltd', - version: '2.' + window._version_number +wn.provide('erpnext'); +erpnext.set_about = function() { + wn.provide('wn.app'); + $.extend(wn.app, { + name: 'ERPNext', + license: 'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is', + source: 'https://github.com/webnotes/erpnext', + publisher: 'Web Notes Technologies Pvt Ltd, Mumbai', + copyright: '© Web Notes Technologies Pvt Ltd', + version: '2.' + window._version_number + }); } wn.modules_path = 'erpnext';