Merge branch 'master' of https://git.vvvvvvaria.org/varia/varia.website

7 years ago · 464cd329e9
32 changed files with 67 additions and 36 deletions
--- a/pelicanconf.py
+++ b/pelicanconf.py
@ -40,18 +40,18 @@ EXTRA_PATH_METADATA = {
 	'extra/htaccess': {'path': '.htaccess'}
 }

-THEME = 'themes/cetcat'
+THEME = 'themes/varia'
 THEME_STATIC_DIR = 'theme/'

 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'
 	}
 }	
--- 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
--- 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;
--- a/themes/cetcat/static/css/pygment.css
+++ b/themes/cetcat/static/css/pygment.css
--- a/themes/cetcat/static/fonts/LiberationMono.ttf
+++ b/themes/cetcat/static/fonts/LiberationMono.ttf
--- a/themes/cetcat/static/fonts/cmunit.ttf
+++ b/themes/cetcat/static/fonts/cmunit.ttf
--- a/themes/cetcat/static/fonts/cmunobx.ttf
+++ b/themes/cetcat/static/fonts/cmunobx.ttf
--- a/themes/cetcat/static/fonts/cmunorm.ttf
+++ b/themes/cetcat/static/fonts/cmunorm.ttf
--- a/themes/cetcat/static/fonts/cmunssdc.ttf
+++ b/themes/cetcat/static/fonts/cmunssdc.ttf
--- a/themes/cetcat/static/fonts/cmuntb.ttf
+++ b/themes/cetcat/static/fonts/cmuntb.ttf
--- a/themes/cetcat/static/fonts/cmuntt.ttf
+++ b/themes/cetcat/static/fonts/cmuntt.ttf
--- a/themes/cetcat/static/fonts/cmuntx.ttf
+++ b/themes/cetcat/static/fonts/cmuntx.ttf
--- a/themes/cetcat/static/fonts/cmunvi.ttf
+++ b/themes/cetcat/static/fonts/cmunvi.ttf
--- a/themes/cetcat/static/fonts/cmunvt.ttf
+++ b/themes/cetcat/static/fonts/cmunvt.ttf
--- a/themes/cetcat/static/js/stars.js
+++ b/themes/cetcat/static/js/stars.js
--- a/themes/cetcat/templates/archives.html
+++ b/themes/cetcat/templates/archives.html
--- a/themes/cetcat/templates/article.html
+++ b/themes/cetcat/templates/article.html
--- a/themes/cetcat/templates/author.html
+++ b/themes/cetcat/templates/author.html
--- a/themes/cetcat/templates/authors.html
+++ b/themes/cetcat/templates/authors.html
--- a/themes/cetcat/templates/base.html
+++ b/themes/cetcat/templates/base.html
@ -1,18 +1,16 @@
 <!DOCTYPE html>
 <html lang="{{ DEFAULT_LANG }}">
 <head>
-        {% block head %}
-        <title>{% block title %}{{ SITENAME }} {{SITESUBTITLE}}{% endblock title %}</title>
-        <meta charset="utf-8" />
+{% block head %}
+    <title>{% block title %}{{ SITENAME }} {{SITESUBTITLE}}{% endblock title %}</title>
+    <meta charset="utf-8" />
    <link rel="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 %}
    {{ 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/{{ CSS_FILE }}" />
-        {% endblock head %}
+    <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 }}" />
+{% endblock head %}
 </head>

 <body id="index" class="home">
--- a/themes/cetcat/templates/categories.html
+++ b/themes/cetcat/templates/categories.html
--- a/themes/cetcat/templates/category.html
+++ b/themes/cetcat/templates/category.html
--- a/themes/cetcat/templates/events_list.html
+++ b/themes/cetcat/templates/events_list.html
--- a/themes/cetcat/templates/gosquared.html
+++ b/themes/cetcat/templates/gosquared.html
--- a/themes/cetcat/templates/index.html
+++ b/themes/cetcat/templates/index.html
@ -19,24 +19,26 @@
 	<article class="hentry {{article.category}}">
 	{% 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>
-			<div class="event-details">
-				{% if article.event_start %}
+			<div class="entry-title">
+				<a href="{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
+			</div>
+			<div class="featured-image {{past}}">
+				{% if article.featured_image %}
+					<a href="{{ article.url }}"><img src="{{ article.featured_image }}"></a>
+				{% endif %}
+			</div>
+			{% if article.event_start %}
+				<div class="event-details">
 					{{ article.event_start }}
 					{% set past = '' %}
 					{% if article.event_start < article.date.now() %}
 						{% set past = ' past-event' %}
 					{% endif %}

-				{% endif %}
-			</div>
-			<div class="featured-image {{past}}">
-				{% if article.featured_image %}
-					<img src="{{ article.featured_image }}">
-				{% endif %}
-			</div>
+				</div>
+			{% endif %}
 		</div>
-		<div class="summary">{{ article.summary }}
+		<div class="summary {{ article.category }}">{{ article.summary }}
 			<span>
 				<a href="{{ article.url }}">
 					{% if DEFAULT_LANG == 'en' %}
@ -47,6 +49,17 @@
 				</a>
 			</span>
 		</div>
+		<!-- <div class="summary {{ article.category }}">{{ article.summary }}
+			<span>
+				<a href="{{ article.url }}">
+					{% if DEFAULT_LANG == 'en' %}
+						read more
+					{% elif DEFAULT_LANG == 'nl' %}
+						lees meer
+					{% endif %}
+				</a>
+			</span>
+		</div> -->
 		<div class="separator"><hr></div>
 		<div class="post-info">
 			{% if article.category %}
--- 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 %}
+<section id="content" class="index">
+	<header id="banner">
+	{% for p in pages %}
+	    {% if p.title == 'header' %}
+	        <div id="title">{{ p.content }}</div>
+	    {% endif %}
+	{% endfor %}
+	</header>
+</section>
    <div id="page-content">
 	{{ page.content }}

--- a/themes/cetcat/templates/pagination.html
+++ b/themes/cetcat/templates/pagination.html
--- a/themes/cetcat/templates/period_archives.html
+++ b/themes/cetcat/templates/period_archives.html
--- 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 %}
@ -28,9 +28,16 @@ serves as the default image for posts whose featured_image is not set. #}
 <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}}">
 {% if article.featured_image %}
-<meta property="og:image" content="{{SITEURL}}{{article.featured_image}}" />
-<meta property="og:image:secure_url" content="{{SITEURL}}{{article.featured_image}}" />
-<meta name="twitter:image" content="{{SITEURL}}{{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}}" >           
+        {% endif %}
+    {% endfor %}
+{% endif %}
 {% else %}
    {% if FEATURED_IMAGE %}
 <meta property="og:image" content="{{FEATURED_IMAGE}}" />
--- a/themes/cetcat/templates/tag.html
+++ b/themes/cetcat/templates/tag.html
--- a/themes/cetcat/templates/tags.html
+++ b/themes/cetcat/templates/tags.html
--- a/themes/cetcat/templates/translations.html
+++ b/themes/cetcat/templates/translations.html