varia
/
varia.website
12
2
Fork 2
Code Issues 4 Pull Requests Releases Activity
Browse Source

various small formatting fixes & h-entry experiments

transformations
rra 6 years ago
parent
9bfeaa4589
commit
8ca9518d6f
3 changed files with 79 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 43
      themes/varia/templates/article.html
  2. 24
      themes/varia/templates/base.html
  3. 14
      themes/varia/templates/syndication.html

43
themes/varia/templates/article.html
View File

@ -1,30 +1,26 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block head %} {% block head %}
{{ super() }} {{ super() }}
{% if article.description %} {% if article.description %}
<meta name="description" content="{{article.description}}" /> <meta name="description" content="{{article.description}}" />
{% endif %} {% endif %}
{% if article.tags or article.category or article.keywords %} {% if article.tags or article.category or article.keywords %}
<meta name="keywords" content="{{ [article.tags|join(', '), article.category, article.keywords]|join(', ') }}" /> <meta name="keywords" content="{{ [article.tags|join(', '), article.category, article.keywords]|join(', ') }}" />
{% endif %} {% endif %}
{% endblock %} {% endblock %}
<div class="file type_folder"> {% block content %}
<a title="../" href="/log/" id="link0" class="type_folder"><img alt="../" src="/icons/back.png" class="type_folder"></a> <header id="banner">
</br>
<span class="filename">../</span>
{% block content %}
<section id="content" class="body h-entry">
<header id="banner">
{% for p in pages %} {% for p in pages %}
{% if p.title == 'header' %} {% if p.title == 'header' %}
<div id="title">{{ p.content }}</div> <div id="title">{{ p.content }}</div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</header> </header>
<section id="content" class="body h-entry">
<div class="entry-title p-name"> <div class="entry-title p-name">
{{ article.title }} {{ article.title }}
</div> </div>
@ -37,7 +33,6 @@
{% set thumb_size =''%} {% set thumb_size =''%}
{% endif %} {% endif %}
<img src="{{ article.featured_image | replace('images','images'+thumb_size) }}"> <img src="{{ article.featured_image | replace('images','images'+thumb_size) }}">
</a> </a>
{% endif %} {% endif %}
</div> </div>
@ -57,24 +52,20 @@
{% if article.translations %} {% if article.translations %}
<div class="article-translation"> <div class="article-translation">
{% for translation in article.translations %} {% for translation in article.translations %}
{% if translation.lang == 'nl' %} {% if translation.lang == 'nl' %}<a href="{{ translation.url }}">Lees dit artikel in het Nederlands</a>
<a href="{{ translation.url }}">Lees dit artikel in het Nederlands</a>
{% endif %} {% 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 %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="entry-content-container"> <div class="entry-content-container">
<div class="entry-content e-content"> <div class="entry-content e-content">
{{ article.content }} {{ article.content }}
<div class="separator"><hr></div> <div class="separator"><hr></div>
</div><!-- /.entry-content --> </div><!-- /.entry-content -->
</div><!-- /.entry-content-container --> </div><!-- /.entry-content-container -->
</section> </section>
{% endblock %} {% endblock %}

24
themes/varia/templates/base.html
View File

@ -2,14 +2,14 @@
<html lang="{{ DEFAULT_LANG }}"> <html lang="{{ DEFAULT_LANG }}">
<head> <head>
{% block head %} {% block head %}
<title>{% block title %}{{ SITENAME }} {{SITESUBTITLE}}{% endblock title %}</title> <title>{% block title %}{{ SITENAME }} {{SITESUBTITLE}}{% endblock title %}</title>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="{{ SITEURL}}/favicon.ico" type="image/x-icon"> <link rel="icon" href="{{ SITEURL}}/favicon.ico" type="image/x-icon">
<link rel="shortcut icon" href="{{ SITEURL }}/favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="{{ SITEURL }}/favicon.ico" type="image/x-icon">
{% 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>
@ -17,11 +17,9 @@
<div id="translation"> <div id="translation">
{% if I18N_SUBSITES %} {% if I18N_SUBSITES %}
{% for lang, url in I18N_SUBSITES.items() %} {% for lang, url in I18N_SUBSITES.items() %}
{% if lang == 'nl' %} {% if lang == 'nl' %}<li>{% if lang == DEFAULT_LANG %} class="active"{% endif %}><a href="/">{{ lang }}</a></li>
<li{% if lang == DEFAULT_LANG %} class="active"{% endif %}><a href="/">{{ lang }}</a></li>
{% endif %} {% endif %}
{% if lang == 'en' %} {% if lang == 'en' %}<li>{% if lang == DEFAULT_LANG %} class="active"{% endif %}><a href="/{{ lang }}/">{{ lang }}</a></li>
<li{% if lang == DEFAULT_LANG %} class="active"{% endif %}><a href="/{{ lang }}/">{{ lang }}</a></li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% 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> <li><a href="feeds/all-{{ DEFAULT_LANG }}.rss.xml" type="application/rss+xml"><i class="fa fa-rss "></i>RSS</a></li>
{% endif %} {% endif %}
</div> </div>
{% block content %} {% block content %}
{% endblock %} {% endblock %}
</body> </body>
</html> </html>

14
themes/varia/templates/syndication.html
View File

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

Write Preview
Loading…
Cancel
Save