diff --git a/erpnext/home/page/event_updates/event_updates.js b/erpnext/home/page/event_updates/event_updates.js index 6d60418e9c..6e09cca971 100644 --- a/erpnext/home/page/event_updates/event_updates.js +++ b/erpnext/home/page/event_updates/event_updates.js @@ -632,7 +632,7 @@ pscript.complete_registration = function(is_complete) { var d = new Dialog(400, 200, "Please Complete Your Registration"); if(user != 'Administrator'){ d.no_cancel(); // Hide close image - $dh(page_body.wntoolbar.wrapper); + $('header').toggle(false); } d.make_body([ @@ -672,7 +672,7 @@ pscript.complete_registration = function(is_complete) { $c_obj('Setup Control','setup_account',JSON.stringify(args),function(r, rt){ sys_defaults = r.message; d.hide(); - $ds(page_body.wntoolbar.wrapper); + $('header').toggle(true); }); } } diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index d46d49ec9e..ad4e78ec4d 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -10,28 +10,18 @@ var user_full_nm = {}; // check if session user is system manager if(inList(user_roles,'System Manager')) is_system_manager = 1; +wn.require('erpnext/startup/toolbar.js'); + function startup_setup() { pscript.is_erpnext_saas = cint(locals['Control Panel']['Control Panel'].sync_with_gateway) if(get_url_arg('embed')) { // hide header, footer - $dh(page_body.banner_area); - $dh(page_body.wntoolbar); + $('.topbar').css('display', 'none'); $dh(page_body.footer); return; } - // page structure - // -------------- - if(page_body.wntoolbar) { - $td(page_body.wntoolbar.body_tab,0,0).innerHTML = 'erpnext'; - $y($td(page_body.wntoolbar.body_tab,0,0), { - width:'140px', - color:'#FFF', - paddingLeft:'8px', - paddingRight:'8px', - fontSize:'14px' - }); - } + $dh(page_body.banner_area); // sidebar @@ -43,7 +33,7 @@ function startup_setup() { page_body.footer.innerHTML = '
Powered by ERPNext
'; // setup toolbar - pscript.startup_setup_toolbar(); + erpnext.toolbar.setup(); } // ==================================================================== @@ -418,37 +408,6 @@ pscript.startup_set_module_order = function() { $c_obj('Home Control', 'get_module_order', '', callback) } - -// ==================================================================== - -pscript.startup_setup_toolbar = function() { - var menu_tab = page_body.wntoolbar.menu_table_right; - // help - // ---- - $td(menu_tab,0,0).innerHTML = 'Help'; - - $td(menu_tab,0,1).innerHTML = 'Forum'; - - if(pscript.is_erpnext_saas){ - // Live Chat Help - // -------------- - $td(menu_tab,0,2).innerHTML = 'Chat'; - - // Manage account - // -------------- - if(is_system_manager) { - $td(menu_tab,0,3).innerHTML = 'Billing'; - } - } - else{ - $dh($td(menu_tab,0,2)); - $dh($td(menu_tab,0,3)); - } - - $y(cell, page_body.wntoolbar.right_table_style); - -} - // chart of accounts // ==================================================================== show_chart_browser = function(nm, chart_type){ diff --git a/erpnext/startup/toolbar.js b/erpnext/startup/toolbar.js new file mode 100644 index 0000000000..49738ce1ee --- /dev/null +++ b/erpnext/startup/toolbar.js @@ -0,0 +1,27 @@ +/* toolbar settings */ +wn.provide('erpnext.toolbar'); + +erpnext.toolbar.setup = function() { + // profile + $('#toolbar-user').append('
  • Profile Settings
    • ') + + // help + $('.topbar .secondary-nav').append('
  • \ + Help\ +
    • ') + + $('#toolbar-help').append('
  • \ + Documentation
    • ') + + $('#toolbar-help').append('
  • \ + Forum
    • ') + + $('#toolbar-help').append('
  • \ + Live Chat (Office Hours)
    • ') + + // billing + if(pscript.is_erpnext_saas && is_system_manager) { + $('#toolbar-user').append('
  • Billing
    • ') + } +} \ No newline at end of file diff --git a/index.html b/index.html index 076064ac66..381e794d5d 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ ERPNext - +
    -
    - -
    +
    Loading...
    diff --git a/js/app.js b/js/app.js index 5a8597d48b..4a27662236 100644 --- a/js/app.js +++ b/js/app.js @@ -1,3 +1,12 @@ +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.settings.no_history = true; wn.require('lib/js/lib/jquery.min.js'); @@ -11,4 +20,8 @@ wn.require('lib/css/legacy/default.css'); $(document).bind('ready', function() { startup(); -}); \ No newline at end of file +}); + +$(document).bind('toolbar_setup', function() { + $('.brand').html('erpnext'); +}) \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index af0b8e5f79..4a24783dba 100644 --- a/templates/index.html +++ b/templates/index.html @@ -6,13 +6,12 @@ +
    -
    - -
    +
    Loading...
    diff --git a/version.num b/version.num index 6139554210..9d1ce53f8c 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -52 \ No newline at end of file +82 \ No newline at end of file