diff --git a/js/core.min.js b/js/core.min.js index 12520f68e2..a5ae468b7f 100644 --- a/js/core.min.js +++ b/js/core.min.js @@ -267,7 +267,7 @@ wn.views.make_404=function(){var page=wn.container.add_page('404');$(page).html( /* * lib/js/wn/request.js */ -wn.provide('wn.request');wn.request.url='index.cgi';wn.request.prepare=function(opts){if(opts.btn)$(opts.btn).set_working();if(opts.show_spinner)set_loading();if(opts.freeze)freeze();if(!opts.args.cmd){console.log(opts) +wn.provide('wn.request');wn.request.url='server.py';wn.request.prepare=function(opts){if(opts.btn)$(opts.btn).set_working();if(opts.show_spinner)set_loading();if(opts.freeze)freeze();if(!opts.args.cmd){console.log(opts) throw"Incomplete Request";}} wn.request.cleanup=function(opts,r){if(opts.btn)$(opts.btn).done_working();if(opts.show_spinner)hide_loading();if(opts.freeze)unfreeze();if(wn.boot&&wn.boot.sid&&wn.get_cookie('sid')!=wn.boot.sid){if(!wn.app.logged_out){msgprint('Session Expired. Logging you out');wn.app.logout();} return;} diff --git a/js/wn/request.js b/js/wn/request.js index c65b25f8ac..13ef878f99 100644 --- a/js/wn/request.js +++ b/js/wn/request.js @@ -23,7 +23,7 @@ // My HTTP Request wn.provide('wn.request'); -wn.request.url = 'index.cgi'; +wn.request.url = 'server.py'; // call execute serverside request wn.request.prepare = function(opts) { diff --git a/py/__init__.py b/py/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/py/webnotes/__init__.py b/py/webnotes/__init__.py index 822e9e3fef..a0a717db4f 100644 --- a/py/webnotes/__init__.py +++ b/py/webnotes/__init__.py @@ -153,8 +153,8 @@ def connect(db_name=None, password=None): """ Connect to this db (or db), if called from command prompt """ - if is_apache_user(): - raise Exception, 'Not for web users!' + #if is_apache_user(): + # raise Exception, 'Not for web users!' import webnotes.db global conn diff --git a/py/webnotes/cms/base.html b/py/webnotes/cms/base.html new file mode 100644 index 0000000000..20f2c4ec40 --- /dev/null +++ b/py/webnotes/cms/base.html @@ -0,0 +1,22 @@ + + + + {% block title %}{% endblock %} + + + + + + + + + + {% block header %} + {% endblock %} + + + + + {% block body %} + {% endblock %} + \ No newline at end of file diff --git a/py/webnotes/cms/template.html b/py/webnotes/cms/template.html deleted file mode 100644 index 9d62b7cd91..0000000000 --- a/py/webnotes/cms/template.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - {{ title }} - - - - - - - - - {% if script %} - - {% endif %} - {% if style %} - - {% endif %} - - -
{{ header }}
-
-
- {{ content }} -
-
- - \ No newline at end of file