Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'edge'

Browse Source
This commit is contained in:
Rushabh Mehta 2013-02-06 14:21:04 +05:30
commit 9cf478618f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
home/page/latest_updates/latest_updates.js
View File

@ -1,4 +1,10 @@
erpnext.updates = [ erpnext.updates = [
["6th February, 2013", [
"Bookmarks: Add bookmarks via toolbar by clicking on the <i class='icon-star'></i> sign.",
]],
["5th February, 2013", [
"Holiday Block List: Block users from taking leave on certain days.",
]],
["2nd February, 2013", [ ["2nd February, 2013", [
"Warehouse: Added table Warehouse User to restrict Warehouse Entry per user.", "Warehouse: Added table Warehouse User to restrict Warehouse Entry per user.",
]], ]],

3
public/js/toolbar.js
View File

@ -51,7 +51,8 @@ erpnext.toolbar.setup = function() {
erpnext.toolbar.add_modules = function() { erpnext.toolbar.add_modules = function() {
$('<li class="dropdown">\ $('<li class="dropdown">\
<a class="dropdown-toggle" data-toggle="dropdown" href="#"\ <a class="dropdown-toggle" data-toggle="dropdown" href="#"\
onclick="return false;">'+wn._('Modules')+'<b class="caret"></b></a>\ title="'+wn._("Modules")+'"\
onclick="return false;"><i class="icon-th"></i> <b class="caret"></b></a>\
<ul class="dropdown-menu modules">\ <ul class="dropdown-menu modules">\
</ul>\ </ul>\
</li>').prependTo('.navbar .nav:first'); </li>').prependTo('.navbar .nav:first');