joak
/
varia.website
forked from varia/varia.website
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

removed merge conflicts

transformations
mb@mb 7 years ago
parent
1fe3973d53 aa79073f03
commit
88342ba9e9
5 changed files with 85 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      content/images/pluz.jpg
  2. 13
      pelicanconf.py
  3. 21
      themes/varia/templates/article.html
  4. 97
      themes/varia/templates/index.html
  5. 7
      themes/varia/templates/syndication.html

BIN
content/images/pluz.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 484 KiB

After

Width:  |  Height:  |  Size: 176 KiB

13
pelicanconf.py
View File

@ -30,7 +30,7 @@ DEFAULT_PAGINATION = 25
# Uncomment following line if you want document-relative URLs when developing
PLUGIN_PATHS = ['./pelican-plugins', './plugins-custom']
PLUGINS = ['dateish', 'extract_toc', 'i18n_subsites', 'summary', 'events-ics','complex_footnotes', 'stream']
PLUGINS = ['dateish', 'extract_toc', 'i18n_subsites', 'summary', 'events-ics','complex_footnotes', 'stream', 'thumbnailer']
MD_EXTENSIONS = ['codehilite','extra','toc']
STATIC_PATHS = ['extra/favicon.ico', 'images', 'pdfs', 'stream']
@ -55,12 +55,21 @@ I18N_SUBSITES = {
'locale':'nl.UTF-8'
}
}
#Options for plugins
#Our custom events plugin
PLUGIN_EVENTS = {
'ics_calendars': ['events.ics', 'curriculum.ics'],
'default_location' : '',
'calendar_per_category': False
}
#Dateish plugin settings
DATEISH_PROPERTIES = ['event_start', 'event_end']
#Thumbnailer plugin settings
IMAGE_PATH ="images"
THUMBNAIL_KEEP_NAME = True
THUMBNAIL_DIR ="images"
THUMBNAIL_SIZES = {'thumb':'200x?', 'thumb2x':'400x?'}

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

@ -30,9 +30,16 @@
</div>
<div class="article-info">
<div class="featured-image">
{% if article.featured_image %}
<img src="{{ article.featured_image }}">
{% endif %}
{% if article.featured_image %}
{% set thumb_size ='/thumb'%}
<a href="{{ article.featured_image }}">
{% if article.featured_image.endswith('.gif') %}
{% set thumb_size =''%}
{% endif %}
<img src="{{ article.featured_image | replace('images','images'+thumb_size) }}">
</a>
{% endif %}
</div>
<div class="event-details">
{% if article.event_start %}
@ -50,7 +57,13 @@
{% if article.translations %}
<div class="article-translation">
{% for translation in article.translations %}
<a href="{{ translation.url }}">{{ translation.lang }}</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>
{% endif %}
{% endfor %}
</div>
{% endif %}

97
themes/varia/templates/index.html
View File

@ -5,75 +5,82 @@
{% for p in pages %}
{% if p.title == 'header' %}
<div id="title">
{{ p.content }}
</div>
{{ p.content }}
</div>
{% endif %}
{% endfor %}
</header>
{% block content_title %}
{% endblock %}
{% if articles_page.has_other_pages() %}
{% include 'pagination.html' %}
{% include 'pagination.html' %}
{% endif %}
<div id="post-list">
{% for article in articles_page.object_list %}
{% if article.category %}
{% if article.category %}
{% if article.event_start %}
{% set event_status = '' %}
{% set thumb_size = '/thumb' %}
{% if article.event_start < article.date.now() %}
{% set event_status = ' past' %}
{% endif %}
{% if article.event_start >= article.date.now() %}
{% set event_status = ' current' %}
{% set thumb_size = '/thumb2x' %}
{% endif %}
{% endif %}
<article class="hentry {{article.category}}{{event_status}}">
{% endif %}
<div class="article-info">
<span class="entry-title"><a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></span>
{% if article.event_start %}
<article class="hentry {{article.category}}{{event_status}}">
{% endif %}
<div class="article-info">
<span class="entry-title"><a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></span>
{% if article.event_start %}
<div class="event-details">
{{ article.event_start | strftime('%d %B %Y') }}
{% set past = '' %}
<!-- {% set event_status = '' %} -->
</div>
{% endif %}
<div class="featured-image {{event_status}}">
{% if article.featured_image %}
<a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">
<img src="{{ article.featured_image }}">
</a>
{% endif %}
</div>
</div>
<div class="summary {{ article.category }}">{{ article.summary }}
<span>
{% if DEFAULT_LANG == 'en' %}
<a href="/en/{{ article.url }}">read more</a>
{% elif DEFAULT_LANG == 'nl' %}
<a href="/{{ article.url }}">lees meer</a>
{% endif %}
</span>
</div>
<div class="separator"><hr></div>
<div class="post-info">
{% if article.category %}
<div class="categories">
<span itemprop="articleSection">
<a href="/{{ article.category.url }}" rel="category">{{ article.category }}</a>
</span>
</div>
{% endif %} {% if article.tags %}
<div class="tags">
Tags: {% for tag in article.tags %}
<span itemprop="keywords">
<a href="/{{ tag.url }}" rel="tag">{{ tag }}</a>
</span> {% endfor %}
</div>
{% endif %}
</div>
</article>
<div class="featured-image {{event_status}}">
{% if article.featured_image %}
<a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">
{% if article.featured_image.endswith('.gif') %}
{% set thumb_size =''%}
{% endif %}
<img src="{{ article.featured_image | replace('images','images'+thumb_size) }}">
</a>
{% endif %}
</div>
</div>
<div class="summary {{ article.category }}">{{ article.summary }}
<span>
{% if DEFAULT_LANG == 'en' %}
<a href="/en/{{ article.url }}">read more</a>
{% elif DEFAULT_LANG == 'nl' %}
<a href="/{{ article.url }}">lees meer</a>
{% endif %}
</span>
</div>
<div class="separator"><hr></div>
<div class="post-info">
{% if article.category %}
<div class="categories">
<span itemprop="articleSection">
<a href="/{{ article.category.url }}" rel="category">{{ article.category }}</a>
</span>
</div>
{% endif %} {% if article.tags %}
<div class="tags">
Tags: {% for tag in article.tags %}
<span itemprop="keywords">
<a href="/{{ tag.url }}" rel="tag">{{ tag }}</a>
</span> {% endfor %}
</div>
{% endif %}
</div>
</article>
{% endfor %}
</div><!-- /#posts-list -->

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

@ -15,7 +15,7 @@ serves as the default image for posts whose featured_image is not set. #}
{% if article %}
<meta property="og:title" content="{{ article.title|striptags|e }} {%if article.subtitle %} - {{ article.subtitle|striptags|e }} {% endif %}"/>
<meta property="og:url" content="{{ SITEURL }}/{{ article.url }}" />
<meta property="og:description" content="{{article.description|striptags|e}}" />
<meta property="og:description" content="{% if article.summary %}{{article.summary|striptags}}{% endif %}" />
<meta property="og:site_name" content="{{ SITENAME|striptags|e }}" />
<meta property="og:article:author" content="{{ article.author }}" />
{% if article.date %}
@ -26,7 +26,10 @@ serves as the default image for posts whose featured_image is not set. #}
{% endif %}
<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="{{article.description|striptags|e}}">
<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() %}

Write Preview
Loading…
Cancel
Save