jmg
/
blog
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

add itemurl macro for creating the url for articles and use it...

main
John-Mark Gurney 4 years ago
parent
3a02e775bb
commit
603f70195f
5 changed files with 12 additions and 6 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -1
      layout/base.j2
  2. +4
    -3
      layout/blog.j2
  3. +2
    -1
      layout/frontpage.j2
  4. +2
    -0
      layout/macros.j2
  5. +2
    -1
      layout/tagged_posts.j2

+ 2
- 1
layout/base.j2 View File

@@ -1,3 +1,4 @@
{% from "macros.j2" import itemurl %}
<!doctype html> <!doctype html>
<!-- https://github.com/paulirish/html5-boilerplate/blob/master/index.html --> <!-- https://github.com/paulirish/html5-boilerplate/blob/master/index.html -->
<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ --> <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
@@ -74,7 +75,7 @@
<b><button class="w3-button">{{ monthgrp.list[0].meta.created|date_format('%B') }}{# font awesome <i class="fa fa-caret-down"></i> #}</button></b> <b><button class="w3-button">{{ monthgrp.list[0].meta.created|date_format('%B') }}{# font awesome <i class="fa fa-caret-down"></i> #}</button></b>
{% for item in monthgrp.list %} {% for item in monthgrp.list %}
<div class="w3-dropdown-click w3-bar-block" style="margin-left: 0.75em;"> <div class="w3-dropdown-click w3-bar-block" style="margin-left: 0.75em;">
<a href="{{ content_url(item.url) }}" class="no-tufte-underline w3-bar-item w3-button">{{ item.meta.title }}</a>
<a href="{{ itemurl(item) }}" class="no-tufte-underline w3-bar-item w3-button">{{ item.meta.title }}</a>
</div> </div>
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}


+ 4
- 3
layout/blog.j2 View File

@@ -1,3 +1,4 @@
{% from "macros.j2" import itemurl %}
{% from "macros.j2" import slug %} {% from "macros.j2" import slug %}
{% extends "base.j2" %} {% extends "base.j2" %}


@@ -6,7 +7,7 @@
{% mark post -%} {% mark post -%}
<article class="post"> <article class="post">


<h1><a name="{{ slug(resource) }}-title" class="no-tufte-underline" href="{{ resource.url ~"#"~slug(resource)~"-title" }}">{{ resource.meta.title }}</a></h1>
<h1><a name="{{ slug(resource) }}-title" class="no-tufte-underline" href="{{ itemurl(resource) }}">{{ resource.meta.title }}</a></h1>


<p class="posted">Posted: {{ resource.meta.created.strftime('%B %e, %Y') }} at {{ resource.meta.time }}</p> <p class="posted">Posted: {{ resource.meta.created.strftime('%B %e, %Y') }} at {{ resource.meta.time }}</p>


@@ -35,7 +36,7 @@
<a class="prev{{' disabled' if not resource.prev_by_time }}" <a class="prev{{' disabled' if not resource.prev_by_time }}"
title="{{ resource.prev_by_time.meta.title }}" title="{{ resource.prev_by_time.meta.title }}"
{% if resource.prev_by_time %} {% if resource.prev_by_time %}
href="{{ content_url(resource.prev_by_time.url) ~ "#" ~ slug(resource.prev_by_time) ~ "-title" }}"{% endif %}>
href="{{ itemurl(resource.prev_by_time) }}"{% endif %}>
Next Next
</a> </a>
| |
@@ -44,7 +45,7 @@
<a class="next{{' disabled' if not resource.next_by_time }}" <a class="next{{' disabled' if not resource.next_by_time }}"
title="{{ resource.next_by_time.meta.title }}" title="{{ resource.next_by_time.meta.title }}"
{% if resource.next_by_time %} {% if resource.next_by_time %}
href="{{ content_url(resource.next_by_time.url) ~ "#" ~ slug(resource.next_by_time) ~ "-title" }}"{% endif %}>
href="{{ itemurl(resource.next_by_time) }}"{% endif %}>
Previous Previous
</a> </a>
</span> </span>


+ 2
- 1
layout/frontpage.j2 View File

@@ -1,3 +1,4 @@
{% from "macros.j2" import itemurl %}
{% extends "base.j2" %} {% extends "base.j2" %}


{% block main %} {% block main %}
@@ -21,7 +22,7 @@
<a class="prev{{' disabled' if not nextpost }}" <a class="prev{{' disabled' if not nextpost }}"
title="{{ nextpost.meta.title }}" title="{{ nextpost.meta.title }}"
{% if nextpost %} {% if nextpost %}
href="{{ content_url(nextpost.url) }}"{% endif %}>
href="{{ itemurl(nextpost) }}"{% endif %}>
Previous Post Previous Post
</a> </a>
</span> </span>


+ 2
- 0
layout/macros.j2 View File

@@ -1,5 +1,7 @@
{% macro slug(res) %} {% macro slug(res) %}
{{ res.meta.id if res.meta.id else res.slug }}{% endmacro %} {{ res.meta.id if res.meta.id else res.slug }}{% endmacro %}
{% macro itemurl(res) %}
{{ res.url ~ "#" ~ (res.meta.id if res.meta.id else res.slug) ~ "-title" }}{% endmacro %}


{# endmacro not on new line to prevent white space at end of macro #} {# endmacro not on new line to prevent white space at end of macro #}




+ 2
- 1
layout/tagged_posts.j2 View File

@@ -1,3 +1,4 @@
{% from "macros.j2" import itemurl %}
{% extends "base.j2" %} {% extends "base.j2" %}


{% block main %} {% block main %}
@@ -9,7 +10,7 @@
<time datetime="{{ resource.meta.created.strftime('%Y-%m-%d') }}"> <time datetime="{{ resource.meta.created.strftime('%Y-%m-%d') }}">
{{ resource.meta.created.strftime('%a, %d %b %Y') }} {{ resource.meta.created.strftime('%a, %d %b %Y') }}
</time> </time>
<a href="{{ content_url(resource.url) }}">{{ resource.meta.title }}</a>
<a href="{{ itemurl(resource) }}">{{ resource.meta.title }}</a>
{% if resource.meta.tags %} {% if resource.meta.tags %}
<ul class="tags clear"> <ul class="tags clear">
{% for tag in resource.meta.tags %} {% for tag in resource.meta.tags %}


Write Preview
Loading…
Cancel
Save