Some events fixes

This reverts commit 29b29d37b1.

mislim da sam sjebao nesto

.gitignore

@@ -7,5 +7,8 @@ poster.html
 poster.pdf
 poster_light.png
 poster_dark.png
+poster.txt
 http.access.log
 http.error.log
+events.ical
+.vscode/

atom_gen.py

@@ -11,20 +11,20 @@ import os
 
 blogs_dir = os.fsencode("blog")
 
-def blogposts_list_gen():
+#def blogposts_list_gen():
-    output_list = []
+#    output_list = []
-    for file in os.listdir(blogs_dir):
+#    for file in os.listdir(blogs_dir):
-        filename = os.fsdecode(file)
+#        filename = os.fsdecode(file)
-        if filename.endswith(".md"):
+#        if filename.endswith(".md"):
-            full_path = "blog/" + filename
+#            full_path = "blog/" + filename
-
+#
-            author = subprocess.run("lowdown -X author " + full_path, capture_output=True, shell=True, text=True).stdout.strip()
+#            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()
+#            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()
+#            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()
+#            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])
+#            output_list.append([author, title, time, content_html, full_path])
-    return output_list
+#    return output_list
 
 def events_list_gen():
     output_list = []
@@ -69,5 +69,3 @@ def feedgen(blogs, events):
 
     fg_blog.atom_file('site/atom_blog.xml')
     fg_events.atom_file('site/atom_events.xml')
-
-feedgen(blogposts_list_gen(), events_list_gen())

build_pages.py

@@ -4,11 +4,13 @@ import os
 PAGES = [
     {'name': 'index', 'titleSR': 'Početna', 'titleEN': 'Home', 'style': 'home'},
     {'name': 'account', 'titleSR': 'Nalog', 'titleEN': 'Account', 'style': 'account'},
-    {'name': 'contact', 'titleSR': 'Kontakt', 'titleEN': 'Contact', 'style': 'contact'},
+    {'name': 'about', 'titleSR': 'O nama', 'titleEN': 'About us', 'style': 'about'},
+    {'name': 'statute', 'titleSR': 'Statut', 'titleEN': 'Statute', 'style': 'statute'},
     {'name': 'events', 'titleSR': 'Događaji', 'titleEN': 'Events', 'style': 'events'},
     {'name': 'events_archive', 'titleSR': 'Arhiva događaja', 'titleEN': 'Events archive', 'style': 'events'},
     {'name': 'services', 'titleSR': 'Servisi', 'titleEN': 'Services', 'style': 'services'},
     {'name': 'webring', 'titleSR': 'Webring', 'titleEN': 'Webring', 'style': ''},
+    {'name': 'donations', 'titleSR': 'Donacije', 'titleEN': 'Donations', 'style': 'home'},
 ]
 
 def buildPage(filename: str, pageTitle: str, pageHtml: str, pageStyle: str, template: str) -> str:

dogadjaji.csv

@@ -1,93 +1,145 @@
-datum, vreme, lokacija, tema
+datum, vreme, lokacija, tema, tip,
-20-12-2022, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u računarske mreže
+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, Hakaton žurka
+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, Radionica privatnosti na internetu
+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, Hakaton žurka
+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 radonica
+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 predavanje
+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 radionica
+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 radionica (pomerena)
+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 + hakaton
+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
+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
+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
+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
+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 radionica
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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, 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
+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 (Q&A)
+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, 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
+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 (Q&A)
+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 (Q&A)
+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 (diskusija)
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+08-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lambda račun, lecture,
-14-08-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Linux distro diskusija
+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
+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 vežbe
+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
+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
+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
+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, Hakaton
+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
+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
+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, Tehno veče
+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?
+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 - diskusija
+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
+25-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Email server E02, lecture,
-26-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lambda račun E02
+26-09-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lambda račun E02, lecture,
-02-10-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Šamirov algoritam za deljenje tajni
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+13-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
-14-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku EP01
+14-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku EP01, lecture workshop,
-20-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Git
+20-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Git, lecture,
-21-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku EP02
+21-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku EP02, lecture workshop,
-27-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Kviz veče
+27-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Kviz veče,
-28-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku EP03
+28-11-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku EP03, lecture workshop,
-04-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lighting talks
+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
+05-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Idejno-politička diskusija, discussion,
-12-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku E04
+10-12-2023, 16:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
-18-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino
+11-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home made portable IDS, ,
+12-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku E04, lecture workshop,
+18-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, lecture workshop,
+19-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, NetHack video igra, ,
+25-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Degoogled phone, ,
+26-12-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u elektroniku E05, lecture workshop,
+08-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Druženje, ,
+09-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Decentrala sysadmin (obuka), ,
+15-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon (Task manager), hack,
+16-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lighting talks, lighting,
+22-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Nadzorni Kapitalizam, lecture discussion,
+23-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, The Art of Code, movie,
+29-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, "Samizdat - izrada zinova,knjiga,slikovnica", ,
+30-01-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Intro to 3D printing, lecture,
+05-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
+06-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
+12-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Kompajleri i trojanci, lecture,
+13-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, AI diskusija, discussion,
+19-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Godot game engine, lecture,
+20-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Svet van Linuxa, lecture,
+26-02-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Veče Video igara (Krovđendan), ,
+27-02-2024, 21:00, DC Krov https://www.openstreetmap.org/node/10594728522, Šifrožur (Krovđendan), ,
+04-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon, hack,
+05-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
+09-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin Decentrala obuka, ,
+11-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop,
+12-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home made SOC build, ,
+18-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Regex, lecture,
+19-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u PCB, ,
+25-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop,
+26-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, (La)TeX, lecture,
+01-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, La Jetée, movie,
+01-04-2024, 20:00, DC Krov https://www.openstreetmap.org/node/10594728522, Decentrala sastanak (ideološki), meeting,
+02-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
+02-04-2024, 21:00, DC Krov https://www.openstreetmap.org/node/10594728522, Decentrala sastanak (strateški), meeting,
+08-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Teorija čvorova, lecture,
+09-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop,
+15-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton / Radna akcija, hack,
+16-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, HomeMade SoC #2, lecture,
+22-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Stencil - šabloni za grafite, workshop,
+23-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop,
+24-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (Proxmox VMs i ssh), workshop,
+29-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Chat aplikacije, discussion,
+30-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Mesečna revizija Decentrale, meeting,
+30-04-2024, 20:00, DC Krov https://www.openstreetmap.org/node/10594728522, Radna grupa Konferencija, meeting,
+06-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (proxmox instalacija), workshop,
+07-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Free software vs open source, lecture,
+13-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Alphaville (1965), movie,
+14-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
+20-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (ssl cronjob scp), lecture,
+21-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton (radna akcija), hack,
+27-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home-made SoC #3, lecture,
+28-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Mesečna revizija, meeting,

image_poster.py

@@ -56,12 +56,25 @@ def drawPoster(events, bg, fg, month:int):
     _, _, w, _ = draw.textbbox((0, 0), subheader, font=fontIosevka)
     draw.text(((W-w)/2, 240), subheader, font=fontIosevka, fill=fg)
 
-    height = 410
+    height = 370
 
     draw.text((120, height), "Radionice pocinju u 19h u DC Krovu", font=fontIosevkaSmall, fill=fg)
-    height += 100
+    height += 60
 
+    draw.text((120, height), "Svi dogadjaji su uvek besplatni", font=fontIosevkaSmall, fill=fg)
+    height += 90
+
+    # 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"]
@@ -70,6 +83,11 @@ def drawPoster(events, bg, fg, month:int):
         draw.text((120, height), eventText, font=fontIosevkaSmall, fill=fg)
         height += 70
 
+        # Add event to textfile
+        textfile.write(eventText + "\n")
+
+    textfile.close()
+
     def drawCircle(x, y):
         r = 10
         draw.ellipse((x - r, y - r, x + r, y+r), fill=fg, outline=(0, 0, 0), width=0)

pages/en/about.html

@@ -0,0 +1,12 @@
+<h1>About us</h1>
+<dl>
+  <dt>Statute:</dt>
+  <dd> We make decisions by direct democracy. Our statute can be found at <a href="/en/statute"> statute page</a></dd>
+
+  <dt>Contact:</dt>
+  <dd>
+    You can send mail to <a href="mailto:dmz@dmz.rs">dmz@dmz.rs</a> or you can register on <a href="https://forum.dmz.rs">our Forum</a>.
+    Also, we are available on the <a href="https://balkan.fedive.rs/@decentrala">Fediverse!</a>
+    If you find a bug on the site, please do tell us. We would be very grateful.
+  </dd>
+</dl>

pages/en/account.html

@@ -1,7 +1,7 @@
 <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://thunderbird.org">Thundebird</a> mail client on this <a href="/img/mailsettings.png">image</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>

pages/en/contact.html

@@ -1,5 +0,0 @@
-<h1>Contact</h1>
-<p>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>.</p>
-<p>Also, we are available on the <a href="https://balkan.fedive.rs/@decentrala">Fediverse!</a></p>
-<br>
-<p>If you find a bug on the site, please do tell us. We would be very grateful.</p>

pages/en/donations.html

@@ -0,0 +1,9 @@
+<h1>Donations</h1>
+<dd>
+    Decentrala accepts donations exclusively from persons and without any obligations.
+  We are independent and we try to keep it that way.
+  You can donate old hardware (laptops, phones, PC components) to us, and we will find a use for it in Decentrala or give it to people who need it.
+    Also, you can donate bitcoin and monero by sending to the following addresses:
+    <p>Bitcoin: bc1qjhsfgq79wuzzv32yml9zglwzf9qcwfj3atuy74</p>
+    <p>Monero: 8BESz45LnxrgCwZP32KieiN1D4LinCfsS1YjdFHfGXrVCmPs35167QsW1gd7qbff4UAtBbT6oWrkbfZnJm71HornVRiRZFS</p>
+</dd>

pages/en/events.html

@@ -1,2 +1,3 @@
 <h1>Events</h1>
-<p>Following list contains all forthcoming events. Held events are listed in <a href="/en/events_archive">archive</a></p><br>
+<p>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>

pages/en/events_archive.html

@@ -1,2 +1,2 @@
 <h1>Events archive</h1>
-<p>All events that we organized so far.</p><br>
+<p>All events that we organized so far. You can find future events on <a href="/en/events">Events page</a></p><br>

pages/en/index.html

@@ -4,6 +4,11 @@
   Here are some more facts about us:
 </p>
 <dl>
+
+  <dt>Motivation:</dt>
+<dd>Decentralization promotes <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#odrzivost">sustanability</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#dostupnost">availability</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#pristupacnost">accesability</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#nezavisnost">autonomy</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#privatnost">privacy</a> and <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#sloboda">freedom</a>. On those networks we have less <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#manipulacija">manipulation</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#propaganda">propaganda</a>, ads, and <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#neopterecenost-paznje-sporednim-stvarima">are not designed to lock your attention (dumbing down)</a>.
+    <a href="https://forum.dmz.rs/t/zasto-nam-je-decentralizacija-bitna/506/1">Tell us why decentralization is important to you</a>
+  </dd>
   <dt>Knowledge:</dt>
   <dd>
     All our workshops are free and open to everyone.
@@ -13,15 +18,6 @@
   <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>
-  <dt>Donations:</dt>
-  <dd>
-	  Decentrala accepts donations exclusively from persons and without any obligations.
-    We are independent and we try to keep it that way.
-    You can donate old hardware (laptops, phones, PC components) to us, and we will find a use for it in Decentrala or give it to people who need it.
-	  Also, you can donate bitcoin and monero by sending to the following addresses:
-	  <p>Bitcoin: bc1qjhsfgq79wuzzv32yml9zglwzf9qcwfj3atuy74</p>
-	  <p>Monero: 8BESz45LnxrgCwZP32KieiN1D4LinCfsS1YjdFHfGXrVCmPs35167QsW1gd7qbff4UAtBbT6oWrkbfZnJm71HornVRiRZFS</p>
-  </dd>
 </dl>
 <p>
   If you are still interested, you can create an <a href="/en/account">account</a>

pages/en/services.html

@@ -13,7 +13,7 @@
     <td>Forum for general discussion and <a href="/events">event</a> organization.</td>
   </tr>
   <tr>
-    <td>Chat</td>
+    <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>.
@@ -30,6 +30,15 @@
       <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>

pages/en/statute.html

@@ -0,0 +1,32 @@
+<h1>Statute</h1>
+<p>O pravilima i statutu Decentrale odlucuje nezavisno glasacko telo u kome se odluke donose se na principima direktne demokratije, dogovorom ili najmanje dvotrećinskom većinom ukupnog broja članova kolektiva.</p>
+<br>
+<p>Delovi statua mogu biti definisati kao nepromenjivi i protiv nepromenjivog delova statua se ne može glasati.</p>
+<br>
+<p>Sastanak glasačkog tela je validan ukoliko mu prisustvuje najmanje troje članova glasačkog tela.</p>
+<br>
+<p>Decentrala o zahtevima za prijem u članstvo odlučuje dvotrećinskom većinom prisutnog članstva kolektiva.</p>
+<br>
+<p>Za ukidanje članstva u kolektivu pojedinac se moze sam iskljuciti u bilo kom momentu ili moze biti izglasan sa dvotrećinskom većinom prisutnog članova.</p>
+<br>
+<p>Ne postoji ograničenje broja članova glasačkog tela.</p>
+<br>
+<p>Trenutni članovi glasačkog tela su pod pseudonimom stvn, z01a, anonionman, byte, goodv1bes, fram3d</p>
+<br>
+<p>Samo članovi koji su fizički prisutni imaju pravo glasa.</p>
+<br>
+<p>Decentrala je zajednica okupljena oko decentralizacije tehnologija i širenja znanja. Decentralizacija uključuje ravnopravnost korišćenja tehnologije, slobodnog softvera, privatnost i bezbednost.</p>
+<br>
+<p>Decentrala prihvata donacije iskljucivo od fizičkog lica, bez uslova i obaveza.</p>
+<br>
+<p>Svaki pojedinac i grupa ima pravo da sprovodi akcije u duhu ciljeva Decentrale koje su definisane statutom, ako su prethodno objavljeni i objašnjeni na javnim digitalnim kanalima komunikacije Decentrale.</p>
+<br>
+<p>Ako član glasačkog tela nije prisutan tokom tri uzastopna sastanka automatski je isključen iz glasačkog tela.</p>
+<br>
+<p>Član moze biti ponovo ukljucen u glasacko telo po vec definisanoj proceduri dodavanja novog clana, ako je prisutan na tom sastanku.</p>
+<br>
+<p> Vreme i mesto sastanka skupštine Decentrale se mora najaviti bar nedelju dana pred vremena sastanka na forumu Decentrale.</p>
+<br>
+<p> Sastanak glasačkog tela treba se održati barem jednom u dva meseca.</p>
+<br>
+<p> Na sastanku glasačkog tela se jedino moze glasati o tačkama koje su najavljene na forumu Decentrale, bar nedelju dana pre vremena sastanka.</p>

pages/sr/about.html

@@ -0,0 +1,10 @@
+<h1>O nama</h1>
+<dl>
+ <dt>Statut:</dt>
+  <dd> Sve odluke se donose po principu direktne demokratije. Nas statut mozete pogledati na <a href="/en/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>

pages/sr/account.html

@@ -1,7 +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">tutorial</a>. <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://thunderbird.org">Thundebird</a> mail klijent možeš pogledati na <a href="/img/mailsettings.png">slici</a>.<p>
+<p>Podešavanja za <a href="https://www.thunderbird.net">Thundebird</a> mail klijent možeš pogledati na <a href="/img/mailsettings.png">slici</a>.<p>
 
 <p><a href="/account/register/">Registruj se</a><p>
 <p><a href="/account/unregister/">Izbriši nalog</a><p>

pages/sr/contact.html

@@ -1,5 +0,0 @@
-<h1>Kontakt</h1>
-<p>Možeš nam poslati mejl na adresu <a href="mailto:dmz@dmz.rs">dmz@dmz.rs</a> ili se možeš pridružiti našem <a href="https://forum.dmz.rs">Forumu</a>.</p>
-<p>Takođe smo dostupni i na <a href="https://balkan.fedive.rs/@decentrala">Fediversu!</a></p>
-<br>
-<p>U slučaju da pronađeš <em>bug</em> na sajtu, bili bismo ti jako zahvalni ako nam ga prijaviš.</p>

pages/sr/donations.html

@@ -0,0 +1,9 @@
+<h1>Donacije</h1>
+<dd>
+    Decentrala prihvata donacije isključivo od fizičkih lica i bez obaveza.
+  Nezavisni smo i trudimo se da to održimo.
+  Možeš nam donirati stari hardver (laptopove, telefone, PC komponente), a mi ćemo mu naći upotrebu u Decentrali ili dati ljudima kojima je potreban.
+    Takođe možeš donirati bitcoin i monero, slanjem na naredne adrese:
+    <p>Bitcoin: bc1qjhsfgq79wuzzv32yml9zglwzf9qcwfj3atuy74</p>
+    <p>Monero: 8BESz45LnxrgCwZP32KieiN1D4LinCfsS1YjdFHfGXrVCmPs35167QsW1gd7qbff4UAtBbT6oWrkbfZnJm71HornVRiRZFS</p>
+</dd>

pages/sr/events.html

@@ -1,2 +1,4 @@
 <h1>Događaji</h1>
-<p>Naredna lista sadrži sve predstojeće događaje. Za listu održanih događaja pogledajte <a href="/events_archive">arhivu</a></p><br>
+<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>
+

pages/sr/events_archive.html

@@ -1,2 +1,2 @@
 <h1>Arhiva događaja</h1>
-<p>Svi događaji koje smo do sada organzivali.</p><br>
+<p>Svi događaji koje smo do sada organzivali. Predstojeće događaje možeš naći <a href="/events">ovde</a></p><br>

pages/sr/index.html

@@ -1,9 +1,13 @@
-<h1>Dobrodošao!</h1>
+<h1>Dobrodošli!</h1>
 <p>
   Mi smo <em>Decentrala</em> - grupa entuzijasta okupljena oko ideja decentralizacije i slobodnog širenja znanja.
   Zvuči interesantno? Evo još nekih stvari o nama:
 </p>
 <dl>
+  <dt>Motivacija:</dt>
+  <dd>Decentralizacijom postizemo <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#odrzivost">odrzivost</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#dostupnost">dostupnost</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#pristupacnost">pristupacnost</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#nezavisnost">nezavisnost</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#privatnost">privatnost</a> i <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#sloboda">slobodu</a>. Na ovim mrezama ima manje <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#manipulacija">manipulacije</a>, <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#propaganda">propagande</a>, reklama, i <a href="https://wiki.dmz.rs/en/zastojedecentralizacijabitna#neopterecenost-paznje-sporednim-stvarima">nisu dizajnirane za zadrzavanje paznje (zaglupljivanje)</a>.
+    <a href="https://forum.dmz.rs/t/zasto-nam-je-decentralizacija-bitna/506/1">Recite zasto je vama decentralizacija bitna</a>
+  </dd>
   <dt>Znanje:</dt>
   <dd>Sve naše radionice su besplatne i otvorene za sve zainteresovane.
     Ako želiš nešto da podeliš najavi se na našem <a href="https://forum.dmz.rs">Forumu</a> i održi radionicu kod nas!
@@ -14,15 +18,6 @@
   <dt>Servisi:</dt>
   <dd>Na našim serverima pokrećemo razne servise (email, git, wiki i druge) koji su otvoreni za sve i koji se mogu
     koristiti sa ili bez našeg naloga.</dd>
-  <dt>Donacije:</dt>
-  <dd>
-	  Decentrala prihvata donacije isključivo od fizičkih lica i bez obaveza.
-    Nezavisni smo i trudimo se da to održimo.
-    Možeš nam donirati stari hardver (laptopove, telefone, PC komponente), a mi ćemo mu naći upotrebu u Decentrali ili dati ljudima kojima je potreban.
-	  Takođe možeš donirati bitcoin i monero, slanjem na naredne adrese:
-	  <p>Bitcoin: bc1qjhsfgq79wuzzv32yml9zglwzf9qcwfj3atuy74</p>
-	  <p>Monero: 8BESz45LnxrgCwZP32KieiN1D4LinCfsS1YjdFHfGXrVCmPs35167QsW1gd7qbff4UAtBbT6oWrkbfZnJm71HornVRiRZFS</p>
-  </dd>
 </dl>
 <p>
   Ako si i dalje zainteresovan, možeš napraviti <a href="/account">nalog</a> na našem serveru koji će ti

pages/sr/services.html

@@ -15,7 +15,7 @@
     </td>
   </tr>
   <tr>
-    <td>Chat</td>
+    <td><a href="/account">Chat</a></td>
     <td>Održavamo sopstveni XMPP server, na kojem možeš da napraviš nalog.
       Ako već poseduješ nalog možeš da nas nađeš u grupi <a
         href="decentrala@conference.dmz.rs">decentrala@conference.dmz.rs</a>.
@@ -35,6 +35,19 @@
       <a href="/projects">projekte</a> kao i ostale <a href="/events">događaje</a>.
     </td>
   </tr>
+  <tr>
+    <td><a href="https://nextcloud.dmz.rs/">Nextcloud</a></td>
+    <td><a href="https://nextcloud.com/">Nextcloud</a> instanca koju koristimo da zapisujemo stvari koje planiramo da uradimo i kao kalendar.
+    </td>
+  </tr>
+  <tr>
+  </tr>
+  <tr>
+    <td><a href="https://search.dmz.rs/">Search</a></td>
+    <td><a href="https://github.com/hnhx/librex/">LibreX</a> instanca koju koristimo za pretraživanje Interneta.
+      Bolji od Google-a.
+    </td>
+  </tr>
   <tr>
     <td><a href="https://pastebin.dmz.rs/">Pastebin</a></td>
     <td><a href="https://privatebin.info/">PrivateBin</a> instanca koju koristimo za brzo deljenje tekstualnih fajlova

pages/sr/statute.html

@@ -0,0 +1,32 @@
+<h1>Statut</h1>
+<p>O pravilima i statutu Decentrale odlucuje nezavisno glasacko telo u kome se odluke donose se na principima direktne demokratije, dogovorom ili najmanje dvotrećinskom većinom ukupnog broja članova kolektiva.</p>
+<br>
+<p>Delovi statua mogu biti definisati kao nepromenjivi i protiv nepromenjivog delova statua se ne može glasati.</p>
+<br>
+<p>Sastanak glasačkog tela je validan ukoliko mu prisustvuje najmanje troje članova glasačkog tela.</p>
+<br>
+<p>Decentrala o zahtevima za prijem u članstvo odlučuje dvotrećinskom većinom prisutnog članstva kolektiva.</p>
+<br>
+<p>Za ukidanje članstva u kolektivu pojedinac se moze sam iskljuciti u bilo kom momentu ili moze biti izglasan sa dvotrećinskom većinom prisutnog članova.</p>
+<br>
+<p>Ne postoji ograničenje broja članova glasačkog tela.</p>
+<br>
+<p>Trenutni članovi glasačkog tela su pod pseudonimom stvn, z01a, anonionman, byte, goodv1bes, fram3d</p>
+<br>
+<p>Samo članovi koji su fizički prisutni imaju pravo glasa.</p>
+<br>
+<p>Decentrala je zajednica okupljena oko decentralizacije tehnologija i širenja znanja. Decentralizacija uključuje ravnopravnost korišćenja tehnologije, slobodnog softvera, privatnost i bezbednost.</p>
+<br>
+<p>Decentrala prihvata donacije iskljucivo od fizičkog lica, bez uslova i obaveza.</p>
+<br>
+<p>Svaki pojedinac i grupa ima pravo da sprovodi akcije u duhu ciljeva Decentrale koje su definisane statutom, ako su prethodno objavljeni i objašnjeni na javnim digitalnim kanalima komunikacije Decentrale.</p>
+<br>
+<p>Ako član glasačkog tela nije prisutan tokom tri uzastopna sastanka automatski je isključen iz glasačkog tela.</p>
+<br>
+<p>Član moze biti ponovo ukljucen u glasacko telo po vec definisanoj proceduri dodavanja novog clana, ako je prisutan na tom sastanku.</p>
+<br>
+<p> Vreme i mesto sastanka skupštine Decentrale se mora najaviti bar nedelju dana pred vremena sastanka na forumu Decentrale.</p>
+<br>
+<p> Sastanak glasačkog tela treba se održati barem jednom u dva meseca.</p>
+<br>
+<p> Na sastanku glasačkog tela se jedino moze glasati o tačkama koje su najavljene na forumu Decentrale, bar nedelju dana pre vremena sastanka.</p>

prep.py

@@ -4,7 +4,16 @@ import csv
 from datetime import datetime
 
 DAYS_SR = ["PON", "UTO", "SRE", "ČET", "PET", "SUB", "NED"]
-DAYS_EN = ["MON ", "TUE", "WED", "THU", "FRI", "SAT", "SUN"]
+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"),
+}
 
 def load_events(csv_path:str) -> list[dict]:
     events = []
@@ -17,14 +26,16 @@ def load_events(csv_path:str) -> list[dict]:
             event_time = event[1]
             event_location = event[2]
             event_title = event[3]
+            types =  event[4].split()
             current_event = {"date":event_date_parsed,
                              "time":event_time,
                              "location": event_location,
-                             "title":event_title.strip()}
+                             "title":event_title.strip(),
+                             "types": types }
             events.append(current_event)
         return events
 
-def build_html(events: list[dict], dayNames: list[str]) -> str:
+def build_html(events: list[dict], dayNames: list[str], typesNames: dict) -> str:
     events_html = []
     for event in events:
         title = event["title"]
@@ -41,10 +52,55 @@ def build_html(events: list[dict], dayNames: list[str]) -> str:
         else:
             event_html.append(f"<div class='place'>@{location.strip()}</div>")
 
+        if len(event["types"]) != 0:
+            types_list = "<div class='types'>"
+            last_item = event["types"][-1]
+            for t in event["types"]:
+                if typesNames.get(t) is not None:
+                    types_list += typesNames.get(t)
+                    if t != last_item:
+                        types_list += ', '
+                else:
+                    print(f"Unknown type {t}!")
+            types_list += "</div>"
+            event_html.append(types_list)
+
         event_html = "".join(event_html)
         events_html.append(f"\n<div class='event'>{event_html}</div>")
     return events_html
 
+def build_ical(events: list[dict]) -> str:
+    today = datetime.today().now()
+    # Header
+    events_ical = ""
+    with open("template/head.ical", "r") as file:
+        events_ical += file.read()
+    # Events
+    for event in events:
+        title = event["title"]
+        location = event["location"]
+        date = event["date"]
+        time = event["time"]
+
+        uid = str(date.month).zfill(2) + str(date.day).zfill(2) + time[:2]
+        date = str(date.year) + str(date.month).zfill(2) + str(date.day).zfill(2) 
+        created = str(today.year) + str(today.month).zfill(2) + str(today.day).zfill(2) + "T" + str(today.hour).zfill(2) + str(today.minute).zfill(2) + str(today.second).zfill(2) + "Z"
+        date = date + "T" + time.replace(":", "") + "00"
+
+        event_template = ""
+        with open("template/event.ical", "r") as file:
+            event_template += file.read()
+        event_template = event_template.replace("<!--UID-->", uid)
+        event_template = event_template.replace("<!--CREATED-->", created)
+        event_template = event_template.replace("<!--DATE-->", date)
+        event_template = event_template.replace("<!--TITLE-->", title)
+
+        events_ical += event_template
+    # Footer
+    with open("template/end.ical", "r") as file:
+        events_ical += file.read()
+    return events_ical
+
 events = sorted(load_events("dogadjaji.csv"), key=lambda e: e["date"])
 
 today = datetime.today().date()
@@ -56,34 +112,48 @@ new_events  = list(filter(lambda e: e["date"] >= today, events))
 
 page_template = ""
 
+sr_types = {}
+en_types = {}
+
+for key, value_pair in TYPES_DICT.items():
+    sr_types[key] = value_pair[0]
+    en_types[key] = value_pair[1]
+
 # Build Serbian Events page
-new_events_html = build_html(new_events, DAYS_SR)
+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])[:2]
+    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)
+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])[:2]
+    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)
+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])[:2]
+    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)
+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])[:2]
+    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))
+

site/img/strelica-closed-dark.svg

@@ -8,36 +8,71 @@
    version="1.1"
    id="svg5"
    sodipodi:docname="strelica-closed-dark.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   inkscape:export-filename="strelica-closed.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
   <sodipodi:namedview
      id="namedview6"
-     pagecolor="#ffffff"
+     pagecolor="#505050"
-     bordercolor="#111111"
+     bordercolor="#eeeeee"
      borderopacity="1"
-     inkscape:pageshadow="0"
+     inkscape:showpageshadow="0"
      inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
      showgrid="false"
-     inkscape:zoom="20.975"
+     inkscape:zoom="9.0932977"
-     inkscape:cx="20"
+     inkscape:cx="17.870305"
-     inkscape:cy="20"
+     inkscape:cy="22.87399"
-     inkscape:window-width="1920"
+     inkscape:window-width="1280"
-     inkscape:window-height="1048"
+     inkscape:window-height="749"
      inkscape:window-x="0"
-     inkscape:window-y="32"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
+     inkscape:current-layer="svg5" />
   <defs
      id="defs2" />
   <g
-     id="layer1">
+     id="layer1" />
-    <path
+  <rect
-       id="rect288"
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
-       style="fill:#ffffff;stroke-width:0.345614"
+     id="rect1317"
-       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 " />
+     width="7.5413027"
-  </g>
+     height="1.3530626"
+     x="1.1514941"
+     y="1.5255219" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-6"
+     width="7.5413027"
+     height="1.3530626"
+     x="1.117918"
+     y="7.1488791" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-3"
+     width="7.5413027"
+     height="1.3530626"
+     x="1.1270616"
+     y="4.4020038" />
+  <path
+     style="fill:#ffffff;stroke:#010400;stroke-width:0.0679621"
+     d="M 4.3438587,8.7976884 V 5.773483 H 19.684828 35.025797 V 8.7976884 11.821894 H 19.684828 4.3438587 Z"
+     id="path305"
+     transform="scale(0.25)" />
+  <path
+     style="fill:#ffffff;stroke:#010400;stroke-width:0.0679621"
+     d="m 4.2338876,20.289669 v -2.96922 H 19.574857 34.915826 v 2.96922 2.96922 H 19.574857 4.2338876 Z"
+     id="path307"
+     transform="scale(0.25)" />
+  <path
+     style="fill:#ffffff;stroke:#010400;stroke-width:0.0679621"
+     d="M 4.2338876,31.286779 V 28.31756 H 19.574857 34.915826 v 2.969219 2.96922 H 19.574857 4.2338876 Z"
+     id="path309"
+     transform="scale(0.25)" />
 </svg>

site/img/strelica-closed-light.svg

@@ -7,15 +7,57 @@
    viewBox="0 0 10 10"
    version="1.1"
    id="svg5"
+   sodipodi:docname="strelica-closed.svg"
+   inkscape:export-filename="strelica-closed.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     showgrid="false"
+     inkscape:zoom="9.0932977"
+     inkscape:cx="17.870305"
+     inkscape:cy="22.87399"
+     inkscape:window-width="1280"
+     inkscape:window-height="749"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5" />
   <defs
      id="defs2" />
   <g
-     id="layer1">
+     id="layer1" />
-    <path
+  <rect
-       id="rect288"
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
-       style="fill:#181715;stroke-width:0.345614"
+     id="rect1317"
-       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 " />
+     width="7.5413027"
-  </g>
+     height="1.3530626"
+     x="1.1514941"
+     y="1.5255219" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-6"
+     width="7.5413027"
+     height="1.3530626"
+     x="1.117918"
+     y="7.1488791" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-3"
+     width="7.5413027"
+     height="1.3530626"
+     x="1.1270616"
+     y="4.4020038" />
 </svg>

site/img/strelica-closed.svg

@@ -7,15 +7,57 @@
    viewBox="0 0 10 10"
    version="1.1"
    id="svg5"
+   sodipodi:docname="strelica-closed.svg"
+   inkscape:export-filename="strelica-closed.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     showgrid="false"
+     inkscape:zoom="9.0932977"
+     inkscape:cx="17.870305"
+     inkscape:cy="22.87399"
+     inkscape:window-width="1280"
+     inkscape:window-height="749"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5" />
   <defs
      id="defs2" />
   <g
-     id="layer1">
+     id="layer1" />
-    <path
+  <rect
-       id="path1336"
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
-       style="fill:#181715;stroke-width:0.504542;fill-opacity:1"
+     id="rect1317"
-       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 " />
+     width="7.5413027"
-  </g>
+     height="1.3530626"
+     x="1.1514941"
+     y="1.5255219" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-6"
+     width="7.5413027"
+     height="1.3530626"
+     x="1.117918"
+     y="7.1488791" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-3"
+     width="7.5413027"
+     height="1.3530626"
+     x="1.1270616"
+     y="4.4020038" />
 </svg>

site/img/strelica-opened-dark.svg

@@ -8,36 +8,74 @@
    version="1.1"
    id="svg5"
    sodipodi:docname="strelica-opened-dark.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   inkscape:export-filename="strelica-closed.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
   <sodipodi:namedview
      id="namedview6"
-     pagecolor="#ffffff"
+     pagecolor="#505050"
-     bordercolor="#111111"
+     bordercolor="#eeeeee"
      borderopacity="1"
-     inkscape:pageshadow="0"
+     inkscape:showpageshadow="0"
      inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
      showgrid="false"
-     inkscape:zoom="20.975"
+     inkscape:zoom="9.0932977"
-     inkscape:cx="20"
+     inkscape:cx="17.870305"
-     inkscape:cy="20"
+     inkscape:cy="22.87399"
-     inkscape:window-width="1920"
+     inkscape:window-width="1280"
-     inkscape:window-height="1048"
+     inkscape:window-height="749"
      inkscape:window-x="0"
-     inkscape:window-y="32"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
+     inkscape:current-layer="svg5" />
   <defs
      id="defs2" />
   <g
-     id="layer1">
+     id="layer1" />
-    <path
+  <rect
-       id="rect288"
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
-       style="fill:#ffffff;stroke-width:0.345614"
+     id="rect1317"
-       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 " />
+     width="7.5289507"
-  </g>
+     height="1.9984204"
+     x="1.1627259"
+     y="1.1712277"
+     ry="0" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-3"
+     width="7.5289507"
+     height="1.9984204"
+     x="1.1609803"
+     y="4.0333257"
+     ry="0" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-6"
+     width="7.5289507"
+     height="1.9984204"
+     x="1.1579751"
+     y="6.9176984"
+     ry="0" />
+  <path
+     style="fill:#ffffff;stroke:#010400;stroke-width:0.0679621;fill-opacity:1"
+     d="M 4.3438587,8.6327318 V 4.3438587 H 19.684828 35.025797 V 8.6327318 12.921605 H 19.684828 4.3438587 Z"
+     id="path908"
+     transform="scale(0.25)" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:#010400;stroke-width:0.0679621"
+     d="M 4.3438587,20.124712 V 15.890825 H 19.684828 35.025797 V 20.124712 24.3586 H 19.684828 4.3438587 Z"
+     id="path2083"
+     transform="scale(0.25)" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:#010400;stroke-width:0.0679621"
+     d="M 4.3438587,31.671678 V 27.437791 H 19.684828 35.025797 v 4.233887 4.233888 H 19.684828 4.3438587 Z"
+     id="path2085"
+     transform="scale(0.25)" />
 </svg>

site/img/strelica-opened-light.svg

@@ -7,15 +7,60 @@
    viewBox="0 0 10 10"
    version="1.1"
    id="svg5"
+   sodipodi:docname="strelica-closed.svg"
+   inkscape:export-filename="strelica-closed.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     showgrid="false"
+     inkscape:zoom="9.0932977"
+     inkscape:cx="17.870305"
+     inkscape:cy="22.87399"
+     inkscape:window-width="1280"
+     inkscape:window-height="749"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5" />
   <defs
      id="defs2" />
   <g
-     id="layer1">
+     id="layer1" />
-    <path
+  <rect
-       id="rect288"
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
-       style="fill:#181715;stroke-width:0.345614"
+     id="rect1317"
-       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 " />
+     width="7.5289507"
-  </g>
+     height="1.9984204"
+     x="1.1627259"
+     y="1.1712277"
+     ry="0" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-3"
+     width="7.5289507"
+     height="1.9984204"
+     x="1.1609803"
+     y="4.0333257"
+     ry="0" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-6"
+     width="7.5289507"
+     height="1.9984204"
+     x="1.1579751"
+     y="6.9176984"
+     ry="0" />
 </svg>

site/img/strelica-opened.svg

@@ -7,15 +7,60 @@
    viewBox="0 0 10 10"
    version="1.1"
    id="svg5"
+   sodipodi:docname="strelica-closed.svg"
+   inkscape:export-filename="strelica-closed.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     showgrid="false"
+     inkscape:zoom="9.0932977"
+     inkscape:cx="17.870305"
+     inkscape:cy="22.87399"
+     inkscape:window-width="1280"
+     inkscape:window-height="749"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5" />
   <defs
      id="defs2" />
   <g
-     id="layer1">
+     id="layer1" />
-    <path
+  <rect
-       id="path1336"
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
-       style="fill:#181715;fill-opacity:1;stroke-width:0.504542"
+     id="rect1317"
-       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 " />
+     width="7.5289507"
-  </g>
+     height="1.9984204"
+     x="1.1627259"
+     y="1.1712277"
+     ry="0" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-3"
+     width="7.5289507"
+     height="1.9984204"
+     x="1.1609803"
+     y="4.0333257"
+     ry="0" />
+  <rect
+     style="fill:#070000;stroke:#010400;stroke-width:0.1545;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1317-6"
+     width="7.5289507"
+     height="1.9984204"
+     x="1.1579751"
+     y="6.9176984"
+     ry="0" />
 </svg>

site/styles/about.css

@@ -0,0 +1,11 @@
+dl {
+  padding: 1rem 0;
+}
+
+dt {
+  font-weight: bold;
+}
+
+dd {
+  margin: 0 0 1rem 1rem;
+}

site/styles/events.css

@@ -7,11 +7,11 @@
   border-bottom: 5px var(--hightlight) solid;
 }
 
-.event:hover>div {
+.event:hover > div {
   padding-bottom: calc(0.5rem - 5px);
 }
 
-.event>div {
+.event > div {
   padding-top: 0.5rem;
   padding-bottom: 0.5rem;
   white-space: nowrap;
@@ -35,6 +35,12 @@
   font-size: 0.9em;
 }
 
+.types {
+  font-size: 0.9em;
+  margin-left: auto;
+  font-style: italic;
+}
+
 @media screen and (max-width: 1160px) {
   .event {
     flex-direction: column;
@@ -51,7 +57,7 @@
     border-bottom: none;
   }
 
-  .event:hover> div {
+  .event:hover > div {
     padding-bottom: 0;
   }
 
@@ -62,4 +68,8 @@
   .title {
     border-left: none;
   }
+
+  .types {
+    margin-left: 0;
+  }
 }

template/end.ical

@@ -0,0 +1 @@
+END:VCALENDAR

template/event.ical

@@ -0,0 +1,13 @@
+BEGIN:VEVENT
+UID:calendar.<!--UID-->.field_date_time.0@radar.squat.net
+DTSTAMP:<!--CREATED-->
+CREATED:<!--CREATED-->
+DTSTART;TZID=Europe/Belgrade:<!--DATE-->
+DTEND;TZID=Europe/Belgrade:<!--DATE-->
+GEO:+44.805613;+20.479234
+LAST-MODIFIED:<!--CREATED-->
+LOCATION:DC Krov\, Kraljice Marije 47\, 6\, Beograd\, Serbia
+STATUS:CONFIRMED
+SUMMARY:<!--TITLE-->
+URL;TYPE=URI:https://dmz.rs/events
+END:VEVENT

template/head.ical

@@ -0,0 +1,20 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Date iCal v3.8//NONSGML kigkonsult.se iCalcreator 2.20.2//
+METHOD:PUBLISH
+X-WR-CALNAME;VALUE=TEXT:Decentrala events
+BEGIN:VTIMEZONE
+TZID:Europe/Belgrade
+BEGIN:STANDARD
+DTSTART:20231029T030000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20240331T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+END:DAYLIGHT
+END:VTIMEZONE

template/page-en.html

@@ -25,8 +25,9 @@
     <nav>
       <a href="/en/events">Events</a>
       <a href="/en/services">Services</a>
-      <a href="/en/contact">Contact</a>
+      <a href="/en/about">About</a>
       <a href="/en/account">Account</a>
+      <a href="/en/donations">Donations</a>
     </nav>
     <span class="links">
       <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>

template/page-sr.html

@@ -25,8 +25,9 @@
     <nav>
       <a href="/events">Događaji</a>
       <a href="/services">Servisi</a>
-      <a href="/contact">Kontakt</a>
+      <a href="/about">O nama</a>
       <a class="account" href="/account">Nalog</a>
+      <a href="/donations">Donacije</a>
     </nav>
     <span class="links">
       <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>