From a03cae0a99d13832d960941bafae1658ea360bb5 Mon Sep 17 00:00:00 2001 From: rra Date: Mon, 26 Feb 2018 21:57:38 +0100 Subject: [PATCH 1/5] disable rel urls --- publishconf.py | 2 +- themes/cetcat/templates/syndication.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/publishconf.py b/publishconf.py index fa91ccb817..79b371b205 100644 --- a/publishconf.py +++ b/publishconf.py @@ -10,7 +10,7 @@ import sys sys.path.append(os.curdir) from pelicanconf import * -RELATIVE_URLS = True +RELATIVE_URLS = False DELETE_OUTPUT_DIRECTORY = True # Following items are often useful when publishing diff --git a/themes/cetcat/templates/syndication.html b/themes/cetcat/templates/syndication.html index 24171c0563..c41234824b 100644 --- a/themes/cetcat/templates/syndication.html +++ b/themes/cetcat/templates/syndication.html @@ -5,7 +5,7 @@ {# Thumbnail image to show when homepage is shared on social media. It also serves as the default image for posts whose featured_image is not set. #} {% if not FEATURED_IMAGE %} -{% set FEATURED_IMAGE = '' %} +{% set FEATURED_IMAGE = 'https://varia.zone/images/de_varia.png' %} {% else %} {% set FEATURED_IMAGE = FEATURED_IMAGE %} {% endif %} From 0b0fcc18c654d896bbfddba584e55ffa70c245ab Mon Sep 17 00:00:00 2001 From: rra Date: Mon, 26 Feb 2018 22:20:23 +0100 Subject: [PATCH 2/5] refactoring --- themes/cetcat/templates/base.html | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/themes/cetcat/templates/base.html b/themes/cetcat/templates/base.html index 80abaf2c1c..d5c913b398 100644 --- a/themes/cetcat/templates/base.html +++ b/themes/cetcat/templates/base.html @@ -1,18 +1,16 @@ - {% block head %} - {% block title %}{{ SITENAME }} {{SITESUBTITLE}}{% endblock title %} - +{% block head %} + {% block title %}{{ SITENAME }} {{SITESUBTITLE}}{% endblock title %} + - - + {% from 'syndication.html' import syndication with context %} {{ syndication(article) }} - - - - {% endblock head %} + + +{% endblock head %} From d2e365612eb394833e8b9e855183cc787b5aa6ef Mon Sep 17 00:00:00 2001 From: rra Date: Mon, 26 Feb 2018 22:51:04 +0100 Subject: [PATCH 3/5] rename theme name + fixed OG images --- pelicanconf.py | 3 ++- themes/{cetcat => varia}/static/css/main.css | 0 themes/{cetcat => varia}/static/css/pygment.css | 0 .../static/fonts/LiberationMono.ttf | Bin themes/{cetcat => varia}/static/fonts/cmunit.ttf | Bin themes/{cetcat => varia}/static/fonts/cmunobx.ttf | Bin themes/{cetcat => varia}/static/fonts/cmunorm.ttf | Bin themes/{cetcat => varia}/static/fonts/cmunssdc.ttf | Bin themes/{cetcat => varia}/static/fonts/cmuntb.ttf | Bin themes/{cetcat => varia}/static/fonts/cmuntt.ttf | Bin themes/{cetcat => varia}/static/fonts/cmuntx.ttf | Bin themes/{cetcat => varia}/static/fonts/cmunvi.ttf | Bin themes/{cetcat => varia}/static/fonts/cmunvt.ttf | Bin themes/{cetcat => varia}/static/js/stars.js | 0 themes/{cetcat => varia}/templates/archives.html | 0 themes/{cetcat => varia}/templates/article.html | 0 themes/{cetcat => varia}/templates/author.html | 0 themes/{cetcat => varia}/templates/authors.html | 0 themes/{cetcat => varia}/templates/base.html | 0 themes/{cetcat => varia}/templates/categories.html | 0 themes/{cetcat => varia}/templates/category.html | 0 themes/{cetcat => varia}/templates/events_list.html | 0 themes/{cetcat => varia}/templates/gosquared.html | 0 themes/{cetcat => varia}/templates/index.html | 0 themes/{cetcat => varia}/templates/page.html | 0 themes/{cetcat => varia}/templates/pagination.html | 0 .../templates/period_archives.html | 0 themes/{cetcat => varia}/templates/syndication.html | 0 themes/{cetcat => varia}/templates/tag.html | 0 themes/{cetcat => varia}/templates/tags.html | 0 .../{cetcat => varia}/templates/translations.html | 0 31 files changed, 2 insertions(+), 1 deletion(-) rename themes/{cetcat => varia}/static/css/main.css (100%) rename themes/{cetcat => varia}/static/css/pygment.css (100%) rename themes/{cetcat => varia}/static/fonts/LiberationMono.ttf (100%) rename themes/{cetcat => varia}/static/fonts/cmunit.ttf (100%) rename themes/{cetcat => varia}/static/fonts/cmunobx.ttf (100%) rename themes/{cetcat => varia}/static/fonts/cmunorm.ttf (100%) rename themes/{cetcat => varia}/static/fonts/cmunssdc.ttf (100%) rename themes/{cetcat => varia}/static/fonts/cmuntb.ttf (100%) rename themes/{cetcat => varia}/static/fonts/cmuntt.ttf (100%) rename themes/{cetcat => varia}/static/fonts/cmuntx.ttf (100%) rename themes/{cetcat => varia}/static/fonts/cmunvi.ttf (100%) rename themes/{cetcat => varia}/static/fonts/cmunvt.ttf (100%) rename themes/{cetcat => varia}/static/js/stars.js (100%) rename themes/{cetcat => varia}/templates/archives.html (100%) rename themes/{cetcat => varia}/templates/article.html (100%) rename themes/{cetcat => varia}/templates/author.html (100%) rename themes/{cetcat => varia}/templates/authors.html (100%) rename themes/{cetcat => varia}/templates/base.html (100%) rename themes/{cetcat => varia}/templates/categories.html (100%) rename themes/{cetcat => varia}/templates/category.html (100%) rename themes/{cetcat => varia}/templates/events_list.html (100%) rename themes/{cetcat => varia}/templates/gosquared.html (100%) rename themes/{cetcat => varia}/templates/index.html (100%) rename themes/{cetcat => varia}/templates/page.html (100%) rename themes/{cetcat => varia}/templates/pagination.html (100%) rename themes/{cetcat => varia}/templates/period_archives.html (100%) rename themes/{cetcat => varia}/templates/syndication.html (100%) rename themes/{cetcat => varia}/templates/tag.html (100%) rename themes/{cetcat => varia}/templates/tags.html (100%) rename themes/{cetcat => varia}/templates/translations.html (100%) diff --git a/pelicanconf.py b/pelicanconf.py index e3dc0c434b..ac4dde2d84 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -40,8 +40,9 @@ EXTRA_PATH_METADATA = { 'extra/htaccess': {'path': '.htaccess'} } -THEME = 'themes/cetcat' +THEME = 'themes/varia' THEME_STATIC_DIR = 'theme/' +STATIC_PATHS = "images/" I18N_SUBSITES = { 'en': { diff --git a/themes/cetcat/static/css/main.css b/themes/varia/static/css/main.css similarity index 100% rename from themes/cetcat/static/css/main.css rename to themes/varia/static/css/main.css diff --git a/themes/cetcat/static/css/pygment.css b/themes/varia/static/css/pygment.css similarity index 100% rename from themes/cetcat/static/css/pygment.css rename to themes/varia/static/css/pygment.css diff --git a/themes/cetcat/static/fonts/LiberationMono.ttf b/themes/varia/static/fonts/LiberationMono.ttf similarity index 100% rename from themes/cetcat/static/fonts/LiberationMono.ttf rename to themes/varia/static/fonts/LiberationMono.ttf diff --git a/themes/cetcat/static/fonts/cmunit.ttf b/themes/varia/static/fonts/cmunit.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmunit.ttf rename to themes/varia/static/fonts/cmunit.ttf diff --git a/themes/cetcat/static/fonts/cmunobx.ttf b/themes/varia/static/fonts/cmunobx.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmunobx.ttf rename to themes/varia/static/fonts/cmunobx.ttf diff --git a/themes/cetcat/static/fonts/cmunorm.ttf b/themes/varia/static/fonts/cmunorm.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmunorm.ttf rename to themes/varia/static/fonts/cmunorm.ttf diff --git a/themes/cetcat/static/fonts/cmunssdc.ttf b/themes/varia/static/fonts/cmunssdc.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmunssdc.ttf rename to themes/varia/static/fonts/cmunssdc.ttf diff --git a/themes/cetcat/static/fonts/cmuntb.ttf b/themes/varia/static/fonts/cmuntb.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmuntb.ttf rename to themes/varia/static/fonts/cmuntb.ttf diff --git a/themes/cetcat/static/fonts/cmuntt.ttf b/themes/varia/static/fonts/cmuntt.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmuntt.ttf rename to themes/varia/static/fonts/cmuntt.ttf diff --git a/themes/cetcat/static/fonts/cmuntx.ttf b/themes/varia/static/fonts/cmuntx.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmuntx.ttf rename to themes/varia/static/fonts/cmuntx.ttf diff --git a/themes/cetcat/static/fonts/cmunvi.ttf b/themes/varia/static/fonts/cmunvi.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmunvi.ttf rename to themes/varia/static/fonts/cmunvi.ttf diff --git a/themes/cetcat/static/fonts/cmunvt.ttf b/themes/varia/static/fonts/cmunvt.ttf similarity index 100% rename from themes/cetcat/static/fonts/cmunvt.ttf rename to themes/varia/static/fonts/cmunvt.ttf diff --git a/themes/cetcat/static/js/stars.js b/themes/varia/static/js/stars.js similarity index 100% rename from themes/cetcat/static/js/stars.js rename to themes/varia/static/js/stars.js diff --git a/themes/cetcat/templates/archives.html b/themes/varia/templates/archives.html similarity index 100% rename from themes/cetcat/templates/archives.html rename to themes/varia/templates/archives.html diff --git a/themes/cetcat/templates/article.html b/themes/varia/templates/article.html similarity index 100% rename from themes/cetcat/templates/article.html rename to themes/varia/templates/article.html diff --git a/themes/cetcat/templates/author.html b/themes/varia/templates/author.html similarity index 100% rename from themes/cetcat/templates/author.html rename to themes/varia/templates/author.html diff --git a/themes/cetcat/templates/authors.html b/themes/varia/templates/authors.html similarity index 100% rename from themes/cetcat/templates/authors.html rename to themes/varia/templates/authors.html diff --git a/themes/cetcat/templates/base.html b/themes/varia/templates/base.html similarity index 100% rename from themes/cetcat/templates/base.html rename to themes/varia/templates/base.html diff --git a/themes/cetcat/templates/categories.html b/themes/varia/templates/categories.html similarity index 100% rename from themes/cetcat/templates/categories.html rename to themes/varia/templates/categories.html diff --git a/themes/cetcat/templates/category.html b/themes/varia/templates/category.html similarity index 100% rename from themes/cetcat/templates/category.html rename to themes/varia/templates/category.html diff --git a/themes/cetcat/templates/events_list.html b/themes/varia/templates/events_list.html similarity index 100% rename from themes/cetcat/templates/events_list.html rename to themes/varia/templates/events_list.html diff --git a/themes/cetcat/templates/gosquared.html b/themes/varia/templates/gosquared.html similarity index 100% rename from themes/cetcat/templates/gosquared.html rename to themes/varia/templates/gosquared.html diff --git a/themes/cetcat/templates/index.html b/themes/varia/templates/index.html similarity index 100% rename from themes/cetcat/templates/index.html rename to themes/varia/templates/index.html diff --git a/themes/cetcat/templates/page.html b/themes/varia/templates/page.html similarity index 100% rename from themes/cetcat/templates/page.html rename to themes/varia/templates/page.html diff --git a/themes/cetcat/templates/pagination.html b/themes/varia/templates/pagination.html similarity index 100% rename from themes/cetcat/templates/pagination.html rename to themes/varia/templates/pagination.html diff --git a/themes/cetcat/templates/period_archives.html b/themes/varia/templates/period_archives.html similarity index 100% rename from themes/cetcat/templates/period_archives.html rename to themes/varia/templates/period_archives.html diff --git a/themes/cetcat/templates/syndication.html b/themes/varia/templates/syndication.html similarity index 100% rename from themes/cetcat/templates/syndication.html rename to themes/varia/templates/syndication.html diff --git a/themes/cetcat/templates/tag.html b/themes/varia/templates/tag.html similarity index 100% rename from themes/cetcat/templates/tag.html rename to themes/varia/templates/tag.html diff --git a/themes/cetcat/templates/tags.html b/themes/varia/templates/tags.html similarity index 100% rename from themes/cetcat/templates/tags.html rename to themes/varia/templates/tags.html diff --git a/themes/cetcat/templates/translations.html b/themes/varia/templates/translations.html similarity index 100% rename from themes/cetcat/templates/translations.html rename to themes/varia/templates/translations.html From 4948bea3c27a6697c00b05bd311fcdc0837c9dee Mon Sep 17 00:00:00 2001 From: rra Date: Mon, 26 Feb 2018 23:26:08 +0100 Subject: [PATCH 4/5] workaround for syndication of translated files --- pelicanconf.py | 5 ++--- themes/varia/templates/syndication.html | 13 ++++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pelicanconf.py b/pelicanconf.py index ac4dde2d84..9d76ac4ec9 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -42,17 +42,16 @@ EXTRA_PATH_METADATA = { THEME = 'themes/varia' THEME_STATIC_DIR = 'theme/' -STATIC_PATHS = "images/" I18N_SUBSITES = { 'en': { 'SITESUBTITLE':u'Centre for Everyday Technology', - 'SITEURL':'varia.zone/en/', + 'SITEURL':'varia.zone/en/', 'locale':'en_US.UTF-8' }, 'nl': { 'SITESUBTITLE':u'Centrum voor Alledaagse Technologie', - 'SITEURL':'varia.zone/', + 'SITEURL':'varia.zone/', 'locale':'nl.UTF-8' } } diff --git a/themes/varia/templates/syndication.html b/themes/varia/templates/syndication.html index c41234824b..c1cff3f3e2 100644 --- a/themes/varia/templates/syndication.html +++ b/themes/varia/templates/syndication.html @@ -28,9 +28,16 @@ serves as the default image for posts whose featured_image is not set. #} {% if article.featured_image %} - - - + {% if I18N_SUBSITES %} + {% for lang, url in I18N_SUBSITES.items() %} + {% if lang == 'en' %} + + + + + {% endif %} + {% endfor %} +{% endif %} {% else %} {% if FEATURED_IMAGE %} From 473c004f176f978332a273518619eccb946180a1 Mon Sep 17 00:00:00 2001 From: "mb@mb" Date: Tue, 27 Feb 2018 08:26:28 +0100 Subject: [PATCH 5/5] refining theme details --- themes/cetcat/static/css/main.css | 20 ++++++++++------- themes/cetcat/templates/index.html | 35 ++++++++++++++++++++---------- themes/cetcat/templates/page.html | 9 ++++++++ 3 files changed, 45 insertions(+), 19 deletions(-) diff --git a/themes/cetcat/static/css/main.css b/themes/cetcat/static/css/main.css index 07c0721b3d..47719212cb 100644 --- a/themes/cetcat/static/css/main.css +++ b/themes/cetcat/static/css/main.css @@ -40,7 +40,7 @@ body{ font-size: 16px; line-height:1.8; font-style: normal; - background-color: rgb(252, 255, 120); + background-color: rgba(252, 255, 120, .7); color:black; } header { @@ -54,8 +54,8 @@ header { } #content.index header{ font-family: 'CMUconcrete'; - font-size: 26px; - line-height: 1.6; + font-size: 22px; + line-height: 1.4; letter-spacing: .035em; } #content.index header em{ @@ -159,6 +159,9 @@ pre{ .summary p{ display: inline; } + .summary.longread{ + font-size: 150%; + } .long-read .hentry{ width:calc(400px + 2em); } @@ -181,7 +184,7 @@ pre{ font-size: 190%; font-weight: bold; line-height: 1.10; - margin:0; + margin:0 0 .5em 0; } .hentry .article-info .entry-title a{ text-decoration: none; @@ -189,14 +192,15 @@ pre{ /* date */ .event-details{ width: 100%; - font-family: 'CMUconcrete'; - font-size: 12px; - margin:.5em 0 1em 0; + font-family: 'liberation'; + font-size: 10px; + margin:.5em 0 0; } /* ascii art styling */ .hentry pre{ font-size: 14.4px; font-weight: normal; + clear:both; /*to prevent the ascii to break up*/ } /* featured image */ .hentry .article-info .featured-image img{ @@ -246,7 +250,7 @@ pre{ } .entry-content-container, #page-content-container{ width: calc(100% - 285px); - background-color: rgba(255,255,0,.3); + /*background-color: rgba(255,255,0,.3);*/ float: right; padding:30px; margin-bottom:25px; diff --git a/themes/cetcat/templates/index.html b/themes/cetcat/templates/index.html index 4b087798e8..7488b18671 100644 --- a/themes/cetcat/templates/index.html +++ b/themes/cetcat/templates/index.html @@ -19,24 +19,26 @@
{% endif %}
- {{ article.title }} -
- {% if article.event_start %} +
+ {{ article.title }} +
+
+ {% if article.featured_image %} + + {% endif %} +
+ {% if article.event_start %} +
{{ article.event_start }} {% set past = '' %} {% if article.event_start < article.date.now() %} {% set past = ' past-event' %} {% endif %} - {% endif %} -
-
- {% if article.featured_image %} - - {% endif %} -
+
+ {% endif %}
-
{{ article.summary }} +
{{ article.summary }} {% if DEFAULT_LANG == 'en' %} @@ -47,6 +49,17 @@
+
{% if article.category %} diff --git a/themes/cetcat/templates/page.html b/themes/cetcat/templates/page.html index 68449375ef..e2cd35a8ed 100644 --- a/themes/cetcat/templates/page.html +++ b/themes/cetcat/templates/page.html @@ -1,6 +1,15 @@ {% extends "base.html" %} {% block title %}{{ page.title }}{%endblock%} {% block content %} +
+ +
{{ page.content }}