merging work of manetta and me of today

.gitignore

@@ -1,2 +1,4 @@
 *.pyc
 output/*
+*.pid
+.DS_Store

content/pages/about.md → content/pages/about-en.md

@@ -1,8 +1,7 @@
-Title: over ons
+Title: about
 Date: 2017-04-09
 Category: about
 Slug: about
 lang: en
 
-
 The Center of Everyday Technology is a Rotterdam based initiative that collects, conducts and instigates research and projects relating to the emerging developments in everyday technology. We aim to provide an environment where questions can be asked, opinions can be stated, projects can be developed and research can be conducted, both collectively and individually. Our goal is to become a hub for exchange and a source for resilience, within the city and beyond.

content/pages/over-ons.md → content/pages/about-nl.md

@@ -1,8 +1,7 @@
-Title: over ons
+Title: about-nl
 Date: 2017-04-09
 Category: about
 Slug: about
 lang: nl
 
-
 Het centrum voor alledaagse technologie is een Rotterdamse initiatief dat werkt aan, met en door technologie. Gezamenlijk en individueel initiëren en verzamelen wij onderzoek naar nieuwe tendensen, organiseren collectieve leermomenten en ontwikkelen nieuwe projecten. Ons doel is om een sociale infrastructuur te creëren waar ruimte is voor vragen, meningen, ingrepen, hulp en actie. Wij willen een plek voor uitwisseling zijn, een stem in debatten bieden en een bron van weerbaarheid vormen. 

content/pages/curriculum.md

@@ -5,5 +5,3 @@ Slug: curriculum
 lang: en
 
 Throughout the year we host a curriculum of a variety of workshops and masterclasses. These differ from introductory courses on technical subjects to advanced and in-depth workshops.
-
-

content/pages/header.md

@@ -0,0 +1,8 @@
+Title: header
+Date: 2017-04-09
+Category: about
+Slug: header
+lang: en
+
+CAT/CET, center of everyday technology is a Rotterdam based initiative working [with, about and through technology](/pages/projects.html). At its core CAT/CET is a [social infrastructure](/pages/about.html) from which to collectively relate to everyday technology. In the city it sees its role as a space for questions, opinions, modifications, help and action. In a wider network De Samenscholing wants to become a [hub for exchange](/pages/curriculum.html), a voice in debates and a resource for resilience. [Current events](/). [Become a member](/pages/membership.html).
+

content/pages/membership.md

@@ -0,0 +1,6 @@
+Title: membership
+Date: 2017-04-09
+Category: about
+Slug: membership
+
+Become a member of the center of everyday technology.

content/pages/projecten.md

@@ -1,17 +0,0 @@
-Title: projecten
-Date: 2017-04-09
-Category: about
-Tags: things, we, do or did
-Slug: projects
-lang:nl
-
-Projecten die we hebben geinitieerd:
-
-De Samenscholing
-----
-De Samenscholing is een MMMOOC, een 'massive multiplayer massive online open course'. Een collectieve benadering voor individualistische leeromgevingen. We beginnen gezamelijk aan een MOOC. De eerste bijeenkomst zal gaan om het uitkiezen van de MOOC die we gezamelijk willen volgen. Vervolgens komen we elke week bij een voor het volgende college. 
-
-Relearn
-----
-[Relearn](http://relearn.be/2017/) is een collectief leerexperiment met evenveel leraren als deelnemers. De collectieve studieweek zet omstandigheden van/voor leren centraal, en zoekt manieren om deze te bevragen. Relearn vindt sinds 2013 jaarlijks plaats en wordt georganiseerd door wisselende collectieven. ʬ faciliteerde de editie van 2017 in Rotterdam.
-

content/pages/projects.md

@@ -3,7 +3,6 @@ Date: 2017-04-09
 Category: about
 Tags: things, we, do or did
 Slug: projects
-lang:en
 
 Projecten we initiated:
 

pelicanconf.py

@@ -48,19 +48,19 @@ EXTRA_PATH_METADATA = {
 
 MENUITEMS=(
         # adds extra menu items, the others are automatically generated as pages
-            ('news', '/'),
-            )
+            ('log', '/'),
+        )
 
 THEME = 'themes/cetcat'
 
-ARTICLE_LANG_URL = '{slug}-{lang}.html'
+# ARTICLE_LANG_URL = '{slug}-{lang}.html'
 
-I18N_SUBSITES = {
-    'en': {
-        'SITENAME': u'ʬ', 'SITESUBTITLE':u'Centre for Everyday Technology', 'locale':'en_US.UTF-8'
-        },
-    'nl': {
-    	'SITENAME': u'ʬ', 'SITESUBTITLE':u'Centrum voor Alledaagse Technologie',
-    }
-    }
+# I18N_SUBSITES = {
+#     'en': {
+#         'SITENAME': u'ʬ', 'SITESUBTITLE':u'Centre for Everyday Technology', 'locale':'en_US.UTF-8'
+#         },
+#     'nl': {
+#     	'SITENAME': u'ʬ', 'SITESUBTITLE':u'Centrum voor Alledaagse Technologie',
+#     }
+#     }
 

themes/cetcat/static/css/main.css

@@ -10,112 +10,96 @@ http://majesticmoo.se
 */
 
 @font-face {
-    font-family: 'NowBlack';
-    src: url('../fonts/Now-Black.otf') format('opentype');
-    font-weight: normal;
-    font-style: normal;
-      }
+	font-family: 'NowBlack';
+	src: url('../fonts/Now-Black.otf') format('opentype');
+	font-weight: normal;
+	font-style: normal;
+	  }
 
 @font-face {
-    font-family: 'NowBold';
-    src: url('../fonts/Now-Bold.otf') format('opentype');
-    font-weight: bold;
-    font-style: normal;
-      }
+	font-family: 'NowBold';
+	src: url('../fonts/Now-Bold.otf') format('opentype');
+	font-weight: bold;
+	font-style: normal;
+	  }
 
 @font-face {
-    font-family: 'NowLight';
-    src: url('../fonts/Now-Light.otf') format('opentype');
-    font-weight: normal;
-    font-style: normal;
-      }
+	font-family: 'NowLight';
+	src: url('../fonts/Now-Light.otf') format('opentype');
+	font-weight: normal;
+	font-style: normal;
+	  }
 
 @font-face {
-    font-family: 'NowMedium';
-    src: url('../fonts/Now-Medium.otf') format('opentype');
-    font-weight: normal;
-    font-style: normal;
-      }
+	font-family: 'NowMedium';
+	src: url('../fonts/Now-Medium.otf') format('opentype');
+	font-weight: normal;
+	font-style: normal;
+	  }
 
 @font-face {
-    font-family: 'NowRegular';
-    src: url('../fonts/Now-Regular.otf') format('opentype');
-    font-weight: normal;
-    font-style: normal;
-      }
+	font-family: 'NowRegular';
+	src: url('../fonts/Now-Regular.otf') format('opentype');
+	font-weight: normal;
+	font-style: normal;
+	  }
 
 @font-face {
-    font-family: 'NowThin';
-    src: url('../fonts/Now-Thin.otf') format('opentype');
-    font-weight: normal;
-    font-style: normal;
-      }
-
-header {
-	width:100%;
-    margin-top:3em;
-    margin-bottom:1em;
-    line-height: 1.5em;
-    border-bottom: 1px solid;
-    padding-bottom:1em;
-    /*transform:rotate(3deg);*/
+	font-family: 'NowThin';
+	src: url('../fonts/Now-Thin.otf') format('opentype');
+	font-weight: normal;
+	font-style: normal;
+	  }
+@font-face{
+	font-family: "liberation";
+	src:url('../fonts/LiberationMono.ttf');
 }
 
-#title {
-	margin-top:0.5em;
-    font-size: 120px;
-    width:50%;
+body {
+	position: relative;
+	width: calc(100% - 50px);
+	top:0px;
+	left:0px;
+	margin: 0 auto;
+	padding: 0;
+	font-family: monospace, "liberation";
+	font-size: 16px;
+	line-height:1.8;
+	font-style: normal; 
+	background-color: rgb(252, 255, 120);
+	color:black;
 }
-#subtitle{
-    font-size: 16px;
+
+a {
+	color:#7e5211;
+	/*font-weight: bold;*/
 }
 
 hr {
-    border:0;
-    color: black;
-    border-bottom:1px solid;
-    margin-top:1em;
-}
-pre {
-}
-#menu{
-    position: absolute;
-    top:25px;
-    right:25px;
-	font-size:20px;
-	font-weight:bold;
-    float: right;
+	border:0;
+	color: black;
+	border-bottom:1px solid;
+	margin-top:1em;
+	margin-bottom:1em;
 }
 
-body {
-    font-size: 16px;
-    line-height:1.8;
-    background-color: rgb(239, 225, 79);
-	/*background-color: rgba(100,100,250,1);*/
-    margin: 0 auto;
-    width: calc(100% - 50px);
-    color:black;
-    /*color:white;*/
-    font-family: monospace;
-    font-style: normal; 
+blockquote {
+	font-style:italic;
 }
 
-a {
-    color:#7e5211;
-    font-weight: bold;
+ul {
+	padding-left:0px;
 }
+
 h1, h2, h3, h4, h5, h6, #header{
-    font-family: sans-serif, "NowRegular";
-    margin:1em 0 0 0;
-    padding:0;
+	font-family: "liberation", monospace;
+	margin:0 0 0 0;
+	padding:0;
 }
 
 .paginator{
-    float:right;
-    margin:0px;
-}
-
-#index{
+	float:right;
+	margin:0px;
 }
 
 #post-list {
@@ -123,62 +107,70 @@ h1, h2, h3, h4, h5, h6, #header{
 	margin-top:0px;
 }
 
-ul {
-	padding-left:0px;
-}
+/* --- */
 
-#translation{
-    float: left;
+header {
+	width:100%;
+	margin-top:1em;
+	line-height: 1.5em;
+	padding-bottom:1em;
+}
+	#title{
+		font-family: "liberation", monospace;
+		font-size: 22px;
+		line-height: 1.5;
+	}
+#content{
+	margin-top:1em;
 }
 
+/* index */
+#content #post-list{
+	width: 100%;
+}
 .hentry{
-    float: left;
-    width: 200px;
-    display: inline-block;
-    margin-right:2em;
-    font-size: 12px;
+	float: left;
+	display: inline-block;
+	width: 200px;
+	font-size: 12px;
+	margin:0 2em 2em 0;
+	vertical-align: top;
 }
 
+/* article */
 .article-info{
-    /*clear: right;*/
-    /*display: inline;*/
-    /*float: left;*/
-    /*margin-bottom: 0em;*/
-    /*max-width: 150px;*/
-    /*padding-right: 1em;*/
-    /*transform: rotate(-3deg);*/
-}
-
-
-/* log */
-.entry-title span{
-    width:100%;
-    display:inline-block;
-}
+	margin-bottom:1em;
+}
+	.post-info time sup{
+		font-size: 100%;
+	}
+	#translation{
+		float: left;
+	}
+	.entry-title{
+		width:100%;
+		display:inline-block;
+		font-family: "liberation", monospace;
+		font-size: 120%;
+		line-height: 1.3;
+	}
 .entry-content{
-	/*display: inline;*/
-	/*float: right;*/
-    /*margin-top:-6em;*/
-    /*margin-bottom: 2.5em;*/
-    /*min-width: 400px;*/
-    /*max-width: 800px;*/
-    /*transform:rotate(-3deg);*/
-	/*padding:0 15%;*/
-    /*border-bottom: 1px solid;*/
+	max-width: 800px;
+	margin:0 0 5em 0;
+
 }
 .entry-content p, .entry-content h1, .entry-content h2, .entry-content h3{
-    /*transform:rotate(3deg);   */
-}
 
+}
 .entry-content pre{
-    font-size:20px;
-    padding-left:1em;
-    overflow: auto;
-    background-color: #F8F8F8;
-    line-height:1.2em;
+	font-size:20px;
+	padding-left:1em;
+	overflow: auto;
+	background-color: #F8F8F8;
+	line-height:1.2em;
 }
 .entry-content img{
-    max-width:100%;
+	max-width:100%;
 }
 .entry-content ul {
 	font-size:20px;
@@ -186,8 +178,16 @@ ul {
 	margin: auto;
 	max-width:800px;
 }
+
+
+
+
+
+
+
+
 .separator hr{
-    display: none;
+	display: none;
 }
 
 .highlight{
@@ -196,22 +196,13 @@ ul {
 }
 
 #page-content{
-    clear: both;
-    float: left;
-    margin-top:-0.5em;
-    /*max-width: 800px;*/
+	clear: both;
+	float: left;
+	margin-top:-0.5em;
+	/*max-width: 800px;*/
 }
 #page-content img{
-    max-width:100%;
-}
-
-blockquote {
-	font-style:italic;
-}
-
-#content{
-   margin:auto;
-   width:100%;
+	max-width:100%;
 }
 
 .divider {
@@ -222,17 +213,17 @@ blockquote {
 }
 /*
 .published{
-    font-size:smaller;
+	font-size:smaller;
 }
 .article_tags{
-    font-size:smaller;
+	font-size:smaller;
 }
 */
 
 #categories {
-    font-size: 40px;
-    margin-top: 2em;
-    text-align: center;
+	font-size: 40px;
+	margin-top: 2em;
+	text-align: center;
 }
 #pertaining{
 	margin-top:2em;
@@ -246,7 +237,7 @@ blockquote {
 }
 
 .author{
-    display: none;
+	display: none;
 	font-size:smaller;
 }
 

themes/cetcat/templates/article.html

@@ -22,8 +22,8 @@
 			<div class="entry-title">
 				<a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
 			</div>
-			{% import 'translations.html' as translations with context %}
-			{{ translations.translations_for(article) }}
+			<!-- {% import 'translations.html' as translations with context %} -->
+			<!-- {{ translations.translations_for(article) }} -->
 			<div class="post-info">
 				<time class="published" datetime="{{ article.date.isoformat() }}">
 					{{ article.locale_date }}

themes/cetcat/templates/base.html

@@ -42,26 +42,35 @@
 
 <body id="index" class="home">
         <header id="banner">
-                <span id="title">{{ SITENAME }}</span>
-                </br>
-                <span id="subtitle">{{ SITESUBTITLE }}</span>
-        <!-- /#banner -->
-        <nav id="menu">
-        {% for title, link in MENUITEMS %}
-            <a class="menu-item" href="{{ link }}">{{ title }}</a>
-        {% endfor %}
-        {% if DISPLAY_PAGES_ON_MENU %}
-          {% for p in pages %}
-            <span {% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></span>
-          {% endfor %}
-        {% else %}
-          {% if DISPLAY_CATEGORIES_ON_MENU %}
-            {% for cat, null in categories %}
-              <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
+            {% for p in pages %}
+                {% if p.title == 'header' %}
+                    <div id="title">{{ p.content }}</div>
+                {% endif %}
             {% endfor %}
-          {% endif %}
-        {% endif %}
-    </ul></nav></header><!-- /#menu -->
+
+                <!-- <span id="title">{{ SITENAME }}</span>
+                </br>
+                <span id="subtitle">{{ SITESUBTITLE }}</span> -->
+
+        <!-- <nav id="menu"> -->
+        <!-- {% for title, link in MENUITEMS %} -->
+            <!-- <a class="menu-item" href="{{ link }}">{{ title }}</a> -->
+        <!-- {% endfor %} -->
+        <!-- {% if DISPLAY_PAGES_ON_MENU %} -->
+          <!-- {% for p in pages %} -->
+            <!-- <span {% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></span> -->
+          <!-- {% endfor %} -->
+        <!-- {% else %} -->
+          <!-- {% if DISPLAY_CATEGORIES_ON_MENU %} -->
+            <!-- {% for cat, null in categories %} -->
+              <!-- <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li> -->
+            <!-- {% endfor %} -->
+          <!-- {% endif %} -->
+        <!-- {% endif %} -->
+    <!-- </ul> -->
+    <!-- </nav> -->
+    </header>
+
         {% block content %}
         {% endblock %}
     

themes/cetcat/templates/page.html

@@ -1,8 +1,8 @@
 {% extends "base.html" %}
 {% block title %}{{ page.title }}{%endblock%}
 {% block content %}
-    {% import 'translations.html' as translations with context %}
-    {{ translations.translations_for(page) }}
+    <!-- {% import 'translations.html' as translations with context %} -->
+    <!-- {{ translations.translations_for(page) }} -->
 
    <div id ="page-content">
 	 {{ page.content }}