webui: Fix the issues due to the split of "header-{base,index}.html"

Tornado currently do NOT support *nested* template extensions.

* Rename "header-base.html" back to "header.html"
* Merge the contents of "header-index.html" to "index.html"
* Add new block "subtitle" to "base.html"

4 files changed, 19 insertions, 27 deletions

diff --git a/fg21sim/webui/templates/base.html b/fg21sim/webui/templates/base.html
index 1fbc75e..a7b5696 100644
--- a/fg21sim/webui/templates/base.html
+++ b/fg21sim/webui/templates/base.html
@@ -11,7 +11,11 @@
   <meta name="author" content="Weitian LI" />
   <meta name="description" content="fg21sim: Realistic Foregrounds Simulation for EoR 21cm Signal Detection" />
   <link rel="icon" type="image/png" href="{{ static_url('images/favicon.png') }}" />
-  <title>{% block title %}FG21sim Web UI{% end %}</title>
+  <title>
+    {% block title %}
+      {% block subtitle %}{% end %} FG21sim Web UI
+    {% end %}
+  </title>
   {% block extra_head %}{% end %}
 
   {% block css %}
@@ -31,7 +35,7 @@
     {% block page %}
     <header class="masthead" role="banner">
       {% block header %}
-        {% include "header-base.html" %}
+        {% include "header.html" %}
       {% end %}
     </header>
 
diff --git a/fg21sim/webui/templates/header-index.html b/fg21sim/webui/templates/header-index.html
deleted file mode 100644
index c801040..0000000
--- a/fg21sim/webui/templates/header-index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{#
- # Copyright (c) 2016 Weitian LI <liweitianux@live.com>
- # MIT license
- #
- # Header of the index page
- #}
-
-{% extends "header-base.html" %}
-
-{% block header_contents %}
-  <span id="ws-status" class="label label-default">
-    <span class="icon fa fa-question-circle" aria-hidden="true"></span>
-    <span class="text">N/A</span>
-  </span>
-  <span id="ws-reconnect" class="btn fa fa-refresh" aria-hidden="true"></span>
-
-  <ul class="navigation-list float-right">
-    <li class="navigation-item"><a class="navigation-link button button-outline" href="#configs" title="Configurations"><span class="fa fa-wrench" aria-hidden="true"></span> Configurations</a></li>
-    <li class="navigation-item"><a class="navigation-link button button-outline" href="#console" title="Console"><span class="fa fa-gamepad" aria-hidden="true"></span> Console</a></li>
-    <li class="navigation-item"><a class="navigation-link button button-outline" href="#results" title="Results"><span class="fa fa-files-o aria-hidden="true"></span> Results</a></li>
-  </ul>
-{% end %}
diff --git a/fg21sim/webui/templates/header-base.html b/fg21sim/webui/templates/header.html
index 607b6f1..607b6f1 100644
--- a/fg21sim/webui/templates/header-base.html
+++ b/fg21sim/webui/templates/header.html
diff --git a/fg21sim/webui/templates/index.html b/fg21sim/webui/templates/index.html
index 150a060..9e47472 100644
--- a/fg21sim/webui/templates/index.html
+++ b/fg21sim/webui/templates/index.html
@@ -7,9 +7,19 @@
 
 {% extends "base.html" %}
 
-{% block header %}
-  {% include "header-index.html" %}
-{% end %}
+{% block header_contents %}
+  <span id="ws-status" class="label label-default">
+    <span class="icon fa fa-question-circle" aria-hidden="true"></span>
+    <span class="text">N/A</span>
+  </span>
+  <span id="ws-reconnect" class="btn fa fa-refresh" aria-hidden="true"></span>
+
+  <ul class="navigation-list float-right">
+    <li class="navigation-item"><a class="navigation-link button button-outline" href="#configs" title="Configurations"><span class="fa fa-wrench" aria-hidden="true"></span> Configurations</a></li>
+    <li class="navigation-item"><a class="navigation-link button button-outline" href="#console" title="Console"><span class="fa fa-gamepad" aria-hidden="true"></span> Console</a></li>
+    <li class="navigation-item"><a class="navigation-link button button-outline" href="#results" title="Results"><span class="fa fa-files-o aria-hidden="true"></span> Results</a></li>
+  </ul>
+{% end %}  {# block header_contents #}
 
 {% block main %}
   {% include "configs.html" %}