nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 03:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi
2012-10-04 13:54:17 +05:30
parent 90a54a0435 e7ccc317de
commit 278f93c941
19 changed files with 88 additions and 2439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2402
public/js/all-app.js
View File

File diff suppressed because one or more lines are too long

4
public/js/toolbar.js
View File

@@ -93,6 +93,8 @@ erpnext.toolbar.add_modules = function() {
erpnext.toolbar.set_new_comments = function(new_comments) {
var navbar_nc = $('.navbar-new-comments');
if(wn.container.page && wn.container.page.page_name=="messages")
return;
if(new_comments && new_comments.length>0) {
navbar_nc.text(new_comments.length);
navbar_nc.addClass('navbar-new-comments-true')
@@ -102,7 +104,7 @@ erpnext.toolbar.set_new_comments = function(new_comments) {
if(!$('#' + id)[0]) {
show_alert(msg).attr("id", id);
}
})
});
} else {
navbar_nc.removeClass('navbar-new-comments-true');
navbar_nc.text(0);

4
public/js/tree_grid.css
View File

@@ -13,9 +13,9 @@
}
.toggle.expand {
background: url(images/expand.gif) no-repeat center center;
background: url(app/images/expand.gif) no-repeat center center;
}
.toggle.collapse {
background: url(images/collapse.gif) no-repeat center center;
background: url(app/images/collapse.gif) no-repeat center center;
}