[toolbars] [design] commonified into common toolbar
diff --git a/accounts/page/accounts_browser/accounts_browser.js b/accounts/page/accounts_browser/accounts_browser.js
index 2e8cc82..ede10e6 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 f714549..aac7076 100644
--- a/accounts/page/financial_analytics/financial_analytics.js
+++ b/accounts/page/financial_analytics/financial_analytics.js
@@ -25,7 +25,7 @@
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 21be3a0..137f5e9 100644
--- a/accounts/page/general_ledger/general_ledger.js
+++ b/accounts/page/general_ledger/general_ledger.js
@@ -24,7 +24,7 @@
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 c64075f..9c4c50a 100644
--- a/accounts/page/trial_balance/trial_balance.js
+++ b/accounts/page/trial_balance/trial_balance.js
@@ -59,6 +59,6 @@
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 fc082ea..857a335 100644
--- a/buying/page/purchase_analytics/purchase_analytics.js
+++ b/buying/page/purchase_analytics/purchase_analytics.js
@@ -24,7 +24,7 @@
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 03d7d0a..1d3d1e7 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('<li><a href="#Form/Profile/'+user+'">'
+ var $user = $('#toolbar-user');
+ $user.append('<li><a href="#Form/Profile/'+user+'">'
+wn._("My Settings")+'...</a></li>');
+ $user.append('<li class="divider"></li>');
+ $user.append('<li><a href="https://erpnext.com/manual" target="_blank">'
+ +wn._('Documentation')+'</a></li>')
+ $user.append('<li><a href="http://groups.google.com/group/erpnext-user-forum" target="_blank">'
+ +wn._('Forum')+'</a></li>')
+ $user.append('<li><a href="http://www.providesupport.com?messenger=iwebnotes" target="_blank">\
+ '+wn._('Live Chat')+'</a></li>')
+
$('.navbar .pull-right').append('\
<li><a href="#!messages" title="'+wn._('Unread Messages')
+'"><span class="navbar-new-comments"></span></a></li>');
- // help
- $('.navbar .pull-right').prepend('<li class="dropdown">\
- <a class="dropdown-toggle" data-toggle="dropdown" href="#" \
- onclick="return false;">'+wn._('Help')+'<b class="caret"></b></a>\
- <ul class="dropdown-menu" id="toolbar-help">\
- </ul></li>')
-
- $('#toolbar-help').append('<li><a href="https://erpnext.com/manual" target="_blank">'
- +wn._('Documentation')+'</a></li>')
-
- $('#toolbar-help').append('<li><a href="http://groups.google.com/group/erpnext-user-forum" target="_blank">'
- +wn._('Forum')+'</a></li>')
-
- $('#toolbar-help').append('<li><a href="http://www.providesupport.com?messenger=iwebnotes" target="_blank">\
- '+wn._('Live Chat')+'</a></li>')
-
erpnext.toolbar.set_new_comments();
}
-erpnext.toolbar.add_modules = function() {
- $('<li class="dropdown">\
- <a class="dropdown-toggle" data-toggle="dropdown" href="#"\
- title="'+wn._("Modules")+'"\
- onclick="return false;"><i class="icon-th"></i></a>\
- <ul class="dropdown-menu modules">\
- </ul>\
- </li>').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('<li><a href="#!%(module_page)s" \
- data-module="%(module)s"><i class="%(icon)s" style="display: inline-block; \
- width: 21px; margin-top: -2px; margin-left: -7px;"></i>\
- %(module_label)s</a></li>', 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('<li class="divider">' + _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 0b35af5..7fdc3ac 100644
--- a/selling/page/sales_analytics/sales_analytics.js
+++ b/selling/page/sales_analytics/sales_analytics.js
@@ -23,7 +23,7 @@
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 4622f24..60bb1fd 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 edad9a7..e257bd4 100644
--- a/stock/page/stock_ageing/stock_ageing.js
+++ b/stock/page/stock_ageing/stock_ageing.js
@@ -25,7 +25,7 @@
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 a003963..a52cb7d 100644
--- a/stock/page/stock_analytics/stock_analytics.js
+++ b/stock/page/stock_analytics/stock_analytics.js
@@ -25,7 +25,7 @@
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 163b74f..4467b98 100644
--- a/stock/page/stock_balance/stock_balance.js
+++ b/stock/page/stock_balance/stock_balance.js
@@ -26,7 +26,7 @@
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 a37ea1c..438f132 100644
--- a/stock/page/stock_ledger/stock_ledger.js
+++ b/stock/page/stock_ledger/stock_ledger.js
@@ -24,7 +24,7 @@
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 75819a5..5f129c3 100644
--- a/stock/page/stock_level/stock_level.js
+++ b/stock/page/stock_level/stock_level.js
@@ -24,7 +24,7 @@
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 60384bb..9b46e6d 100644
--- a/support/page/support_analytics/support_analytics.js
+++ b/support/page/support_analytics/support_analytics.js
@@ -8,7 +8,7 @@
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 e479e13..8672350 100644
--- a/utilities/page/question_view/question_view.js
+++ b/utilities/page/question_view/question_view.js
@@ -18,7 +18,7 @@
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);