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

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

Browse Source
This commit is contained in:
Nabin Hait 2012-03-01 19:23:42 +05:30
commit 06292433a6
6 changed files with 20 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.json
View File

@ -74,7 +74,6 @@
{
"js/all-web.js": [
"lib/js/lib/jquery.min.js:concat",
"lib/js/lib/history/history.min.js:concat",
"lib/js/lib/bootstrap.min.js:concat",
"lib/js/lib/sprintf.js",
@ -115,7 +114,6 @@
{
"js/all-app.js": [
"lib/js/lib/jquery.min.js:concat",
"lib/js/lib/history/history.min.js:concat",
"lib/js/legacy/jquery/jquery-ui.min.js:concat",
"lib/js/legacy/tiny_mce_33/jquery.tinymce.js:concat",

25
erpnext/startup/startup.js
View File

@ -150,31 +150,6 @@ erpnext.set_user_background = function(src) {
set_style(repl('body { background: url("files/%(src)s") repeat !important;}', {src:src}))
}
// =======================================
$(document).bind('ready', function() {
(function() {
var is_supported = function() {
if($.browser.mozilla && flt($.browser.version)<4) return false;
if($.browser.msie && flt($.browser.version)<9) return false;
if($.browser.webkit && flt($.browser.version)<534) return false;
return true;
}
if(!is_supported()) {
$('body').html('<div style="width: 900px; margin: 20px auto; padding: 20px;\
background-color: #fff; border: 2px solid #aaa; font-family: Arial">\
<h3>Unsupported Browser</h3> \
<p><i>ERPNext requires a modern web browser to function correctly</i></p> \
<p>Supported browsers are: \
<ul><li><a href="http://mozilla.com/firefox">Mozilla Firfox 4+</a>, \
<li><a href="http://google.com/chrome">Google Chorme 14+</a>, \
<li><a href="http://apple.com/safari">Apple Safari 5+</a>, \
<li><a href="http://ie.microsoft.com">Microsoft Internet Explorer 9+</a>, \
<li><a href="http://www.opera.com/">Opera</a></p></ul>');
}
})();
})
// start
$(document).bind('startup', function() {
erpnext.startup.start();

17
js/all-app.js
View File

File diff suppressed because one or more lines are too long

17
js/all-web.js
View File

File diff suppressed because one or more lines are too long

19
unsupported.html Normal file
View File

@ -0,0 +1,19 @@
<html>
<head>
<title>ERPNext - Uprade your browser</title>
</head>
<body style="background-color: #eee">
<div style="width: 900px; margin: 20px auto; padding: 20px;
background-color: #fff; border: 2px solid #aaa; font-family: Arial">
<h3>Upgrade Your Browser</h3>
<p><i>ERPNext requires a modern web browser to function correctly</i></p>
<p>Supported browsers are:
<ul>
<li><a href="http://mozilla.com/firefox">Mozilla Firfox 4+</a>,
<li><a href="http://google.com/chrome">Google Chorme 14+</a>,
<li><a href="http://apple.com/safari">Apple Safari 5+</a>,
<li><a href="http://ie.microsoft.com">Microsoft Internet Explorer 9+</a>,
<li><a href="http://www.opera.com/">Opera</a>
</ul>
</p>
</body>

2
version.num
View File

@ -1 +1 @@
805
814