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

Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive

Browse Source
This commit is contained in:
Saurabh 2013-07-10 13:09:11 +05:30
commit d8a9033c9b
3 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
home/page/latest_updates/latest_updates.py
View File

@ -19,6 +19,7 @@ def make():
last_commit["author"] = l[8:-1] last_commit["author"] = l[8:-1]
if l.startswith(" "): if l.startswith(" "):
last_commit["message"] = l[4:-1] last_commit["message"] = l[4:-1]
if l.startswith("commit"): if l.startswith("commit"):
last_commit = { last_commit = {
"repo": repo, "repo": repo,
@ -29,12 +30,12 @@ def make():
os.chdir("lib") os.chdir("lib")
logs = [] logs = []
out_lib = tempfile.TemporaryFile() out_lib = tempfile.TemporaryFile()
subprocess.call("git --no-pager log -n 200", shell=True, stdout=out_lib) subprocess.call("git --no-pager log -n 200 --no-color", shell=True, stdout=out_lib)
add_to_logs(out_lib, "lib") add_to_logs(out_lib, "lib")
os.chdir("../app") os.chdir("../app")
out_app = tempfile.TemporaryFile() out_app = tempfile.TemporaryFile()
subprocess.call("git --no-pager log -n 200", shell=True, stdout=out_app) subprocess.call("git --no-pager log -n 200 --no-color", shell=True, stdout=out_app)
add_to_logs(out_app, "app") add_to_logs(out_app, "app")
logs.sort(key=lambda a: a["datetime"], reverse=True) logs.sort(key=lambda a: a["datetime"], reverse=True)

5
public/js/complete_setup.js
View File

@ -48,7 +48,7 @@ $.extend(erpnext.complete_setup, {
{fieldname:'update', label:'Setup',fieldtype:'Button'}, {fieldname:'update', label:'Setup',fieldtype:'Button'},
], ],
}); });
if(user != 'Administrator'){ if(user != 'Administrator'){
$(d.appframe.$titlebar).find('.close').toggle(false); // Hide close image $(d.appframe.$titlebar).find('.close').toggle(false); // Hide close image
$('header').toggle(false); // hide toolbar $('header').toggle(false); // hide toolbar
@ -87,7 +87,6 @@ $.extend(erpnext.complete_setup, {
} else { } else {
$(this).done_working(); $(this).done_working();
} }
}); });
}; };
@ -125,7 +124,7 @@ $.extend(erpnext.complete_setup, {
} }
} }
return d; return d;
}, },
fy_start_list: ['', '1st Jan', '1st Apr', '1st Jul', '1st Oct'], fy_start_list: ['', '1st Jan', '1st Apr', '1st Jul', '1st Oct'],

27
public/js/startup.js
View File

@ -15,23 +15,14 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
var current_module; var current_module;
var is_system_manager = 0;
wn.provide('erpnext.startup'); wn.provide('erpnext.startup');
erpnext.startup.set_globals = function() {
if(inList(user_roles,'System Manager')) is_system_manager = 1;
}
erpnext.startup.start = function() { erpnext.startup.start = function() {
console.log('Starting up...'); console.log('Starting up...');
$('#startup_div').html('Starting up...').toggle(true); $('#startup_div').html('Starting up...').toggle(true);
erpnext.startup.set_globals();
if(user != 'Guest'){ if(user != 'Guest'){
erpnext.setup_mousetrap();
// setup toolbar // setup toolbar
erpnext.toolbar.setup(); erpnext.toolbar.setup();
@ -66,27 +57,9 @@ erpnext.startup.start = function() {
} }
} }
erpnext.set_about(); erpnext.set_about();
if(wn.control_panel.custom_startup_code)
eval(wn.control_panel.custom_startup_code);
} }
} }
erpnext.setup_mousetrap = function() {
$(document).keydown("meta+g ctrl+g", function(e) {
wn.ui.toolbar.search.show();
return false;
});
$(document).keydown("meta+s ctrl+s", function(e) {
if(cur_frm) {
cur_frm.save_or_update();
}
else if(wn.container.page.save_action)
wn.container.page.save_action();
return false;
})
}
// start // start
$(document).bind('startup', function() { $(document).bind('startup', function() {
erpnext.startup.start(); erpnext.startup.start();