Merge pull request #2268 from jekyll/template-fixes

lib/site_template/_config.yml

@@ -1,5 +1,10 @@
+# Site settings
 name: Dat site title tho
-markdown: redcarpet
-highlighter: pygments
-description: "Write an awesome description for your new site here. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
-url: "http://yourdomain.com"
+title: Your awesome title
+email: your-email@domain.com
+description: "Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description."
+baseurl: "http://yourdomain.com"
+
+# Build settings
+markdown: kramdown
+permalinks: pretty

lib/site_template/_includes/footer.html

@@ -2,19 +2,19 @@
 
   <div class="wrap">
 
-    <h2 class="footer-heading">Bart Simpson</h2>
+    <h2 class="footer-heading">{{ site.name }}</h2>
 
     <div class="footer-col-1 column">
       <ul>
-        <li>Chief Flatulence Officer</li>
-        <li><a href="mailto:bsimpson@flatulencehub.com">bsimpson@flatulencehub.com</a></li>
+        <li>{{ site.title }}</li>
+        <li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
       </ul>
     </div>
 
     <div class="footer-col-2 column">
       <ul>
         <li>
-          <a href="https://github.com/yourusername">
+          <a href="https://github.com/{{ site.username }}">
             <span class="icon github">
               <svg version="1.1" class="github-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
                  viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
@@ -29,11 +29,11 @@
                 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
               </svg>
             </span>
-            <span class="username">bartrulez</span>
+            <span class="username">{{ site.username }}</span>
           </a>
         </li>
         <li>
-          <a href="https://twitter.com/yourusername">
+          <a href="https://twitter.com/{{ site.username }}">
             <span class="icon twitter">
               <svg version="1.1" class="twitter-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
                  viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
@@ -46,16 +46,16 @@
                 c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/>
               </svg>
             </span>
-            <span class="username">bartrulez</span>
+            <span class="username">{{ site.username }}</span>
           </a>
         </li>
       </ul>
     </div>
 
     <div class="footer-col-3 column">
-      <p class="text">Any additional text you want to have here is totally cool for you to haz, yo.</p>
+      <p class="text">{{ site.description }}</p>
     </div>
 
   </div>
 
-</footer>
+</footer>

lib/site_template/_includes/head.html

@@ -4,9 +4,9 @@
     <title>{% if page.title %}{{ page.title }}{% else %}{{ site.name }}{% endif %}</title>
     <meta name="viewport" content="width=device-width">
     <meta name="description" content="{{ site.description }}">
-    <link rel="canonical" href="{{ site.url }}{{ page.url | replace:'index.html','' }}">
+    <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl }}">
 
     <!-- Custom CSS -->
-    <link rel="stylesheet" href="/css/main.css">
+    <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
 
-</head>
+</head>

lib/site_template/_includes/header.html

@@ -2,7 +2,7 @@
 
   <div class="wrap">
 
-    <a class="site-title" href="/">{{ site.name }}</a>
+    <a class="site-title" href="{{ site.baseurl }}">{{ site.name }}</a>
 
     <nav class="site-nav">
       <a href="#" class="menu-icon">
@@ -17,11 +17,12 @@
         </svg>
       </a>
       <div class="trigger">
-        <a class="page-link" href="/about">About</a>
-        <a class="page-link" href="/projects">Projects</a>
+        {% for page in site.pages %}
+          <a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
+        {% endfor %}
       </div>
     </nav>
 
   </div>
 
-</header>
+</header>

lib/site_template/about.md

@@ -1,10 +1,11 @@
 ---
 layout: page
 title: About
+permalink: /about/
 ---
 
 This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/)
 
 You can find the source code for the Jekyll new theme at: [github.com/jglovier/jekyll-new](https://github.com/jglovier/jekyll-new)
 
-You can find the source code for Jekyll at [github.com/jekyll/jekyll](https://github.com/jekyll/jekyll)
+You can find the source code for Jekyll at [github.com/jekyll/jekyll](https://github.com/jekyll/jekyll)

lib/site_template/feed.xml

@@ -6,16 +6,16 @@ layout: none
   <channel>
     <title>{{ site.name | xml_escape }}</title>
     <description>{{ site.description | xml_escape }}</description>
-    <link>{{ site.url }}</link>
-    <atom:link href="{{ site.url }}/feed.xml" rel="self" type="application/rss+xml" />
+    <link>{{ site.baseurl }}</link>
+    <atom:link href="{{ "/feed.xml" | prepend: site.baseurl }}" rel="self" type="application/rss+xml" />
     {% for post in site.posts limit:10 %}
       <item>
         <title>{{ post.title | xml_escape }}</title>
         <description>{{ post.content | xml_escape }}</description>
         <pubDate>{{ post.date | date: "%a, %d %b %Y %H:%M:%S %z" }}</pubDate>
-        <link>{{ site.url }}/{{ post.url }}</link>
-        <guid isPermaLink="true">{{ site.url }}/{{ post.url }}</guid>
+        <link>{{ post.url | prepend: site.baseurl }}</link>
+        <guid isPermaLink="true">{{ post.url | prepend: site.baseurl }}</guid>
       </item>
     {% endfor %}
   </channel>
-</rss>
+</rss>

lib/site_template/index.html

@@ -8,10 +8,13 @@ layout: default
 
   <ul class="posts">
     {% for post in site.posts %}
-      <li><span class="post-date">{{ post.date | date: "%b %-d, %Y" }}</span> <a class="post-link" href="{{ post.url }}">{{ post.title }}</a></li>
+      <li>
+        <span class="post-date">{{ post.date | date: "%b %-d, %Y" }}</span>
+        <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
+      </li>
     {% endfor %}
   </ul>
 
-  <p class="rss-subscribe">subscribe <a href="/feed.xml">via RSS</a></p>
+  <p class="rss-subscribe">subscribe <a href="{{ "/feed.xml" | prepend: site.baseurl }}">via RSS</a></p>
 
-</div>
+</div>

lib/site_template/projects/index.md

@@ -1,14 +0,0 @@
----
-layout: page
-title: Projects
----
-
-Just a sample of another page that you could include for some purpose in the primary navigation.
-
-This could be a great place to list your own projects. But to get you started, here's some handy links:
-
-- [List of Jekyll-powered websites](https://github.com/jekyll/jekyll/wiki/Sites)
-- [Octopress, a Jekyll based blog framework](https://github.com/octopress/)
-- [Jekyll documentation](http://jekyllrb.com/)
-- [Jekyll source on GitHub](https://github.com/jekyll/jekyll)
-- [Available plugins](http://jekyllrb.com/docs/plugins/#available_plugins)