Izmenjen dogadaji.csv radi popravljanja konflikta

stvarno popravljeno formatiranje
Opet popravljeno formatiranje
2023-08-30 12:55:09 -04:00 · 2023-08-30 12:31:28 -04:00 · 2023-08-30 12:29:52 -04:00 · 2023-08-30 12:28:28 -04:00 · 2023-08-30 12:26:22 -04:00
53 changed files with 428 additions and 1724 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,14 +1,8 @@
 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,12 +31,9 @@ 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
- [x] make english version
-  - double check spelling and wording
- add account and donations page and style them with the site style
+- [ ] make english version (localisation)
--- a/atom_gen.py
+++ b/atom_gen.py
@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#! /usr/bin/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,3 +69,5 @@ 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,4 +1,3 @@
-#! /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,24 +1,18 @@
-#! /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': 'about', 'titleSR': 'O nama', 'titleEN': 'About us', 'style': 'about'},
-    {'name': 'statute', 'titleSR': 'Statut', 'titleEN': 'Statute', 'style': 'statute'},
+    {'name': 'contact', 'titleSR': 'Kontakt', 'titleEN': 'Contact', 'style': 'contact'},
    {'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': 'donations'},
-    {'name': 'deconference', 'titleSR': 'Dekonferencija', 'titleEN': 'Deconference', 'style': 'deconference'},
 ]

-def buildPage(filename: str, pageTitle: str, pageHtml: str, pageStyle: str, template: str) -> str:
+def buildPage(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

@ -30,16 +24,10 @@ def main():
        for page in PAGES:
            with open(f'pages/sr/{page["name"]}.html') as f:
                pageHtml = f.read()
-                html = buildPage(page['name'], page['titleSR'], pageHtml, page['style'], templateSR)
+                html = buildPage(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,220 +1,80 @@
-datum, vreme, lokacija, tema, tip, link
-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 #1, 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 #2, 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 #1, lecture workshop, https://forum.dmz.rs/t/uvod-u-elektroniku/342
-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 #2, lecture workshop, https://forum.dmz.rs/t/uvod-u-elektroniku/342
-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 #3, lecture workshop, https://forum.dmz.rs/t/uvod-u-elektroniku/342
-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 #4, lecture workshop, https://forum.dmz.rs/t/uvod-u-elektroniku/342
-18-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, lecture workshop, https://forum.dmz.rs/t/arduino-radionica/382
-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 #5, lecture workshop, https://forum.dmz.rs/t/uvod-u-elektroniku/342
-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, https://ubavic.rs/kompajleri_i_trojanci/
-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, https://forum.dmz.rs/t/arduino-radionica/382
-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, https://forum.dmz.rs/t/arduino-radionica/382
-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 (1962), movie, https://en.wikipedia.org/wiki/La_Jet%C3%A9e
-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, https://forum.dmz.rs/t/teorija-cvorova/494
-09-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop, https://forum.dmz.rs/t/arduino-radionica/382
-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, https://forum.dmz.rs/t/arduino-radionica/382
-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, https://en.wikipedia.org/wiki/Alphaville_(film)
-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, https://en.wikipedia.org/wiki/Pi_(film)
-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, https://forum.dmz.rs/t/uticaj-tehnologije-na-prirodu/616
-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 veštačku inteligenciju, lecture discussion,
-29-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, OnionShare, lecture, https://forum.dmz.rs/t/plan-za-jul-2024/612/17?u=mkevac
-30-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, CryptoPals #1, workshop, https://forum.dmz.rs/t/cryptopals-u-decentrali/620
-05-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, CryptoPals #2, workshop, https://forum.dmz.rs/t/cryptopals-u-decentrali/620
-06-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Intro to Zig, lecture, https://forum.dmz.rs/t/intro-to-zig-or-30-reasons-you-should-start-using-zig/696
-12-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, CryptoPals #3, workshop, https://forum.dmz.rs/t/cryptopals-u-decentrali/620
-13-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardware hackathon, hack, https://wiki.dmz.rs/decentrala/dogadjaji/hakaton
-15-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, GETÖSEFÖHN, music, https://forum.dmz.rs/t/fwd-gig-in-july-august/626
-19-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, CryptoPals #4, workshop, https://forum.dmz.rs/t/cryptopals-u-decentrali/620
-20-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Open Street Map, hack, https://forum.dmz.rs/t/hakaton-avgust-2024/682
-26-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting, https://wiki.dmz.rs/decentrala/dogadjaji/lightningtalks
-27-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin vezbe, workshop, https://wiki.dmz.rs/en/sysadmin
-02-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Clerks (1994), movie, https://en.wikipedia.org/wiki/Clerks_(film)
-03-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Python vezbe, workshop, https://radionice.dmz.rs/python/
-09-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton, hack, https://wiki.dmz.rs/decentrala/dogadjaji/hakaton
-10-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardverski hakaton, hack, https://wiki.dmz.rs/decentrala/dogadjaji/hakaton
-14-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Priprema za Dekonferenciju, meeting, https://dmz.rs/deconference
-15-09-2024, 11:00, KC Magacin https://www.openstreetmap.org/node/1226456745#map=19/44.81314/20.45378, Dekonferencija, conference, https://dmz.rs/deconference
-16-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting, https://wiki.dmz.rs/decentrala/dogadjaji/lightningtalks
-17-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Linux install day, workshop, https://en.wikipedia.org/wiki/Linux_user_group#Installfests
-23-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Linux ricing , workshop, https://excaliburzero.gitbooks.io/an-introduction-to-linux-ricing/content/ricing.html
-24-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Strateški sastanak, meeting, https://forum.dmz.rs/t/decentrala-sastanak/13/113
-30-09-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u ekonomiju, lecture, https://forum.dmz.rs/t/uvod-u-ekonomiju/719
-01-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Jam session, music, https://forum.dmz.rs/t/jam-session/741
-04-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Ludum Dare doček teme, meeting, https://forum.dmz.rs/t/ludum-dare-56-game-jam/749/1
-05-10-2024, 00:00, DC Krov https://www.openstreetmap.org/node/10594728522, Ludum Dare gamejam, hack, https://forum.dmz.rs/t/ludum-dare-56-game-jam/749/1
-06-10-2024, 00:00, DC Krov https://www.openstreetmap.org/node/10594728522, Ludum Dare gamejam, hack, https://forum.dmz.rs/t/ludum-dare-56-game-jam/749/1
-07-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Predstavljanje igrica, lecture, https://forum.dmz.rs/t/ludum-dare-56-game-jam/749/1
-08-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, In browser dev tools, lecture, https://forum.dmz.rs/t/in-browser-dev-tools-kako-rade-veb-stranice/751
-14-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Radio hakaton, hack, https://forum.dmz.rs/t/745
-15-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, LAN party, party, https://forum.dmz.rs/t/lan-party/126
-21-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Algebra - Grupe, lecture, https://forum.dmz.rs/t/746
-22-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin vežbe, workshop, https://wiki.dmz.rs/en/sysadmin
-28-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardverski hakaton, hack, https://wiki.dmz.rs/en/decentrala/dogadjaji/hakaton
-29-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Radionica lemljenja, workshop, https://forum.dmz.rs/t/lemljenje/777/1
-30-10-2024, 18:00, Matematički fakultet (Učionica 251) https://www.openstreetmap.org/node/12291697569, Linux install day, workshop, https://forum.dmz.rs/t/linux-install-day/803
-4-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin vežbe, workshop, https://wiki.dmz.rs/en/sysadmin
-5-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, SYSTEMD - da/ne/zašto ne i alternative, lecture, https://forum.dmz.rs/t/plan-za-novembar-2024/785/4?u=wingaxe
-11-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting, https://wiki.dmz.rs/decentrala/dogadjaji/lightningtalks
-12-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Don’t be afraid of pointers, lecture, https://forum.dmz.rs/t/ne-boj-se-pointera-dont-be-afraid-of-pointers-predavanje/807
-13-11-2024, 18:00, Matematički fakultet (Učionica 153) https://www.openstreetmap.org/node/12291697569, Makefiles (en), lecture,
-18-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Intro to Security Auditing, lecture,
-19-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, LAN party, party, https://forum.dmz.rs/t/lan-party/126
-20-11-2024, 18:00, Matematički fakultet (Učionica 153) https://www.openstreetmap.org/node/12291697569, 30 reasons to use Zig, lecture, https://forum.dmz.rs/t/intro-to-zig-or-30-reasons-you-should-start-using-zig/696
-25-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardverski Hackaton, hack, https://wiki.dmz.rs/en/decentrala/dogadjaji/hakaton
-26-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Tiny Keyboards Explained - 28 keys are enough, lecture,
-27-11-2024, 18:00, Matematički fakultet (Učionica 153) https://www.openstreetmap.org/node/12291697569, OpenGL šejderi #1: Osnove, lecture,
-02-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting, https://wiki.dmz.rs/decentrala/dogadjaji/lightningtalks
-03-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin vežbe, workshop, https://wiki.dmz.rs/en/sysadmin
-04-12-2024, 18:00, Matematički fakultet (Učionica 153) https://www.openstreetmap.org/node/12291697569, OpenGL šejderi #2: SDF renderovanje, lecture,
-09-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Ne treba nam (toliko) Javascript, lecture,
-10-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Creating Interactive Fiction with TADS (en), lecture
-11-12-2024, 18:00, Matematički fakultet (Učionica 153) https://www.openstreetmap.org/node/12291697569, OpenGL šejderi #3: Kompleksna analiza, lecture,
-16-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Softverski hakaton, hack, https://wiki.dmz.rs/decentrala/dogadjaji/hakaton
-17-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardverski hakaton, hack, https://forum.dmz.rs/t/hardware-hackathon-novembar/832
-18-12-2024, 18:00, Matematički fakultet (Učionica 153) https://www.openstreetmap.org/node/12291697569, Git basics (en) , lecture
-23-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Osnove Elektrotehnike (OET), lecture,
+datum, vreme, lokacija, tema
+20-12-2022, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u računarske mreze, firewall
+03-01-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton žurka
+16-01-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Radionica privatnosti na internetu
+04-01-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton žurka
+13-02-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u Bitcoin radonica
+14-02-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Privacy & Security predavanje
+20-02-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Cyber reconnisance radionica
+21-02-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u konfiguraciju servera radionica (pomerena)
+27-02-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Šta je Decentrala + hakaton
+03-03-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u python
+10-03-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u python
+13-03-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, TLS (SSL) kriptografija
+14-03-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Matrix chat protokol
+20-03-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, LDAP protokol radionica
+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 - film
+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 radionica
+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, Hakaton
+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 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 Zuzorić 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 Zuzorić https://www.openstreetmap.org/node/256367543, ULUS izlozba (Q&A)
+06-05-2023, 12:00, Cvijeta Zuzorić https://www.openstreetmap.org/node/256367543, ULUS izlozba (Q&A)
+07-05-2023, 16:00, Cvijeta Zuzorić 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 računarske mreže
+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
+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
+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
+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, 3D modelovanje
+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
+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, Tehno veče
+07-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Linux ricing
+08-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lambda račun
+14-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Linux distro diskusija
+15-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Pirati 777 mora
+21-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Python vežbe
+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
+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
+04-09-2023, 19:00, DC Krov, Hakaton
+05-09-2023, 19:00, DC Krov, Cybersecurity - Phishing
+11-09-2023, 19:00, DC Krov, Radionica kreativnog pisanja
+12-09-2023, 19:00, DC Krov, Tehno vece - diskusija i kratka predavanja
+18-09-2023, 19:00, DC Krov, Stop reklamama - diskusija - organizacija i pocetak kampanje
+19-09-2023, 19:00, DC Krov, Cybersecurity - kako poceti
+25-09-2023, 19:00, DC Krov, Email server E02 (nastavak predavanja)
+26-09-2023, 19:00, DC Krov, Lambda racun - E02 (nastavak predavanja)
--- a/image_poster.py
+++ b/image_poster.py
@ -1,154 +0,0 @@
-#! /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), "Pondeljkom i utorkom u 19h u DC Krovu", font=fontIosevkaSmall, fill=fg)
-    height += 200
-
-    draw.text((165, height), "Sredom u 18h na MATF-u", 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
@ -1,12 +0,0 @@
-<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
@ -1,8 +0,0 @@
-<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/deconference.html
+++ b/pages/en/deconference.html
@ -1,34 +0,0 @@
-<h1>Deconference</h1>
-
-<h2 id="program"><a href="#program">Program</a></h2>
-<p>11:00  Otvaranje<p>
-<p>12:00  <a href="https://wiki.dmz.rs/en/decentrala/dogadjaji/cryptoparty">Cryptoparty</a><p>
-<p>14:00  <a href="https://wiki.dmz.rs/en/decentrala/dogadjaji/hakaton">Hakaton</a><p>
-<p>16:00  <a href="https://wiki.dmz.rs/en/decentrala/dogadjaji/lightningtalks">Lightning talks</a><p>
-<p>18:00  Diskusije<p>
-<p>20:00  <a href="https://wiki.dmz.rs/en/decentrala/dogadjaji/cryptoparty">Cryptoparty</a><p>
-<p>22:00  Kraj<p>
-
-<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="when-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>
--- a/pages/en/donations.html
+++ b/pages/en/donations.html
@ -1,39 +0,0 @@
-<h1>Donations</h1>
-<dd>
-  <p>
-    Decentrala accepts donations exclusively from the natural person and without
-    any obligations. We are independent and we try to keep it that way.
-  </p>
-  <p>
-    We accept old hardware (laptops, phones, PC components), which we would fix
-    and find a use for it in Decentrala or donate to people in need
-    (permacomputing).
-  </p>
-  <p>
-    Support can also be contributing to our
-    <a href="https://wiki.dmz.rs" target="_blank">wiki</a> page, projects on
-    <a href="https://gitea.dmz.rs" target="_blank">gitea</a>, writing
-    documentation, reporting and/or fixing bugs, typos, translations, etc.
-  </p>
-  <p>
-    If you aqure some kind of knowldege you would like to share with the
-    Decentrala's participants, you can do it as a forum post, wiki page, or
-    participate in one of our events, probably host one.
-  </p>
-  <p>
-    Simple usage of our software also counts as a contribution, because that way
-    you will join the decetralization.
-  </p>
-  <p>
-    Also, we accept donations in bitcoin and monero to the following addresses:
-  </p>
-  <ul>
-    <li>Bitcoin: <i>bc1qjhsfgq79wuzzv32yml9zglwzf9qcwfj3atuy74</i></li>
-    <li>
-      Monero:
-      <i
-        >8BESz45LnxrgCwZP32KieiN1D4LinCfsS1YjdFHfGXrVCmPs35167QsW1gd7qbff4UAtBbT6oWrkbfZnJm71HornVRiRZFS</i
-      >
-    </li>
-  </ul>
-</dd>
--- a/pages/en/events.html
+++ b/pages/en/events.html
@ -1,3 +0,0 @@
-<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
@ -1,2 +0,0 @@
-<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
@ -1,27 +0,0 @@
-<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">sustainability</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#dostupnost">availability</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#pristupacnost">accesibility</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
@ -1,59 +0,0 @@
-<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
@ -1,86 +0,0 @@
-<h1>Statute</h1>
-
-<div>
-  <p>
-    Decentrala je zajednica okupljena oko decentralizacije tehnologija i širenja
-    znanja. Decentralizacija uključuje ravnopravnost korišćenja tehnologije,
-    slobodnog softvera, privatnost i bezbednost.
-  </p>
-
-  <p>
-    Decentrala prihvata donacije iskljucivo od fizičkog lica, bez uslova i
-    obaveza.
-  </p>
-
-  <p>
-    Delovi statua mogu biti definisati kao nepromenjivi i protiv nepromenjivog
-    delova statua se ne može glasati.
-  </p>
-
-  <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>
-
-  <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>
-</div>
-
-<h2>Glasacko telo</h2>
-
-<div>
-  <p>
-    Decentrala o zahtevima za prijem u članstvo odlučuje dvotrećinskom većinom
-    prisutnog članstva kolektiva.
-  </p>
-
-  <p>Samo članovi koji su fizički prisutni imaju pravo glasa.</p>
-
-  <p>Ne postoji ograničenje broja članova glasačkog tela.</p>
-
-  <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>
-
-  <p>
-    Ako član glasačkog tela nije prisutan tokom tri uzastopna sastanka
-    automatski je isključen iz glasačkog tela.
-  </p>
-
-  <p>
-    Član moze biti ponovo ukljucen u glasacko telo po vec definisanoj proceduri
-    dodavanja novog clana, ako je prisutan na tom sastanku.
-  </p>
-
-  <p>
-    Trenutni članovi glasačkog tela su pod pseudonimom fram3d, climatechanged,
-    anonionman, goodv1bes, coja, vuk, bora, mad3v, wingaxe, nothke, duchman,
-    texhno, txrpe, fl3ka, euffrat.
-  </p>
-</div>
-
-<h2>Sastanci</h2>
-
-<div>
-  <p>
-    Sastanak glasačkog tela je validan ukoliko mu prisustvuje najmanje troje
-    članova glasačkog tela.
-  </p>
-
-  <p>
-    Vreme i mesto sastanka skupštine Decentrale se mora najaviti bar nedelju
-    dana pred vremena sastanka na forumu Decentrale.
-  </p>
-
-  <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>
-
-  <p>Sastanak glasačkog tela treba se održati barem jednom u dva meseca.</p>
-</div>
--- a/pages/en/webring.html
+++ b/pages/en/webring.html
@ -1,5 +0,0 @@
-<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
@ -1,10 +0,0 @@
-<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,8 +1,7 @@
-<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> 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>

 <p><a href="/account/register/">Registruj se</a><p>
-<p><a href="/account/unregister/">Izbriši nalog</a><p>
+<p><a href="/account/unregister/">Izbrisi nalog</a><p>
 <p><a href="/account/changepassword/">Promeni lozinku</a><p>
--- a/pages/sr/contact.html
+++ b/pages/sr/contact.html
@ -0,0 +1,5 @@
+<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/deconference.html
+++ b/pages/sr/deconference.html
@ -1,35 +0,0 @@
-<h1>Dekonferencija</h1>
-
-<h2 id="program"><a href="#program">Program</a></h2>
-<p>11:00  Otvaranje<p>
-<p>12:00  <a href="https://wiki.dmz.rs/en/decentrala/dogadjaji/cryptoparty">Cryptoparty</a><p>
-<p>14:00  <a href="https://wiki.dmz.rs/en/decentrala/dogadjaji/hakaton">Hakaton</a><p>
-<p>16:00  <a href="https://wiki.dmz.rs/en/decentrala/dogadjaji/lightningtalks">Lightning talks</a><p>
-<p>18:00  Diskusije<p>
-<p>20:00  <a href="https://wiki.dmz.rs/en/decentrala/dogadjaji/cryptoparty">Cryptoparty</a><p>
-<p>22:00  Kraj<p>
-
-<h2 id="what"><a href="#what">Šta?</a></h2>
-<p>Dekonferencija je prva konferencija organizovana od strane <a href="https://dmz.rs">Decentrale</a>, Beogradskog hakerspejsa. Dekonferencija služi kao platforma za predstavljanje i diskusiju ideja decentralizacije u svim svojim oblicima.</p>
-
-<h2 id="when-and-where"><a href="#when-and-where">Kad & Gde?</a></h2>
-<p>Dekonferencija će se održati u nedelju, 15.-og Septembra, 2024, u Kulturnom Centru Magacin, na adresi <a href="https://osm.org/go/xf3Fz31te?node=1226456745">Kraljevića Marka 4-8, Beograd</a>. Veče pre, održaće se druženje povodom organizovanja konferencije u prostorijama <a href="https://dckrov.rs/">Društvenog Centra Krov</a>, na adresi  <a href="https://osm.org/go/xf3HQQdIH">Kraljice Marije 47, Beograd</a>.</p>
-
-<h2 id="why"><a href="#why">Zašto?</a></h2>
-
-<p>Decentrala je osnovana od strane male grupe entuzijasta udružene oko ideje decentralizacije tehnologije. Poslednjih godinu i po, organizovali smo više od 160 događaja—predavanja, radionica, diskusija, hakatona—sa ciljem demokratizacije tehnološkog znanja i edukacije o privatnosti, open source principa, prava na popravku (i kako popraviti), digitalna svojina, i pravo korišćenja. Od prvog dana, naš pristup je bio da informišemo pojedince o alternativama umesto da im namećemo naše mišljenje.</p>
-
-<p>Vremenom, angažovanjem sa raznovrsnim posetiocima, od kojih su mnogi iz ne-tehničkih sfera, shvatili smo da decentralizacija obuhvata više od samo "otvorene tehnologije." Mnogi aktivisti i organizacije se danas zalažu za različite oblike decentralizacije. Zato, smatramo da su dobrodošle priče decentralizacije iz različitih perspektiva.</p>
-
-<h2 id="who"><a href="#who">Ko?</a></h2>
-
-<p>Dekonferencija je otvorena platforma za sve zainteresovane za diskusiju, demonstraciju, ili istraživanje decentralizacije. Možete registrovati vaš događaj slanjem email-a na <a href="mailto:dekonferencija@dmz.rs">dekonferencija@dmz.rs</a> do dana Dekonferencije (15.-ti Septembar).</p>
-
-<p>Osvežićemo ovaj deo kako se teme događaja potvrde.</p>
-
-<h2 id="how"><a href="#how">Kako?</a></h2>
-
-<p>Dekonferencija je finansirana od strane ličnih sredstava organizatora. Kao i sve aktivnosti Decentrale, Dekonferencija je besplatna svima. Nažalost, nismo u stanju da pružimo subvencije predavačima.</p>
-
-
-<p>Decentrala prihvata donacije isključivo od fizičkih lica.</p>
--- a/pages/sr/donations.html
+++ b/pages/sr/donations.html
@ -1,37 +0,0 @@
-<h1>Donacije</h1>
-<dd>
-  <p>
-    Decentrala prihvata donacije isključivo od fizičkih lica i bez obaveza.
-    Nezavisni smo i trudimo se da to održimo.
-  </p>
-  <p>
-    Prihvatamo stari hardver (laptopove, telefone, PC komponente), koje
-    popravljamo i nalazimo mu dalju upotrebu u Decentrali ili ga doniramo dalje,
-    onima kojima je potreban (permacomputing).
-  </p>
-  <p>
-    Podrska takodje moze biti i u vidu doprinosa na nasoj
-    <a href="https://wiki.dmz.rs" target="_blank">wiki</a> strani, projektima na
-    <a href="https://gitea.dmz.rs" target="_blank">gitea</a>, pisanjem
-    dokumentacije i prijavom i ispravkom bugova, typos, prevoda, itd.
-  </p>
-  <p>
-    Ako posedujete neko znanje koje bi zeleli da podelite sa ucesnicima
-    Decentrale, to mozete uraditi u vidu forum posta, wiki strane ili
-    ucestvovanjem na evenotovima, drizanjem predavanja.
-  </p>
-  <p>
-    Jednostavno koriscenje naseg softwera se takodje racuna kao doprinos, posto
-    bi se time pridruzili decentralizaciji.
-  </p>
-  <p>Takođe primamo donacije u bitcoinu i moneru na adresama:</p>
-  <ul>
-    <li>Bitcoin: <i>bc1qjhsfgq79wuzzv32yml9zglwzf9qcwfj3atuy74</i></li>
-    <li>
-      Monero:
-      <i
-        >8BESz45LnxrgCwZP32KieiN1D4LinCfsS1YjdFHfGXrVCmPs35167QsW1gd7qbff4UAtBbT6oWrkbfZnJm71HornVRiRZFS</i
-      >
-    </li>
-  </ul>
-</dd>
--- a/pages/sr/events.html
+++ b/pages/sr/events.html
@ -1,4 +1,59 @@
 <h1>Događaji</h1>
-<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>
-
+<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>
--- a/pages/sr/events_archive.html
+++ b/pages/sr/events_archive.html
@ -1,2 +0,0 @@
-<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,13 +1,9 @@
-<h1>Dobrodošli!</h1>
+<h1>Dobrodošao!</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!
@ -20,8 +16,8 @@
    koristiti sa ili bez našeg naloga.</dd>
 </dl>
 <p>
-  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 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 želiš prvo da vidiš kako to sve izgleda u realnosti, možeš doći na neki od naših <a
-    href="/events">događaja</a>, i tu nas upoznati!
-</p>
+    href="/pages/events.html">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">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>
+    <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>
  </tr>
  <tr>
    <td><a href="https://forum.dmz.rs/">Forum</a></td>
-    <td>Forum na kom obično organizujemo naše <a href="/events">događaje</a>.
+    <td>Forum na kom obično organizujemo naše <a href="/pages/events.html">događaje</a>.
    </td>
  </tr>
  <tr>
-    <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
+    <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
        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 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
+    <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
      prijatelja.
      Ovo može biti dom tvog sledećeg projekta. Bolji od Github-a.
    </td>
@ -32,16 +32,10 @@
  <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="/projects">projekte</a> kao i ostale <a href="/events">događaje</a>.
+      <a href="/pages/projects.html">projekte</a> kao i
+      ostale <a href="/pages/events.html">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.
@ -55,11 +49,12 @@
  </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ž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>
+<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>
--- a/pages/sr/statute.html
+++ b/pages/sr/statute.html
@ -1,73 +0,0 @@
-<h1>Statut</h1>
-
-<div>
-  <p>
-    Decentrala je zajednica okupljena oko decentralizacije tehnologija i širenja
-    znanja. Decentralizacija uključuje ravnopravnost korišćenja tehnologije,
-    slobodnog softvera, privatnost i bezbednost.
-  </p>
-  <p>
-    Decentrala prihvata donacije iskljucivo od fizičkog lica, bez uslova i
-    obaveza.
-  </p>
-  <p>
-    Delovi statua mogu biti definisati kao nepromenjivi i protiv nepromenjivog
-    delova statua se ne može glasati.
-  </p>
-  <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>
-  <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>
-</div>
-
-<h2>Glasacko telo</h2>
-
-<div>
-  <p>
-    Decentrala o zahtevima za prijem u članstvo odlučuje dvotrećinskom većinom
-    prisutnog članstva kolektiva.
-  </p>
-  <p>Samo članovi koji su fizički prisutni imaju pravo glasa.</p>
-  <p>Ne postoji ograničenje broja članova glasačkog tela.</p>
-  <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>
-  <p>
-    Ako član glasačkog tela nije prisutan tokom tri uzastopna sastanka
-    automatski je isključen iz glasačkog tela.
-  </p>
-  <p>
-    Član moze biti ponovo ukljucen u glasacko telo po vec definisanoj proceduri
-    dodavanja novog clana, ako je prisutan na tom sastanku.
-  </p>
-  <p>
-    Trenutni članovi glasačkog tela su pod pseudonimom fram3d, climatechanged,
-    anonionman, goodv1bes, coja, vuk, bora, mad3v, wingaxe, nothke, duchman,
-    texhno, txrpe, fl3ka, euffrat.
-  </p>
-</div>
-
-<h2>Sastanci</h2>
-
-<div>
-  <p>
-    Sastanak glasačkog tela je validan ukoliko mu prisustvuje najmanje troje
-    članova glasačkog tela.
-  </p>
-  <p>
-    Vreme i mesto sastanka skupštine Decentrale se mora najaviti bar nedelju
-    dana pred vremena sastanka na forumu Decentrale.
-  </p>
-  <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>
-  <p>Sastanak glasačkog tela treba se održati barem jednom u dva meseca.</p>
-</div>
--- a/pages/sr/webring.html
+++ b/pages/sr/webring.html
@ -1,5 +1,3 @@
-<h1>Webring</h1>
 <ul>
-  <li><a href="https://pionir.org">Slobodna škola Pionir</a></li>
-  <li><a href="https://tilda.center">Tilda Centar</a></li>
-</ul>
+  <li><a href="https://tilde.zone/explore">Tilde Zone</a></li>
+</ul>
--- a/poster.py
+++ b/poster.py
@ -1,4 +1,3 @@
-#! /usr/bin/env python3
 import csv
 import datetime as dt
 from dateutil import relativedelta
--- a/prep.py
+++ b/prep.py
@ -1,172 +1,101 @@
-#! /usr/bin/env python3
+#! /usr/bin/env python

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

-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"),
-    "music": ("svirka", "gig"),
-    "party": ("zabava", "entertainment"),
-}
+days = [
+    "Ponedeljak",
+    "Utorak",
+    "Sreda",
+    "Četvrtak",
+    "Petak",
+    "Subota",
+    "Nedelja",
+]

-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()
-            try:
-                link = event[5]
-            except IndexError:
-                link = ""
-            current_event = {"date":event_date_parsed,
-                             "time":event_time,
-                             "location": event_location,
-                             "title":event_title.strip(),
-                             "types": types,
-                             "link": link}
-            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>")
-        if event["link"] != "":
-            event_html.append(f"<div class='title'><a href=\"{event['link']}\">{title}</a></div>")
-        else:
-            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"]
-        url = event["link"]
-
-        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)
-        event_template = event_template.replace("<!--URL-->", url)
-
-        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"])
+months = [
+    "Januar",
+    "Februar",
+    "Mart",
+    "April",
+    "Maj",
+    "Jun",
+    "Jul",
+    "Avgust",
+    "Septembar",
+    "Oktobar",
+    "Novembar",
+    "Decembar",
+]

 today = datetime.today().date()

-past_events = list(filter(lambda e: e["date"] <= today, events))
-past_events.reverse()
-new_events  = list(filter(lambda e: e["date"] >= today, events))
+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))


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

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

-for key, value_pair in TYPES_DICT.items():
-    sr_types[key] = value_pair[0]
-    en_types[key] = value_pair[1]
+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>")

-# 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/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>"])

+#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
@ -0,0 +1,36 @@
+<!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
@ -1,141 +0,0 @@
-<!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,71 +8,36 @@
   version="1.1"
   id="svg5"
   sodipodi:docname="strelica-closed-dark.svg"
-   inkscape:export-filename="strelica-closed.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
   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"
+     pagecolor="#ffffff"
+     bordercolor="#111111"
     borderopacity="1"
-     inkscape:showpageshadow="0"
+     inkscape:pageshadow="0"
     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#505050"
+     inkscape:pagecheckerboard="1"
     showgrid="false"
-     inkscape:zoom="9.0932977"
-     inkscape:cx="17.870305"
-     inkscape:cy="22.87399"
-     inkscape:window-width="1280"
-     inkscape:window-height="749"
+     inkscape:zoom="20.975"
+     inkscape:cx="20"
+     inkscape:cy="20"
+     inkscape:window-width="1920"
+     inkscape:window-height="1048"
     inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="32"
     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5" />
+     inkscape:current-layer="layer1" />
  <defs
     id="defs2" />
  <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)" />
+     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>
 </svg>
--- a/site/img/strelica-closed-light.svg
+++ b/site/img/strelica-closed-light.svg
@ -7,57 +7,15 @@
   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" />
-  <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" />
+     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>
 </svg>
--- a/site/img/strelica-closed.svg
+++ b/site/img/strelica-closed.svg
@ -7,57 +7,15 @@
   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" />
-  <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" />
+     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>
 </svg>
--- a/site/img/strelica-opened-dark.svg
+++ b/site/img/strelica-opened-dark.svg
@ -8,74 +8,36 @@
   version="1.1"
   id="svg5"
   sodipodi:docname="strelica-opened-dark.svg"
-   inkscape:export-filename="strelica-closed.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
   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"
+     pagecolor="#ffffff"
+     bordercolor="#111111"
     borderopacity="1"
-     inkscape:showpageshadow="0"
+     inkscape:pageshadow="0"
     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#505050"
+     inkscape:pagecheckerboard="1"
     showgrid="false"
-     inkscape:zoom="9.0932977"
-     inkscape:cx="17.870305"
-     inkscape:cy="22.87399"
-     inkscape:window-width="1280"
-     inkscape:window-height="749"
+     inkscape:zoom="20.975"
+     inkscape:cx="20"
+     inkscape:cy="20"
+     inkscape:window-width="1920"
+     inkscape:window-height="1048"
     inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="32"
     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5" />
+     inkscape:current-layer="layer1" />
  <defs
     id="defs2" />
  <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)" />
+     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>
 </svg>
--- a/site/img/strelica-opened-light.svg
+++ b/site/img/strelica-opened-light.svg
@ -7,60 +7,15 @@
   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" />
-  <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" />
+     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>
 </svg>
--- a/site/img/strelica-opened.svg
+++ b/site/img/strelica-opened.svg
@ -7,60 +7,15 @@
   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" />
-  <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" />
+     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>
 </svg>
--- a/site/styles/about.css
+++ b/site/styles/about.css
@ -1,11 +0,0 @@
-dl {
-  padding: 1rem 0;
-}
-
-dt {
-  font-weight: bold;
-}
-
-dd {
-  margin: 0 0 1rem 1rem;
-}
--- a/site/styles/account.css
+++ b/site/styles/account.css
@ -0,0 +1,4 @@
+h1 {
+  margin-bottom: 2rem;
+  font-weight: normal;
+}
--- a/site/styles/contact.css
+++ b/site/styles/contact.css
@ -0,0 +1,4 @@
+h1 {
+  margin-bottom: 2rem;
+  font-weight: normal;
+}
--- a/site/styles/deconference.css
+++ b/site/styles/deconference.css
@ -1,11 +0,0 @@
-dl {
-  padding: 1rem 0;
-}
-
-dt {
-  font-weight: bold;
-}
-
-dd {
-  margin: 0 0 1rem 1rem;
-}
--- a/site/styles/donations.css
+++ b/site/styles/donations.css
@ -1,14 +0,0 @@
-p {
-  margin-bottom: 1.5rem;
-}
-
-li {
-  padding-left: 1.5rem;
-}
-
-li i {
-  word-break: break-all;
-  font-size: 1rem;
-}
-
-
--- a/site/styles/events.css
+++ b/site/styles/events.css
@ -1,75 +1,30 @@
-.event {
-  display: flex;
-  flex-direction: row;
+table {
+  table-layout: fixed;
+  border-spacing: 0;
 }

-.event:hover {
-  border-bottom: 5px var(--hightlight) solid;
-}
-
-.event:hover > div {
-  padding-bottom: calc(0.5rem - 5px);
-}
-
-.event > div {
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
-  white-space: nowrap;
-}
-
-.date {
-  width: 250px;
-  font-size: 0.9em;
-  overflow-x: hidden;
-  white-space: nowrap;
-}
-
-.title {
+th,
+td {
+  padding: 0 1rem 0 1rem;
+  text-align: left;
  border-left: 2px solid var(--border);
-  font-weight: bold;
-  padding-left: 1rem;
-  padding-right: 0.5em;
 }

-.place {
-  font-size: 0.9em;
+th {
+  padding: 1rem 1rem 0 1rem;
+  border-bottom: 2px solid var(--border);
 }

-.types {
-  font-size: 0.9em;
-  margin-left: auto;
-  font-style: italic;
+td:nth-child(odd) {
+  white-space: nowrap;
 }

-@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;
-  }
+td {
+  padding: 0 1rem 1rem 1rem;
+  vertical-align: top;
 }
+
+h1 {
+  margin-bottom: 2rem;
+  font-weight: normal;
+}
--- a/site/styles/home.css
+++ b/site/styles/home.css
@ -1,3 +1,8 @@
+h1 {
+  margin-bottom: 2rem;
+  font-weight: normal;
+}
+
 dl {
  padding: 1rem 0;
 }
--- a/site/styles/services.css
+++ b/site/styles/services.css
@ -21,6 +21,7 @@ td {
  vertical-align: top;
 }

-td a {
-  word-break: keep-all;
-}
+h1 {
+  margin-bottom: 2rem;
+  font-weight: normal;
+}
--- a/site/styles/statute.css
+++ b/site/styles/statute.css
@ -1,10 +0,0 @@
-h2 {
-  margin: 1.5rem 0;
-  font-weight: normal;
-  font-size: 1.4em;
-  font-variant-caps: small-caps;
-}
-
-p {
-  padding-bottom: 1.5rem;
-}
--- a/site/styles/style.css
+++ b/site/styles/style.css
@ -20,7 +20,6 @@
  box-sizing: border-box;
  margin: 0;
  padding: 0;
-  word-break: break-word;
 }

 html,
@ -69,13 +68,6 @@ 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;
@ -83,7 +75,8 @@ a:visited {
 }

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

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

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

@ -218,4 +211,8 @@ screen and (max-width: 1500px) {
  #theme-switcher {
    margin-right: 1rem;
  }
-}
+
+  .account {
+    font-size: 1rem;
+  }
+}
--- a/template/end.ical
+++ b/template/end.ical
@ -1 +0,0 @@
-END:VCALENDAR
--- a/template/event.ical
+++ b/template/event.ical
@ -1,13 +0,0 @@
-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:<!--URL-->
-END:VEVENT
--- a/template/head.ical
+++ b/template/head.ical
@ -1,20 +0,0 @@
-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
@ -3,46 +3,18 @@
 <head>
  <meta charset="UTF-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-  <!--
-  <pre>
-
-                                *@@* 
-                               *@@@@*
-                                *@@*                               
-                                 ||                         
-                                 ||                      
-                       *@@*     *@@*     *@@*                
-                      *@@@@*===*@@@@*===*@@@@*
-                       *@@*     *@@*     *@@*
-                                 ||     //                              
-                                 ||   //                      
-                                *@@*//                      
-                               *@@@@*                         
-                                *@@*
-
-   ____  _____ ____ _____ _   _ _____ ____      _    _        _    
-  |  _ \| ____/ ___| ____| \ | |_   _|  _ \    / \  | |      / \   
-  | | | |  _|| |   |  _| |  \| | | | | |_) |  / _ \ | |     / _ \  
-  | |_| | |__| |___| |___| |\  | | | |  _ <  / ___ \| |___ / ___ \ 
-  |____/|_____\____|_____|_| \_| |_| |_| \_\/_/   \_\_____/_/   \_\
-
-  </pre>
-  -->
-
  <link rel="stylesheet" href="/styles/reset.css">
  <link rel="stylesheet" href="/styles/style.css">
  <!--ADDITIONAL_STYLE-->
  <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="/en/index"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
+    <a id="logo" href="/"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
    <button id="theme-switcher"></button>
-    <a class="lang" hreflang="sr" href="/PAGE_NAME">SR</a>
+    <a class="account" href="/en/account">Account</a>
  </header>
  <main>
    <!--MAIN-->
@ -50,11 +22,9 @@
  <footer>
    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
    <nav>
-      <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>
+      <a href="/en/events">Događaji</a>
+      <a href="/en/services">Servisi</a>
+      <a href="/en/contact">Kontakt</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
@ -3,46 +3,18 @@
 <head>
  <meta charset="UTF-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-  <!--
-  <pre>
-
-                                *@@* 
-                               *@@@@*
-                                *@@*                               
-                                 ||                         
-                                 ||                      
-                       *@@*     *@@*     *@@*                
-                      *@@@@*===*@@@@*===*@@@@*
-                       *@@*     *@@*     *@@*
-                                 ||     //                              
-                                 ||   //                      
-                                *@@*//                      
-                               *@@@@*                         
-                                *@@*
-
-   ____  _____ ____ _____ _   _ _____ ____      _    _        _    
-  |  _ \| ____/ ___| ____| \ | |_   _|  _ \    / \  | |      / \   
-  | | | |  _|| |   |  _| |  \| | | | | |_) |  / _ \ | |     / _ \  
-  | |_| | |__| |___| |___| |\  | | | |  _ <  / ___ \| |___ / ___ \ 
-  |____/|_____\____|_____|_| \_| |_| |_| \_\/_/   \_\_____/_/   \_\
-
-  </pre>
-  -->
-
  <link rel="stylesheet" href="/styles/reset.css">
  <link rel="stylesheet" href="/styles/style.css">
  <!--ADDITIONAL_STYLE-->
  <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="lang" hreflang="en" href="/en/PAGE_NAME">EN</a>
+    <a class="account" href="/account">Nalog</a>
  </header>
  <main>
    <!--MAIN-->
@ -52,9 +24,7 @@
    <nav>
      <a href="/events">Događaji</a>
      <a href="/services">Servisi</a>
-      <a href="/about">O nama</a>
-      <a class="account" href="/account">Nalog</a>
-      <a href="/donations">Donacije</a>
+      <a href="/contact">Kontakt</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
svitvojimilioni@dmz.rs	a8cf26599a	Izmenjen dogadaji.csv radi popravljanja konflikta	2023-08-30 12:55:09 -04:00
svitvojimilioni@dmz.rs	996fcf837a	stvarno popravljeno formatiranje	2023-08-30 12:31:28 -04:00
svitvojimilioni@dmz.rs	c72bf1021a	Opet popravljeno formatiranje	2023-08-30 12:29:52 -04:00
svitvojimilioni@dmz.rs	97e28e171a	popravljeno formatiranje	2023-08-30 12:28:28 -04:00
svitvojimilioni@dmz.rs	f2aee9719a	septembar desavanja	2023-08-30 12:26:22 -04:00