##// END OF EJS Templates
Merge pull request #8196 from quantopian/jinja-vars-from-config...
Min RK -
r21162:e4bf8e7e merge
parent child Browse files
Show More
@@ -119,6 +119,11 b' class IPythonHandler(AuthenticatedHandler):'
119 return Application.instance().log
119 return Application.instance().log
120 else:
120 else:
121 return app_log
121 return app_log
122
123 @property
124 def jinja_template_vars(self):
125 """User-supplied values to supply to jinja templates."""
126 return self.settings.get('jinja_template_vars', {})
122
127
123 #---------------------------------------------------------------
128 #---------------------------------------------------------------
124 # URLs
129 # URLs
@@ -250,6 +255,7 b' class IPythonHandler(AuthenticatedHandler):'
250 sys_info=sys_info,
255 sys_info=sys_info,
251 contents_js_source=self.contents_js_source,
256 contents_js_source=self.contents_js_source,
252 version_hash=self.version_hash,
257 version_hash=self.version_hash,
258 **self.jinja_template_vars
253 )
259 )
254
260
255 def get_json_body(self):
261 def get_json_body(self):
@@ -195,6 +195,7 b' class NotebookWebApplication(web.Application):'
195 config_manager=config_manager,
195 config_manager=config_manager,
196
196
197 # IPython stuff
197 # IPython stuff
198 jinja_template_vars=ipython_app.jinja_template_vars,
198 nbextensions_path=ipython_app.nbextensions_path,
199 nbextensions_path=ipython_app.nbextensions_path,
199 websocket_url=ipython_app.websocket_url,
200 websocket_url=ipython_app.websocket_url,
200 mathjax_url=ipython_app.mathjax_url,
201 mathjax_url=ipython_app.mathjax_url,
@@ -520,6 +521,11 b' class NotebookApp(BaseIPythonApplication):'
520
521
521 jinja_environment_options = Dict(config=True,
522 jinja_environment_options = Dict(config=True,
522 help="Supply extra arguments that will be passed to Jinja environment.")
523 help="Supply extra arguments that will be passed to Jinja environment.")
524
525 jinja_template_vars = Dict(
526 config=True,
527 help="Extra variables to supply to jinja templates when rendering.",
528 )
523
529
524 enable_mathjax = Bool(True, config=True,
530 enable_mathjax = Bool(True, config=True,
525 help="""Whether to enable MathJax for typesetting math/TeX
531 help="""Whether to enable MathJax for typesetting math/TeX
@@ -25,6 +25,7 b' window.mathjax_url = "{{mathjax_url}}";'
25
25
26 {% block params %}
26 {% block params %}
27
27
28 {{super()}}
28 data-project="{{project}}"
29 data-project="{{project}}"
29 data-base-url="{{base_url}}"
30 data-base-url="{{base_url}}"
30 data-ws-url="{{ws_url}}"
31 data-ws-url="{{ws_url}}"
@@ -4,7 +4,7 b''
4
4
5
5
6 {% block params %}
6 {% block params %}
7
7 {{super()}}
8 data-base-url="{{base_url}}"
8 data-base-url="{{base_url}}"
9 data-notebook-path="{{notebook_path}}"
9 data-notebook-path="{{notebook_path}}"
10 data-terminals-available="{{terminals_available}}"
10 data-terminals-available="{{terminals_available}}"
General Comments 0
You need to be logged in to leave comments. Login now