p2yq6ufca
/
monkeyking
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2363 from crbates/jinja2

Browse Source 
Refactor notebook templates to use Jinja2
Bussonnier Matthias 14 years ago
parent edd27cf292 6de923fb95
commit f9f46750fe
5 changed files with 57 additions and 50 deletions
Show Stats Download Patch File Download Diff File

46
IPython/frontend/html/notebook/handlers.py
Unescape View File

@ -27,6 +27,7 @@ import stat
import threading
import time
import uuid
import os
from tornado import web
from tornado import websocket
@ -194,7 +195,7 @@ class AuthenticatedHandler(RequestHandler):
if host == '':
host = self.request.host # get from request
return "%s://%s" % (proto, host)
class AuthenticatedFileHandler(AuthenticatedHandler, web.StaticFileHandler):
"""static files should only be accessible when logged in"""
@ -209,28 +210,28 @@ class ProjectDashboardHandler(AuthenticatedHandler):
@authenticate_unless_readonly
def get(self):
nbm = self.application.notebook_manager
project = nbm.notebook_dir
self.render(
'projectdashboard.html', project=project,
project = nbm.notebook_dir
template = self.application.jinja2_env.get_template('projectdashboard.html')
self.write( template.render(project=project,
base_project_url=self.application.ipython_app.base_project_url,
base_kernel_url=self.application.ipython_app.base_kernel_url,
read_only=self.read_only,
logged_in=self.logged_in,
login_available=self.login_available
)
login_available=self.login_available))
class LoginHandler(AuthenticatedHandler):
def _render(self, message=None):
self.render('login.html',
def _render(self, message=None):
template = self.application.jinja2_env.get_template('login.html')
self.write( template.render(
next=self.get_argument('next', default=self.application.ipython_app.base_project_url),
read_only=self.read_only,
logged_in=self.logged_in,
login_available=self.login_available,
base_project_url=self.application.ipython_app.base_project_url,
message=message
)
))
def get(self):
if self.current_user:
@ -259,13 +260,13 @@ class LogoutHandler(AuthenticatedHandler):
else:
message = {'warning': 'Cannot log out. Notebook authentication '
'is disabled.'}
self.render('logout.html',
template = self.application.jinja2_env.get_template('logout.html')
self.write( template.render(
read_only=self.read_only,
logged_in=self.logged_in,
login_available=self.login_available,
base_project_url=self.application.ipython_app.base_project_url,
message=message)
message=message))
class NewHandler(AuthenticatedHandler):
@ -277,7 +278,6 @@ class NewHandler(AuthenticatedHandler):
notebook_id = nbm.new_notebook()
self.redirect('/'+urljoin(self.application.ipython_app.base_project_url, notebook_id))
class NamedNotebookHandler(AuthenticatedHandler):
@authenticate_unless_readonly
@ -285,10 +285,9 @@ class NamedNotebookHandler(AuthenticatedHandler):
nbm = self.application.notebook_manager
project = nbm.notebook_dir
if not nbm.notebook_exists(notebook_id):
raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)
self.render(
'notebook.html', project=project,
raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)
template = self.application.jinja2_env.get_template('notebook.html')
self.write( template.render(project=project,
notebook_id=notebook_id,
base_project_url=self.application.ipython_app.base_project_url,
base_kernel_url=self.application.ipython_app.base_kernel_url,
@ -296,8 +295,7 @@ class NamedNotebookHandler(AuthenticatedHandler):
read_only=self.read_only,
logged_in=self.logged_in,
login_available=self.login_available,
mathjax_url=self.application.ipython_app.mathjax_url,
)
mathjax_url=self.application.ipython_app.mathjax_url,))
class PrintNotebookHandler(AuthenticatedHandler):
@ -307,10 +305,10 @@ class PrintNotebookHandler(AuthenticatedHandler):
nbm = self.application.notebook_manager
project = nbm.notebook_dir
if not nbm.notebook_exists(notebook_id):
raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)
self.render(
'printnotebook.html', project=project,
raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)
template = self.application.jinja2_env.get_template('printnotebook.html')
self.write( template.render(
project=project,
notebook_id=notebook_id,
base_project_url=self.application.ipython_app.base_project_url,
base_kernel_url=self.application.ipython_app.base_kernel_url,
@ -319,7 +317,7 @@ class PrintNotebookHandler(AuthenticatedHandler):
logged_in=self.logged_in,
login_available=self.login_available,
mathjax_url=self.application.ipython_app.mathjax_url,
)
))
#-----------------------------------------------------------------------------
# Kernel handlers

3
IPython/frontend/html/notebook/notebookapp.py
Unescape View File

@ -33,6 +33,7 @@ import webbrowser
# Third party
import zmq
from jinja2 import Environment, FileSystemLoader
# Install the pyzmq ioloop. This has to be done before anything else from
# tornado is imported.
@ -186,6 +187,8 @@ class NotebookWebApplication(web.Application):
self.ipython_app = ipython_app
self.read_only = self.ipython_app.read_only
self.log = log
self.jinja2_env = Environment(loader=FileSystemLoader(os.path.join(os.path.dirname(__file__), "templates")))
#-----------------------------------------------------------------------------

19
IPython/frontend/html/notebook/templates/notebook.html
Unescape View File

@ -1,9 +1,10 @@
{% extends page.html %}
{% extends "page.html" %}
{% block stylesheet %}
{% if mathjax_url %}
<script type="text/javascript" src="{{mathjax_url}}?config=TeX-AMS_HTML-full&delayStartupUntil=configured" charset="utf-8"></script>
{% end %}
{% endif %}
<script type="text/javascript">
// MathJax disabled, set as null to distingish from *missing* MathJax,
// where it will be undefined, and should prompt a dialog later.
@ -20,9 +21,7 @@ window.mathjax_url = "{{mathjax_url}}";
<link rel="stylesheet" href="{{ static_url("css/renderedhtml.css") }}" type="text/css" />
<link rel="stylesheet" href="{{ static_url("css/printnotebook.css") }}" type="text/css" media="print"/>
{% end %}
{% endblock %}
{% block params %}
@ -32,7 +31,7 @@ data-base-kernel-url={{base_kernel_url}}
data-read-only={{read_only and not logged_in}}
data-notebook-id={{notebook_id}}
{% end %}
{% endblock %}
{% block header %}
@ -42,7 +41,7 @@ data-notebook-id={{notebook_id}}
<span id="save_status"></span>
</span>
{% end %}
{% endblock %}
{% block site %}
@ -177,7 +176,7 @@ data-notebook-id={{notebook_id}}
<div id='tooltip' class='ipython_tooltip ui-corner-all' style='display:none'></div>
{% end %}
{% endblock %}
{% block script %}
@ -222,5 +221,7 @@ data-notebook-id={{notebook_id}}
<script src="{{ static_url("js/notebookmain.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/contexthint.js") }}" charset="utf-8"></script>
{% endblock %}
{% end %}

23
IPython/frontend/html/notebook/templates/page.html
Unescape View File

@ -1,26 +1,31 @@
<!DOCTYPE HTML>
{% macro static_url(name) -%}
/static/{{ name }}
{%- endmacro %}
<html>
<head>
<meta charset="utf-8">
<title>{% block title %}IPython Notebook{% end %}</title>
<title>{% block title %}IPython Notebook{% endblock %}</title>
<link rel="stylesheet" href="{{static_url("jquery/css/themes/base/jquery-ui.min.css") }}" type="text/css" />
<link rel="stylesheet" href="{{static_url("css/boilerplate.css") }}" type="text/css" />
<link rel="stylesheet" href="{{static_url("css/fbm.css") }}" type="text/css" />
<link rel="stylesheet" href="{{static_url("css/page.css") }}" type="text/css"/>
{% block stylesheet %}
{% end %}
{% endblock %}
<link rel="stylesheet" href="{{ static_url("css/custom.css") }}" type="text/css" />
{% block meta %}
{% end %}
{% endblock %}
</head>
<body {% block params %}{% end %}>
<body {% block params %}{% endblock %}>
<div id="header">
<span id="ipython_notebook"><div><a href={{base_project_url}} alt='dashboard'><img src='{{static_url("ipynblogo.png") }}' alt='IPython Notebook'/></a></div></span>
@ -32,18 +37,18 @@
<button id="logout">Logout</button>
{% elif login_available and not logged_in %}
<button id="login">Login</button>
{% end %}
{% endif %}
</span>
{% end %}
{% endblock %}
{% block header %}
{% end %}
{% endblock %}
</div>
<div id="site">
{% block site %}
{% end %}
{% endblock %}
</div>
<script src="{{static_url("jquery/js/jquery-1.7.1.min.js") }}" type="text/javascript" charset="utf-8"></script>
@ -53,7 +58,7 @@
<script src="{{static_url("js/loginwidget.js") }}" type="text/javascript" charset="utf-8"></script>
{% block script %}
{% end %}
{% endblock %}
<script src="{{static_url("js/custom.js") }}" type="text/javascript" charset="utf-8"></script>

16
IPython/frontend/html/notebook/templates/projectdashboard.html
Unescape View File

@ -1,11 +1,11 @@
{% extends page.html %}
{% extends "page.html" %}
{% block title %}IPython Dashboard{% end %}
{% block title %}IPython Dashboard{% endblock %}
{% block stylesheet %}
<link rel="stylesheet" href="{{static_url("css/projectdashboard.css") }}" type="text/css" />
<link rel="stylesheet" href="{{static_url("css/alternateuploadform.css") }}" type="text/css" />
{% end %}
<link rel="stylesheet" href="{{static_url("css/alternateuploadform.css") }}" type="text/css" />
{% endblock %}
{% block params %}
@ -15,7 +15,7 @@ data-base-project-url={{base_project_url}}
data-base-kernel-url={{base_kernel_url}}
data-read-only={{read_only}}
{% end %}
{% endblock %}
{% block site %}
@ -42,7 +42,7 @@ data-read-only={{read_only}}
<button id="new_notebook" title="Create new notebook">New Notebook</button>
</span>
</div>
{% end %}
{% endif %}
<div id="notebook_list">
<div id="project_name"><h2>{{project}}</h2></div>
@ -72,10 +72,10 @@ data-read-only={{read_only}}
</div>
{% end %}
{% endblock %}
{% block script %}
<script src="{{static_url("js/notebooklist.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("js/clusterlist.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("js/projectdashboardmain.js") }}" type="text/javascript" charset="utf-8"></script>
{% end %}
{% endblock %}

Write Preview
Loading…
Cancel
Save