compute the menu recursively; put it between title and content

[web.git] / _layouts / default.html
diff --git a/_layouts/default.html b/_layouts/default.html

index e19cd91e18b4bbe06bce2e98adbf4ec046b70759..7db3ba6a7bd74ce304735702010245f69bfba99a 100644 (file)
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -9,20 +9,24 @@
      {% if page.excerpt %}<meta name="description" content="{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}">{% endif %}
  
      <link rel="stylesheet" href="/style.css">
-    <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.url }}">
+    {% capture canonicalurl %}{{ page.url | replace:'index.html','' }}{% endcapture %}
+    <link rel="canonical" href="{{ canonicalurl | prepend: site.url }}">
      {% if page.rss or page.layout == 'post' %}<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.url }}" />{% endif %}
    </head>
  
  
    <body><div id="frame">
+  
+    <div id="title">
+      <h1>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</h1>
+    </div>
  
-    {% include menu.html %}
+    <div id="navi">
+        {% include menu-level.html menu=site.structure base="" above=true %}
+    </div>
  
-    <div id="page">
-        <h1>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</h1>
-        <div id="content">
-            {{ content }}
-        </div>
+    <div id="content">
+        {{ content }}
      </div>
  
    </div></body>