fix2

fix
Uticaj tehnologije na prirodu
2024-06-27 19:14:25 +02:00 · 2024-06-27 19:13:47 +02:00 · 2024-06-27 19:04:55 +02:00 · 2024-06-27 19:01:35 +02:00 · 2024-06-27 18:59:11 +02:00 · 2024-06-27 18:33:05 +02:00
49 changed files with 1338 additions and 367 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,8 +1,14 @@
 venv/
 site/*.html
+site/en/*.html
 site/atom_blog.xml
 site/atom_events.xml
 poster.html
 poster.pdf
+poster_light.png
+poster_dark.png
+poster.txt
 http.access.log
 http.error.log
+events.ical
+.vscode/
--- a/README.md
+++ b/README.md
@ -31,9 +31,12 @@ nginx -p . -s stop
 ## TODO:

 - [x] create page builder
+  - rename `prep.py` to more informative name (`build_events.py`)
 - [ ] create blogging system
 - [ ] create xmpp bot that connects to events section.
 - [ ] webring system
  - [x] make page
  - [ ] populate page
- [ ] make english version (localisation)
+- [x] make english version
+  - double check spelling and wording
+- add account and donations page and style them with the site style
--- a/atom_gen.py
+++ b/atom_gen.py
@ -1,4 +1,4 @@
-#! /usr/bin/python3
+#! /usr/bin/env python3

 # needs lowdown and feegden installed
 # feedgen can be installed with pip
@ -11,20 +11,20 @@ import os

 blogs_dir = os.fsencode("blog")

-def blogposts_list_gen():
-    output_list = []
-    for file in os.listdir(blogs_dir):
-        filename = os.fsdecode(file)
-        if filename.endswith(".md"):
-            full_path = "blog/" + filename
-
-            author = subprocess.run("lowdown -X author " + full_path, capture_output=True, shell=True, text=True).stdout.strip()
-            title = subprocess.run("lowdown -X title " + full_path, capture_output=True, shell=True, text=True).stdout.strip()
-            time = subprocess.run("lowdown -X time " + full_path, capture_output=True, shell=True, text=True).stdout.strip()
-            content_html = subprocess.run("lowdown " + full_path, capture_output=True, shell=True, text=True).stdout.strip()
-
-            output_list.append([author, title, time, content_html, full_path])
-    return output_list
+#def blogposts_list_gen():
+#    output_list = []
+#    for file in os.listdir(blogs_dir):
+#        filename = os.fsdecode(file)
+#        if filename.endswith(".md"):
+#            full_path = "blog/" + filename
+#
+#            author = subprocess.run("lowdown -X author " + full_path, capture_output=True, shell=True, text=True).stdout.strip()
+#            title = subprocess.run("lowdown -X title " + full_path, capture_output=True, shell=True, text=True).stdout.strip()
+#            time = subprocess.run("lowdown -X time " + full_path, capture_output=True, shell=True, text=True).stdout.strip()
+#            content_html = subprocess.run("lowdown " + full_path, capture_output=True, shell=True, text=True).stdout.strip()
+#
+#            output_list.append([author, title, time, content_html, full_path])
+#    return output_list

 def events_list_gen():
    output_list = []
@ -69,5 +69,3 @@ def feedgen(blogs, events):

    fg_blog.atom_file('site/atom_blog.xml')
    fg_events.atom_file('site/atom_events.xml')
-
-feedgen(blogposts_list_gen(), events_list_gen())
--- a/blog.py
+++ b/blog.py
@ -1,3 +1,4 @@
+#! /usr/bin/env python3
 # just testing markdown library for now

 from markdown import markdown as to_markdown
--- a/build_pages.py
+++ b/build_pages.py
@ -1,18 +1,23 @@
+#! /usr/bin/env python3
 import os

 PAGES = [
    {'name': 'index', 'titleSR': 'Početna', 'titleEN': 'Home', 'style': 'home'},
    {'name': 'account', 'titleSR': 'Nalog', 'titleEN': 'Account', 'style': 'account'},
-    {'name': 'contact', 'titleSR': 'Kontakt', 'titleEN': 'Contact', 'style': 'contact'},
+    {'name': 'about', 'titleSR': 'O nama', 'titleEN': 'About us', 'style': 'about'},
+    {'name': 'statute', 'titleSR': 'Statut', 'titleEN': 'Statute', 'style': 'statute'},
    {'name': 'events', 'titleSR': 'Događaji', 'titleEN': 'Events', 'style': 'events'},
+    {'name': 'events_archive', 'titleSR': 'Arhiva događaja', 'titleEN': 'Events archive', 'style': 'events'},
    {'name': 'services', 'titleSR': 'Servisi', 'titleEN': 'Services', 'style': 'services'},
    {'name': 'webring', 'titleSR': 'Webring', 'titleEN': 'Webring', 'style': ''},
+    {'name': 'donations', 'titleSR': 'Donacije', 'titleEN': 'Donations', 'style': 'home'},
 ]

-def buildPage(pageTitle: str, pageHtml: str, pageStyle: str, template: str) -> str:
+def buildPage(filename: str, pageTitle: str, pageHtml: str, pageStyle: str, template: str) -> str:
    template = template.replace('<!--TITLE-->', pageTitle)
    style =  '' if not pageStyle else f'<link rel=\"stylesheet\" href=\"/styles/{pageStyle}.css\">'
    template = template.replace('<!--ADDITIONAL_STYLE-->', style)
+    template = template.replace('PAGE_NAME', filename)
    template = template.replace('<!--MAIN-->', pageHtml)
    return template

@ -24,10 +29,16 @@ def main():
        for page in PAGES:
            with open(f'pages/sr/{page["name"]}.html') as f:
                pageHtml = f.read()
-                html = buildPage(page['titleSR'], pageHtml, page['style'], templateSR)
+                html = buildPage(page['name'], page['titleSR'], pageHtml, page['style'], templateSR)
                f = open(f'site/{page["name"]}.html', 'w')
                f.write(html)
                f.close()
+            with open(f'pages/en/{page["name"]}.html') as f:
+                pageHtml = f.read()
+                html = buildPage(page['name'], page['titleEN'], pageHtml, page['style'], templateEN)
+                f = open(f'site/en/{page["name"]}.html', 'w')
+                f.write(html)
+                f.close()

 if __name__ == '__main__':
-    main()
+    main()
--- a/dogadjaji.csv
+++ b/dogadjaji.csv
@ -1,20 +1,167 @@
-datum, vreme, lokacija, tema
-03-05-2023, 12:00, Cvijeta Zuzoric https://www.openstreetmap.org/node/256367543, Otvaranje izlozbe (Q&A)
-03-05-2023, 18:00, KC Grad https://www.openstreetmap.org/node/4118716889, Linux install fest
-04-05-2023, 17:00, Cvijeta Zuzoric https://www.openstreetmap.org/node/256367543, ULUS izlozba (Q&A)
-04-05-2023, 18:00, Polyhedra https://www.openstreetmap.org/node/4856556781, Uvod u racunarske mreze
-04-05-2023, 21:00, n/a, Online sastanak sa Zajednicom za slobodnu tehnologiju iz Kikinde
-05-05-2023, 15:30, Cvijeta Zuzoric https://www.openstreetmap.org/node/256367543, ULUS izlozba (Q&A)
-06-05-2023, 12:00, Cvijeta Zuzoric https://www.openstreetmap.org/node/256367543, ULUS izlozba (Q&A)
-07-05-2023, 16:00, Cvijeta Zuzoric https://www.openstreetmap.org/node/256367543, ULUS izlozba (diskusija)
-08-05-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Linux install day
-09-05-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cryptoparty - Uvod u privatnost
-11-05-2023, 18:00, Polyhedra https://www.openstreetmap.org/node/4856556781, Uvod u racunarske mreze
-01-08-2023, 19:00, DC Krov, Tehno veče
-07-08-2023, 19:00, DC Krov, Linux ricing
-08-08-2023, 19:00, DC Krov, Lambda račun
-14-08-2023, 19:00, DC Krov, Linux distro diskusija
-15-08-2023, 19:00, DC Krov, Pirati 777 mora
-21-08-2023, 19:00, DC Krov, Python vežbe
-22-08-2023, 19:00, DC Krov, Autentifikacija na internetu
-28-08-2023, 19:00, DC Krov, Kviz
+datum, vreme, lokacija, tema, tip,
+20-12-2022, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u računarske mreže, ,
+03-01-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon žurka, hack,
+16-01-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Privatnost na internetu, workshop,
+04-01-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon žurka, hack,
+13-02-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u Bitcoin, workshop,
+14-02-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Privacy & Security, lecture,
+20-02-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cyber reconnisance, workshop,
+21-02-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u konfiguraciju servera (pomereno), workshop,
+27-02-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Šta je Decentrala + hackathon, hack,
+03-03-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u python, lecture,
+10-03-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u python, lecture,
+13-03-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, TLS (SSL) kriptografija, lecture,
+14-03-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Matrix chat protokol, lecture,
+20-03-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, LDAP protokol, workshop,
+21-03-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Android reverse engineering, ,
+25-03-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Open hackerspace day, movie,
+27-03-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, SQL baze podataka, ,
+28-03-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Esolang, ,
+03-04-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Pentest, workshop,
+04-04-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Runtime modification of Android apps, ,
+10-04-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
+11-04-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u OpenBSD, ,
+17-04-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lan party, ,
+18-04-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Pentest radionica nastavak, ,
+23-04-2023, 19:00, Polyhedra https://www.openstreetmap.org/node/4856556781, Uvod u mreže, ,
+03-05-2023, 12:00, Cvijeta Zuzorić https://www.openstreetmap.org/node/256367543, Otvaranje izložbe (Q&A), ,
+03-05-2023, 18:00, KC Grad https://www.openstreetmap.org/node/4118716889, Linux install fest, workshop,
+04-05-2023, 17:00, Cvijeta Zuzorić https://www.openstreetmap.org/node/256367543, ULUS izložba, discussion,
+04-05-2023, 18:00, Polyhedra https://www.openstreetmap.org/node/4856556781, Uvod u računarske mreže,
+04-05-2023, 21:00, n/a, Online sastanak sa Zajednicom za slobodnu tehnologiju iz Kikinde, meeting,
+05-05-2023, 15:30, Cvijeta Zuzorić https://www.openstreetmap.org/node/256367543, ULUS izložba, discussion workshop,
+06-05-2023, 12:00, Cvijeta Zuzorić https://www.openstreetmap.org/node/256367543, ULUS izložba, discussion workshop,
+07-05-2023, 16:00, Cvijeta Zuzorić https://www.openstreetmap.org/node/256367543, ULUS izložba, discussion workshop,
+08-05-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Linux install day, workshop,
+09-05-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cryptoparty - Uvod u privatnost, ,
+11-05-2023, 18:00, Polyhedra https://www.openstreetmap.org/node/4856556781, Uvod u računarske mreže, lecture,
+05-06-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Šifre, ,
+06-06-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Random i kriptografija, ,
+12-06-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u Blender, lecture,
+13-06-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cybersecurity odbrana, ,
+19-06-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Pisanje BASH skripti, ,
+20-06-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cybersecurity odbrana, ,
+26-06-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Python vežbe, workshop,
+27-06-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cybersecurity odbrana, ,
+03-07-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, DNS, lecture,
+04-07-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cybersecurity odbrana, ,
+10-07-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Blender, lecture,
+11-07-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cybersecurity odbrana, ,
+17-07-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, OpenGL, workshop,
+18-07-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cybersecurity odbrana, ,
+24-07-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Web scraping, ,
+25-07-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cybersecurity odbrana, ,
+31-07-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Python - Web development, ,
+01-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lighting talks, lighting,
+07-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Linux ricing, discussion,
+08-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lambda račun, lecture,
+14-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Linux distro, discussion,
+15-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Pirati 777 mora, lecture,
+21-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Python, workshop,
+22-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Autentifikacija na internetu, ,
+28-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Podešavanje Mail servera, ,
+29-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Prevođenje wiki-a, lecture workshop,
+04-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
+05-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cybersecurity - phishing, ,
+11-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Radionica kreativnog pisanja, workshop,
+12-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lighting talks, lighting,
+18-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cybersecurity - kako početi?, ,
+19-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Stop reklamama, discussion,
+25-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Email server E02, lecture,
+26-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lambda račun E02, lecture,
+02-10-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Šamirov algoritam za deljenje tajni, lecture,
+03-10-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
+09-10-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lighting talks, lighting,
+14-10-2023, 12:00, Matematički Fakultet (učionica 821) https://www.openstreetmap.org/node/4705189523, Linux install day, workshop,
+16-10-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Audio radionica, lecture,
+17-10-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Libreboot, lecture workshop,
+23-10-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Tor, lecture,
+24-10-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Proslava rođendana Decentrale, ,
+30-10-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Rešavanje Rubikove kocke, lecture workshop,
+31-10-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Vim, lecture,
+06-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
+07-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cybersecurity card game, ,
+13-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
+14-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku EP01, lecture workshop,
+20-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Git, lecture,
+21-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku EP02, lecture workshop,
+27-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Kviz veče,
+28-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku EP03, lecture workshop,
+04-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lighting talks, lighting,
+05-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Idejno-politička diskusija, discussion,
+10-12-2023, 16:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
+11-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home made portable IDS, ,
+12-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku E04, lecture workshop,
+18-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, lecture workshop,
+19-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, NetHack video igra, ,
+25-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Degoogled phone, ,
+26-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku E05, lecture workshop,
+08-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Druženje, ,
+09-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Decentrala sysadmin (obuka), ,
+15-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon (Task manager), hack,
+16-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lighting talks, lighting,
+22-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Nadzorni Kapitalizam, lecture discussion,
+23-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, The Art of Code, movie,
+29-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, "Samizdat - izrada zinova,knjiga,slikovnica", ,
+30-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Intro to 3D printing, lecture,
+05-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
+06-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
+12-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Kompajleri i trojanci, lecture,
+13-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, AI diskusija, discussion,
+19-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Godot game engine, lecture,
+20-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Svet van Linuxa, lecture,
+26-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Veče Video igara (Krovđendan), ,
+27-02-2024, 21:00, DC Krov https://www.openstreetmap.org/node/10594728522, Šifrožur (Krovđendan), ,
+04-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
+05-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
+09-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin Decentrala obuka, ,
+11-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop,
+12-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home made SOC build, ,
+18-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Regex, lecture,
+19-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u PCB, ,
+25-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop,
+26-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, (La)TeX, lecture,
+01-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, La Jetée, movie,
+01-04-2024, 20:00, DC Krov https://www.openstreetmap.org/node/10594728522, Decentrala sastanak (ideološki), meeting,
+02-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
+02-04-2024, 21:00, DC Krov https://www.openstreetmap.org/node/10594728522, Decentrala sastanak (strateški), meeting,
+08-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Teorija čvorova, lecture,
+09-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop,
+15-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton / Radna akcija, hack,
+16-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, HomeMade SoC #2, lecture,
+22-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Stencil - šabloni za grafite, workshop,
+23-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop,
+24-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (Proxmox VMs i ssh), workshop,
+29-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Chat aplikacije, discussion,
+30-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Mesečna revizija Decentrale, meeting,
+30-04-2024, 20:00, DC Krov https://www.openstreetmap.org/node/10594728522, Radna grupa Konferencija, meeting,
+06-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (proxmox instalacija), workshop,
+07-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Free software vs open source, lecture,
+13-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Alphaville (1965), movie,
+14-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
+20-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (ssl cronjob scp), lecture,
+21-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton (radna akcija), hack,
+27-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home-made SoC #3, lecture,
+28-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Mesečna revizija, meeting,
+02-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (ejabberd/xmpp server), workshop,
+03-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Pi (1998), movie,
+04-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardverski hakaton, hack,
+09-06-2024, 14:00, DC Krov https://www.openstreetmap.org/node/10594728522, Game Jam, hack,
+10-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Obrada prirodnih jezika kroz Python, lecture,
+11-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Ideološka diskusija, discussion,
+17-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Diskusija o P2P mrežama, discussion,
+18-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Softverski hakaton, hack,
+24-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home-made SoC #4, lecture,
+25-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Mesečna bleja i revizija, meeting,
+29-06-2024, 20:00, Dunavski park https://osm.org/go/xf3SLRlmR-, Uticaj tehnologije na prirodu, discussion,
+30-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (ldap server/nalozi korisnika), workshop,
+01-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, 1984 (1956), movie
+02-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Open-source SoC, lecture,
+07-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka: SQL Server, lecture,
+08-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
+09-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton, hack,
+12-07-2024, 15:00, KC Gnezdo https://osm.org/go/xftd8rbl2, Uticaj tehnologije na kulturu, lecture,
+14-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Napadi na vestacku inteligenciju, lecture discussion
+29-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, OnionShare, lecture
+30-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, CryptoPals #1, workshop
+15-09-2024, 12:00, KC Magacin https://www.openstreetmap.org/node/1226456745#map=19/44.81314/20.45378, Dekonferencija, conference,
--- a/image_poster.py
+++ b/image_poster.py
@ -0,0 +1,151 @@
+#! /usr/bin/env python3
+
+import argparse
+import freetype
+import io
+from PIL import Image, ImageDraw, ImageFont
+import csv
+import datetime as dt
+from dateutil import relativedelta
+from cairosvg import svg2png
+
+CURRENT_TIME = dt.date.today()
+NEXT_MONTH = CURRENT_TIME + relativedelta.relativedelta(months=1, day=1)
+DAYS_OF_WEEK_SR = ("PON", "UTO", "SRE", "ČET", "PET", "SUB", "NED")
+MONTHS_SR = ("Januar", "Februar", "Mart", "April", "Maj", "Jun", "Jul", "Avgust",\
+        "Septembar", "Oktobar", "Novembar", "Decembar")
+
+def parseArgs(parser):
+    """
+        Parse all arguments and return the list of argument values
+    """
+    parser.add_argument("month", metavar = "MM", help = "two digit number representing the month for which to generate poster", default = "empty", nargs = "?")
+    return parser.parse_args()
+
+def load_events(csv_path:str, month:int) -> list[dict]:
+    monthafter = month + relativedelta.relativedelta(months=1, day=1)
+    events = []
+    with open(csv_path) as csv_file:
+        csv_reader = csv.reader(csv_file)
+        next(csv_reader, None)
+        for event in csv_reader:
+            event_date = event[0]
+            event_date_parsed = dt.datetime.strptime(event_date, "%d-%m-%Y").date()
+            event_time = event[1]
+            event_title = event[3]
+            current_event = {"date":event_date_parsed,
+                             "time":event_time,
+                             "title":event_title.strip()}
+            if event_date_parsed >= month and event_date_parsed < monthafter:
+                events.append(current_event)
+        return events
+
+def drawPoster(events, bg, fg, month:int):
+    fontFacade = ImageFont.truetype('./site/font/Facade-Sud.woff', size=365)
+    fontIosevka = ImageFont.truetype('./site/font/iosevka-regular.woff', size=200)
+    fontIosevkaSmall = ImageFont.truetype('./site/font/iosevka-regular.woff', size=150)
+
+    W = 3508
+    H = 4960 
+    img = Image.new('RGB', (W, H), bg)
+    draw = ImageDraw.Draw(img)
+
+    header = "DECENTRALA"
+    _, _, w, _ = draw.textbbox((0, 0), header, font=fontFacade)
+    draw.text(((W-w)/2, 165), header, font=fontFacade, fill=fg)
+
+    subheader = f"Plan za {MONTHS_SR[month.month - 1]}"
+    _, _, w, _ = draw.textbbox((0, 0), subheader, font=fontIosevka)
+    draw.text(((W-w)/2, 560), subheader, font=fontIosevka, fill=fg)
+
+    height = 990
+
+    draw.text((165, height), "Radionice pocinju u 19h u DC Krovu", font=fontIosevkaSmall, fill=fg)
+    height += 200
+
+    draw.text((165, height), "Svi dogadjaji su uvek besplatni", font=fontIosevkaSmall, fill=fg)
+    height += 300
+
+    # Write list of events to sperate text file as well
+    textfile=open("poster.txt","w")
+
+    textfile.write(f"Plan za {MONTHS_SR[month.month - 1]}\n\n")
+    textfile.write("Radionice pocinju u 19h u DC Krovu\n")
+    textfile.write("Svi dogadjaji su uvek besplatni\n\n")
+
+    # Loop to write events both to poster image and text file
+    for event in events:
+
+        # Add event to image poster
+        date = DAYS_OF_WEEK_SR[event["date"].weekday()]
+        day = event["date"].day
+        title = event["title"]
+        pad = " " if event["date"].day < 10 else ""
+        eventText = f"{date} {day}. {pad}{title}"
+        draw.text((165, height), eventText, font=fontIosevkaSmall, fill=fg)
+        height += 200
+
+        # Add event to textfile
+        textfile.write(eventText + "\n")
+
+    textfile.close()
+
+    def drawCircle(x, y):
+        r = 50
+        draw.ellipse((x - r, y - r, x + r, y+r), fill=fg, outline=(0, 0, 0), width=0)
+
+    LCX = 415 # logo center x
+    LCY = 4350 # logo center y
+    d = 190 # delta
+    drawCircle(LCX - d, LCY)
+    drawCircle(LCX, LCY)
+    drawCircle(LCX, LCY - d)
+    drawCircle(LCX, LCY + d)
+    drawCircle(LCX + d, LCY)
+
+    draw.line([(LCX - d, LCY), (LCX + d, LCY)], fill=fg, width=20, joint=None)
+    draw.line([(LCX, LCY), (LCX, LCY + d), (LCX + d, LCY), (LCX, LCY - d)], fill=fg, width=20, joint=None)
+    draw.text((LCX - 1.7*d, LCY + 1.5*d), "dmz.rs", font=fontIosevka, fill=fg)
+
+    mesh_svg = svg2png(url='site/img/mesh-light.svg')
+    mesh_svg_bytes = io.BytesIO(mesh_svg)
+    mesh_img = Image.open(mesh_svg_bytes)
+    if bg == (0,0,0):
+        pixdata = mesh_img.load()
+        for y in range(mesh_img.size[1]):
+            for x in range(mesh_img.size[0]):
+                if pixdata[x,y] != (0,0,0,0):
+                    pixdata[x, y] = (0, 100, 0, 255)
+
+    mesh_img = mesh_img.resize((W,H))
+    mesh_img.thumbnail((W,H), Image.Resampling.LANCZOS)
+
+    mesh_w, mesh_h = mesh_img.size
+    mesh_position = (W - mesh_w, H - mesh_h)
+    img.paste(mesh_img, mesh_position, mesh_img)
+
+    return img
+
+def main():
+    # Parse arguments
+    parser = argparse.ArgumentParser(description="Generate images of the poster")
+    args = parseArgs(parser)
+
+    # Set month based on user input
+    month = NEXT_MONTH
+    if args.month.isdigit():
+      month = dt.date(CURRENT_TIME.year, int(args.month), 1)
+    elif args.month != "empty":
+      print("Month has to be specified as a number. I will use next month as the default")
+
+    # Load events and draw a poseter
+    events = load_events("dogadjaji.csv", month)
+
+    img = drawPoster(events, (0, 0, 0), (20, 250, 50), month)
+    img.save('poster_dark.png')
+
+    img = drawPoster(events, (255, 255, 255), (0, 0, 0), month)
+    img.save('poster_light.png')
+
+if __name__ == "__main__":
+    main()
--- a/pages/en/about.html
+++ b/pages/en/about.html
@ -0,0 +1,12 @@
+<h1>About us</h1>
+<dl>
+  <dt>Statute:</dt>
+  <dd> We make decisions by direct democracy. Our statute can be found at <a href="/en/statute"> statute page</a></dd>
+
+  <dt>Contact:</dt>
+  <dd>
+    You can send mail to <a href="mailto:dmz@dmz.rs">dmz@dmz.rs</a> or you can register on <a href="https://forum.dmz.rs">our Forum</a>.
+    Also, we are available on the <a href="https://balkan.fedive.rs/@decentrala">Fediverse!</a>
+    If you find a bug on the site, please do tell us. We would be very grateful.
+  </dd>
+</dl>
--- a/pages/en/account.html
+++ b/pages/en/account.html
@ -0,0 +1,8 @@
+<h1>Account</h1>
+<p>If you have created an account on dmz.rs, you can use our XMPP and e-mail server, as well as other services that support LDAP login.<p>
+<p>For more on XMPP see <a href="https://wiki.dmz.rs/en/tutorial/conversations">this tutorial</a>. <p>
+<p>You can see settings for the <a href="https://www.thunderbird.net">Thundebird</a> mail client on this <a href="/img/mailsettings.png">image</a>.<p>
+
+<p><a href="/account/register/">Register</a><p>
+<p><a href="/account/unregister/">Delete account</a><p>
+<p><a href="/account/changepassword/">Change password</a><p>
--- a/pages/en/donations.html
+++ b/pages/en/donations.html
@ -0,0 +1,9 @@
+<h1>Donations</h1>
+<dd>
+    Decentrala accepts donations exclusively from persons and without any obligations.
+  We are independent and we try to keep it that way.
+  You can donate old hardware (laptops, phones, PC components) to us, and we will find a use for it in Decentrala or give it to people who need it.
+    Also, you can donate bitcoin and monero by sending to the following addresses:
+    <p>Bitcoin: bc1qjhsfgq79wuzzv32yml9zglwzf9qcwfj3atuy74</p>
+    <p>Monero: 8BESz45LnxrgCwZP32KieiN1D4LinCfsS1YjdFHfGXrVCmPs35167QsW1gd7qbff4UAtBbT6oWrkbfZnJm71HornVRiRZFS</p>
+</dd>
--- a/pages/en/events.html
+++ b/pages/en/events.html
@ -0,0 +1,3 @@
+<h1>Events</h1>
+<p>Following list contains all forthcoming events. Held events are listed in <a href="/en/events_archive">archive</a>.</p><br>
+<p>We also provide <a href="https://dmz.rs/events.ical">ical file</a></p><br>
--- a/pages/en/events_archive.html
+++ b/pages/en/events_archive.html
@ -0,0 +1,2 @@
+<h1>Events archive</h1>
+<p>All events that we organized so far. You can find future events on <a href="/en/events">Events page</a></p><br>
--- a/pages/en/index.html
+++ b/pages/en/index.html
@ -0,0 +1,27 @@
+<h1>Welcome!</h1>
+<p>
+  We are <em>Decentrala</em> - a group of enthusiasts gathered around the idea of decentralization and knowledge sharing.
+  Here are some more facts about us:
+</p>
+<dl>
+
+  <dt>Motivation:</dt>
+<dd>Decentralization promotes <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#odrzivost">sustanability</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#dostupnost">availability</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#pristupacnost">accesability</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#nezavisnost">autonomy</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#privatnost">privacy</a> and <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#sloboda">freedom</a>. On those networks we have less <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#manipulacija">manipulation</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#propaganda">propaganda</a>, ads, and <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#neopterecenost-paznje-sporednim-stvarima">are not designed to lock your attention (dumbing down)</a>.
+    <a href="https://forum.dmz.rs/t/zasto-nam-je-decentralizacija-bitna/506/1">Tell us why decentralization is important to you</a>
+  </dd>
+  <dt>Knowledge:</dt>
+  <dd>
+    All our workshops are free and open to everyone.
+    Also, if you have something to share, feel free to announce the event  on the <a href="https://forum.dmz.rs"></a>Forum</a>.
+  </dd>
+  <dt>Actions:</dt>
+  <dd>From time to time we organize actions, hackathons, crypto parties, exhibitions, etc.</dd>
+  <dt>Services:</dt>
+  <dd>Our servers run various services (like e-mail, git, wiki, etc...) that are open to everyone.</dd>
+</dl>
+<p>
+  If you are still interested, you can create an <a href="/en/account">account</a>
+  on our server which will enable the use of all our <a href="/en/services">services</a>.
+  If you want to see first how it all looks, you can come to one of our
+  <a href="/en/events">event</a>, and meet us there!
+</p>
--- a/pages/en/services.html
+++ b/pages/en/services.html
@ -0,0 +1,59 @@
+<h1>Services</h1>
+<table>
+  <tr>
+    <th>Service</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td><a href="/account">E-mail</a></td>
+    <td>E-mail account that you can use with any e-mail client (for example, with the <a href="https://www.thunderbird.net/">Thunderbird</a>).</td>
+  </tr>
+  <tr>
+    <td><a href="https://forum.dmz.rs/">Forum</a></td>
+    <td>Forum for general discussion and <a href="/events">event</a> organization.</td>
+  </tr>
+  <tr>
+    <td><a href="/account">Chat</a></td>
+    <td>
+      We have our XMPP server, on which you can make an account.
+      If you already have an account, you can find us at group <a href="decentrala@conference.dmz.rs">decentrala@conference.dmz.rs</a>.
+    </td>
+  </tr>
+  <tr>
+    <td><a href="https://gitea.dmz.rs/">Git</a></td>
+    <td><a href="https://gitea.io/en-us/">Gitea</a> instance on which we host our code and resources (including the code for this site).
+    </td>
+  </tr>
+  <tr>
+    <td><a href="https://wiki.dmz.rs/">Wiki</a></td>
+    <td><a href="https://js.wiki/">Wiki.js</a> instance on which we publish documentation for our projects,
+      <a href="/events">events</a> resources, and tutorials.
+    </td>
+  </tr>
+  <tr>
+    <td><a href="https://nextcloud.dmz.rs/">Nextcloud</a></td>
+    <td><a href="https://nextcloud.com/">Nextcloud</a> instance on which we organize tasks we need to do and use as calandar.
+    </td>
+  </tr>
+  <tr>
+    <td><a href="https://search.dmz.rs/">Search</a></td>
+    <td><a href="https://github.com/hnhx/librex/">LibreX</a> instance used for Web searching.</td>
+  </tr>
+  <tr>
+    <td><a href="https://pastebin.dmz.rs/">Pastebin</a></td>
+    <td><a href="https://privatebin.info/">PrivateBin</a> instance we use for sharing text files</td>
+  </tr>
+  <tr>
+    <td><a href="ssh://soft.dmz.rs:2222/">Soft Serve</a></td>
+    <td>
+      <a href="https://github.com/charmbracelet/soft-serve">Soft Serve</a> instance that we use as a replacement for the Gitea service.
+      Soft Serve works entirely from the terminal.
+    </td>
+  </tr>
+</table>
+<p>
+  These are some of the services we currently maintain on our servers.
+  To use these services, you can register for each service separately,
+  or you can create a unique <a href="/en/account">account</a>
+  on our server and use all services with the same account.
+</p>
--- a/pages/en/statute.html
+++ b/pages/en/statute.html
@ -0,0 +1,32 @@
+<h1>Statute</h1>
+<p>O pravilima i statutu Decentrale odlucuje nezavisno glasacko telo u kome se odluke donose se na principima direktne demokratije, dogovorom ili najmanje dvotrećinskom većinom ukupnog broja članova kolektiva.</p>
+<br>
+<p>Delovi statua mogu biti definisati kao nepromenjivi i protiv nepromenjivog delova statua se ne može glasati.</p>
+<br>
+<p>Sastanak glasačkog tela je validan ukoliko mu prisustvuje najmanje troje članova glasačkog tela.</p>
+<br>
+<p>Decentrala o zahtevima za prijem u članstvo odlučuje dvotrećinskom većinom prisutnog članstva kolektiva.</p>
+<br>
+<p>Za ukidanje članstva u kolektivu pojedinac se moze sam iskljuciti u bilo kom momentu ili moze biti izglasan sa dvotrećinskom većinom prisutnog članova.</p>
+<br>
+<p>Ne postoji ograničenje broja članova glasačkog tela.</p>
+<br>
+<p>Trenutni članovi glasačkog tela su pod pseudonimom stvn, z01a, anonionman, byte, goodv1bes, fram3d</p>
+<br>
+<p>Samo članovi koji su fizički prisutni imaju pravo glasa.</p>
+<br>
+<p>Decentrala je zajednica okupljena oko decentralizacije tehnologija i širenja znanja. Decentralizacija uključuje ravnopravnost korišćenja tehnologije, slobodnog softvera, privatnost i bezbednost.</p>
+<br>
+<p>Decentrala prihvata donacije iskljucivo od fizičkog lica, bez uslova i obaveza.</p>
+<br>
+<p>Svaki pojedinac i grupa ima pravo da sprovodi akcije u duhu ciljeva Decentrale koje su definisane statutom, ako su prethodno objavljeni i objašnjeni na javnim digitalnim kanalima komunikacije Decentrale.</p>
+<br>
+<p>Ako član glasačkog tela nije prisutan tokom tri uzastopna sastanka automatski je isključen iz glasačkog tela.</p>
+<br>
+<p>Član moze biti ponovo ukljucen u glasacko telo po vec definisanoj proceduri dodavanja novog clana, ako je prisutan na tom sastanku.</p>
+<br>
+<p> Vreme i mesto sastanka skupštine Decentrale se mora najaviti bar nedelju dana pred vremena sastanka na forumu Decentrale.</p>
+<br>
+<p> Sastanak glasačkog tela treba se održati barem jednom u dva meseca.</p>
+<br>
+<p> Na sastanku glasačkog tela se jedino moze glasati o tačkama koje su najavljene na forumu Decentrale, bar nedelju dana pre vremena sastanka.</p>
--- a/pages/en/webring.html
+++ b/pages/en/webring.html
@ -0,0 +1,5 @@
+<h1>Webring</h1>
+<ul>
+  <li><a href="https://pionir.org">Pionir school</a></li>
+  <li><a href="https://tilda.center">Tilda Center</a></li>
+</ul>
--- a/pages/sr/about.html
+++ b/pages/sr/about.html
@ -0,0 +1,10 @@
+<h1>O nama</h1>
+<dl>
+ <dt>Statut:</dt>
+  <dd> Sve odluke se donose po principu direktne demokratije. Nas statut mozete pogledati na <a href="/statute">stranici za statut</a>. </dd>
+
+ <dt>Kontakt:</dt>
+  <dd>Možeš nam poslati mejl na adresu <a href="mailto:dmz@dmz.rs">dmz@dmz.rs</a> ili se možeš pridružiti našem <a href="https://forum.dmz.rs">Forumu</a>.</dd>
+  <dd>Takođe smo dostupni i na <a href="https://balkan.fedive.rs/@decentrala">Fediversu!</a></dd>
+  <dd>U slučaju da pronađeš <em>bug</em> na sajtu, bili bismo ti jako zahvalni ako nam ga prijaviš.</dd>
+</dl>
--- a/pages/sr/account.html
+++ b/pages/sr/account.html
@ -1,7 +1,8 @@
-<p> Ako ste napravili nalog na dmz.rs mozete koristi nas xmpp i email server i ostale servise koji podrzavaju LDAP login. <p>
-<p> Za vise o XMPP pogledajte <a href="https://wiki.dmz.rs/en/tutorial/conversations">tutorial</a>. <p>
-<p> Za primer podesavanja na <a href="https://thunderbird.org">Thundebird</a> mail klijentu mozete pogledati <a href="/img/mailsettings.png">sliku</a>. <p>
+<h1>Nalog</h1>
+<p>Ako si napravio nalog na dmz.rs možeš koristiti naš XMPP i e-mail server, kao i ostale servise koji podržavaju LDAP login.<p>
+<p>Za više o XMPP-u pogledaj <a href="https://wiki.dmz.rs/en/tutorial/conversations-srpski">tutorial</a>. <p>
+<p>Podešavanja za <a href="https://www.thunderbird.net">Thundebird</a> mail klijent možeš pogledati na <a href="/img/mailsettings.png">slici</a>.<p>

 <p><a href="/account/register/">Registruj se</a><p>
-<p><a href="/account/unregister/">Izbrisi nalog</a><p>
+<p><a href="/account/unregister/">Izbriši nalog</a><p>
 <p><a href="/account/changepassword/">Promeni lozinku</a><p>
--- a/pages/sr/contact.html
+++ b/pages/sr/contact.html
@ -1,5 +0,0 @@
-<h1>Kontakt</h1>
-<p>Možeš nam poslati mejl na adresu <a href="mailto:dmz@dmz.rs">dmz@dmz.rs</a> ili se možeš pridružiti našem <a href="https://forum.dmz.rs">Forumu</a>.</p>
-<p>Takođe smo dostupni i na <a href="https://balkan.fedive.rs/@decentrala">Fediversu!</a></p>
-<br>
-<p>U slučaju da si pronašao <em>bug</em> na sajtu, bili bismo ti jako zahvalni ako bi nam ga prijavio/prijalvila.</p>
--- a/pages/sr/donations.html
+++ b/pages/sr/donations.html
@ -0,0 +1,9 @@
+<h1>Donacije</h1>
+<dd>
+    Decentrala prihvata donacije isključivo od fizičkih lica i bez obaveza.
+  Nezavisni smo i trudimo se da to održimo.
+  Možeš nam donirati stari hardver (laptopove, telefone, PC komponente), a mi ćemo mu naći upotrebu u Decentrali ili dati ljudima kojima je potreban.
+    Takođe možeš donirati bitcoin i monero, slanjem na naredne adrese:
+    <p>Bitcoin: bc1qjhsfgq79wuzzv32yml9zglwzf9qcwfj3atuy74</p>
+    <p>Monero: 8BESz45LnxrgCwZP32KieiN1D4LinCfsS1YjdFHfGXrVCmPs35167QsW1gd7qbff4UAtBbT6oWrkbfZnJm71HornVRiRZFS</p>
+</dd>
--- a/pages/sr/events.html
+++ b/pages/sr/events.html
@ -1,59 +1,4 @@
 <h1>Događaji</h1>
-<table>
-  <tbody>
-    <tr>
-      <th>Datum</th>
-      <th>Vreme</th>
-      <th>Mesto</th>
-      <th>Tema</th>
-    </tr>
-    <tr>
-      <td> Ponedeljak, 7. Avgust 2023. </td>
-      <td> 19:00h </td>
-      <td> DC Krov </td>
-      <td> Linux ricing </td>
-    </tr>
-    <tr>
-      <td> Utorak, 8. Avgust 2023. </td>
-      <td> 19:00h </td>
-      <td> DC Krov </td>
-      <td> Lambda račun </td>
-    </tr>
-    <tr>
-      <td> Ponedeljak, 14. Avgust 2023. </td>
-      <td> 19:00h </td>
-      <td> DC Krov </td>
-      <td> Linux distro diskusija </td>
-    </tr>
-    <tr>
-      <td> Utorak, 15. Avgust 2023. </td>
-      <td> 19:00h </td>
-      <td> DC Krov </td>
-      <td> Pirati 777 mora </td>
-    </tr>
-    <tr>
-      <td> Ponedeljak, 21. Avgust 2023. </td>
-      <td> 19:00h </td>
-      <td> DC Krov </td>
-      <td> Python vežbe </td>
-    </tr>
-    <tr>
-      <td> Utorak, 22. Avgust 2023. </td>
-      <td> 19:00h </td>
-      <td> DC Krov </td>
-      <td> Autentifikacija na internetu </td>
-    </tr>
-    <tr>
-      <td> Ponedeljak, 28. Avgust 2023. </td>
-      <td> 19:00h </td>
-      <td> DC Krov </td>
-      <td> Podesavanje Mail servera </td>
-    </tr>
-    <tr>
-      <td> Utorak, 29. Avgust 2023. </td>
-      <td> 19:00h </td>
-      <td> DC Krov </td>
-      <td> Prevodjenje wiki-a </td>
-    </tr>
-  </tbody>
-</table>
+<p>Naredna lista sadrži sve predstojeće događaje. Za listu održanih događaja pogledaj <a href="/events_archive">arhivu</a>.</p><br>
+<p>Događaje možeš učitati i sa <a href="https://dmz.rs/events.ical">ical</a> datotekom.</p><br>
+
--- a/pages/sr/events_archive.html
+++ b/pages/sr/events_archive.html
@ -0,0 +1,2 @@
+<h1>Arhiva događaja</h1>
+<p>Svi događaji koje smo do sada organzivali. Predstojeće događaje možeš naći <a href="/events">ovde</a></p><br>
--- a/pages/sr/index.html
+++ b/pages/sr/index.html
@ -1,9 +1,13 @@
-<h1>Dobrodošao!</h1>
+<h1>Dobrodošli!</h1>
 <p>
  Mi smo <em>Decentrala</em> - grupa entuzijasta okupljena oko ideja decentralizacije i slobodnog širenja znanja.
  Zvuči interesantno? Evo još nekih stvari o nama:
 </p>
 <dl>
+  <dt>Motivacija:</dt>
+  <dd>Decentralizacijom postizemo <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#odrzivost">odrzivost</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#dostupnost">dostupnost</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#pristupacnost">pristupacnost</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#nezavisnost">nezavisnost</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#privatnost">privatnost</a> i <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#sloboda">slobodu</a>. Na ovim mrezama ima manje <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#manipulacija">manipulacije</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#propaganda">propagande</a>, reklama, i <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#neopterecenost-paznje-sporednim-stvarima">nisu dizajnirane za zadrzavanje paznje (zaglupljivanje)</a>.
+    <a href="https://forum.dmz.rs/t/zasto-nam-je-decentralizacija-bitna/506/1">Recite zasto je vama decentralizacija bitna</a>
+  </dd>
  <dt>Znanje:</dt>
  <dd>Sve naše radionice su besplatne i otvorene za sve zainteresovane.
    Ako želiš nešto da podeliš najavi se na našem <a href="https://forum.dmz.rs">Forumu</a> i održi radionicu kod nas!
@ -16,8 +20,8 @@
    koristiti sa ili bez našeg naloga.</dd>
 </dl>
 <p>
-  Ako si i dalje zainteresovan, možeš napraviti <a href="/pages/account.html">nalog</a> na našem serveru koji će ti
-  omogućiti korišćenje svih naših <a href="/pages/services.html">servisa</a>.
+  Ako si i dalje zainteresovan, možeš napraviti <a href="/account">nalog</a> na našem serveru koji će ti
+  omogućiti korišćenje svih naših <a href="/services">servisa</a>.
  Ako želiš prvo da vidiš kako to sve izgleda u realnosti, možeš doći na neki od naših <a
-    href="/pages/events.html">događaja</a>, i tu nas upoznati!
-</p>
+    href="/events">događaja</a>, i tu nas upoznati!
+</p>
--- a/pages/sr/services.html
+++ b/pages/sr/services.html
@ -5,26 +5,26 @@
    <th>Opis</th>
  </tr>
  <tr>
-    <td><a href="/account.html">Email</a></td>
-    <td>Email nalog koji možeš koristiti sa bilo kojim email
-      klijentom generalne namene (na primer <a href="https://www.thunderbird.net/">Thunderbird-u</a>).</td>
+    <td><a href="/account">E-mail</a></td>
+    <td>E-mail nalog koji možeš da koristiš sa bilo kojim email
+      klijentom generalne namene (na primer <a href="https://www.thunderbird.net/">Thunderbird</a>-om).</td>
  </tr>
  <tr>
    <td><a href="https://forum.dmz.rs/">Forum</a></td>
-    <td>Forum na kom obično organizujemo naše <a href="/pages/events.html">događaje</a>.
+    <td>Forum na kom obično organizujemo naše <a href="/events">događaje</a>.
    </td>
  </tr>
  <tr>
-    <td>Chat</td>
-    <td>Održavamo sopstveni XMPP server, na kojem možeš napraviti nalog.
-      Ako već poseduješ nalog možeš nas naći u grupi <a
+    <td><a href="/account">Chat</a></td>
+    <td>Održavamo sopstveni XMPP server, na kojem možeš da napraviš nalog.
+      Ako već poseduješ nalog možeš da nas nađeš u grupi <a
        href="decentrala@conference.dmz.rs">decentrala@conference.dmz.rs</a>.
    </td>
  </tr>
  <tr>
    <td><a href="https://gitea.dmz.rs/">Git</a></td>
-    <td><a href="https://gitea.io/en-us/">Gitea</a> instanca na kojoj držimo kod kao i ostale resurse za naše
-      <a href="/pages/projects.html">projekte</a>, <a href="/pages/events.html">dogadjaje</a>, kao i projekte naših
+    <td><a href="https://gitea.io/en-us/">Gitea</a> instanca na kojoj držimo kôd kao i ostale resurse za naše
+      <a href="/projects">projekte</a>, <a href="/events">događaje</a>, kao i projekte naših
      prijatelja.
      Ovo može biti dom tvog sledećeg projekta. Bolji od Github-a.
    </td>
@ -32,10 +32,16 @@
  <tr>
    <td><a href="https://wiki.dmz.rs/">Wiki</a></td>
    <td><a href="https://js.wiki/">Wiki.js</a> instanca koju koristimo da dokumentujemo naše
-      <a href="/pages/projects.html">projekte</a> kao i
-      ostale <a href="/pages/events.html">događaje</a>.
+      <a href="/projects">projekte</a> kao i ostale <a href="/events">događaje</a>.
    </td>
  </tr>
+  <tr>
+    <td><a href="https://nextcloud.dmz.rs/">Nextcloud</a></td>
+    <td><a href="https://nextcloud.com/">Nextcloud</a> instanca koju koristimo da zapisujemo stvari koje planiramo da uradimo i kao kalendar.
+    </td>
+  </tr>
+  <tr>
+  </tr>
  <tr>
    <td><a href="https://search.dmz.rs/">Search</a></td>
    <td><a href="https://github.com/hnhx/librex/">LibreX</a> instanca koju koristimo za pretraživanje Interneta.
@ -49,12 +55,11 @@
  </tr>
  <tr>
    <td><a href="ssh://soft.dmz.rs:2222/">Soft Serve</a></td>
-    <td><a href="https://github.com/charmbracelet/soft-serve">Soft Serve</a> instanca koju koristimo kao zamenu za Gitea
-      servis.
+    <td><a href="https://github.com/charmbracelet/soft-serve">Soft Serve</a> instanca koju koristimo kao zamenu za Gitea servis.
      Soft Serve radi potpuno iz terminala
    </td>
  </tr>
 </table>
-<p>Ovo su neki od servisa koje trenutno održavamo na našim serverima. Da bi koristio ove servise, <em>možes</em> se
-  registovati na svaki servis posebno, a možeš i napraviti jedinstveni <a href="/pages/account.html">nalog</a> na nasem
-  serveru i koristiti sve servise sa istim nalogom.</p>
+<p>Ovo su neki od servisa koje trenutno održavamo na našim serverima. Da bi koristio ove servise, <em>možeš</em> da se
+  registuješ na svaki servis posebno, a možeš i da napraviš jedinstveni <a href="/account">nalog</a> na našem
+  serveru i da koristiš sve servise sa istim nalogom.</p>
--- a/pages/sr/statute.html
+++ b/pages/sr/statute.html
@ -0,0 +1,32 @@
+<h1>Statut</h1>
+<p>O pravilima i statutu Decentrale odlucuje nezavisno glasacko telo u kome se odluke donose se na principima direktne demokratije, dogovorom ili najmanje dvotrećinskom većinom ukupnog broja članova kolektiva.</p>
+<br>
+<p>Delovi statua mogu biti definisati kao nepromenjivi i protiv nepromenjivog delova statua se ne može glasati.</p>
+<br>
+<p>Sastanak glasačkog tela je validan ukoliko mu prisustvuje najmanje troje članova glasačkog tela.</p>
+<br>
+<p>Decentrala o zahtevima za prijem u članstvo odlučuje dvotrećinskom većinom prisutnog članstva kolektiva.</p>
+<br>
+<p>Za ukidanje članstva u kolektivu pojedinac se moze sam iskljuciti u bilo kom momentu ili moze biti izglasan sa dvotrećinskom većinom prisutnog članova.</p>
+<br>
+<p>Ne postoji ograničenje broja članova glasačkog tela.</p>
+<br>
+<p>Trenutni članovi glasačkog tela su pod pseudonimom stvn, z01a, anonionman, byte, goodv1bes, fram3d</p>
+<br>
+<p>Samo članovi koji su fizički prisutni imaju pravo glasa.</p>
+<br>
+<p>Decentrala je zajednica okupljena oko decentralizacije tehnologija i širenja znanja. Decentralizacija uključuje ravnopravnost korišćenja tehnologije, slobodnog softvera, privatnost i bezbednost.</p>
+<br>
+<p>Decentrala prihvata donacije iskljucivo od fizičkog lica, bez uslova i obaveza.</p>
+<br>
+<p>Svaki pojedinac i grupa ima pravo da sprovodi akcije u duhu ciljeva Decentrale koje su definisane statutom, ako su prethodno objavljeni i objašnjeni na javnim digitalnim kanalima komunikacije Decentrale.</p>
+<br>
+<p>Ako član glasačkog tela nije prisutan tokom tri uzastopna sastanka automatski je isključen iz glasačkog tela.</p>
+<br>
+<p>Član moze biti ponovo ukljucen u glasacko telo po vec definisanoj proceduri dodavanja novog clana, ako je prisutan na tom sastanku.</p>
+<br>
+<p> Vreme i mesto sastanka skupštine Decentrale se mora najaviti bar nedelju dana pred vremena sastanka na forumu Decentrale.</p>
+<br>
+<p> Sastanak glasačkog tela treba se održati barem jednom u dva meseca.</p>
+<br>
+<p> Na sastanku glasačkog tela se jedino moze glasati o tačkama koje su najavljene na forumu Decentrale, bar nedelju dana pre vremena sastanka.</p>
--- a/pages/sr/webring.html
+++ b/pages/sr/webring.html
@ -1,3 +1,5 @@
+<h1>Webring</h1>
 <ul>
-  <li><a href="https://tilde.zone/explore">Tilde Zone</a></li>
-</ul>
+  <li><a href="https://pionir.org">Slobodna škola Pionir</a></li>
+  <li><a href="https://tilda.center">Tilda Centar</a></li>
+</ul>
--- a/poster.py
+++ b/poster.py
@ -1,3 +1,4 @@
+#! /usr/bin/env python3
 import csv
 import datetime as dt
 from dateutil import relativedelta
--- a/prep.py
+++ b/prep.py
@ -1,101 +1,160 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3

+import csv
 from datetime import datetime
-from functools import cmp_to_key

-days = [
-    "Ponedeljak",
-    "Utorak",
-    "Sreda",
-    "Četvrtak",
-    "Petak",
-    "Subota",
-    "Nedelja",
-]
+DAYS_SR = ["PON", "UTO", "SRE", "ČET", "PET", "SUB", "NED"]
+DAYS_EN = ["MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN"]
+TYPES_DICT = {
+    "hack": ("hakaton", "hackathon"),
+    "lecture": ("predavanje", "lecture"),
+    "workshop": ("radionica", "workshop"),
+    "discussion": ("diskusija", "discussion"),
+    "lighting": ("kratka predavanja", "short talks"),
+    "movie": ("film", "movie"),
+    "meeting": ("sastanak", "meeting"),
+    "conference": ("konferencija", "conference"),
+}

-months = [
-    "Januar",
-    "Februar",
-    "Mart",
-    "April",
-    "Maj",
-    "Jun",
-    "Jul",
-    "Avgust",
-    "Septembar",
-    "Oktobar",
-    "Novembar",
-    "Decembar",
-]
+def load_events(csv_path:str) -> list[dict]:
+    events = []
+    with open(csv_path) as csv_file:
+        csv_reader = csv.reader(csv_file, skipinitialspace=True)
+        next(csv_reader, None)
+        for event in csv_reader:
+            event_date = event[0]
+            event_date_parsed = datetime.strptime(event_date, "%d-%m-%Y").date()
+            event_time = event[1]
+            event_location = event[2]
+            event_title = event[3]
+            types =  event[4].split()
+            current_event = {"date":event_date_parsed,
+                             "time":event_time,
+                             "location": event_location,
+                             "title":event_title.strip(),
+                             "types": types }
+            events.append(current_event)
+        return events
+
+def build_html(events: list[dict], dayNames: list[str], typesNames: dict) -> str:
+    events_html = []
+    for event in events:
+        title = event["title"]
+        location = event["location"]
+        date = event["date"]
+        date = dayNames[date.weekday()]+", "+str(date.day)+". "+str(date.month)+". "+str(date.year)+", "
+        time = event["time"]+"h"
+        event_html = []
+        event_html.append(f"<div class='date'>{date} {time}</div>")
+        event_html.append(f"<div class='title'>{title}</div>")
+        if "https://" in location:
+            place,link = location.split("https://")
+            event_html.append(f"<div class='place'><a href=\"https://{link}\">@{place.strip()}</a></div>")
+        else:
+            event_html.append(f"<div class='place'>@{location.strip()}</div>")
+
+        if len(event["types"]) != 0:
+            types_list = "<div class='types'>"
+            last_item = event["types"][-1]
+            for t in event["types"]:
+                if typesNames.get(t) is not None:
+                    types_list += typesNames.get(t)
+                    if t != last_item:
+                        types_list += ', '
+                else:
+                    print(f"Unknown type {t}!")
+            types_list += "</div>"
+            event_html.append(types_list)
+
+        event_html = "".join(event_html)
+        events_html.append(f"\n<div class='event'>{event_html}</div>")
+    return events_html
+
+def build_ical(events: list[dict]) -> str:
+    today = datetime.today().now()
+    # Header
+    events_ical = ""
+    with open("template/head.ical", "r") as file:
+        events_ical += file.read()
+    # Events
+    for event in events:
+        title = event["title"]
+        location = event["location"]
+        date = event["date"]
+        time = event["time"]
+
+        uid = str(date.month).zfill(2) + str(date.day).zfill(2) + time[:2]
+        date = str(date.year) + str(date.month).zfill(2) + str(date.day).zfill(2) 
+        created = str(today.year) + str(today.month).zfill(2) + str(today.day).zfill(2) + "T" + str(today.hour).zfill(2) + str(today.minute).zfill(2) + str(today.second).zfill(2) + "Z"
+        date = date + "T" + time.replace(":", "") + "00"
+
+        event_template = ""
+        with open("template/event.ical", "r") as file:
+            event_template += file.read()
+        event_template = event_template.replace("<!--UID-->", uid)
+        event_template = event_template.replace("<!--CREATED-->", created)
+        event_template = event_template.replace("<!--DATE-->", date)
+        event_template = event_template.replace("<!--TITLE-->", title)
+
+        events_ical += event_template
+    # Footer
+    with open("template/end.ical", "r") as file:
+        events_ical += file.read()
+    return events_ical
+
+events = sorted(load_events("dogadjaji.csv"), key=lambda e: e["date"])

 today = datetime.today().date()

-def parse_date(date):
-    return datetime.strptime(date,"%d-%m-%Y").date()
-
-def compare_events(one, two):
-    one = parse_date(one.split(", ")[0])
-    two = parse_date(two.split(", ")[0])
-    if one>two:
-        return 1
-    elif one==two:
-        return 0
-    else:
-        return -1
-
-def is_past_event(event):
-    return event < today
-
-def load_events():
-    events = []
-    with open("dogadjaji.csv", "rt") as file:
-        file.readline()
-        for event in file.readlines():
-            event = event.strip()
-            if event != "":
-                events.append(event)
-    return events
-
-def write_events(events):
-    with open("dogadjaji.csv", "wt") as file:
-        file.write("datum, vreme, lokacija, tema\n")
-        for event in events:
-            file.write(event+"\n")
-
-def sort_events(events):
-    return sorted(events, key = cmp_to_key(compare_events))
+past_events = list(filter(lambda e: e["date"] <= today, events))
+past_events.reverse()
+new_events  = list(filter(lambda e: e["date"] >= today, events))


-events = load_events()
-events = sort_events(events)
-write_events(events)
+page_template = ""

-events = []
+sr_types = {}
+en_types = {}

-for event in events:
-    date, time, location, title = event.split(", ")
-    date = parse_date(date)
-    if is_past_event(date):
-        continue
-    date = days[date.weekday()]+", "+str(date.day)+". "+months[date.month-1]+" "+str(date.year)+"."
-    time = time+"h"
-    future_event = []
-    future_event.append("<td> "+date+" </td>")
-    future_event.append("<td> "+time+" </td>")
-    if "https://" in location:
-        place,link = location.split("https://")
-        future_event.append("<td> <a href=\"https://"+link+"\""+"> "+place.strip()+" </a> </td>")
-    else:
-        future_event.append("<td> "+location.strip()+" </td>")
-    future_event.append("<td> "+title+" </td>")
-    events.append("<tr>\n"+"\n".join(future_event)+"\n</tr>")
+for key, value_pair in TYPES_DICT.items():
+    sr_types[key] = value_pair[0]
+    en_types[key] = value_pair[1]

-with open("pages/sr/events.html","wt") as file:
-    file.writelines(["<h1>Događaji</h1>\n", "<table>\n", "<tr><th>Datum</th><th>Vreme</th><th>Mesto</th><th>Tema</th></tr>\n"])
-    file.writelines(events)
-    file.writelines(["</table>"])
+# Build Serbian Events page
+new_events_html = build_html(new_events, DAYS_SR, sr_types)
+with open("pages/sr/events.html", "r") as file:
+    page_template = ([line for line in file])
+
+with open("pages/sr/events.html", "w") as file:
+    file.writelines(page_template + new_events_html)
+
+# Build English Events page
+new_events_html = build_html(new_events, DAYS_EN, en_types)
+with open("pages/en/events.html", "r") as file:
+    page_template = ([line for line in file])
+
+with open("pages/en/events.html", "w") as file:
+    file.writelines(page_template + new_events_html)
+
+# Build Serbian Archive page
+past_events_html = build_html(past_events, DAYS_SR, sr_types)
+with open("pages/sr/events_archive.html", "r") as file:
+    page_template = ([line for line in file])
+
+with open("pages/sr/events_archive.html", "w") as file:
+    file.writelines(page_template + past_events_html)
+
+# Build English Archive page
+past_events_html = build_html(past_events, DAYS_EN, en_types)
+with open("pages/en/events_archive.html", "r") as file:
+    page_template = ([line for line in file])
+
+with open("pages/en/events_archive.html", "w") as file:
+    file.writelines(page_template + past_events_html)
+
+new_events_ical = build_ical(new_events)
+
+# Build ical
+with open("site/events.ical", "w") as file:
+    file.write(build_ical(new_events))

-#with open("pages/en/events.html","wt") as file:
-#    file.writelines(["<h1>Events</h1>", "<table>", "<tr>\n<th>Date</th>\n<th>Time</th>\n<th>Place</th>\n<th>Theme</th>\n</tr>"])
-#    file.writelines(events)
-#    file.writelines(["</table>"])
--- a/servisi.html
+++ b/servisi.html
@ -1,36 +0,0 @@
-<!doctype html>
-<meta charset="UTF-8">
-<html>
-	<head>
-		<link rel="icon" type="image/x-icon" href="/static/d.png">
-		<link rel="stylesheet" href="./static/reset.css">
-		<link rel="stylesheet" href="./static/main.css">
-		<title>Decentrala</title>
-	</head>
-	<body>
-		<div class="container">
-			<div class="header">
-				<h1 class="logo">DECENTRALA</h1>
-			</div>
-			<main>
-				<h2>Servisi</h2>
-				<p><a href="https://forum.dmz.rs">FORUM</a><p>
-				<p><a href="../chat.html">XMPP</a><p>
-				<p><a href="https://gitea.dmz.rs">GITEA</a><p>
-				<p><a href="https://wiki.dmz.rs">WIKI</a><p>
-				<p><a href="../nalog.html">EMAIL</a><p>
-				<p><a href="ssh://soft.dmz.rs:2222">SOFT SERVE</a><p>
-				<p><a href="https://search.dmz.rs">LibreX</a><p>
-				<p><a href="https://git.dmz.rs">CGIT</a><p>
-				<p><a href="https://pastebin.dmz.rs">PrivateBin</a><p>
-				<p><a href="https://cryptpad.dmz.rs">CryptPad</a><p>
-
-				<div class="back">
-					<ul class="nav">
-						<a href="../"><li>Nazad</li></a>
-					</ul>
-				</div>
-			</main>
-		</div>
-	</body>
-</html>
--- a/site/deconference.html
+++ b/site/deconference.html
@ -0,0 +1,141 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
+  <title>Deconference</title>
+<style>
+    :root {
+        --hightlight: #72dec2;
+        --text: #181715;
+        --bg: #ffffff;
+    }
+
+    @media screen and (prefers-color-scheme: dark) {
+        :root {
+            --text: #ffffff;
+            --bg: #181715;
+        }
+    }
+
+    @font-face {
+        font-family: "Iosevka";
+        src: url('/font/iosevka-regular.woff') format('woff');
+    }
+
+    body {
+        font-family: 'Iosevka';
+        font-size: 110%;
+        color: var(--text);
+        background: var(--bg);
+    }
+
+    main {
+        max-width: 52rem;
+        margin: 0 auto;
+    }
+
+    a,
+    a:visited {
+        text-decoration: underline;
+        color: var(--text);
+    
+        &:hover {
+            background-color: var(--hightlight);
+            text-decoration: line-through var(--text);
+            cursor: pointer;
+        }
+    }
+
+    header {
+        user-select: none;
+        text-align: center;
+    }
+
+    h1 {
+        font-variant: small-caps;
+        letter-spacing: 0.3rem;
+        font-size: 4em;
+        margin: 3rem auto;
+
+        & > a {
+            text-decoration: none;
+        }
+    }
+
+    h2 {
+        font-variant: small-caps;
+        letter-spacing: 0.3rem;
+
+        & > a {
+            text-decoration: none;
+        }
+    }
+
+    p {
+        margin-left: 1rem;
+        text-align: justify;
+    }
+
+
+    details {
+        margin-left: 1rem;
+    }
+
+    footer {
+        border-top: 2px solid var(--text);
+        padding-top: 1rem;
+        max-width: 42rem;
+        margin: 2rem auto;
+        text-align: center;
+    
+        & .links {
+            display: flex;
+            flex-direction: row;
+            gap: 2rem;
+            justify-content: center;
+            margin-top: 1rem;
+        }
+    }
+</style>
+</head>
+<body>
+  <header>
+    <h1>Deconference</h1>
+  </header>
+  <main>
+    <h2 id="what"><a href="#what">What?</a></h2>
+    <p>Deconference is the inaugural conference organized by <a href="https://dmz.rs">Decentrala</a>, a Belgrade hackerspace. It serves as a platform for individuals to present and discuss ideas related to decentralization in all its forms.</p>
+    
+    <h2 id="wwhen-and-where"><a href="#when-and-where">When & Where?</a></h2>
+    <p>Deconference will take place all day on Sunday, September 15, 2024, at Cultural Center Magacin, located at <a href="https://osm.org/go/xf3Fz31te?node=1226456745">Kraljevića Marka 4-8, Belgrade</a>. The evening prior, a social gathering will be hosted at <a href="https://dckrov.rs/">Community Center Krov</a>, located at  <a href="https://osm.org/go/xf3HQQdIH">Kraljice Marije 47, Belgrade</a>.</p>
+
+    <h2 id="why"><a href="#why">Why?</a></h2>
+
+    <p>Decentrala was founded by a small group of enthusiasts united by the idea of technological decentralization. Over the past year and a half, we've organized over 160 events—lectures, workshops, discussions, hackathons—aimed at democratizing technological knowledge and educating people about privacy, open source principles, the right to repair (and how to repair), digital assets, and usage rights. Since day one, our approach has been to inform individuals about alternatives rather than impose opinions upon them.</p>
+
+    <p>Through engaging with diverse visitors, many from non-technical backgrounds, we've come to realize that decentralization encompasses more than just "open technology." Many activists and organizations today advocate for various forms of decentralization. Therefore, we welcome stories about decentralization from diverse perspectives.</p>
+
+    <h2 id="who"><a href="#who">Who?</a></h2>
+
+    <p>Deconference is an open platform for anyone interested in discussing, demonstrating, or exploring decentralization. You can register your event by emailing <a href="mailto:dekonferencija@dmz.rs">dekonferencija@dmz.rs</a> up until the day of the Deconference (September 15).</p>
+
+    <p>We will update this section as topics are confirmed.</p>
+
+    <h2 id="how"><a href="#how">How?</a></h2>
+
+    <p>The Deconference is funded by the organizers' private assets. Like all of Decentrala's activities, Deconference is free for all attendees. Unfortunately, we are unable to provide grants to lecturers or presenters.</p>
+
+    <p>Decentrala accepts donations exclusively from individuals.</p>
+
+  </main>
+  <footer>
+    <span class="links">
+      <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>
+      <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg" alt="SourceCode"></a>
+      <a href="https://balkan.fedive.rs/@decentrala"><img src="/img/mastodon-light.svg" alt="Mastodon"></a>
+    </span>
+  </footer>
+</body>
+</html>
--- a/site/img/strelica-closed-dark.svg
+++ b/site/img/strelica-closed-dark.svg
@ -8,36 +8,71 @@
   version="1.1"
   id="svg5"
   sodipodi:docname="strelica-closed-dark.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   inkscape:export-filename="strelica-closed.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg">
  <sodipodi:namedview
     id="namedview6"
-     pagecolor="#ffffff"
-     bordercolor="#111111"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
     borderopacity="1"
-     inkscape:pageshadow="0"
+     inkscape:showpageshadow="0"
     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
     showgrid="false"
-     inkscape:zoom="20.975"
-     inkscape:cx="20"
-     inkscape:cy="20"
-     inkscape:window-width="1920"
-     inkscape:window-height="1048"
+     inkscape:zoom="9.0932977"
+     inkscape:cx="17.870305"
+     inkscape:cy="22.87399"
+     inkscape:window-width="1280"
+     inkscape:window-height="749"
     inkscape:window-x="0"
-     inkscape:window-y="32"
+     inkscape:window-y="27"
     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
+     inkscape:current-layer="svg5" />
  <defs
     id="defs2" />
  <g
-     id="layer1">
-    <path
-       id="rect288"
-       style="fill:#ffffff;stroke-width:0.345614"
-       d="M 0 0 L 0 1.25 L 8.1494141 1.25 L 2.5751953 10 L 4.0571289 10 L 8.75 2.6333008 L 8.75 10 L 10 10 L 10 1.25 L 10 0.67138672 L 10 0 L 8.9458008 0 L 8.75 0 L 0 0 z " />
-  </g>
+     id="layer1" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317"
+     width="7.5413027"
+     height="1.3530626"
+     x="1.1514941"
+     y="1.5255219" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-6"
+     width="7.5413027"
+     height="1.3530626"
+     x="1.117918"
+     y="7.1488791" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-3"
+     width="7.5413027"
+     height="1.3530626"
+     x="1.1270616"
+     y="4.4020038" />
+  <path
+     style="fill:#ffffff;stroke:#010400;stroke-width:0.0679621"
+     d="M 4.3438587,8.7976884 V 5.773483 H 19.684828 35.025797 V 8.7976884 11.821894 H 19.684828 4.3438587 Z"
+     id="path305"
+     transform="scale(0.25)" />
+  <path
+     style="fill:#ffffff;stroke:#010400;stroke-width:0.0679621"
+     d="m 4.2338876,20.289669 v -2.96922 H 19.574857 34.915826 v 2.96922 2.96922 H 19.574857 4.2338876 Z"
+     id="path307"
+     transform="scale(0.25)" />
+  <path
+     style="fill:#ffffff;stroke:#010400;stroke-width:0.0679621"
+     d="M 4.2338876,31.286779 V 28.31756 H 19.574857 34.915826 v 2.969219 2.96922 H 19.574857 4.2338876 Z"
+     id="path309"
+     transform="scale(0.25)" />
 </svg>
--- a/site/img/strelica-closed-light.svg
+++ b/site/img/strelica-closed-light.svg
@ -7,15 +7,57 @@
   viewBox="0 0 10 10"
   version="1.1"
   id="svg5"
+   sodipodi:docname="strelica-closed.svg"
+   inkscape:export-filename="strelica-closed.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     showgrid="false"
+     inkscape:zoom="9.0932977"
+     inkscape:cx="17.870305"
+     inkscape:cy="22.87399"
+     inkscape:window-width="1280"
+     inkscape:window-height="749"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5" />
  <defs
     id="defs2" />
  <g
-     id="layer1">
-    <path
-       id="rect288"
-       style="fill:#181715;stroke-width:0.345614"
-       d="M 0 0 L 0 1.25 L 8.1494141 1.25 L 2.5751953 10 L 4.0571289 10 L 8.75 2.6333008 L 8.75 10 L 10 10 L 10 1.25 L 10 0.67138672 L 10 0 L 8.9458008 0 L 8.75 0 L 0 0 z " />
-  </g>
+     id="layer1" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317"
+     width="7.5413027"
+     height="1.3530626"
+     x="1.1514941"
+     y="1.5255219" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-6"
+     width="7.5413027"
+     height="1.3530626"
+     x="1.117918"
+     y="7.1488791" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-3"
+     width="7.5413027"
+     height="1.3530626"
+     x="1.1270616"
+     y="4.4020038" />
 </svg>
--- a/site/img/strelica-closed.svg
+++ b/site/img/strelica-closed.svg
@ -7,15 +7,57 @@
   viewBox="0 0 10 10"
   version="1.1"
   id="svg5"
+   sodipodi:docname="strelica-closed.svg"
+   inkscape:export-filename="strelica-closed.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     showgrid="false"
+     inkscape:zoom="9.0932977"
+     inkscape:cx="17.870305"
+     inkscape:cy="22.87399"
+     inkscape:window-width="1280"
+     inkscape:window-height="749"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5" />
  <defs
     id="defs2" />
  <g
-     id="layer1">
-    <path
-       id="path1336"
-       style="fill:#181715;stroke-width:0.504542;fill-opacity:1"
-       d="M 10 0 L 8.8911133 0.57714844 L 8.8862305 0.58544922 L 0.96435547 4.2792969 A 10 10 0 0 0 1.574707 5.3740234 L 7.6362305 2.5473633 L 4.1142578 8.0756836 A 10 10 0 0 0 5.1674805 8.7485352 L 8.6904297 3.21875 L 8.6904297 9.9086914 A 10 10 0 0 0 9.9404297 9.9975586 L 9.9404297 1.2568359 L 9.9453125 1.2490234 L 10 0 z " />
-  </g>
+     id="layer1" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317"
+     width="7.5413027"
+     height="1.3530626"
+     x="1.1514941"
+     y="1.5255219" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-6"
+     width="7.5413027"
+     height="1.3530626"
+     x="1.117918"
+     y="7.1488791" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-3"
+     width="7.5413027"
+     height="1.3530626"
+     x="1.1270616"
+     y="4.4020038" />
 </svg>
--- a/site/img/strelica-opened-dark.svg
+++ b/site/img/strelica-opened-dark.svg
@ -8,36 +8,74 @@
   version="1.1"
   id="svg5"
   sodipodi:docname="strelica-opened-dark.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   inkscape:export-filename="strelica-closed.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg">
  <sodipodi:namedview
     id="namedview6"
-     pagecolor="#ffffff"
-     bordercolor="#111111"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
     borderopacity="1"
-     inkscape:pageshadow="0"
+     inkscape:showpageshadow="0"
     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
     showgrid="false"
-     inkscape:zoom="20.975"
-     inkscape:cx="20"
-     inkscape:cy="20"
-     inkscape:window-width="1920"
-     inkscape:window-height="1048"
+     inkscape:zoom="9.0932977"
+     inkscape:cx="17.870305"
+     inkscape:cy="22.87399"
+     inkscape:window-width="1280"
+     inkscape:window-height="749"
     inkscape:window-x="0"
-     inkscape:window-y="32"
+     inkscape:window-y="27"
     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
+     inkscape:current-layer="svg5" />
  <defs
     id="defs2" />
  <g
-     id="layer1">
-    <path
-       id="rect288"
-       style="fill:#ffffff;stroke-width:0.345614"
-       d="M 0 0 L 0 1.25 L 2.8071289 1.25 L 2.8071289 10 L 4.0571289 10 L 4.0571289 1.25 L 8.75 1.25 L 10 1.25 L 10 0 L 8.75 0 L 0 0 z " />
-  </g>
+     id="layer1" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317"
+     width="7.5289507"
+     height="1.9984204"
+     x="1.1627259"
+     y="1.1712277"
+     ry="0" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-3"
+     width="7.5289507"
+     height="1.9984204"
+     x="1.1609803"
+     y="4.0333257"
+     ry="0" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-6"
+     width="7.5289507"
+     height="1.9984204"
+     x="1.1579751"
+     y="6.9176984"
+     ry="0" />
+  <path
+     style="fill:#ffffff;stroke:#010400;stroke-width:0.0679621;fill-opacity:1"
+     d="M 4.3438587,8.6327318 V 4.3438587 H 19.684828 35.025797 V 8.6327318 12.921605 H 19.684828 4.3438587 Z"
+     id="path908"
+     transform="scale(0.25)" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:#010400;stroke-width:0.0679621"
+     d="M 4.3438587,20.124712 V 15.890825 H 19.684828 35.025797 V 20.124712 24.3586 H 19.684828 4.3438587 Z"
+     id="path2083"
+     transform="scale(0.25)" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:#010400;stroke-width:0.0679621"
+     d="M 4.3438587,31.671678 V 27.437791 H 19.684828 35.025797 v 4.233887 4.233888 H 19.684828 4.3438587 Z"
+     id="path2085"
+     transform="scale(0.25)" />
 </svg>
--- a/site/img/strelica-opened-light.svg
+++ b/site/img/strelica-opened-light.svg
@ -7,15 +7,60 @@
   viewBox="0 0 10 10"
   version="1.1"
   id="svg5"
+   sodipodi:docname="strelica-closed.svg"
+   inkscape:export-filename="strelica-closed.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     showgrid="false"
+     inkscape:zoom="9.0932977"
+     inkscape:cx="17.870305"
+     inkscape:cy="22.87399"
+     inkscape:window-width="1280"
+     inkscape:window-height="749"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5" />
  <defs
     id="defs2" />
  <g
-     id="layer1">
-    <path
-       id="rect288"
-       style="fill:#181715;stroke-width:0.345614"
-       d="M 0 0 L 0 1.25 L 2.8071289 1.25 L 2.8071289 10 L 4.0571289 10 L 4.0571289 1.25 L 8.75 1.25 L 10 1.25 L 10 0 L 8.75 0 L 0 0 z " />
-  </g>
+     id="layer1" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317"
+     width="7.5289507"
+     height="1.9984204"
+     x="1.1627259"
+     y="1.1712277"
+     ry="0" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-3"
+     width="7.5289507"
+     height="1.9984204"
+     x="1.1609803"
+     y="4.0333257"
+     ry="0" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-6"
+     width="7.5289507"
+     height="1.9984204"
+     x="1.1579751"
+     y="6.9176984"
+     ry="0" />
 </svg>
--- a/site/img/strelica-opened.svg
+++ b/site/img/strelica-opened.svg
@ -7,15 +7,60 @@
   viewBox="0 0 10 10"
   version="1.1"
   id="svg5"
+   sodipodi:docname="strelica-closed.svg"
+   inkscape:export-filename="strelica-closed.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     showgrid="false"
+     inkscape:zoom="9.0932977"
+     inkscape:cx="17.870305"
+     inkscape:cy="22.87399"
+     inkscape:window-width="1280"
+     inkscape:window-height="749"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5" />
  <defs
     id="defs2" />
  <g
-     id="layer1">
-    <path
-       id="path1336"
-       style="fill:#181715;fill-opacity:1;stroke-width:0.504542"
-       d="M 5 0.0029296875 L 4.375 1.0859375 L 4.375 1.0952148 L 0.35400391 7.4072266 A 8.75 8.75 0 0 0 1.4614258 7.9956055 L 4.375 3.4213867 L 4.375 8.7265625 A 8.75 8.75 0 0 0 5 8.75 A 8.75 8.75 0 0 0 5.625 8.7265625 L 5.625 3.4213867 L 8.5390625 7.9956055 A 8.75 8.75 0 0 0 9.6464844 7.4072266 L 5.625 1.0952148 L 5.625 1.0859375 L 5 0.0029296875 z " />
-  </g>
+     id="layer1" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317"
+     width="7.5289507"
+     height="1.9984204"
+     x="1.1627259"
+     y="1.1712277"
+     ry="0" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-3"
+     width="7.5289507"
+     height="1.9984204"
+     x="1.1609803"
+     y="4.0333257"
+     ry="0" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-6"
+     width="7.5289507"
+     height="1.9984204"
+     x="1.1579751"
+     y="6.9176984"
+     ry="0" />
 </svg>
--- a/site/styles/about.css
+++ b/site/styles/about.css
@ -0,0 +1,11 @@
+dl {
+  padding: 1rem 0;
+}
+
+dt {
+  font-weight: bold;
+}
+
+dd {
+  margin: 0 0 1rem 1rem;
+}
--- a/site/styles/account.css
+++ b/site/styles/account.css
@ -1,4 +0,0 @@
-h1 {
-  margin-bottom: 2rem;
-  font-weight: normal;
-}
--- a/site/styles/contact.css
+++ b/site/styles/contact.css
@ -1,4 +0,0 @@
-h1 {
-  margin-bottom: 2rem;
-  font-weight: normal;
-}
--- a/site/styles/events.css
+++ b/site/styles/events.css
@ -1,30 +1,75 @@
-table {
-  table-layout: fixed;
-  border-spacing: 0;
+.event {
+  display: flex;
+  flex-direction: row;
 }

-th,
-td {
-  padding: 0 1rem 0 1rem;
-  text-align: left;
-  border-left: 2px solid var(--border);
+.event:hover {
+  border-bottom: 5px var(--hightlight) solid;
 }

-th {
-  padding: 1rem 1rem 0 1rem;
-  border-bottom: 2px solid var(--border);
+.event:hover > div {
+  padding-bottom: calc(0.5rem - 5px);
 }

-td:nth-child(odd) {
+.event > div {
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
  white-space: nowrap;
 }

-td {
-  padding: 0 1rem 1rem 1rem;
-  vertical-align: top;
+.date {
+  width: 250px;
+  font-size: 0.9em;
+  overflow-x: hidden;
+  white-space: nowrap;
 }

-h1 {
-  margin-bottom: 2rem;
-  font-weight: normal;
-}
+.title {
+  border-left: 2px solid var(--border);
+  font-weight: bold;
+  padding-left: 1rem;
+  padding-right: 0.5em;
+}
+
+.place {
+  font-size: 0.9em;
+}
+
+.types {
+  font-size: 0.9em;
+  margin-left: auto;
+  font-style: italic;
+}
+
+@media screen and (max-width: 1160px) {
+  .event {
+    flex-direction: column;
+    margin-bottom: 1rem;
+    border-left: 3px solid var(--border);
+  }
+
+  .event > div {
+    padding: 0 0.5rem;
+    white-space: normal;
+  }
+
+  .event:hover {
+    border-bottom: none;
+  }
+
+  .event:hover > div {
+    padding-bottom: 0;
+  }
+
+  .date {
+    width: 100%;
+  }
+
+  .title {
+    border-left: none;
+  }
+
+  .types {
+    margin-left: 0;
+  }
+}
--- a/site/styles/home.css
+++ b/site/styles/home.css
@ -1,8 +1,3 @@
-h1 {
-  margin-bottom: 2rem;
-  font-weight: normal;
-}
-
 dl {
  padding: 1rem 0;
 }
--- a/site/styles/services.css
+++ b/site/styles/services.css
@ -20,8 +20,3 @@ td {
  padding: 0 1rem 1rem 1rem;
  vertical-align: top;
 }
-
-h1 {
-  margin-bottom: 2rem;
-  font-weight: normal;
-}
--- a/site/styles/statute.css
+++ b/site/styles/statute.css
--- a/site/styles/style.css
+++ b/site/styles/style.css
@ -68,6 +68,13 @@ main {
  overflow: auto;
 }

+main h1 {
+  margin-bottom: 2rem;
+  font-weight: normal;
+  font-size: 1.5em;
+  font-variant-caps: small-caps;
+}
+
 a,
 a:visited {
  text-decoration: none;
@ -75,8 +82,7 @@ a:visited {
 }

 main a {
-  position: relative;
-  top: 0.2rem;
+  text-decoration: underline;
 }

 a:hover,
@ -112,7 +118,7 @@ a:focus {
  background: linear-gradient(90deg, var(--hightlight) 0%, var(--hightlight) 50%, var(--bg) 51%, var(--bg) 100%);
 }

-.account {
+.lang {
  font-size: 2rem;
 }

@ -211,8 +217,4 @@ screen and (max-width: 1500px) {
  #theme-switcher {
    margin-right: 1rem;
  }
-
-  .account {
-    font-size: 1rem;
-  }
 }
--- a/template/end.ical
+++ b/template/end.ical
@ -0,0 +1 @@
+END:VCALENDAR
--- a/template/event.ical
+++ b/template/event.ical
@ -0,0 +1,13 @@
+BEGIN:VEVENT
+UID:calendar.<!--UID-->.field_date_time.0@radar.squat.net
+DTSTAMP:<!--CREATED-->
+CREATED:<!--CREATED-->
+DTSTART;TZID=Europe/Belgrade:<!--DATE-->
+DTEND;TZID=Europe/Belgrade:<!--DATE-->
+GEO:+44.805613;+20.479234
+LAST-MODIFIED:<!--CREATED-->
+LOCATION:DC Krov\, Kraljice Marije 47\, 6\, Beograd\, Serbia
+STATUS:CONFIRMED
+SUMMARY:<!--TITLE-->
+URL;TYPE=URI:https://dmz.rs/events
+END:VEVENT
--- a/template/head.ical
+++ b/template/head.ical
@ -0,0 +1,20 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Date iCal v3.8//NONSGML kigkonsult.se iCalcreator 2.20.2//
+METHOD:PUBLISH
+X-WR-CALNAME;VALUE=TEXT:Decentrala events
+BEGIN:VTIMEZONE
+TZID:Europe/Belgrade
+BEGIN:STANDARD
+DTSTART:20231029T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20240331T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+END:DAYLIGHT
+END:VTIMEZONE
--- a/template/page-en.html
+++ b/template/page-en.html
@ -9,12 +9,13 @@
  <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
  <script src="/scripts/main.js" defer></script>
  <title><!--TITLE--> Decentrala</title>
+  <link rel="alternate" hreflang="sr" href="/PAGE_NAME" />
 </head>
 <body>
  <header>
-    <a id="logo" href="/"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
+    <a id="logo" href="/en/index"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
    <button id="theme-switcher"></button>
-    <a class="account" href="/en/account">Account</a>
+    <a class="lang" hreflang="sr" href="/PAGE_NAME">SR</a>
  </header>
  <main>
    <!--MAIN-->
@ -22,9 +23,11 @@
  <footer>
    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
    <nav>
-      <a href="/en/events">Događaji</a>
-      <a href="/en/services">Servisi</a>
-      <a href="/en/contact">Kontakt</a>
+      <a href="/en/events">Events</a>
+      <a href="/en/services">Services</a>
+      <a href="/en/about">About</a>
+      <a href="/en/account">Account</a>
+      <a href="/en/donations">Donations</a>
    </nav>
    <span class="links">
      <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>
--- a/template/page-sr.html
+++ b/template/page-sr.html
@ -9,12 +9,13 @@
  <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
  <script src="/scripts/main.js" defer></script>
  <title><!--TITLE--> Decentrala</title>
+  <link rel="alternate" hreflang="en" href="/en/PAGE_NAME" />
 </head>
 <body>
  <header>
    <a id="logo" href="/"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
    <button id="theme-switcher"></button>
-    <a class="account" href="/account">Nalog</a>
+    <a class="lang" hreflang="en" href="/en/PAGE_NAME">EN</a>
  </header>
  <main>
    <!--MAIN-->
@ -24,7 +25,9 @@
    <nav>
      <a href="/events">Događaji</a>
      <a href="/services">Servisi</a>
-      <a href="/contact">Kontakt</a>
+      <a href="/about">O nama</a>
+      <a class="account" href="/account">Nalog</a>
+      <a href="/donations">Donacije</a>
    </nav>
    <span class="links">
      <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>
Author	SHA1	Message	Date
Hugo	e17f94e214	fix2	2024-06-27 19:14:25 +02:00
Hugo	60b3d6a345	fix	2024-06-27 19:13:47 +02:00
Hugo	96fa0361fa	Uticaj tehnologije na prirodu	2024-06-27 19:04:55 +02:00
Hugo	aeb0ed405b	a new event	2024-06-27 19:01:35 +02:00
Hugo	129a2ac74a	wording fixes	2024-06-27 18:59:11 +02:00
Hugo	33c81b39d8	Merge branch 'dekonferencija'	2024-06-27 18:33:05 +02:00
Hugo	7e179c704c	fix events	2024-06-26 18:02:26 +02:00
Hugo	037ddb0af6	Jul 2024	2024-06-20 19:13:25 +02:00
fram3d	b7cdc83cff	fix link to statute on serbian version	2024-06-03 00:03:16 +02:00
fram3d	54013ac9a9	fix pad and dark poster mesh color in imageposter	2024-06-01 17:25:16 +02:00
fram3d	7c134225ed	add imageposter mesh for dark	2024-06-01 17:18:36 +02:00
fram3d	56149858bf	add mesh	2024-06-01 17:02:14 +02:00
fram3d	f3eebcdfa3	fix time in events	2024-06-01 15:17:37 +02:00
fram3d	e8b4495c58	add A3 poster format	2024-06-01 15:16:21 +02:00
fram3d	d4a8d92615	make bigger margins in poster	2024-06-01 12:56:02 +02:00
fram3d	a8736b7805	fix time of events	2024-06-01 12:54:42 +02:00
fram3d	468cb2c59e	add events	2024-05-28 19:48:04 +02:00
fram3d	31d8bf8236	add event	2024-05-28 19:36:19 +02:00
fram3d	0722444a3c	fix image_poster.py to only show specified month	2024-05-24 01:19:32 +02:00
fram3d	f6d5004ae4	fix typo	2024-05-24 00:57:39 +02:00
fram3d	182dcec506	add conference type of event	2024-05-21 01:56:19 +02:00
fram3d	08d5f5d75b	add dekonferencija to dogadjaji.csv	2024-05-21 01:26:02 +02:00
Hugo	47c4260b5e	June events	2024-05-17 22:56:33 +02:00
Hugo	5f00b87c9d	Some events fixes	2024-05-17 22:51:41 +02:00
fram3d	6b990d2a14	fix event descritpion	2024-04-24 21:15:17 +02:00
fram3d	ac6f4fae9a	fix typo in events	2024-04-24 00:05:03 +02:00
fram3d	a2ac99b959	add events	2024-04-22 13:38:08 +02:00
fram3d	931d6c6cdc	add events	2024-04-18 15:52:16 +02:00
fram3d	670ab75750	change navigation arrow to hamburger	2024-04-18 14:52:01 +02:00
fram3d	4944923f77	fix more typos	2024-04-16 21:53:35 +02:00
fram3d	2a02dfe9b4	fix typo	2024-04-16 21:49:06 +02:00
fram3d	5113f8820b	add links to why decentralization is important to wiki and forum page	2024-04-16 21:35:49 +02:00
saky	07a6a0834d	Motivacija	2024-04-15 21:44:05 +02:00
Vuk	def454358d	jos manjih edita	2024-04-15 21:40:55 +02:00
Vuk	c891f9edad	manji edit	2024-04-15 21:39:03 +02:00
fram3d	de7d7bfbbd	rename donacije.html to donations.html	2024-04-15 21:05:06 +02:00
vuk	2790292f3b	donacije bi sad trebalo da se pojave	2024-04-15 21:03:12 +02:00
fram3d	99a78157a4	move statute from index to new about	2024-04-15 20:56:29 +02:00
vuk	4896f7c5fa	Revert "nadam se da sam nesto sad uradio sa py skriptama" This reverts commit `29b29d37b1`. mislim da sam sjebao nesto	2024-04-15 20:48:49 +02:00
vuk	29b29d37b1	nadam se da sam nesto sad uradio sa py skriptama	2024-04-15 20:42:39 +02:00
vuk	9f5d011ad5	bice vremena za blog, ja moram stranicu za donacije da pravim	2024-04-15 20:40:48 +02:00
Vuk	56917d46a3	uklonjene info o donacijama sa indexa	2024-04-15 20:18:12 +02:00
Vuk	7cb83e0a0a	new file: pages/en/donations.html donacije od sad i na engleskom	2024-04-15 20:15:15 +02:00
Vuk	cf3b989150	new file: pages/sr/donacije.html donacije od sad na odvojenoj strani	2024-04-15 20:05:50 +02:00
fram3d	d76ddeabdf	change dobrodosao to dobrodosli on home page	2024-04-08 13:05:43 +02:00
Hugo	0557807a7e	Fix a day label	2024-04-03 21:23:13 +02:00
Hugo	2c522eebc5	Update `.gitignore`	2024-04-03 21:21:54 +02:00
Hugo	5977040b1a	Fix html formatting	2024-04-03 21:21:15 +02:00
fram3d	0357513776	temporary fix for statute link	2024-04-03 04:18:44 +02:00
fram3d	405fce696c	add statute link to index page	2024-04-03 03:52:41 +02:00
fram3d	611cd84ad6	add statute	2024-04-03 03:11:59 +02:00
fram3d	771dad3b38	fix sr/services.html	2024-04-03 03:06:46 +02:00
fram3d	71f32835f0	add event type for Home Made SoC	2024-04-03 03:04:21 +02:00
fram3d	e61a1adc67	Merge remote-tracking branch 'origin/master'	2024-04-03 03:01:16 +02:00
fram3d	2f77647279	add nextcloud to services	2024-04-03 03:00:26 +02:00
fram3d	a479558be1	add statute	2024-04-03 02:57:07 +02:00
Hugo	0b49fec686	Type fix	2024-03-31 12:28:34 +02:00
Hugo	e76d57f07d	Add event types	2024-03-31 12:25:49 +02:00
fram3d	0e99f5f8c8	add events	2024-03-27 12:09:05 +01:00
fram3d	b99250308e	add events	2024-03-26 16:12:42 +01:00
fram3d	dc6e5ce2d3	add events	2024-03-20 13:20:59 +01:00
fram3d	b288706b80	add events	2024-03-04 15:32:18 +01:00
fram3d	b7a18b2b0e	add link to chat in services	2024-03-04 12:26:27 +01:00
fram3d	8b81831ba3	change to librex in services	2024-02-29 10:30:47 +01:00
fram3d	cfa94f3bea	add events.ical to gitignore	2024-02-29 09:54:22 +01:00
fram3d	61db7770db	Revert "remove searhx from list of services since it is not available anymore" This reverts commit `5edf754421`.	2024-02-29 09:53:36 +01:00
fram3d	5b7738c728	fix account page link for thunderbird	2024-02-28 04:14:32 +01:00
fram3d	ffea059296	add events	2024-02-23 01:48:01 +01:00
fram3d	61d1a949f7	add events	2024-02-23 01:40:10 +01:00
fram3d	b2479a045e	fix ical link displayed on events page	2024-02-08 18:04:31 +01:00
fram3d	bd496eac3c	generate event page in prep from the whole page	2024-02-08 18:01:43 +01:00
fram3d	4959a91b08	add link to ical calendar to events page	2024-02-08 17:29:48 +01:00
fram3d	45eb5e6b21	fix uid ical again	2024-02-08 17:21:52 +01:00
fram3d	4d4fd6d4d3	fix uid in ical	2024-02-08 17:19:13 +01:00
fram3d	35198a33d2	fix ical templates	2024-02-08 17:10:51 +01:00
fram3d	2c42a80a33	fix ical	2024-02-08 16:56:11 +01:00
fram3d	3845e7b870	fix ical	2024-02-08 16:55:39 +01:00
fram3d	95f02eb0c9	add ical page	2024-02-08 16:50:05 +01:00
fram3d	17a8e7fc95	update events	2024-01-27 10:57:05 +01:00
fram3d	1a0d147564	update events	2024-01-26 22:09:38 +01:00
fram3d	f38fcc7dcf	dogadjaji februar 2024	2024-01-23 16:51:18 +01:00
fram3d	c53d73cc1b	add more text to textfile	2023-12-29 20:44:23 +01:00
fram3d	dfa84076b7	add text to poster image and also write events to a text file	2023-12-29 20:40:22 +01:00
fram3d	b6a198ed5f	add events	2023-12-29 02:01:16 +01:00
fram3d	40d22dd42f	add time for hacakathon	2023-11-30 04:18:19 +01:00
fram3d	6b26791c2e	add events	2023-11-24 00:27:54 +01:00
fram3d	38b6b18a40	add events	2023-11-21 16:00:17 +01:00
fram3d	3577486210	add events	2023-11-15 18:11:11 +01:00
hugo	a39f257b94	Merge pull request 'December events' (#22 ) from hugo/website2:master into master Reviewed-on: #22	2023-11-12 09:32:59 +00:00
Hugo	828be8cd8f	Reverse archive page	2023-11-12 10:29:32 +01:00
Hugo	1d20360c46	December events	2023-11-12 10:26:17 +01:00
fram3d	03fb78892c	add quiz night in dogadjaji.csv	2023-10-20 16:30:38 +02:00
Hugo	658f47a1ae	November	2023-10-18 22:12:29 +02:00
Hugo	df32ef6116	Serbian letters	2023-10-18 21:59:39 +02:00
fram3d	c3da6e392d	replace card game night with Decentrala birthday party	2023-10-17 11:59:15 +02:00
fram3d	81f136b7cb	add linux install day event	2023-10-11 01:12:51 +02:00
fram3d	5edf754421	remove searhx from list of services since it is not available anymore	2023-10-09 00:25:18 +02:00
svitvojimilioni	ac0d32559c	Merge pull request 'Support for commas in csv' (#21 ) from ivdv/website:csv-comma into master lepo :D	2023-10-01 16:27:08 +00:00
ivdv	7df04ecf71	Support for commas	2023-09-29 12:27:11 -07:00
fram3d	25662d7bda	change postiton of location and time text to make more space from events	2023-09-28 14:09:12 +02:00
fram3d	12235ab51e	add text to poster about time and location	2023-09-28 14:07:35 +02:00
fram3d	62da74bf99	add optional argument for month	2023-09-27 17:40:11 +02:00
fram3d	a321ebe765	fix wrong array index	2023-09-27 17:00:13 +02:00
fram3d	a70fd1369e	change NEXT_MONTH to actaul next month instead of CURRENT_TIME	2023-09-27 16:58:28 +02:00
fram3d	768f1c66e6	and shebangs and make all scripts executable	2023-09-27 16:47:55 +02:00
fram3d	fb50c076fe	add events	2023-09-27 16:43:15 +02:00
fram3d	b31a1b5ebf	add events	2023-09-26 13:43:04 +02:00
fram3d	ab15c97e5e	add dogadjaji	2023-09-22 01:13:32 +02:00
fram3d	702ab07e03	add tilda and pionir to webring	2023-09-18 22:25:32 +02:00
hugo	3232cdcf09	October events	2023-09-17 19:28:00 +00:00
hugo	aec8f74ed2	Izmena	2023-09-17 19:25:48 +00:00
hugo	62778e2679	Merge pull request 'PNG poster maker' (#20 ) from hugo/website2:poster into master Reviewed-on: #20	2023-09-01 11:45:10 +00:00
Hugo	4eae5c08b8	Png poster maker	2023-09-01 13:44:12 +02:00
hugo	4b700f6652	Merge pull request 'September events' (#19 ) from hugo/website2:events into master Reviewed-on: #19	2023-08-30 17:47:59 +00:00
Hugo	de3d5142f6	Fix navigation link	2023-08-30 19:47:10 +02:00
Hugo	1bfa147cb4	Add september events. Fix events layout	2023-08-30 19:47:00 +02:00
hugo	8d942cf2f3	Merge pull request 'Archive page' (#17 ) from hugo/website2:archive_page into master Reviewed-on: #17	2023-08-30 11:20:27 +00:00
Hugo	39b65d0547	Fix account link	2023-08-30 13:18:43 +02:00
Hugo	efe1ea873b	Fix h1 tags	2023-08-30 13:17:27 +02:00
Hugo	44910c183b	Implement Archive builder. Change events layout	2023-08-30 13:09:10 +02:00
Hugo	be37b42273	Update TODO	2023-08-30 13:00:09 +02:00
Hugo	29c1b7ad55	Update events list	2023-08-30 12:59:10 +02:00
Hugo	4233fe7f44	Implement events pages skeletons	2023-08-30 11:56:05 +02:00
hugo	4bcd13a713	Merge pull request 'Implement the English version' (#16 ) from hugo/website2:english_version into master Reviewed-on: #16	2023-08-30 08:08:51 +00:00
Hugo	05c11219d2	Wording	2023-08-30 10:08:34 +02:00
Hugo	6671fb1547	Implement page builder for English	2023-08-29 15:25:20 +02:00
Hugo	221dff13dd	Spelling	2023-08-29 15:01:45 +02:00
Hugo	1f5e541922	Fix events script	2023-08-29 14:02:39 +02:00
Hugo	d31e4e10c8	Translate pages	2023-08-29 13:46:59 +02:00
hugo	005fba6010	Merge pull request 'fix wording, fix links, remove obsolete page' (#15 ) from hugo/website2:fixes3 into master Reviewed-on: #15	2023-08-29 09:59:03 +00:00
Hugo	b71eb393ce	fix wording, fix links, remove obsolete page	2023-08-29 11:54:05 +02:00
hugo	bdd7a3e7ef	Merge pull request 'change from LibreX to SearXNG for bot protection' (#14 ) from youshitsune/website:master into master Reviewed-on: #14	2023-08-28 08:20:27 +00:00
youshitsune	703c11a5ce	change from LibreX to SearXNG for bot protection	2023-08-28 08:39:06 +02:00
fram3d	1db838a44c	add links to events	2023-08-28 01:19:28 +02:00
fram3d	0fde75bc41	add new events	2023-08-28 01:16:36 +02:00
fram3d	9fa68a27b6	fix issue with using same name for two different variables	2023-08-26 01:03:33 +02:00
fram3d	d878e884d4	Merge pull request 'Dodate donacije, prepisao sa hackerspaces wikija' (#12 ) from svitvojimilioni/website:donacije-3 into master Reviewed-on: #12	2023-08-25 22:39:06 +00:00
fram3d	f9ff147495	Merge pull request 'pravopis, gramatika, rodna ravnopravnost...' (#13 ) from stalker/website:pravopis-fixes into master Reviewed-on: #13	2023-08-25 22:38:53 +00:00
Branko Kokanovic	5e90343728	pravopis, gramatika, rodna ravnopravnost...	2023-08-25 21:28:33 +02:00
svitvojimilioni@dmz.rs	1a1ee35992	Dodate donacije, prepisao sa hackerspaces wikija	2023-08-25 11:42:45 -04:00