write welcome blog post

[web.git] / _layouts / default.html

diff --git a/_layouts/default.html b/_layouts/default.html
index cff4389b9f615936a127fae8423131098fcee3a3..bd9f1f65cebec5fb577168a7fa65a6870b0d0c90 100644 (file)
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -5,13 +5,13 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
 
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
 

-    <title>{{ page.title }}</title>
+    <title>{{ page.title }}{% if page.subtitle %} - {{ page.subtitle }}{% endif %}</title>

     {% if page.excerpt %}<meta name="description" content="{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}">{% endif %}
 
     <link rel="stylesheet" href="/style.css">
     {% capture canonicalurl %}{{ page.url | replace:'index.html','' }}{% endcapture %}
     <link rel="canonical" href="{{ canonicalurl | prepend: site.url }}">
     {% if page.excerpt %}<meta name="description" content="{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}">{% endif %}
 
     <link rel="stylesheet" href="/style.css">
     {% 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.blog.title }}" href="/feed.xml" />{% endif %}
+    {% if page.rss %}<link rel="alternate" type="application/rss+xml" title="{{ site.blog.title }}" href="/blog/feed.xml" />{% endif %}

   </head>
 
 
   </head>
 
 


@@ -22,7 +22,7 @@
     </header>
 
     <nav id="-navi">
     </header>
 
     <nav id="-navi">

-      {% assign menu = site.html_pages | menu: page.url %}
+      {% assign menu = site.pages | menu: page.url %}

       {% include menu-level.html menu=menu %}
     </nav>
 
       {% include menu-level.html menu=menu %}
     </nav>