diff --git a/Makefile b/Makefile index 63577a5..32c8815 100644 --- a/Makefile +++ b/Makefile @@ -12,10 +12,10 @@ FTP_HOST=localhost FTP_USER=anonymous FTP_TARGET_DIR=/ -SSH_HOST=localhost -SSH_PORT=22 -SSH_USER=root -SSH_TARGET_DIR=/var/www +SSH_HOST=varia.zone +SSH_PORT=12345 +SSH_USER=r +SSH_TARGET_DIR=/var/www/wttf/ S3_BUCKET=my_s3_bucket diff --git a/content/federations.md b/content/federations.md index ae925dc..05eb6e0 100644 --- a/content/federations.md +++ b/content/federations.md @@ -3,7 +3,7 @@ Category: an introduction slug: welcome-to-the-federation tags: Wtt�F, software, design -Over the past few years[^1] there has been a renewed interest in 'alternative' on-line services such as social media and chat. These are services that promise to provide different experiences and models to the ones we are used to seemingly for free from corporations like Google, Facebook and Apple. +Over the past few years there has been a renewed interest in 'alternative' on-line services such as social media and chat[^1]. These are services that promise to provide different experiences and models to the ones we are used to seemingly for free from corporations like Google, Facebook and Apple. Some of these alternatives are that in name only. These alternatives promise to be something else from the start, but often end up being more of the same since they use similar or identical business models as the platform they pretend to be an alternative to. In essence a different brand serving the same product. @@ -21,14 +21,14 @@ The Wtt�F question is to explore how arts and design communities can play a su Wtt�F will host a series of two-day gatherings that invite developers of these software projects and people active in arts and design. After an evening of presentation and discussion on the first day, the second day will be dedicated to a hands-on worksession. -For these worksessions the invited developers will introduce outline a few issues in the context of language, design and ux that participantes are invited to address. Concrete *contributions* are explored as a way to introduce these critical software practices in a tangible way. +For these worksessions the invited developers will introduce and outline a few issues in the context of language, design and ux that participantes are invited to address. Concrete *contributions* are explored as a way to introduce these critical software practices in a tangible way. ## Coming gatherings -### June 1st 2018: ['The Ecosystem Is Moving'](/conversations-gultsch.html) +### June 1st 2018: ['The Ecosystem Is Moving'](conversations-gultsch.html) an evening on XMPP, federated chat and Conversations with Daniel Gultsch. -### June 2nd 2018: 'The Ecosystem Is Moving' worksession. +### June 2nd 2018: ['The Ecosystem Is Moving'](conversations-gultsch.html) - worksession. A hands-on dive into the affordances and challenges of Conversations as part of a larger free software ecosystem. diff --git a/content/images/fi.jpg b/content/images/fi.jpg new file mode 100644 index 0000000..d82fb5c Binary files /dev/null and b/content/images/fi.jpg differ diff --git a/content/images/fi_im.jpg b/content/images/fi_im.jpg new file mode 100644 index 0000000..8f790f1 Binary files /dev/null and b/content/images/fi_im.jpg differ diff --git a/content/meet_the_dev_1.md b/content/meet_the_dev_1.md index d1fc1e6..890f327 100644 --- a/content/meet_the_dev_1.md +++ b/content/meet_the_dev_1.md @@ -1,15 +1,15 @@ -Title: 'The Ecosystem is Moving' a gathering with Daniel Gultsch +Title: 'The Ecosystem is Moving' a gathering with Daniel Gultsch Category: a meeting with a developer slug: conversations-gultsch tags: instant messaging, conversations, xmpp +featured_image: images/fi_im.jpg - -On the 1st and 2nd of june [*varia*](https://varia.zone) will host 'The Ecosystem Is Moving', a lecture by and worksesion with Daniel Gultsch about federated instant messaging, open source software and the sustainability of open systems. +On the 1st and 2nd of June [*varia*](https://varia.zone) will host 'The Ecosystem Is Moving', a lecture by and worksession with Daniel Gultsch about federated instant messaging, open source software and the sustainability of open systems. * June 1st, 19.00 - 22.00 - introduction to XMPP and lecture by Daniel Gultsch * June 2nd, 10.00 - 18.00 - hands on worksession on design and federated chat systems. Please register for the worksession via `info * varia.zone` -Daniel Gultsch is the developer behind [Conversations](https://conversations.im), an open source instant messaging application for Android. In 2014 he decided to work full time on Conversations and try to make a living from it. Rather than starting from scratch with Conversations, he built it as a client for the existing federated messaging protocol XMPP. +Daniel Gultsch is the developer behind [Conversations](https://conversations.im), an open source instant messaging application for Android. In 2014, he decided to work full time on Conversations and try to make a living from it. Rather than starting from scratch with Conversations, he built it as a client for the existing federated messaging protocol XMPP. Since an XMPP messenger can, in a way, only be as good as the entire ecosystem, Daniels work on Conversations also meant work on expanding and improving that larger XMPP ecosystem. This work includes helping to draft and implement protocol standards, such as OMEMO, a modern and user-friendly end-to-end encryption based on Signal's protocol. He also contributed code to other XMPP servers and clients in the ecosystem to bring them up to speed with modern uses. Additionally, [through his critical essays](https://gultsch.de/xmpp_2016.html) he is a vocal defender of XMPP and open standards in general. diff --git a/content/pages/agenda.md b/content/pages/agenda.md index d23eeab..bef4a30 100644 --- a/content/pages/agenda.md +++ b/content/pages/agenda.md @@ -1,26 +1,20 @@ Title: agenda slug: agenda -*Coming gatherings* +##Upcoming events ------------- +### Friday, June 1st 2018 -⟿ Friday, June 1st 2018 - -**['The Ecosystem Is Moving'](/conversations-gultsch.html)** +**['The Ecosystem Is Moving'](conversations-gultsch.html)** An evening on XMPP, federated chat and Conversations with Daniel Gultsch. -Start: 20:00h - ------------- +Start: 19:00h -⟿ Saturday, June 2nd 2018 +### Saturday, June 2nd 2018 -**'The Ecosystem Is Moving' - worksession** +**['The Ecosystem Is Moving'](conversations-gultsch.html) - worksession** A hands-on dive into the affordances and challenges of Conversations as part of a larger free software ecosystem. Start: 10:00h, end: 18:00h - ------------- diff --git a/content/pages/colophon.md b/content/pages/colophon.md index 841a93d..7797968 100644 --- a/content/pages/colophon.md +++ b/content/pages/colophon.md @@ -1,7 +1,9 @@ Title: colophon slug: colophon -*Welcome to the � Federation* is a project by [Roel Roscam Abbing](http://roelof.info/), in collaboration with [Manetta Berends](http://manettaberends.nl). +[*Welcome to the � Federation*](/welcome-to-the-federation.html) is a project by [Roel Roscam Abbing](http://roelof.info/), in collaboration with [Manetta Berends](http://manettaberends.nl). -This project is made possible with the support of [Varia](https://varia.zone), [CBK Rotterdam](https://www.cbkrotterdam.nl/). + + +This project is made possible with the support of [Varia](https://varia.zone) and [CBK Rotterdam](https://www.cbkrotterdam.nl/). diff --git a/pelicanconf.py b/pelicanconf.py index 6b2806d..553fa29 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -4,8 +4,10 @@ from __future__ import unicode_literals AUTHOR = 'rra' SITENAME = 'Wtt�F' -SITEURL = '' -SUBTITLE=" a project about federated social media and open source design" +SITEURL = 'https://varia.zone/wttf/' +SUBTITLE="how arts and design can contribute to open source and federated social media" + +FEATURED_IMAGE = SITEURL + 'images/fi.jpg' PATH = 'content' THEME = 'theme/wttf' @@ -34,7 +36,7 @@ AUTHOR_FEED_RSS = None PLUGIN_PATHS = ["plugins"] PLUGINS = ['summary'] -DEFAULT_PAGINATION = 500 +DEFAULT_PAGINATION = 50 # Uncomment following line if you want document-relative URLs when developing -RELATIVE_URLS = True +#RELATIVE_URLS = True diff --git a/publishconf.py b/publishconf.py index 85ff8ef..f037520 100644 --- a/publishconf.py +++ b/publishconf.py @@ -10,7 +10,7 @@ import sys sys.path.append(os.curdir) from pelicanconf import * -SITEURL = '' +SITEURL = 'https://varia.zone/wttf/' RELATIVE_URLS = False FEED_ALL_ATOM = 'feeds/all.atom.xml' diff --git a/theme/wttf/static/main.css b/theme/wttf/static/main.css index dfe204b..e034c33 100644 --- a/theme/wttf/static/main.css +++ b/theme/wttf/static/main.css @@ -39,8 +39,8 @@ body{ margin:0px; font-size: 14px; font-family: "serif"; - /*background-color: #ccd1cab3;*/ - background: linear-gradient(to bottom right, #c2c2c2, #fff7f7, #e4e3e3); + background-color: #ccd1cab3; + /*background: linear-gradient(to bottom right, #c2c2c2, #fff7f7, #e4e3e3);*/ word-break: normal; } h1{ @@ -108,12 +108,15 @@ header{ line-height: 1.35; color:white; background-color: #fb4817; - background: linear-gradient(to bottom, #7e2502, #ff4800, #e2dede); + background: linear-gradient(to bottom, salmon, #ff7f4d, #ccd1cab3); } #menu.main{ position: relative; z-index: 10; } + #menu a{ + text-decoration: none; + } #menu.main .indent{ padding-left:60px; } @@ -168,19 +171,25 @@ header{ #content{ margin-bottom:5em; } - #agenda{ - width: calc(50% - 6em); + width: calc(50% - 6.5em); float: left; - padding: 2em; + padding: 1em 1.5em 2em 4em; margin:0 0 2em 0; background-color: #6ade4e; color:#3c0e02; border-radius: 15px; } - #agenda hr{ - margin:2em 0; - border-color:#3c0e02; + #agenda h2{ + margin-bottom:-1em; + } + #agenda h3{ + margin:2em 0 0.5em 0; + } + #agenda h3:before{ + content:'⟿'; + margin-left:-1.8em; + padding-right: 0.5em; } #agenda strong{ font-family: "headers"; diff --git a/theme/wttf/templates/article.html b/theme/wttf/templates/article.html index b5e582e..4e8b61e 100644 --- a/theme/wttf/templates/article.html +++ b/theme/wttf/templates/article.html @@ -8,14 +8,14 @@ {% block header %}

- Welcome to - the + Welcome to + the � - Federation + Federation

{% endblock %} @@ -32,7 +32,7 @@ {% for tag in article.tags %} - + {% endfor %} diff --git a/theme/wttf/templates/base.html b/theme/wttf/templates/base.html index fddd953..7abb13a 100644 --- a/theme/wttf/templates/base.html +++ b/theme/wttf/templates/base.html @@ -6,7 +6,9 @@ - + {% from 'syndication.html' import syndication with context %} + {{ syndication(article) }} + {% if FEED_ALL_ATOM %} {% endif %} @@ -40,29 +42,29 @@ {% block header %}

- Welcome -
to the + Welcome +
to the
-
Federation
+
Federation
{{ SUBTITLE }}

- Welcome to - the � + Welcome to + the � - Federation + Federation

{% endblock %} @@ -84,7 +86,7 @@ var t = getRandom(-5,95); var l = getRandom(-5,98); var s = getRandom(1,6); - $('header #menu.main').append(''); + $('header #menu.main').append(''); } diff --git a/theme/wttf/templates/index.html b/theme/wttf/templates/index.html index ce7646c..77dd1c8 100644 --- a/theme/wttf/templates/index.html +++ b/theme/wttf/templates/index.html @@ -73,7 +73,7 @@ {% for tag in article.tags %} - + {% endfor %} diff --git a/theme/wttf/templates/syndication.html b/theme/wttf/templates/syndication.html new file mode 100644 index 0000000..c7643b4 --- /dev/null +++ b/theme/wttf/templates/syndication.html @@ -0,0 +1,59 @@ +{#This template is for syndicating across the fucked up part of the web. It implements Open Graph and Twitter Card metadata to display links to HBSC well on social media +# This code is mostly taken from Talha Mansoor's Elegant pelican theme https://github.com/talha131/pelican-elegant +#} + +{# 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 = 'https://roelof.info/~r/wttf/images/fi.jpg' %} +{% else %} +{% set FEATURED_IMAGE = FEATURED_IMAGE %} +{% endif %} + + +{% macro syndication(article) %} +{% if article %} + + + + + +{% if article.date %} + +{% endif %} +{% if article.locale_modified and article.modified %} + +{% endif %} + + +{% if article.featured_image %} + + + + +{% else %} +{% if FEATURED_IMAGE %} + + + + {% endif %} +{% endif %} + +{% endif %} +{% if not article %} + + + + + + + + +{% if FEATURED_IMAGE %} + + +{% endif %} +{% endif %} +{% endmacro %}b + +