major reworking of page navigation
diff --git a/erpnext/accounts/doctype/journal_voucher/listview.js b/erpnext/accounts/doctype/journal_voucher/listview.js
index d8f295b..da344de 100644
--- a/erpnext/accounts/doctype/journal_voucher/listview.js
+++ b/erpnext/accounts/doctype/journal_voucher/listview.js
@@ -1,4 +1,4 @@
-wn.doclistviews['Journal Voucher'] = wn.pages.ListView.extend({
+wn.doclistviews['Journal Voucher'] = wn.views.ListView.extend({
init: function(d) {
this._super(d);
this.fields = this.fields.concat([
diff --git a/erpnext/home/page/event_updates/event_updates.js b/erpnext/home/page/event_updates/event_updates.js
index 084ff0c..797d8e9 100644
--- a/erpnext/home/page/event_updates/event_updates.js
+++ b/erpnext/home/page/event_updates/event_updates.js
@@ -600,7 +600,7 @@
// get values
$c_page('home', 'event_updates', 'get_status_details', user,
function(r,rt) {
- //page_body.wntoolbar.set_new_comments(r.message.unread_messages);
+ //wn.container.wntoolbar.set_new_comments(r.message.unread_messages);
// render online users
pscript.online_users_obj.render(r.message.online_users);
diff --git a/erpnext/selling/doctype/sales_order/listview.js b/erpnext/selling/doctype/sales_order/listview.js
index bcdddc0..4b55e2b 100644
--- a/erpnext/selling/doctype/sales_order/listview.js
+++ b/erpnext/selling/doctype/sales_order/listview.js
@@ -1,5 +1,5 @@
// render
-wn.doclistviews['Sales Order'] = wn.pages.ListView.extend({
+wn.doclistviews['Sales Order'] = wn.views.ListView.extend({
init: function(d) {
this._super(d)
this.fields = this.fields.concat([
diff --git a/erpnext/startup/js/complete_setup.js b/erpnext/startup/js/complete_setup.js
index ac89aff..c643813 100644
--- a/erpnext/startup/js/complete_setup.js
+++ b/erpnext/startup/js/complete_setup.js
@@ -85,7 +85,7 @@
wn.boot.user_info[user].fullname = user_fullname;
d.hide();
$('header').toggle(true);
- page_body.wntoolbar.set_user_name();
+ wn.container.wntoolbar.set_user_name();
});
}
diff --git a/erpnext/startup/js/toolbar.js b/erpnext/startup/js/toolbar.js
index 7bf9c6a..eb3bff8 100644
--- a/erpnext/startup/js/toolbar.js
+++ b/erpnext/startup/js/toolbar.js
@@ -48,7 +48,7 @@
$('#toolbar-user').append('<li><a href="#billing">Billing</a></li>')
}
- $.extend(page_body.wntoolbar, {
+ $.extend(wn.container.wntoolbar, {
set_new_comments: function(new_comments) {
var navbar_nc = $('.navbar-new-comments');
if(new_comments && new_comments.length>0) {
@@ -66,7 +66,7 @@
}
});
- page_body.wntoolbar.set_new_comments();
+ wn.container.wntoolbar.set_new_comments();
}
erpnext.toolbar.add_modules = function() {
diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js
index c00770c..c00f097 100644
--- a/erpnext/startup/startup.js
+++ b/erpnext/startup/startup.js
@@ -114,7 +114,7 @@
function(r,rt) {
if(!r.exc) {
// This function is defined in toolbar.js
- page_body.wntoolbar.set_new_comments(r.message.unread_messages);
+ wn.container.wntoolbar.set_new_comments(r.message.unread_messages);
var show_in_circle = function(parent_id, msg) {
var parent = $('#'+parent_id);
@@ -139,7 +139,7 @@
}
);
} else {
- page_body.wntoolbar.set_new_comments(0);
+ wn.container.wntoolbar.set_new_comments(0);
$('#unread_messages').toggle(false);
}
}
diff --git a/erpnext/utilities/page/messages/messages.js b/erpnext/utilities/page/messages/messages.js
index 7e74fef..4cc7a52 100644
--- a/erpnext/utilities/page/messages/messages.js
+++ b/erpnext/utilities/page/messages/messages.js
@@ -76,7 +76,7 @@
// check for updates every 5 seconds if page is active
refresh: function() {
setTimeout(erpnext.messages.refresh, 10000);
- if(page_body.cur_page_label != 'messages') return;
+ if(wn.container.page.label != 'messages') return;
erpnext.messages.show();
},
get_contact: function() {