various small formatting fixes & h-entry experiments

This commit is contained in:
rra 2018-03-08 18:14:24 +01:00
parent 9bfeaa4589
commit 8ca9518d6f
3 changed files with 79 additions and 96 deletions

View File

@ -11,13 +11,7 @@
{% endif %}
{% endblock %}
<div class="file type_folder">
<a title="../" href="/log/" id="link0" class="type_folder"><img alt="../" src="/icons/back.png" class="type_folder"></a>
</br>
<span class="filename">../</span>
{% block content %}
<section id="content" class="body h-entry">
<header id="banner">
{% for p in pages %}
{% if p.title == 'header' %}
@ -25,6 +19,8 @@
{% endif %}
{% endfor %}
</header>
<section id="content" class="body h-entry">
<div class="entry-title p-name">
{{ article.title }}
</div>
@ -37,7 +33,6 @@
{% set thumb_size =''%}
{% endif %}
<img src="{{ article.featured_image | replace('images','images'+thumb_size) }}">
</a>
{% endif %}
</div>
@ -57,12 +52,9 @@
{% if article.translations %}
<div class="article-translation">
{% for translation in article.translations %}
{% if translation.lang == 'nl' %}
<a href="{{ translation.url }}">Lees dit artikel in het Nederlands</a>
{% if translation.lang == 'nl' %}<a href="{{ translation.url }}">Lees dit artikel in het Nederlands</a>
{% endif %}
{% if translation.lang == 'en' %}
<a href="{{ translation.url }}">Read this article in English</a>
{% if translation.lang == 'en' %}<a href="{{ translation.url }}">Read this article in English</a>
{% endif %}
{% endfor %}
</div>
@ -71,7 +63,6 @@
</div>
<div class="entry-content-container">
<div class="entry-content e-content">
{{ article.content }}
<div class="separator"><hr></div>
</div><!-- /.entry-content -->

View File

@ -17,11 +17,9 @@
<div id="translation">
{% if I18N_SUBSITES %}
{% for lang, url in I18N_SUBSITES.items() %}
{% if lang == 'nl' %}
<li{% if lang == DEFAULT_LANG %} class="active"{% endif %}><a href="/">{{ lang }}</a></li>
{% if lang == 'nl' %}<li>{% if lang == DEFAULT_LANG %} class="active"{% endif %}><a href="/">{{ lang }}</a></li>
{% endif %}
{% if lang == 'en' %}
<li{% if lang == DEFAULT_LANG %} class="active"{% endif %}><a href="/{{ lang }}/">{{ lang }}</a></li>
{% if lang == 'en' %}<li>{% if lang == DEFAULT_LANG %} class="active"{% endif %}><a href="/{{ lang }}/">{{ lang }}</a></li>
{% endif %}
{% endfor %}
{% endif %}
@ -30,9 +28,7 @@
<li><a href="feeds/all-{{ DEFAULT_LANG }}.rss.xml" type="application/rss+xml"><i class="fa fa-rss "></i>RSS</a></li>
{% endif %}
</div>
{% block content %}
{% endblock %}
</body>
</html>

View File

@ -27,14 +27,10 @@ serves as the default image for posts whose featured_image is not set. #}
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:title" content="{{ article.title|striptags|e }} {%if article.subtitle %} - {{ article.subtitle|striptags|e }} {% endif %}">
<meta name="twitter:description" content="{% if article.summary %}{{article.summary|striptags}}{% endif %}">
{% if article.featured_image %}
{% if I18N_SUBSITES %}
{% for lang, url in I18N_SUBSITES.items() %}
{% if lang == 'en' %}
<!-- this is a dirty hack, FIXME -->
<meta property="og:image" content="http://varia.zone{{article.featured_image}}" />
<meta property="og:image:secure_url" content="https://varia.zone{{article.featured_image}}" />
<meta name="twitter:image" content="https://varia.zone{{article.featured_image}}" >