From 823fb20c83ff9dedcc5d804f32a0f80ab1810813 Mon Sep 17 00:00:00 2001
From: Aaron LI <aaronly.me@outlook.com>
Date: Tue, 15 Nov 2016 17:34:02 +0800
Subject: 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"
---
 fg21sim/webui/templates/base.html         |  8 ++++++--
 fg21sim/webui/templates/header-base.html  | 33 -------------------------------
 fg21sim/webui/templates/header-index.html | 22 ---------------------
 fg21sim/webui/templates/header.html       | 33 +++++++++++++++++++++++++++++++
 fg21sim/webui/templates/index.html        | 16 ++++++++++++---
 5 files changed, 52 insertions(+), 60 deletions(-)
 delete mode 100644 fg21sim/webui/templates/header-base.html
 delete mode 100644 fg21sim/webui/templates/header-index.html
 create mode 100644 fg21sim/webui/templates/header.html

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-base.html b/fg21sim/webui/templates/header-base.html
deleted file mode 100644
index 607b6f1..0000000
--- a/fg21sim/webui/templates/header-base.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{#
- # Copyright (c) 2016 Weitian LI <liweitianux@live.com>
- # MIT license
- #
- # Template of the basic header
- #}
-
-{% block navigator %}
-<nav role="navigation" class="navigation">
-  <section class="container">
-    {% block header_logo %}
-    <a class="navigation-title" href="https://github.com/liweitianux/fg21sim" target="_blank">
-      <img class="logo" src="{{ static_url('images/logo.svg') }}" height="30" alt="FG21SIM LOGO" title="fg21sim" />
-      <span class="title">fg21sim</span>
-    </a>
-    <span class="description">Foregrounds Simulation for EoR 21cm Signal Detection</span>
-    {% end %}  {# block header_logo #}
-
-    {% block header_contents %}
-    {% end %}  {# block header_contents #}
-
-    {% block header_github %}
-    <a class="hidden-xs github" href="https://github.com/liweitianux/fg21sim" title="fg21sim on Github" target="_blank">
-      <svg width="80" height="80" viewBox="0 0 250 250" class="github">
-        <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
-        <path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path>
-        <path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path>
-      </svg>
-    </a>
-    {% end %}  {# block header_github #}
-  </section>
-</nav>
-{% end %}  {# block navigator #}
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.html b/fg21sim/webui/templates/header.html
new file mode 100644
index 0000000..607b6f1
--- /dev/null
+++ b/fg21sim/webui/templates/header.html
@@ -0,0 +1,33 @@
+{#
+ # Copyright (c) 2016 Weitian LI <liweitianux@live.com>
+ # MIT license
+ #
+ # Template of the basic header
+ #}
+
+{% block navigator %}
+<nav role="navigation" class="navigation">
+  <section class="container">
+    {% block header_logo %}
+    <a class="navigation-title" href="https://github.com/liweitianux/fg21sim" target="_blank">
+      <img class="logo" src="{{ static_url('images/logo.svg') }}" height="30" alt="FG21SIM LOGO" title="fg21sim" />
+      <span class="title">fg21sim</span>
+    </a>
+    <span class="description">Foregrounds Simulation for EoR 21cm Signal Detection</span>
+    {% end %}  {# block header_logo #}
+
+    {% block header_contents %}
+    {% end %}  {# block header_contents #}
+
+    {% block header_github %}
+    <a class="hidden-xs github" href="https://github.com/liweitianux/fg21sim" title="fg21sim on Github" target="_blank">
+      <svg width="80" height="80" viewBox="0 0 250 250" class="github">
+        <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
+        <path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path>
+        <path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path>
+      </svg>
+    </a>
+    {% end %}  {# block header_github #}
+  </section>
+</nav>
+{% end %}  {# block navigator #}
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" %}
-- 
cgit v1.2.2