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

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

Browse Source 
Conflicts:
	index.html
	versions-master.db
This commit is contained in:
Anand Doshi 2012-01-09 17:27:12 +05:30
commit 41cbf0ac9e
5 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
index.html
View File

@ -3,7 +3,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>ERPNext</title> <title>ERPNext</title>
<meta name="author" content=""> <meta name="author" content="">
<script type="text/javascript">window._version_number="371" <script type="text/javascript">window._version_number="11"
wn={} wn={}
wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}} wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}
@ -12,11 +12,8 @@ wn.provide('wn.settings');wn.provide('wn.ui');wn.xmlhttp={request:function(){if(
return new XMLHttpRequest();else if(window.ActiveXObject) return new XMLHttpRequest();else if(window.ActiveXObject)
return new ActiveXObject("MsXml2.XmlHttp");},complete:function(req,callback,url){if(req.status==200||req.status==304){callback(req.responseText);}else{alert(url+' request error: '+req.statusText+' ('+req.status+')');}},get:function(url,callback,args,async){if(async===null)async=true;var req=wn.xmlhttp.request();req.onreadystatechange=function(){if(req.readyState==4){wn.xmlhttp.complete(req,callback,url)}} return new ActiveXObject("MsXml2.XmlHttp");},complete:function(req,callback,url){if(req.status==200||req.status==304){callback(req.responseText);}else{alert(url+' request error: '+req.statusText+' ('+req.status+')');}},get:function(url,callback,args,async){if(async===null)async=true;var req=wn.xmlhttp.request();req.onreadystatechange=function(){if(req.readyState==4){wn.xmlhttp.complete(req,callback,url)}}
var sep=((args&&args.indexOf('?'))==-1)?'?':'&';var u=args?(url+sep+args):url;req.open('GET',u,async);req.send(null);if(!async){wn.xmlhttp.complete(req,callback,url)}}} var sep=((args&&args.indexOf('?'))==-1)?'?':'&';var u=args?(url+sep+args):url;req.open('GET',u,async);req.send(null);if(!async){wn.xmlhttp.complete(req,callback,url)}}}
wn.versions={is_latest:function(){if(window._version_number==(localStorage?localStorage['_version_number']:null)){return true;} wn.versions={check:function(){if(localStorage){if(window._version_number==-1||parseInt(localStorage._version_number)!=parseInt(window._version_number)){localStorage.clear();}
return false;},get_diff:function(){if(!localStorage)return;wn.xmlhttp.get('index.cgi',function(txt){r=JSON.parse(txt);if(r.exc){alert(r.exc);} localStorage.setItem('_version_number',window._version_number);}}}
wn.versions.set(r.message);},'cmd=get_diff&version_number='+localStorage['_version_number'],false);},set:function(diff){for(var i=0;i<diff.length;i++){localStorage.removeItem(diff[i]);}
localStorage['_version_number']=_version_number;},check:function(){if(localStorage&&!localStorage['_version_number']){localStorage['_version_number']=_version_number;return;}
if(!wn.versions.is_latest())wn.versions.get_diff();}}
wn.assets={executed_:{},exists:function(src){if('localStorage'in window&&localStorage.getItem(src)) wn.assets={executed_:{},exists:function(src){if('localStorage'in window&&localStorage.getItem(src))
return true},add:function(src,txt){if('localStorage'in window){localStorage.setItem(src,txt);}},get:function(src){return localStorage.getItem(src);},extn:function(src){if(src.indexOf('?')!=-1){src=src.split('?').slice(-1)[0];} return true},add:function(src,txt){if('localStorage'in window){localStorage.setItem(src,txt);}},get:function(src){return localStorage.getItem(src);},extn:function(src){if(src.indexOf('?')!=-1){src=src.split('?').slice(-1)[0];}
return src.split('.').slice(-1)[0];},html_src:function(src){if(src.indexOf('/')!=-1){var t=src.split('/').slice(0,-1);t.push('src');t=t.join('/')+'/'+a.split('/').slice(-1)[0];}else{var t='src/'+src;} return src.split('.').slice(-1)[0];},html_src:function(src){if(src.indexOf('/')!=-1){var t=src.split('/').slice(0,-1);t.push('src');t=t.join('/')+'/'+a.split('/').slice(-1)[0];}else{var t='src/'+src;}
@ -74,7 +71,7 @@ throw new SyntaxError('JSON.parse');};}}());wn.versions.check();wn.require("lib/
<!--static (no script) content--> <!--static (no script) content-->
<div class="no_script"> <div class="no_script">
No content
</div> </div>
</div> </div>
<script>wn.require('js/app.js');</script> <script>wn.require('js/app.js');</script>

7
js/app.js
View File

@ -4,17 +4,10 @@ wn.require('lib/js/lib/jquery.min.js');
wn.require('lib/js/legacy/tiny_mce_33/jquery.tinymce.js'); wn.require('lib/js/legacy/tiny_mce_33/jquery.tinymce.js');
wn.require('lib/js/wn/ui/status_bar.js'); wn.require('lib/js/wn/ui/status_bar.js');
wn.sb = new wn.ui.StatusBar();
wn.sb.set_value(15);
// for datepicker // for datepicker
wn.require('lib/js/legacy/jquery/jquery-ui.min.js') wn.require('lib/js/legacy/jquery/jquery-ui.min.js')
wn.sb.set_value(25);
wn.require('lib/js/legacy/wnf.compressed.js'); wn.require('lib/js/legacy/wnf.compressed.js');
wn.sb.set_value(40);
wn.require('lib/css/legacy/default.css'); wn.require('lib/css/legacy/default.css');
wn.sb.set_value(70);
$(document).bind('ready', function() { $(document).bind('ready', function() {
startup(); startup();

4
templates/index.html
View File

@ -3,7 +3,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<title>ERPNext</title> <title>ERPNext</title>
<meta name="author" content=""> <meta name="author" content="">
<script type="text/javascript">{{ boot }}</script> <script type="text/javascript">%s</script>
</head> </head>
<body> <body>
<div id="startup_div" style="padding: 8px; font-size: 14px;"></div> <div id="startup_div" style="padding: 8px; font-size: 14px;"></div>
@ -13,7 +13,7 @@
<!--static (no script) content--> <!--static (no script) content-->
<div class="no_script"> <div class="no_script">
{{ content }} No content
</div> </div>
</div> </div>
<script>wn.require('js/app.js');</script> <script>wn.require('js/app.js');</script>

1
version.num Normal file
View File

@ -0,0 +1 @@
11

BIN
versions-master.db
View File

Binary file not shown.