Merge branch 'master' of https://git.vvvvvvaria.org/varia/varia.website
This commit is contained in:
commit
bac52977fa
@ -1 +1 @@
|
|||||||
Subproject commit 4ded3cbc6c9899acbed83a146107c8244c56f882
|
Subproject commit d91a9e910bffb850ecb597f5c77241678f197e24
|
@ -10,8 +10,8 @@
|
|||||||
{% from 'syndication.html' import syndication with context %}
|
{% from 'syndication.html' import syndication with context %}
|
||||||
{{ syndication(article) }}
|
{{ syndication(article) }}
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="{{ THEME_STATIC_DIR }}css/pygment.css" />
|
<link rel="stylesheet" type="text/css" href="/{{ THEME_STATIC_DIR }}css/pygment.css" />
|
||||||
<link rel="stylesheet" type="text/css" href="{{ THEME_STATIC_DIR }}css/{{ CSS_FILE }}" />
|
<link rel="stylesheet" type="text/css" href="/{{ THEME_STATIC_DIR }}css/{{ CSS_FILE }}" />
|
||||||
{% endblock head %}
|
{% endblock head %}
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
{% extends "index.html" %}
|
{% extends "index.html" %}
|
||||||
{% block content_title %}
|
{% block content_title %}
|
||||||
<h1>{{ category }}</h1>
|
<h1>Category: {{ category }}</h1>
|
||||||
|
<hr>
|
||||||
{% for p in pages %}
|
{% for p in pages %}
|
||||||
{% if p.slug == category %}
|
{% if p.slug == category %}
|
||||||
<div id="title">{{ p.content }}</div>
|
<div id="title">{{ p.content }}</div>
|
||||||
|
@ -52,14 +52,14 @@
|
|||||||
{% if article.category %}
|
{% if article.category %}
|
||||||
<div class="categories">
|
<div class="categories">
|
||||||
<span itemprop="articleSection">
|
<span itemprop="articleSection">
|
||||||
→ <a href="{{ SITEURL }}/{{ article.category.url }}" rel="category">{{ article.category }}</a>
|
→ <a href="/{{ article.category.url }}" rel="category">{{ article.category }}</a>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
{% endif %} {% if article.tags %}
|
{% endif %} {% if article.tags %}
|
||||||
<div class="tags">
|
<div class="tags">
|
||||||
Tags: {% for tag in article.tags %}
|
Tags: {% for tag in article.tags %}
|
||||||
<span itemprop="keywords">
|
<span itemprop="keywords">
|
||||||
<a href="{{ SITEURL }}/{{ tag.url }}" rel="tag">{{ tag }}</a>
|
<a href="/{{ tag.url }}" rel="tag">{{ tag }}</a>
|
||||||
</span> {% endfor %}
|
</span> {% endfor %}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
{% block title %}{{ page.title }}{%endblock%}
|
{% block title %}{{ page.title }}{%endblock%}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div id ="page-content">
|
<div id="page-content">
|
||||||
{{ page.content }}
|
{{ page.content }}
|
||||||
|
|
||||||
{% if page.modified %}
|
{% if page.modified %}
|
||||||
|
Loading…
Reference in New Issue
Block a user