cms now powered by jinja2
This commit is contained in:
parent
a7c282f810
commit
c38d600dcb
6 changed files with 26 additions and 47 deletions
2
js/core.min.js
vendored
2
js/core.min.js
vendored
|
|
@ -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;}
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
22
py/webnotes/cms/base.html
Normal file
22
py/webnotes/cms/base.html
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
<!DOCTYPE html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>{% block title %}{% endblock %}</title>
|
||||
<meta name="generator" content="wnframework">
|
||||
<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon">
|
||||
<link rel="icon" href="images/favicon.ico" type="image/x-icon">
|
||||
<script type="text/javascript" src="js/lib/jquery/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="js/all-web.js"></script>
|
||||
<script type="text/javascript" src="js/wn-web.js"></script>
|
||||
<link type="text/css" rel="stylesheet" href="css/all-web.css">
|
||||
<link type="text/css" rel="stylesheet" href="css/wn-web.css">
|
||||
|
||||
{% block header %}
|
||||
{% endblock %}
|
||||
|
||||
|
||||
</head>
|
||||
<body>
|
||||
{% block body %}
|
||||
{% endblock %}
|
||||
</body>
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>{{ title }}</title>
|
||||
<meta name="generator" content="wnframework">
|
||||
<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon">
|
||||
<link rel="icon" href="images/favicon.ico" type="image/x-icon">
|
||||
<script type="text/javascript" src="js/lib/jquery/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="js/all-web.js"></script>
|
||||
<script type="text/javascript" src="js/wn-web.js"></script>
|
||||
<link type="text/css" rel="stylesheet" href="css/all-web.css">
|
||||
<link type="text/css" rel="stylesheet" href="css/wn-web.css">
|
||||
{% if script %}
|
||||
<script>
|
||||
window.page_name = "{{ name }}";
|
||||
|
||||
$(document).bind('app_ready', function() {
|
||||
var _page = new wn.views.Page(window.page_name);
|
||||
|
||||
// page script
|
||||
{{ script }}
|
||||
|
||||
// trigger onload
|
||||
_page.trigger('onload');
|
||||
|
||||
// activate page
|
||||
wn.container.change_to(window.page_name);
|
||||
});
|
||||
</script>
|
||||
{% endif %}
|
||||
{% if style %}
|
||||
<style>{{ style }}</style>
|
||||
{% endif %}
|
||||
</head>
|
||||
<body>
|
||||
<header>{{ header }}</header>
|
||||
<div id="body_div">
|
||||
<div class="content" id="page-{{ name }}" style="display: block;">
|
||||
{{ content }}
|
||||
</div>
|
||||
</div>
|
||||
<footer>{{ footer }}</footer>
|
||||
</body>
|
||||
Loading…
Add table
Reference in a new issue