Merge pull request #2296 from pelson/logo_in_page_template

Add a logo block, and update the docs regarding base.html.
This commit is contained in:
Min RK
2018-11-15 12:44:15 +01:00
committed by GitHub
2 changed files with 9 additions and 5 deletions

View File

@@ -25,19 +25,19 @@ supplement the material in the block. The
make extensive use of blocks, which allows you to customize parts of the make extensive use of blocks, which allows you to customize parts of the
interface easily. interface easily.
In general, a child template can extend a base template, `base.html`, by beginning with: In general, a child template can extend a base template, `page.html`, by beginning with:
```html ```html
{% extends "base.html" %} {% extends "page.html" %}
``` ```
This works, unless you are trying to extend the default template for the same This works, unless you are trying to extend the default template for the same
file name. Starting in version 0.9, you may refer to the base file with a file name. Starting in version 0.9, you may refer to the base file with a
`templates/` prefix. Thus, if you are writing a custom `base.html`, start the `templates/` prefix. Thus, if you are writing a custom `page.html`, start the
file with this block: file with this block:
```html ```html
{% extends "templates/base.html" %} {% extends "templates/page.html" %}
``` ```
By defining `block`s with same name as in the base template, child templates By defining `block`s with same name as in the base template, child templates

View File

@@ -96,7 +96,11 @@
<nav class="navbar navbar-default"> <nav class="navbar navbar-default">
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<span id="jupyterhub-logo" class="pull-left"><a href="{{logo_url or base_url}}"><img src='{{base_url}}logo' alt='JupyterHub' class='jpy-logo' title='Home'/></a></span> {% block logo %}
<span id="jupyterhub-logo" class="pull-left">
<a href="{{logo_url or base_url}}"><img src='{{base_url}}logo' alt='JupyterHub' class='jpy-logo' title='Home'/></a>
</span>
{% endblock %}
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#thenavbar" aria-expanded="false"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#thenavbar" aria-expanded="false">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>