Browse Source

Revert "Relative links for everything"

This reverts commit ff484f854e.
master
Henner M. Kruse 4 years ago
parent
commit
d1f2eb2e21
10 changed files with 19 additions and 19 deletions
  1. +1
    -1
      templates/archives.html
  2. +4
    -4
      templates/article.html
  3. +1
    -1
      templates/authors.html
  4. +4
    -4
      templates/base.html
  5. +1
    -1
      templates/categories.html
  6. +2
    -2
      templates/index.html
  7. +2
    -2
      templates/pagination.html
  8. +1
    -1
      templates/period_archives.html
  9. +1
    -1
      templates/tags.html
  10. +2
    -2
      templates/translations.html

+ 1
- 1
templates/archives.html View File

@@ -8,7 +8,7 @@
<dl> <dl>
{% for article in dates %} {% for article in dates %}
<dt>{{ article.locale_date }}</dt> <dt>{{ article.locale_date }}</dt>
<dd><a href="./{{ article.url }}">{{ article.title }}</a></dd>
<dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
{% endfor %} {% endfor %}
</dl> </dl>
{% endblock %} {% endblock %}

+ 4
- 4
templates/article.html View File

@@ -25,7 +25,7 @@
<section id="content" class="body"> <section id="content" class="body">
<header> <header>
<h2 class="entry-title"> <h2 class="entry-title">
<a href="./{{ article.url }}" rel="bookmark"
<a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2> title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
{% import 'translations.html' as translations with context %} {% import 'translations.html' as translations with context %}
{{ translations.translations_for(article) }} {{ translations.translations_for(article) }}
@@ -40,7 +40,7 @@
{% endif %} {% endif %}
{% if article.authors %} {% if article.authors %}
<address class="vcard author"> <address class="vcard author">
By {% for author in article.authors %}<a class="url fn" href="./{{ author.url }}">{{ author }}</a>{% endfor %}
By {% for author in article.authors %}<a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>{% endfor %}
</address> </address>
{% endif %} {% endif %}
</div> </div>
@@ -51,14 +51,14 @@
<footer class="post-info"> <footer class="post-info">
{% if article.category %} {% if article.category %}
<div class="category"> <div class="category">
Category: <a href="./{{ article.category.url }}">{{ article.category }}</a>
Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
</div> </div>
{% endif %} {% endif %}
{% if article.tags %} {% if article.tags %}
<div class="tags"> <div class="tags">
Tags: Tags:
{% for tag in article.tags %} {% for tag in article.tags %}
<a href="./{{ tag.url }}">{{ tag }}</a>
<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}


+ 1
- 1
templates/authors.html View File

@@ -6,7 +6,7 @@
<h1>Authors on {{ SITENAME }}</h1> <h1>Authors on {{ SITENAME }}</h1>
<ul> <ul>
{% for author, articles in authors|sort %} {% for author, articles in authors|sort %}
<li><a href="./{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
<li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endblock %} {% endblock %}

+ 4
- 4
templates/base.html View File

@@ -7,7 +7,7 @@
{% block head %} {% block head %}
<title>{% block title %}{{ SITENAME }}{% endblock title %}</title> <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="stylesheet" type="text/css" href="./theme/css/site.css" />
<link rel="stylesheet" type="text/css" href="{{ SITE_URL }}/theme/css/site.css" />
{% if FEED_ALL_ATOM %} {% if FEED_ALL_ATOM %}
<link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" /> <link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
{% endif %} {% endif %}
@@ -40,7 +40,7 @@
<body id="index" class="home"> <body id="index" class="home">


<header id="banner" class="body"> <header id="banner" class="body">
<h1><a href="./">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>
<h1><a href="{{ SITEURL }}/">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>
</header><!-- /#banner --> </header><!-- /#banner -->


<div id="container"> <div id="container">
@@ -53,14 +53,14 @@
{% if DISPLAY_PAGES_ON_MENU %} {% if DISPLAY_PAGES_ON_MENU %}
<ul id="pages" class="menuitems"> <ul id="pages" class="menuitems">
{% for p in pages %} {% for p in pages %}
<li{% if p == page %} class="active"{% endif %}><a href="./{{ p.url }}">{{ p.title }}</a></li>
<li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endif %} {% endif %}
{% if DISPLAY_CATEGORIES_ON_MENU %} {% if DISPLAY_CATEGORIES_ON_MENU %}
<ul id="categories" class="menuitems"> <ul id="categories" class="menuitems">
{% for cat, null in categories %} {% for cat, null in categories %}
<li{% if cat == category %} class="active"{% endif %}><a href="./{{ cat.url }}">{{ cat }}</a></li>
<li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endif %} {% endif %}


+ 1
- 1
templates/categories.html View File

@@ -6,7 +6,7 @@
<h1>Categories on {{ SITENAME }}</h1> <h1>Categories on {{ SITENAME }}</h1>
<ul> <ul>
{% for category, articles in categories|sort %} {% for category, articles in categories|sort %}
<li><a href="./{{ category.url }}">{{ category }}</a> ({{ articles|count }})</li>
<li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a> ({{ articles|count }})</li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endblock %} {% endblock %}

+ 2
- 2
templates/index.html View File

@@ -13,13 +13,13 @@
<article class="hentry"> <article class="hentry">
<header> <header>
<h2 class="entry-title"> <h2 class="entry-title">
<a href="./{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
<a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
</h2> </h2>
<div class="post-info"> <div class="post-info">
<time class="published" datetime="{{ article.date.isoformat() }}"> {{ article.locale_date }} </time> <time class="published" datetime="{{ article.date.isoformat() }}"> {{ article.locale_date }} </time>
<address class="vcard author">By <address class="vcard author">By
{% for author in article.authors %} {% for author in article.authors %}
<a class="url fn" href="./{{ author.url }}">{{ author }}</a>
<a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
{% endfor %} {% endfor %}
</address> </address>
</div><!-- /.post-info --> </div><!-- /.post-info -->


+ 2
- 2
templates/pagination.html View File

@@ -1,11 +1,11 @@
{% if DEFAULT_PAGINATION %} {% if DEFAULT_PAGINATION %}
<p class="paginator"> <p class="paginator">
{% if articles_page.has_previous() %} {% if articles_page.has_previous() %}
<a href="./{{ articles_previous_page.url }}">&laquo;</a>
<a href="{{ SITEURL }}/{{ articles_previous_page.url }}">&laquo;</a>
{% endif %} {% endif %}
Page {{ articles_page.number }} / {{ articles_paginator.num_pages }} Page {{ articles_page.number }} / {{ articles_paginator.num_pages }}
{% if articles_page.has_next() %} {% if articles_page.has_next() %}
<a href="./{{ articles_next_page.url }}">&raquo;</a>
<a href="{{ SITEURL }}/{{ articles_next_page.url }}">&raquo;</a>
{% endif %} {% endif %}
</p> </p>
{% endif %} {% endif %}

+ 1
- 1
templates/period_archives.html View File

@@ -8,7 +8,7 @@
<dl> <dl>
{% for article in dates %} {% for article in dates %}
<dt>{{ article.locale_date }}</dt> <dt>{{ article.locale_date }}</dt>
<dd><a href="./{{ article.url }}">{{ article.title }}</a></dd>
<dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
{% endfor %} {% endfor %}
</dl> </dl>
{% endblock %} {% endblock %}

+ 1
- 1
templates/tags.html View File

@@ -6,7 +6,7 @@
<h1>Tags for {{ SITENAME }}</h1> <h1>Tags for {{ SITENAME }}</h1>
<ul> <ul>
{% for tag, articles in tags|sort %} {% for tag, articles in tags|sort %}
<li><a href="./{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
<li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endblock %} {% endblock %}

+ 2
- 2
templates/translations.html View File

@@ -2,7 +2,7 @@
{% if article.translations %} {% if article.translations %}
Translations: Translations:
{% for translation in article.translations %} {% for translation in article.translations %}
<a href="./{{ translation.url }}" hreflang="{{ translation.lang }}">{{ translation.lang }}</a>
<a href="{{ SITEURL }}/{{ translation.url }}" hreflang="{{ translation.lang }}">{{ translation.lang }}</a>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}
@@ -10,7 +10,7 @@ Translations:
{% macro entry_hreflang(entry) %} {% macro entry_hreflang(entry) %}
{% if entry.translations %} {% if entry.translations %}
{% for translation in entry.translations %} {% for translation in entry.translations %}
<link rel="alternate" hreflang="{{ translation.lang }}" href="./{{ translation.url }}">
<link rel="alternate" hreflang="{{ translation.lang }}" href="{{ SITEURL }}/{{ translation.url }}">
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}

Loading…
Cancel
Save