steve-for-jekyll 0.2.0 → 1.1

data/_includes/blog/sidebar.html

@@ -1,39 +1,42 @@
-{% assign lang = page.lang | default: site.lang %}
-
-{% assign locale = site.data.locales[lang] %}
-
-{% include search-form.html class="widget -search" %}
-
-<aside class="widget -sidebar">
-  {% if site.data.social %}
-    <ul class="social-links">
-      {% for link in site.data.social %}
-        <li class="link">
-          <a href="{{ link.url }}" rel="external">
-            {{ link.icon }}
-          </a>
-        </li>
-      {% endfor %}
-    </ul>
-  {% endif %}
-
-  {% if site.data.blogroll %}
-    {% for blogroll in site.data.blogroll %}
-      <section class="blogroll">
-        <h4 class="blogroll-title">{{ blogroll.title }}</h4>
-
-        <ul class="blogroll-list">
-          {% for link in blogroll.links %}
-            <li class="link">
-              <a href="{{ link.url }}" {% if link.external %} rel="external" {% endif %}>
-                {{ link.title }}
-              </a>
-            </li>
-          {% endfor %}
-        </ul>
-      </section>
-    {% endfor %}
-  {% endif %}
-
-  {% include blog/custom-widgets.html %}
-</aside>
+{% include search-form.html class="widget -search" %}
+
+{% capture custom_widgets %}
+  {% include blog/custom-widgets.html %}
+{% endcapture %}
+
+{% assign custom_widgets = custom_widgets | strip | strip_newlines | normalize_whitespace %}
+
+{% if site.data.social or site.data.blogroll or custom_widgets != "" %}
+  <aside class="widget -sidebar">
+    {% if site.data.social %}
+      <ul class="social-links">
+        {% for link in site.data.social %}
+          <li class="link">
+            <a href="{{ link.url }}" rel="external">
+              {{ link.icon }}
+            </a>
+          </li>
+        {% endfor %}
+      </ul>
+    {% endif %}
+    {% if site.data.blogroll %}
+      {% for blogroll in site.data.blogroll %}
+        <section class="blogroll">
+          <h4 class="blogroll-title">{{ blogroll.title }}</h4>
+
+          <ul class="blogroll-list">
+            {% for link in blogroll.links %}
+              <li class="link">
+                <a href="{{ link.url }}" {% if link.external %} rel="external" {% endif %}>
+                  {{ link.title }}
+                </a>
+              </li>
+            {% endfor %}
+          </ul>
+        </section>
+      {% endfor %}
+    {% endif %}
+
+    {{ custom_widgets }}
+  </aside>
+{% endif %}

data/_includes/footer.html

@@ -1,13 +1,11 @@
-<footer class="colophon">
-  <div class="site-info">
-    <h5>
-      <a href="{{ site.url }}">{{ site.title }}</a>
-    </h5>
-
-    {{ site.description }}
-
-    {% include footer/custom-text.html %}
-  </div>
-
-  {% include footer/links.html %}
-</footer>
+<footer class="colophon">
+  <div class="site-info">
+    <h5>
+      <a href="{{ site.url }}">{{ site.title }}</a>
+    </h5>
+
+    {% include footer/custom-text.html %}
+  </div>
+
+  {% include footer/links.html %}
+</footer>

data/_includes/footer/custom-text.html

@@ -1,3 +1,5 @@
-{% comment %}
-  Create a file like this and add your own custom content that should be shown at the bottom of your website.
-{% endcomment %}
+{% comment %}
+  Create a file like this and add your own custom content that should be shown at the bottom of your website.
+{% endcomment %}
+
+{{ site.description }}

data/_includes/header.html

@@ -1,17 +1,17 @@
-{% capture site_branding %}
-<a href="{{ site.url }}">
-  {% if site.logo %}
-    <img class="logo" src="{{ site.logo }}" alt="{{ site.title }}" />
-  {% else %}
-    {{ site.title }}
-  {% endif %}
-</a>
-{% endcapture %}
-
-<header class="masthead">
-  {% if page.title %}
-    <p class="site-title">{{ site_branding }}</p>
-  {% else %}
-    <h1 class="site-title">{{ site_branding }}</h1>
-  {% endif %} {% include header/menu.html %}
-</header>
+{% capture site_branding %}
+<a href="{{ "/" | relative_url }}">
+  {% if site.logo %}
+    <img class="logo" src="{{ site.logo }}" alt="{{ site.title }}" />
+  {% else %}
+    {{ site.title }}
+  {% endif %}
+</a>
+{% endcapture %}
+
+<header class="masthead">
+  {% if page.title %}
+    <p class="site-title">{{ site_branding }}</p>
+  {% else %}
+    <h1 class="site-title">{{ site_branding }}</h1>
+  {% endif %} {% include header/menu.html %}
+</header>

data/_includes/header/menu.html

@@ -1,12 +1,12 @@
-{% if site.data.menu %}
-  <nav class="site-menu">
-    {% for item in site.data.menu %}
-      <a class="menu-item" href="{{ item.url }}"
-        {% if item.external %} rel="external" {% endif %}
-        {% if item.color %} style="background-color: {{ item.color }}" {% endif %}
-      >
-        {{ item.title }}
-      </a>
-    {% endfor %}
-  </nav>
-{% endif %}
+{% if site.data.menu %}
+  <nav class="site-menu">
+    {% for item in site.data.menu %}
+      <a class="menu-item" href="{{ item.url }}"
+        {% if item.external %} rel="external" {% endif %}
+        {% if item.color %} style="background-color: {{ item.color }}" {% endif %}
+      >
+        {{ item.title }}
+      </a>
+    {% endfor %}
+  </nav>
+{% endif %}

data/_includes/post/comment-form.html

@@ -0,0 +1,69 @@
+<form action="{{ site.comments.staticman_endpoint }}" method="post">
+  <h3 class="form-title">{{ site.comments.form_title }}</h3>
+
+  <div class="comments-notice">
+    {{ site.comments.notice | markdownify }}
+  </div>
+
+  <div class="comment-message-area">
+    <label for="comment_message" class="visually-hidden">
+      {{ site.comments.fields.message.label }}
+    </label>
+
+    <textarea
+      id="comment_message"
+      class="message-area"
+      name="fields[message]"
+      placeholder="{{ site.comments.fields.message.placeholder }}"
+      required
+    ></textarea>
+  </div>
+
+  <div class="comment-fields">
+    <label for="comment_name" class="visually-hidden">
+      {{ site.comments.fields.name.label }}
+    </label>
+
+    <input
+      type="text"
+      id="comment_name"
+      class="comment-field"
+      name="fields[name]"
+      placeholder="{{ site.comments.fields.name.placeholder }}"
+      required
+    />
+
+    <label for="comment_email" class="visually-hidden">
+      {{ site.comments.fields.email.label }}
+    </label>
+    <input
+      type="email"
+      id="comment_email"
+      class="comment-field"
+      name="fields[email]"
+      placeholder="{{ site.comments.fields.email.placeholder }}"
+      required
+    />
+
+    <label for="comment_website" class="visually-hidden">
+      {{ site.comments.fields.website.label }}
+    </label>
+    <input
+      type="url"
+      id="comment_website"
+      class="comment-field"
+      name="fields[website]"
+      placeholder="{{ site.comments.fields.website.placeholder }}"
+    />
+  </div>
+
+  <div class="comment-actions">
+    <button class="form-submit" type="submit">
+      Submit Comment
+    </button>
+  </div>
+
+  <input type="hidden" name="options[redirect]" value="{{ page.url |
+  absolute_url }}#comments" />
+  <input type="hidden" name="options[slug]" value="{{ page.slug }}" />
+</form>

data/_includes/post/comments.html

@@ -0,0 +1,43 @@
+{% if site.data.comments[page.slug] or page.comments != false %}
+  <section id="comments" class="content">
+    <h2 class="comments-title">
+      {{ site.comments.title }}
+    </h2>
+
+    {% if site.data.comments[page.slug] %}
+      <ol class="comments-list">
+
+        {% for comment in site.data.comments[page.slug] %}
+          {% assign comment_body = comment | last %}
+          <li class="comment-item">
+            <section class="comment">
+              <header class="comment-meta">
+                <img class="author-avatar" src="//www.gravatar.com/avatar/{{ comment_body.email }}?d=monsterid&s=64" alt="" />
+                <h5 class="author">
+                  {% if comment_body.website %}
+                    <a href="{{ comment_body.website }}" rel="author">
+                      {{ comment_body.name }}
+                    </a>
+                  {% else %}
+                    {{ comment_body.name }}
+                  {% endif %}
+                </h5>
+
+                <time class="comment-date">
+                  {{ comment_body.date | date: site.comments.date_format }}
+                </time>
+              </header>
+
+              <div class="comment-body">
+                {{ comment_body.message | markdownify }}
+              </div>
+            </section>
+          </li>
+        {% endfor %}
+
+      </ol>
+    {% endif %}
+
+    {% include post/comment-form.html %}
+  </section>
+{% endif %}

data/_includes/search-form.html

@@ -1,17 +1,13 @@
-{% assign lang = page.lang | default: site.lang %}
-
-{% assign locale = site.data.locales[lang] %}
-
-<form action="//duckduckgo.com" method="get" {% if include.class %}class="{{ include.class }}"{% endif %}>
-  <label for="search_terms">{{ locale.search.label }}</label>
-
-  <div class="search-controls">
-
-    <input id="search_terms" placeholder="{{ locale.search.placeholder }}" type="search" name="q" required />
-    <input type="hidden" name="sites" value="{{ site.url | remove: 'https://' }}" />
-    <button type="submit">
-      {{ locale.search.submit }}
-    </button>
-
-  </div>
-</form>
+<form action="//duckduckgo.com" method="get" {% if include.class %}class="{{ include.class }}"{% endif %}>
+  <label for="search_terms">{{ site.steve.search.label }}</label>
+
+  <div class="search-controls">
+
+    <input id="search_terms" placeholder="{{ site.steve.search.placeholder }}" type="search" name="q" required />
+    <input type="hidden" name="sites" value="{{ site.url | remove: 'https://' }}" />
+    <button type="submit">
+      {{ site.steve.search.submit }}
+    </button>
+
+  </div>
+</form>

data/_layouts/archive.html

@@ -1,25 +1,21 @@
----
-layout: blog
----
-
-{% assign lang = page.lang | default: site.lang %}
-
-{% assign locale = site.data.locales[lang] %}
-
-<header class="archive-header">
-  {% if page.date %}
-    <h1>
-      {{ locale.archives.date }}<br />
-      <strong>{{ page.date | date: locale.date_formats.archives[page.type] }}</strong>
-    </h1>
-  {% else %}
-    <h1>
-      {{ locale.archives[page.type] }}<br />
-      <strong>{{ page.title }}</strong>
-    </h1>
-  {% endif %}
-</header>
-
-{% for post in page.posts %}
-  {% include blog/post.html full_post=false %}
-{% endfor %}
+---
+layout: blog
+---
+
+<header class="archive-header">
+  {% if page.date %}
+    <h1>
+      {{ site.steve.archives.date }}<br />
+      <strong>{{ page.date | date: site.steve.date_formats.archives[page.type] }}</strong>
+    </h1>
+  {% else %}
+    <h1>
+      {{ site.steve.archives[page.type] }}<br />
+      <strong>{{ page.title }}</strong>
+    </h1>
+  {% endif %}
+</header>
+
+{% for post in page.posts %}
+  {% include blog/post.html full_post=false %}
+{% endfor %}

data/_layouts/default.html

@@ -1,18 +1,18 @@
-<!doctype html>
-<html lang="{{ page.lang | default: site.lang }}">
-  {% include head.html %}
-
-  <body class="{{ page.layout | prepend: 'layout-' }}">
-    {% include header.html %}
-
-    <main class="container">
-      {{ content }}
-    </main>
-
-    {% include footer.html %}
-
-    {% if content contains "iframe" %}
-      <script src="{% link assets/js/responsive-videos.js %}"></script>
-    {% endif %}
-  </body>
-</html>
+<!doctype html>
+<html lang="{{ page.lang | default: site.lang }}">
+  {% include head.html %}
+
+  <body class="{{ page.layout | prepend: 'layout-' }}">
+    {% include header.html %}
+
+    <main class="container">
+      {{ content }}
+    </main>
+
+    {% include footer.html %}
+
+    {% if content contains "iframe" %}
+      <script src="{% link assets/js/responsive-videos.js %}"></script>
+    {% endif %}
+  </body>
+</html>

data/_layouts/home.html

@@ -0,0 +1,23 @@
+---
+layout: blog
+---
+
+{% for post in paginator.posts %}
+  {% include blog/post.html %}
+{% endfor %}
+
+{% if paginator.total_pages > 1 %}
+  <nav class="content-navigation">
+    {% if paginator.previous_page %}
+      <a class="nav-link prev-link" href="{{ paginator.previous_page_path | relative_url }}" rel="prev">
+        {{ site.steve.pagination.next_page }}
+      </a>
+    {% endif %}
+
+    {% if paginator.next_page %}
+      <a class="nav-link next-link" href="{{ paginator.next_page_path | relative_url }}" rel="next">
+        {{ site.steve.pagination.prev_page }}
+      </a>
+    {% endif %}
+  </nav>
+{% endif %}

data/_layouts/page.html

@@ -1,15 +1,15 @@
----
-layout: default
----
-
-<article class="content page">
-  <header class="content-header">
-    <h1 class="content-title">
-      {{ page.title }}
-    </h1>
-  </header>
-
-  <div class="content-body">
-    {{ content }}
-  </div>
-</article>
+---
+layout: default
+---
+
+<article class="content page">
+  <header class="content-header">
+    <h1 class="content-title">
+      {{ page.title }}
+    </h1>
+  </header>
+
+  <div class="content-body">
+    {{ content }}
+  </div>
+</article>