Mercurial > web-octave

changeset 194:9ac0211ca132

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* _layouts/default.html: Inline includes.
author Kai T. Ohlhus <k.ohlhus@gmail.com>
date Wed, 08 Jul 2020 15:26:00 +0900
parents 8ec5df986ad3
children afac0bdee0ee
files _includes/footer.html _includes/head.html _includes/header.html _layouts/default.html
diffstat 4 files changed, 98 insertions(+), 97 deletions(-) [+]
line wrap: on
line diff
--- a/_includes/footer.html	Wed Jul 08 15:16:23 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<footer class="column">
-  <section>
-  <div class="row">
-    <div class="columns small-12">
-      <div class="text-center">
-        <p>Octave is free software under the <a href="{{ "license.html" | relative_url }}">GNU General Public License.</a></p>
-        <small>
-          Copyright © 1998-{{ site.time | date: "%Y" }} John W. Eaton.
-          This work is licensed under a
-          <a rel="license" href="https://creativecommons.org/licenses/by-nd/4.0/">
-          Creative Commons Attribution-NoDerivatives 4.0 International License</a>.
-          Get the <a href="http://hg.octave.org/web-octave/file/tip">page sources</a>.
-        </small>
-      </div>
-    </div>
-  </div>
-  </section>
-</footer>
-
-<script>
-  $(document).foundation();
-</script>
--- a/_includes/head.html	Wed Jul 08 15:16:23 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-
-  <title>{{ page.title | default: site.title }}</title>
-  <meta name="description" content="{{ page.excerpt | default: site.description | strip_html | lstrip | rstrip | truncate: 140 }}">
-  <meta property="og:title" content="{{ page.title | default: site.title }}">
-  <meta property="og:description" content="{{ page.excerpt | default: site.description | strip_html | lstrip | rstrip | truncate: 140 }}">
-  <meta property="og:image" content="{{ "/img/octave-logo.png" | absolute_url }}">
-  <meta property="og:image:alt" content="GNU Octave">
-  <meta property="og:type" content="website">
-  <meta property="og:url" content="{{ page.url | absolute_url }}">
-  <meta name="twitter:card" content="summary">
-
-  <link rel="stylesheet" href="{{ "/css/foundation.min.css" | relative_url }}">
-  <link rel="stylesheet" href="{{ "/css/normalize.css" | relative_url }}">
-  <link rel="stylesheet" href="{{ "/css/app.css" | relative_url }}">
-  <link rel="stylesheet" href="{{ "/css/syntax-highlight.css" | relative_url }}">
-  <noscript>
-    <style>
-    div.no-js { position: relative; }
-    nav.no-js { height: auto; }
-    .tabs-content > div.no-js { display: block; }
-    </style>
-  </noscript>
-
-  <script src="{{ "/js/vendor/modernizr.js" | relative_url }}"></script>
-  <script src="{{ "/js/vendor/jquery.js" | relative_url }}"></script>
-  <script src="{{ "/js/foundation/foundation.js" | relative_url }}"></script>
-  <script src="{{ "/js/foundation/foundation.alert.js" | relative_url }}"></script>
-  <script src="{{ "/js/foundation/foundation.reveal.js" | relative_url }}"></script>
-  <script src="{{ "/js/foundation/foundation.topbar.js" | relative_url }}"></script>
-  <script src="{{ "/js/foundation/foundation.tab.js" | relative_url }}"></script>
-  <script src="{{ "/js/foundation/foundation.dropdown.js" | relative_url }}"></script>
-
-  <link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">
-  <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | relative_url }}">
-</head>
--- a/_includes/header.html	Wed Jul 08 15:16:23 2020 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<div class="no-js fixed contain-to-grid">
-  <nav class="no-js top-bar" data-topbar role="navigation">
-    <ul class="title-area">
-      <li class="name">
-        <h1>
-          <a href="{{ "/" | relative_url }}" style="height:100%">
-            <img src="{{ "/img/octave-logo.svg" | relative_url }}"
-                 style="width: 32px; height: auto" alt="GNU Octave logo">
-            {{ site.title }}
-          </a>
-        </h1>
-      </li>
-      <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-      <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
-    </ul>
-
-    <section class="top-bar-section">
-      <!-- Right Nav Section -->
-      <ul class="right">
-        {% for page in site.pages %}
-          {% if page.menu %}
-            <li>
-              <a href="{{ page.url | relative_url }}">{{ page.title }}</a>
-            </li>
-          {% endif %}
-        {% endfor %}
-        <li>
-          <a href="{{site.docs_url}}">Docs</a>
-        </li>
-      </ul>
-    </section>
-  </nav>
-</div>
--- a/_layouts/default.html	Wed Jul 08 15:16:23 2020 +0900
+++ b/_layouts/default.html	Wed Jul 08 15:26:00 2020 +0900
@@ -1,18 +1,113 @@
 <!DOCTYPE html>
 <html>
 
-  {% include head.html %}
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <title>{{ page.title | default: site.title }}</title>
+    <meta name="description" content="{{ page.excerpt | default: site.description | strip_html | lstrip | rstrip | truncate: 140 }}">
+    <meta property="og:title" content="{{ page.title | default: site.title }}">
+    <meta property="og:description" content="{{ page.excerpt | default: site.description | strip_html | lstrip | rstrip | truncate: 140 }}">
+    <meta property="og:image" content="{{ "/img/octave-logo.png" | absolute_url }}">
+    <meta property="og:image:alt" content="GNU Octave">
+    <meta property="og:type" content="website">
+    <meta property="og:url" content="{{ page.url | absolute_url }}">
+    <meta name="twitter:card" content="summary">
+
+    <link rel="stylesheet" href="{{ "/css/foundation.min.css" | relative_url }}">
+    <link rel="stylesheet" href="{{ "/css/normalize.css" | relative_url }}">
+    <link rel="stylesheet" href="{{ "/css/app.css" | relative_url }}">
+    <link rel="stylesheet" href="{{ "/css/syntax-highlight.css" | relative_url }}">
+    <noscript>
+      <style>
+      div.no-js { position: relative; }
+      nav.no-js { height: auto; }
+      .tabs-content > div.no-js { display: block; }
+      </style>
+    </noscript>
+
+    <script src="{{ "/js/vendor/modernizr.js" | relative_url }}"></script>
+    <script src="{{ "/js/vendor/jquery.js" | relative_url }}"></script>
+    <script src="{{ "/js/foundation/foundation.js" | relative_url }}"></script>
+    <script src="{{ "/js/foundation/foundation.alert.js" | relative_url }}"></script>
+    <script src="{{ "/js/foundation/foundation.reveal.js" | relative_url }}"></script>
+    <script src="{{ "/js/foundation/foundation.topbar.js" | relative_url }}"></script>
+    <script src="{{ "/js/foundation/foundation.tab.js" | relative_url }}"></script>
+    <script src="{{ "/js/foundation/foundation.dropdown.js" | relative_url }}"></script>
+
+    <link rel="canonical" href="{{ page.url | replace:'index.html','' | absolute_url }}">
+    <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | relative_url }}">
+  </head>
 
   <body>
 
-    {% include header.html %}
+    <div class="no-js fixed contain-to-grid">
+      <nav class="no-js top-bar" data-topbar role="navigation">
+        <ul class="title-area">
+          <li class="name">
+            <h1>
+              <a href="{{ "/" | relative_url }}" style="height:100%">
+                <img src="{{ "/img/octave-logo.svg" | relative_url }}"
+                    style="width: 32px; height: auto" alt="GNU Octave logo">
+                {{ site.title }}
+              </a>
+            </h1>
+          </li>
+          <!-- Remove the class "menu-icon" to get rid of menu icon.
+               Take out "Menu" to just have icon alone -->
+          <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
+        </ul>
+
+        <section class="top-bar-section">
+          <!-- Right Nav Section -->
+          <ul class="right">
+            {% for page in site.pages %}
+              {% if page.menu %}
+                <li>
+                  <a href="{{ page.url | relative_url }}">{{ page.title }}</a>
+                </li>
+              {% endif %}
+            {% endfor %}
+            <li>
+              <a href="{{site.docs_url}}">Docs</a>
+            </li>
+          </ul>
+        </section>
+      </nav>
+    </div>
 
     <div class="page-content row">
       <div class="wrapper column">
         {{ content }}
       </div>
 
-      {% include footer.html %}
+      <footer class="column">
+        <section>
+        <div class="row">
+          <div class="columns small-12">
+            <div class="text-center">
+              <p>
+                Octave is free software under the
+                <a href="{{ "license.html" | relative_url }}">GNU General Public License.</a>
+              </p>
+              <small>
+                Copyright © 1998-{{ site.time | date: "%Y" }} John W. Eaton.
+                This work is licensed under a
+                <a rel="license" href="https://creativecommons.org/licenses/by-nd/4.0/">
+                Creative Commons Attribution-NoDerivatives 4.0 International License</a>.
+                Get the <a href="http://hg.octave.org/web-octave/file/tip">page sources</a>.
+              </small>
+            </div>
+          </div>
+        </div>
+        </section>
+      </footer>
+
+      <script>
+        $(document).foundation();
+      </script>
     </div>
 
   </body>