Merge pull request #4250 from vilhelmen/headercontent_super

Respect parent template headercontainer in child pages

notebook/templates/edit.html

@@ -25,6 +25,7 @@ data-file-path="{{file_path}}"
     <span class="last_modified"></span>
 </span>
 
+{{super()}}
 {% endblock %}
 
 {% block header %}

notebook/templates/notebook.html

@@ -44,6 +44,8 @@ data-notebook-path="{{notebook_path | urlencode}}"
     <span class="autosave_status"></span>
 </span>
 
+{{super()}}
+
 <span id="kernel_logo_widget">
   {% block kernel_logo_widget %}
   <img class="current_kernel_logo" alt="Current Kernel Logo" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"/>

notebook/templates/terminal.html

@@ -20,6 +20,7 @@ data-ws-path="{{ws_path}}"
 
 {% block headercontainer %}
 <span id="save_widget" class="save_widget"></span>
+{{super()}}
 {% endblock headercontainer %}
 
 {% block site %}

notebook/templates/tree.html

@@ -13,6 +13,7 @@ data-server-root="{{server_root}}"
 
 {% block headercontainer %}
   <span class="flex-spacer"></span>
+  {{super()}}
   {% if shutdown_button %}
     <span id="shutdown_widget">
       <button id="shutdown" class="btn btn-sm navbar-btn"