Skip to content

Commit

Permalink
Merge pull request #2976 from pieqq/simple-theme-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
justinmayer committed Aug 4, 2022
2 parents 73c0320 + 16b8a03 commit e265deb
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 16 deletions.
10 changes: 4 additions & 6 deletions pelican/themes/simple/templates/article.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@
{% endblock %}

{% block content %}
<section id="content" class="body">
<header>
<h2 class="entry-title">
<h1 class="entry-title">
<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></h1>
{% import 'translations.html' as translations with context %}
{{ translations.translations_for(article) }}
</header>
Expand Down Expand Up @@ -60,8 +59,7 @@ <h2 class="entry-title">
</div>
{% endif %}
</footer><!-- /.post-info -->
<div class="entry-content">
<article>
{{ article.content }}
</div><!-- /.entry-content -->
</section>
</article>
{% endblock %}
2 changes: 1 addition & 1 deletion pelican/themes/simple/templates/author.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
{% block title %}{{ SITENAME }} - Articles by {{ author }}{% endblock %}

{% block content_title %}
<h2>Articles by {{ author }}</h2>
<h1>Articles by {{ author }}</h1>
{% endblock %}

17 changes: 10 additions & 7 deletions pelican/themes/simple/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
<meta charset="utf-8" />
<meta name="generator" content="Pelican" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% 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" />
{% endif %}
Expand Down Expand Up @@ -32,11 +33,11 @@
{% endblock head %}
</head>

<body id="index" class="home">
<header id="banner" class="body">
<body>
<header>
<h1><a href="{{ SITEURL }}/">{{ SITENAME }}{% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
</header><!-- /#banner -->
<nav id="menu"><ul>
</header>
<nav><ul>
{% for title, link in MENUITEMS %}
<li><a href="{{ link }}">{{ title }}</a></li>
{% endfor %}
Expand All @@ -50,14 +51,16 @@ <h1><a href="{{ SITEURL }}/">{{ SITENAME }}{% if SITESUBTITLE %} <strong>{{ SITE
<li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
{% endfor %}
{% endif %}
</ul></nav><!-- /#menu -->
</ul></nav>
<main>
{% block content %}
{% endblock %}
<footer id="contentinfo" class="body">
</main>
<footer>
<address id="about" class="vcard body">
Proudly powered by <a href="https://getpelican.com/">Pelican</a>,
which takes great advantage of <a href="https://www.python.org/">Python</a>.
</address><!-- /#about -->
</footer><!-- /#contentinfo -->
</footer>
</body>
</html>
2 changes: 1 addition & 1 deletion pelican/themes/simple/templates/category.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
{% block title %}{{ SITENAME }} - {{ category }} category{% endblock %}

{% block content_title %}
<h2>Articles in the {{ category }} category</h2>
<h1>Articles in the {{ category }} category</h1>
{% endblock %}

2 changes: 1 addition & 1 deletion pelican/themes/simple/templates/tag.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
{% block title %}{{ SITENAME }} - {{ tag }} tag{% endblock %}

{% block content_title %}
<h2>Articles tagged with {{ tag }}</h2>
<h1>Articles tagged with {{ tag }}</h1>
{% endblock %}

0 comments on commit e265deb

Please sign in to comment.