From cc32b65b66a0befc67b710fa4ebf503c21482f9f Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 19 Apr 2013 13:01:32 +0530 Subject: [PATCH] [toolbars] [design] commonified into common toolbar --- .../page/accounts_browser/accounts_browser.js | 2 +- .../financial_analytics.js | 2 +- .../page/general_ledger/general_ledger.js | 2 +- accounts/page/trial_balance/trial_balance.js | 2 +- .../purchase_analytics/purchase_analytics.js | 2 +- public/js/toolbar.js | 69 +++---------------- .../page/sales_analytics/sales_analytics.js | 2 +- selling/page/sales_browser/sales_browser.js | 2 +- stock/page/stock_ageing/stock_ageing.js | 2 +- stock/page/stock_analytics/stock_analytics.js | 2 +- stock/page/stock_balance/stock_balance.js | 2 +- stock/page/stock_ledger/stock_ledger.js | 2 +- stock/page/stock_level/stock_level.js | 2 +- .../support_analytics/support_analytics.js | 2 +- utilities/page/question_view/question_view.js | 2 +- 15 files changed, 24 insertions(+), 73 deletions(-) diff --git a/accounts/page/accounts_browser/accounts_browser.js b/accounts/page/accounts_browser/accounts_browser.js index 2e8cc820a6..ede10e65cb 100644 --- a/accounts/page/accounts_browser/accounts_browser.js +++ b/accounts/page/accounts_browser/accounts_browser.js @@ -23,7 +23,7 @@ pscript['onload_Accounts Browser'] = function(wrapper){ wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area')); wrapper.appframe.add_home_breadcrumb() - wrapper.appframe.add_module_breadcrumb("Accounts") + wrapper.appframe.add_module_icon("Accounts") if (wn.boot.profile.can_create.indexOf("Company") !== -1) { wrapper.appframe.add_button('New Company', function() { newdoc('Company'); }, diff --git a/accounts/page/financial_analytics/financial_analytics.js b/accounts/page/financial_analytics/financial_analytics.js index f7145490a1..aac7076519 100644 --- a/accounts/page/financial_analytics/financial_analytics.js +++ b/accounts/page/financial_analytics/financial_analytics.js @@ -25,7 +25,7 @@ wn.pages['financial-analytics'].onload = function(wrapper) { erpnext.trial_balance = new erpnext.FinancialAnalytics(wrapper, 'Financial Analytics'); wrapper.appframe.add_home_breadcrumb() - wrapper.appframe.add_module_breadcrumb("Accounts") + wrapper.appframe.add_module_icon("Accounts") wrapper.appframe.add_breadcrumb("icon-bar-chart") } diff --git a/accounts/page/general_ledger/general_ledger.js b/accounts/page/general_ledger/general_ledger.js index 21be3a05dd..137f5e941c 100644 --- a/accounts/page/general_ledger/general_ledger.js +++ b/accounts/page/general_ledger/general_ledger.js @@ -24,7 +24,7 @@ wn.pages['general-ledger'].onload = function(wrapper) { erpnext.general_ledger = new erpnext.GeneralLedger(wrapper); wrapper.appframe.add_home_breadcrumb() - wrapper.appframe.add_module_breadcrumb("Accounts") + wrapper.appframe.add_module_icon("Accounts") wrapper.appframe.add_breadcrumb("icon-bar-chart") } diff --git a/accounts/page/trial_balance/trial_balance.js b/accounts/page/trial_balance/trial_balance.js index c64075f6b9..9c4c50ad20 100644 --- a/accounts/page/trial_balance/trial_balance.js +++ b/accounts/page/trial_balance/trial_balance.js @@ -59,6 +59,6 @@ wn.pages['trial-balance'].onload = function(wrapper) { erpnext.trial_balance = new TrialBalance(wrapper, 'Trial Balance'); wrapper.appframe.add_home_breadcrumb() - wrapper.appframe.add_module_breadcrumb("Accounts") + wrapper.appframe.add_module_icon("Accounts") wrapper.appframe.add_breadcrumb("icon-bar-chart") } \ No newline at end of file diff --git a/buying/page/purchase_analytics/purchase_analytics.js b/buying/page/purchase_analytics/purchase_analytics.js index fc082eae13..857a335ae7 100644 --- a/buying/page/purchase_analytics/purchase_analytics.js +++ b/buying/page/purchase_analytics/purchase_analytics.js @@ -24,7 +24,7 @@ wn.pages['purchase-analytics'].onload = function(wrapper) { new erpnext.PurchaseAnalytics(wrapper); wrapper.appframe.add_home_breadcrumb() - wrapper.appframe.add_module_breadcrumb("Buying") + wrapper.appframe.add_module_icon("Buying") wrapper.appframe.add_breadcrumb("icon-bar-chart") } diff --git a/public/js/toolbar.js b/public/js/toolbar.js index 03d7d0aba9..1d3d1e7682 100644 --- a/public/js/toolbar.js +++ b/public/js/toolbar.js @@ -18,75 +18,26 @@ wn.provide('erpnext.toolbar'); erpnext.toolbar.setup = function() { - // modules - erpnext.toolbar.add_modules(); - // profile - $('#toolbar-user').append('
  • ' + var $user = $('#toolbar-user'); + $user.append('
  • ' +wn._("My Settings")+'...
    • '); + $user.append('
  • '); + $user.append('
  • ' + +wn._('Documentation')+'
    • ') + $user.append('
  • ' + +wn._('Forum')+'
    • ') + $user.append('
  • \ + '+wn._('Live Chat')+'
    • ') + $('.navbar .pull-right').append('\
    • '); - // help - $('.navbar .pull-right').prepend('
  • \ - '+wn._('Help')+'\ -
    • ') - - $('#toolbar-help').append('
  • ' - +wn._('Documentation')+'
    • ') - - $('#toolbar-help').append('
  • ' - +wn._('Forum')+'
    • ') - - $('#toolbar-help').append('
  • \ - '+wn._('Live Chat')+'
    • ') - erpnext.toolbar.set_new_comments(); } -erpnext.toolbar.add_modules = function() { - $('
  • \ - \ - \ -
    • ').prependTo('.navbar .nav:first'); - - var modules_list = wn.user.get_desktop_items().sort(); - - var _get_list_item = function(m) { - args = { - module: m, - module_page: wn.modules[m].link, - module_label: wn._(wn.modules[m].label || m), - icon: wn.modules[m].icon - } - - return repl('
  • \ - %(module_label)s
    • ', args); - } - - // add to dropdown - $.each(modules_list,function(i, m) { - if(m!='Setup') { - $('.navbar .modules').append(_get_list_item(m)); - } - }) - - // setup for system manager - if(user_roles.indexOf("System Manager")!=-1) { - $('.navbar .modules').append('
  • ' + _get_list_item("Setup")); - } - -} - erpnext.toolbar.set_new_comments = function(new_comments) { var navbar_nc = $('.navbar-new-comments'); if(cint(new_comments)) { diff --git a/selling/page/sales_analytics/sales_analytics.js b/selling/page/sales_analytics/sales_analytics.js index 0b35af5f31..7fdc3ac641 100644 --- a/selling/page/sales_analytics/sales_analytics.js +++ b/selling/page/sales_analytics/sales_analytics.js @@ -23,7 +23,7 @@ wn.pages['sales-analytics'].onload = function(wrapper) { new erpnext.SalesAnalytics(wrapper); wrapper.appframe.add_home_breadcrumb() - wrapper.appframe.add_module_breadcrumb("Selling") + wrapper.appframe.add_module_icon("Selling") wrapper.appframe.add_breadcrumb("icon-bar-chart") } diff --git a/selling/page/sales_browser/sales_browser.js b/selling/page/sales_browser/sales_browser.js index 4622f24a43..60bb1fd9b7 100644 --- a/selling/page/sales_browser/sales_browser.js +++ b/selling/page/sales_browser/sales_browser.js @@ -17,7 +17,7 @@ pscript['onload_Sales Browser'] = function(wrapper){ wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area')); wrapper.appframe.add_home_breadcrumb() - wrapper.appframe.add_module_breadcrumb("Selling") + wrapper.appframe.add_module_icon("Selling") wrapper.appframe.add_button('Refresh', function() { wrapper.make_tree(); diff --git a/stock/page/stock_ageing/stock_ageing.js b/stock/page/stock_ageing/stock_ageing.js index edad9a76a1..e257bd4722 100644 --- a/stock/page/stock_ageing/stock_ageing.js +++ b/stock/page/stock_ageing/stock_ageing.js @@ -25,7 +25,7 @@ wn.pages['stock-ageing'].onload = function(wrapper) { new erpnext.StockAgeing(wrapper); wrapper.appframe.add_home_breadcrumb() - wrapper.appframe.add_module_breadcrumb("Stock") + wrapper.appframe.add_module_icon("Stock") wrapper.appframe.add_breadcrumb("icon-bar-chart") } diff --git a/stock/page/stock_analytics/stock_analytics.js b/stock/page/stock_analytics/stock_analytics.js index a0039638d0..a52cb7da54 100644 --- a/stock/page/stock_analytics/stock_analytics.js +++ b/stock/page/stock_analytics/stock_analytics.js @@ -25,7 +25,7 @@ wn.pages['stock-analytics'].onload = function(wrapper) { new erpnext.StockAnalytics(wrapper); wrapper.appframe.add_home_breadcrumb() - wrapper.appframe.add_module_breadcrumb("Stock") + wrapper.appframe.add_module_icon("Stock") wrapper.appframe.add_breadcrumb("icon-bar-chart") } diff --git a/stock/page/stock_balance/stock_balance.js b/stock/page/stock_balance/stock_balance.js index 163b74f629..4467b98712 100644 --- a/stock/page/stock_balance/stock_balance.js +++ b/stock/page/stock_balance/stock_balance.js @@ -26,7 +26,7 @@ wn.pages['stock-balance'].onload = function(wrapper) { new erpnext.StockBalance(wrapper); wrapper.appframe.add_home_breadcrumb() - wrapper.appframe.add_module_breadcrumb("Stock") + wrapper.appframe.add_module_icon("Stock") wrapper.appframe.add_breadcrumb("icon-bar-chart") } diff --git a/stock/page/stock_ledger/stock_ledger.js b/stock/page/stock_ledger/stock_ledger.js index a37ea1c83f..438f132244 100644 --- a/stock/page/stock_ledger/stock_ledger.js +++ b/stock/page/stock_ledger/stock_ledger.js @@ -24,7 +24,7 @@ wn.pages['stock-ledger'].onload = function(wrapper) { new erpnext.StockLedger(wrapper); wrapper.appframe.add_home_breadcrumb() - wrapper.appframe.add_module_breadcrumb("Stock") + wrapper.appframe.add_module_icon("Stock") wrapper.appframe.add_breadcrumb("icon-bar-chart") } diff --git a/stock/page/stock_level/stock_level.js b/stock/page/stock_level/stock_level.js index 75819a5f11..5f129c3ef2 100644 --- a/stock/page/stock_level/stock_level.js +++ b/stock/page/stock_level/stock_level.js @@ -24,7 +24,7 @@ wn.pages['stock-level'].onload = function(wrapper) { new erpnext.StockLevel(wrapper); wrapper.appframe.add_home_breadcrumb() - wrapper.appframe.add_module_breadcrumb("Stock") + wrapper.appframe.add_module_icon("Stock") wrapper.appframe.add_breadcrumb("icon-bar-chart"); } diff --git a/support/page/support_analytics/support_analytics.js b/support/page/support_analytics/support_analytics.js index 60384bb0a8..9b46e6dd3c 100644 --- a/support/page/support_analytics/support_analytics.js +++ b/support/page/support_analytics/support_analytics.js @@ -8,7 +8,7 @@ wn.pages['support-analytics'].onload = function(wrapper) { new erpnext.SupportAnalytics(wrapper); wrapper.appframe.add_home_breadcrumb() - wrapper.appframe.add_module_breadcrumb("Support") + wrapper.appframe.add_module_icon("Support") wrapper.appframe.add_breadcrumb("icon-bar-chart") } diff --git a/utilities/page/question_view/question_view.js b/utilities/page/question_view/question_view.js index e479e131c5..86723505d8 100644 --- a/utilities/page/question_view/question_view.js +++ b/utilities/page/question_view/question_view.js @@ -18,7 +18,7 @@ pscript['onload_question-view'] = function(wrapper) { wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.layout-appframe')); wrapper.appframe.title('Question'); wrapper.appframe.add_home_breadcrumb(); - wrapper.appframe.add_module_breadcrumb("Knowledge Base"); + wrapper.appframe.add_module_icon("Knowledge Base"); wrapper.appframe.add_breadcrumb("icon-file"); wrapper.add_answer_area = $('.add-answer-area').get(0);