From ca553ec3053f0b55cbfbedd1ddb16adf15f1355d 2015-03-30 10:18:59 From: Scott Sanderson Date: 2015-03-30 10:18:59 Subject: [PATCH] DEV: Allow supplying jinja vars from python config. --- diff --git a/IPython/html/base/handlers.py b/IPython/html/base/handlers.py index 1b04206..202bf36 100644 --- a/IPython/html/base/handlers.py +++ b/IPython/html/base/handlers.py @@ -119,6 +119,11 @@ class IPythonHandler(AuthenticatedHandler): return Application.instance().log else: return app_log + + @property + def jinja_template_vars(self): + """User-supplied values to supply to jinja templates.""" + return self.settings.get('jinja_template_vars', {}) #--------------------------------------------------------------- # URLs @@ -250,6 +255,7 @@ class IPythonHandler(AuthenticatedHandler): sys_info=sys_info, contents_js_source=self.contents_js_source, version_hash=self.version_hash, + **self.jinja_template_vars ) def get_json_body(self): diff --git a/IPython/html/notebookapp.py b/IPython/html/notebookapp.py index ce99521..1ac2e25 100644 --- a/IPython/html/notebookapp.py +++ b/IPython/html/notebookapp.py @@ -200,6 +200,7 @@ class NotebookWebApplication(web.Application): config_manager=config_manager, # IPython stuff + jinja_template_vars=ipython_app.jinja_template_vars, nbextensions_path=ipython_app.nbextensions_path, websocket_url=ipython_app.websocket_url, mathjax_url=ipython_app.mathjax_url, @@ -525,6 +526,11 @@ class NotebookApp(BaseIPythonApplication): jinja_environment_options = Dict(config=True, help="Supply extra arguments that will be passed to Jinja environment.") + + jinja_template_vars = Dict( + config=True, + help="Extra variables to supply to jinja templates when rendering.", + ) enable_mathjax = Bool(True, config=True, help="""Whether to enable MathJax for typesetting math/TeX diff --git a/IPython/html/templates/notebook.html b/IPython/html/templates/notebook.html index 443d20d..c065d8c 100644 --- a/IPython/html/templates/notebook.html +++ b/IPython/html/templates/notebook.html @@ -25,6 +25,7 @@ window.mathjax_url = "{{mathjax_url}}"; {% block params %} +{{super()}} data-project="{{project}}" data-base-url="{{base_url}}" data-ws-url="{{ws_url}}" diff --git a/IPython/html/templates/tree.html b/IPython/html/templates/tree.html index 498b7de..d2b9f86 100644 --- a/IPython/html/templates/tree.html +++ b/IPython/html/templates/tree.html @@ -4,7 +4,7 @@ {% block params %} - +{{super()}} data-base-url="{{base_url}}" data-notebook-path="{{notebook_path}}" data-terminals-available="{{terminals_available}}"