.gitignore

@@ -12,5 +12,3 @@ http.access.log
 http.error.log
 events.ical
 .vscode/
-events.html
-events_archive.html

README.md

@@ -28,23 +28,15 @@ To stop it:
 nginx -p . -s stop
 ```
 
-## Events
-
-To update events, update the `events.csv` then run commands
-```
-python build_pages.py # builds html out of csv
-python image_poster.py # generates images for events
-```
-
 ## TODO:
 
 - [x] create page builder
-  - [x] rename `prep.py` to more informative name (`build_events.py`)
+  - rename `prep.py` to more informative name (`build_events.py`)
-- [x] create xmpp bot that connects to events section.
 - [ ] 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
-- [x] add account and donations page and style them with the site style
+- add account and donations page and style them with the site style

build_pages.py

@@ -10,7 +10,7 @@ PAGES = [
     {'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': 'support', 'titleSR': 'Podrška', 'titleEN': 'Support', 'style': 'support'},
+    {'name': 'donations', 'titleSR': 'Donacije', 'titleEN': 'Donations', 'style': 'donations'},
     {'name': 'deconference', 'titleSR': 'Dekonferencija', 'titleEN': 'Deconference', 'style': 'deconference'},
 ]
 
@@ -29,15 +29,13 @@ def main():
         templateEN = fTempEN.read()
         for page in PAGES:
             with open(f'pages/sr/{page["name"]}.html') as f:
-                pageHtml = "<div><img src='/img/students_bug.jpg' alt='Studenti su nasli bug' /></div>"
+                pageHtml = f.read()
-                pageHtml += f.read()
                 html = buildPage(page['name'], page['titleSR'], pageHtml, page['style'], templateSR)
                 f = open(f'site/{page["name"]}.html', 'w')
                 f.write(html)
                 f.close()
             with open(f'pages/en/{page["name"]}.html') as f:
-                pageHtml = "<div><img src='/img/students_bug.jpg' alt='Students found the bug' /></div>"
+                pageHtml = f.read()
-                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)

dogadjaji.csv

@@ -198,56 +198,15 @@ datum, vreme, lokacija, tema, tip, link
 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
+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, Dont be afraid of pointers, lecture, https://forum.dmz.rs/t/ne-boj-se-pointera-dont-be-afraid-of-pointers-predavanje/807
+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,
+27-11-2024, 18:00, Matematički fakultet (N251) 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
+04-12-2024, 18:00, Matematički fakultet (N251) https://www.openstreetmap.org/node/12291697569, OpenGL šejderi #2: SDF renderovanje, lecture,
-03-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin vežbe, workshop, https://wiki.dmz.rs/en/sysadmin
+11-12-2024, 18:00, Matematički fakultet (N251) https://www.openstreetmap.org/node/12291697569, OpenGL šejderi #3: Kompleksna analiza, lecture,
-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, DC Krov https://www.openstreetmap.org/node/10594728522, 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, 18:00, DC Krov https://www.openstreetmap.org/node/10594728522, Verifiable Computing Project - Truly Open Source Hardware (en), lecture, https://forum.dmz.rs/t/plan-za-decembar-2024/815/29
-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, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Git basics (en), lecture,
-23-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Osnove Elektrotehnike (OET), lecture,
-24-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Praznicno-novogodisnji izazov u kodiranju 2024, hack,
-13-01-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
-14-01-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardware hackathon, hack, https://wiki.dmz.rs/decentrala/dogadjaji/hakaton
-20-01-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Parser combinators (Haskel introduction hard way), lecture,
-21-01-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin vežbe, workshop, https://wiki.dmz.rs/en/sysadmin
-27-01-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Svet van linuxa, lecture,
-28-01-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, OpenStreetMap editovanje, meeting, https://osmcal.org/event/3355/
-03-02-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Gaming audio, lecture,
-04-02-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Guitar pedals, lecture workshop,
-10-02-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
-11-02-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, TIC-80 gamejam, hack, https://forum.dmz.rs/t/tic-80-game-jam/946
-17-02-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin radionica, workshop,
-18-02-2025, 20:00, DC Krov https://www.openstreetmap.org/node/10594728522, Tumbleweed board game implementation (Rust/MCTS/GGEZ), lecture,
-24-02-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Idejno-politička diskusija, discussion,
-25-02-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Intro to 3d printing, lecture,
-4-03-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Nadzor na radnom mestu - predavanje i razgovor,
-10-03-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
-11-03-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, LAN Party, party,
-17-03-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home made IDS - Clear NDR community edition, workshop,
-18-03-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Radna akcija, hack,
-24-03-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Decentrilized storage, lecture,
-25-03-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin radionica, workshop,
-31-03-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Mesečni pregled decentrale, meeting,
-1-04-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Popravka racunara/hardwera, workshop,
-7-04-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Tasks overview (soft/fixme), workshop,
-8-04-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Selfhosting - basics, lecture,
-14-04-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin radionica, workshop, 
-15-04-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lighting talks,lecture workshop, 
-21-04-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, LAN party, party, 
-21-04-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Network IDS, lecture,
-28-04-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino radionica - ekrani, workshop,
-29-04-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Revizija meseca decentrale, meeting,

image_poster.py

@@ -63,8 +63,8 @@ def drawPoster(events, bg, fg, month:int):
     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)
+    draw.text((165, height), "Sredom u 18h na MATF-u", font=fontIosevkaSmall, fill=fg)
-    # height += 200
+    height += 200
 
     draw.text((165, height), "Svi dogadjaji su uvek besplatni", font=fontIosevkaSmall, fill=fg)
     height += 300

pages/en/donations.html

@@ -0,0 +1,34 @@
+<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>

pages/en/events.html

@@ -0,0 +1,3 @@
+<h1>Events</h1>
+<p>Following list contains all forthcoming events. Held events are listed in <a href="/en/events_archive">archive</a>.</p><br>
+<p>We also provide <a href="https://dmz.rs/events.ical">ical file</a></p><br>

pages/en/services.html

@@ -6,79 +6,54 @@
   </tr>
   <tr>
     <td><a href="/account">E-mail</a></td>
-    <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>
-      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>
+    <td>Forum for general discussion and <a href="/events">event</a> organization.</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
+      We have our XMPP server, on which you can make an account.
-      have an account, you can find us at group
+      If you already have an account, you can find us at group <a href="decentrala@conference.dmz.rs">decentrala@conference.dmz.rs</a>.
-      <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>
+    <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).
-      <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>
+    <td><a href="https://js.wiki/">Wiki.js</a> instance on which we publish documentation for our projects,
-      <a href="https://js.wiki/">Wiki.js</a> instance on which we publish
+      <a href="/events">events</a> resources, and tutorials.
-      documentation for our projects, <a href="/events">events</a> resources,
-      and tutorials.
     </td>
   </tr>
-  <!--<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>
-  <!--<tr>
-    <td><a href="https://cryptpad.dmz.rs/">CryptPad</a></td>
-    <td>
-      <a href="https://cryptpad.org/">CryptPad</a> alternative to google office
-    </td>
-  </tr>-->
-
-  <tr></tr>
   <tr>
     <td><a href="https://search.dmz.rs/">Search</a></td>
-    <td>
+    <td><a href="https://github.com/hnhx/librex/">LibreX</a> instance used for Web searching.</td>
-      <a href="https://github.com/searxng/searxg/">SearXNG</a> instance used for
-      Web searching.
-    </td>
   </tr>
   <tr>
     <td><a href="https://pastebin.dmz.rs/">Pastebin</a></td>
-    <td>
+    <td><a href="https://privatebin.info/">PrivateBin</a> instance we use for sharing text files</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>
+      <a href="https://github.com/charmbracelet/soft-serve">Soft Serve</a> instance that we use as a replacement for the Gitea service.
-      instance that we use as a replacement for the Gitea service. Soft Serve
+      Soft Serve works entirely from the terminal.
-      works entirely from the terminal.
     </td>
   </tr>
 </table>
 <p>
-  These are some of the services we currently maintain on our servers. To use
+  These are some of the services we currently maintain on our servers.
-  these services, you can register for each service separately, or you can
+  To use these services, you can register for each service separately,
-  create a unique <a href="/en/account">account</a>
+  or you can create a unique <a href="/en/account">account</a>
   on our server and use all services with the same account.
 </p>

pages/en/statute.html

@@ -1,86 +1,44 @@
 <h1>Statute</h1>
 
 <div>
-  <p>
+  <p>Decentrala je zajednica okupljena oko decentralizacije tehnologija i širenja znanja. Decentralizacija uključuje ravnopravnost korišćenja tehnologije, slobodnog softvera, privatnost i bezbednost.</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>
+  <p>Decentrala prihvata donacije iskljucivo od fizičkog lica, bez uslova i obaveza.</p>
-    Decentrala prihvata donacije iskljucivo od fizičkog lica, bez uslova i
-    obaveza.
-  </p>
 
-  <p>
+  <p>Delovi statua mogu biti definisati kao nepromenjivi i protiv nepromenjivog delova statua se ne može glasati.</p>
-    Delovi statua mogu biti definisati kao nepromenjivi i protiv nepromenjivog
-    delova statua se ne može glasati.
-  </p>
 
-  <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>
-    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>
+  <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>
-    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>
+  <p>Decentrala o zahtevima za prijem u članstvo odlučuje dvotrećinskom većinom prisutnog članstva kolektiva.</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>
+  <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>
-    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>
+  <p>Ako član glasačkog tela nije prisutan tokom tri uzastopna sastanka automatski je isključen iz glasačkog tela.</p>
-    Ako član glasačkog tela nije prisutan tokom tri uzastopna sastanka
-    automatski je isključen iz glasačkog tela.
-  </p>
 
-  <p>
+  <p>Član moze biti ponovo ukljucen u glasacko telo po vec definisanoj proceduri dodavanja novog clana, ako je prisutan na tom sastanku.</p>
-    Član moze biti ponovo ukljucen u glasacko telo po vec definisanoj proceduri
-    dodavanja novog clana, ako je prisutan na tom sastanku.
-  </p>
 
-  <p>
+  <p> Trenutni članovi glasačkog tela su pod pseudonimom fram3d, climatechanged, anonionman, seraphi, goodv1bes, coja, vuk, bora, mad3v, wingaxe, nothke, duchman, texhno.</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>
+<h2>Sastanci </h2>
 
 <div>
-  <p>
+  <p>Sastanak glasačkog tela je validan ukoliko mu prisustvuje najmanje troje članova glasačkog tela.</p>
-    Sastanak glasačkog tela je validan ukoliko mu prisustvuje najmanje troje
-    članova glasačkog tela.
-  </p>
 
-  <p>
+  <p>Vreme i mesto sastanka skupštine Decentrale se mora najaviti bar nedelju dana pred vremena sastanka na forumu Decentrale.</p>
-    Vreme i mesto sastanka skupštine Decentrale se mora najaviti bar nedelju
-    dana pred vremena sastanka na forumu Decentrale.
-  </p>
 
-  <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>
-    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>

pages/en/support.html

@@ -1,39 +0,0 @@
-<h1>Support</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 by 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>
-    By simply using services we are hosting, conts as contributing, because in
-    that way you joining 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>

pages/sr/donations.html

@@ -0,0 +1,33 @@
+<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 zeliti 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>

pages/sr/events.html

@@ -0,0 +1,4 @@
+<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>
+

pages/sr/services.html

@@ -6,82 +6,60 @@
   </tr>
   <tr>
     <td><a href="/account">E-mail</a></td>
-    <td>
+    <td>E-mail nalog koji možeš da koristiš sa bilo kojim email
-      E-mail nalog koji možeš da koristiš sa bilo kojim email klijentom
+      klijentom generalne namene (na primer <a href="https://www.thunderbird.net/">Thunderbird</a>-om).</td>
-      generalne namene (na primer
-      <a href="https://www.thunderbird.net/">Thunderbird</a>-om).
-    </td>
   </tr>
   <tr>
     <td><a href="https://forum.dmz.rs/">Forum</a></td>
-    <td>
+    <td>Forum na kom obično organizujemo naše <a href="/events">događaje</a>.
-      Forum na kom obično organizujemo naše <a href="/events">događaje</a>.
     </td>
   </tr>
   <tr>
     <td><a href="/account">Chat</a></td>
-    <td>
+    <td>Održavamo sopstveni XMPP server, na kojem možeš da napraviš nalog.
-      Održavamo sopstveni XMPP server, na kojem možeš da napraviš nalog. Ako već
+      Ako već poseduješ nalog možeš da nas nađeš u grupi <a
-      poseduješ nalog možeš da nas nađeš u grupi
+        href="decentrala@conference.dmz.rs">decentrala@conference.dmz.rs</a>.
-      <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>
+    <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="https://gitea.io/en-us/">Gitea</a> instanca na kojoj držimo kôd
+      <a href="/projects">projekte</a>, <a href="/events">događaje</a>, kao i projekte naših
-      kao i ostale resurse za naše <a href="/projects">projekte</a>,
+      prijatelja.
-      <a href="/events">događaje</a>, kao i projekte naših prijatelja. Ovo može
+      Ovo može biti dom tvog sledećeg projekta. Bolji od Github-a.
-      biti dom tvog sledećeg projekta. Bolji od Github-a.
     </td>
   </tr>
   <tr>
     <td><a href="https://wiki.dmz.rs/">Wiki</a></td>
-    <td>
+    <td><a href="https://js.wiki/">Wiki.js</a> instanca koju koristimo da dokumentujemo naše
-      <a href="https://js.wiki/">Wiki.js</a> instanca koju koristimo da
+      <a href="/projects">projekte</a> kao i ostale <a href="/events">događaje</a>.
-      dokumentujemo naše <a href="/projects">projekte</a> kao i ostale
-      <a href="/events">događaje</a>.
     </td>
   </tr>
-  <!--<tr>
+  <tr>
     <td><a href="https://nextcloud.dmz.rs/">Nextcloud</a></td>
-    <td>
+    <td><a href="https://nextcloud.com/">Nextcloud</a> instanca koju koristimo da zapisujemo stvari koje planiramo da uradimo i kao kalendar.
-      <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://cryptpad.dmz.rs/">CryptPad</a></td>
+  </tr>
-    <td>
-      <a href="https://cryptpad.org/">CryptPad</a> zamena za google office
-    </td>
-  <tr>-->
   <tr>
     <td><a href="https://search.dmz.rs/">Search</a></td>
-    <td>
+    <td><a href="https://github.com/hnhx/librex/">LibreX</a> instanca koju koristimo za pretraživanje Interneta.
-      <a href="https://github.com/searxng/searxng/">SearXNG</a> instanca koju
+      Bolji od Google-a.
-      koristimo za pretraživanje Interneta. Zamena za Google.
     </td>
   </tr>
   <tr>
     <td><a href="https://pastebin.dmz.rs/">Pastebin</a></td>
-    <td>
+    <td><a href="https://privatebin.info/">PrivateBin</a> instanca koju koristimo za brzo deljenje tekstualnih fajlova
-      <a href="https://privatebin.info/">PrivateBin</a> instanca koju koristimo
-      za brzo deljenje tekstualnih fajlova
     </td>
   </tr>
   <tr>
     <td><a href="ssh://soft.dmz.rs:2222/">Soft Serve</a></td>
-    <td>
+    <td><a href="https://github.com/charmbracelet/soft-serve">Soft Serve</a> instanca koju koristimo kao zamenu za Gitea servis.
-      <a href="https://github.com/charmbracelet/soft-serve">Soft Serve</a>
+      Soft Serve radi potpuno iz terminala
-      instanca koju koristimo kao zamenu za Gitea servis. Soft Serve radi
-      potpuno iz terminala
     </td>
   </tr>
 </table>
-<p>
+<p>Ovo su neki od servisa koje trenutno održavamo na našim serverima. Da bi koristio ove servise, <em>možeš</em> da se
-  Ovo su neki od servisa koje trenutno održavamo na našim serverima. Da bi
+  registuješ na svaki servis posebno, a možeš i da napraviš jedinstveni <a href="/account">nalog</a> na našem
-  koristio ove servise, <em>možeš</em> da se registuješ na svaki servis posebno,
+  serveru i da koristiš sve servise sa istim nalogom.</p>
-  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>

pages/sr/statute.html

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

pages/sr/support.html

@@ -1,37 +0,0 @@
-<h1>Podrška</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>

prep.py

@@ -107,13 +107,6 @@ def build_ical(events: list[dict]) -> str:
         event_template = event_template.replace("<!--DATE-->", date)
         event_template = event_template.replace("<!--TITLE-->", title)
         event_template = event_template.replace("<!--URL-->", url)
-        if location.startswith("DC Krov"):
-            event_template = event_template.replace("<!--LOCATION-->", "DC Krov\\, Kraljice Marije 47\\, 6\\, Beograd\\, Serbia")
-        elif location.startswith("Matematički fakultet (Učionica 153)"):
-            event_template = event_template.replace("<!--LOCATION-->", "Matematički fakultet\\, Svetog Nikole 39\\, Beograd\\, Serbia")
-        else:
-            event_template = event_template.replace("<!--LOCATION-->", "")
-
 
         events_ical += event_template
     # Footer
@@ -141,7 +134,7 @@ for key, value_pair in TYPES_DICT.items():
 
 # Build Serbian Events page
 new_events_html = build_html(new_events, DAYS_SR, sr_types)
-with open("template/events-sr.html", "r") as file:
+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:
@@ -149,7 +142,7 @@ with open("pages/sr/events.html", "w") as file:
 
 # Build English Events page
 new_events_html = build_html(new_events, DAYS_EN, en_types)
-with open("template/events-en.html", "r") as file:
+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:
@@ -157,7 +150,7 @@ with open("pages/en/events.html", "w") as file:
 
 # Build Serbian Archive page
 past_events_html = build_html(past_events, DAYS_SR, sr_types)
-with open("template/events_archive-sr.html", "r") as file:
+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:
@@ -165,7 +158,7 @@ with open("pages/sr/events_archive.html", "w") as file:
 
 # Build English Archive page
 past_events_html = build_html(past_events, DAYS_EN, en_types)
-with open("template/events_archive-en.html", "r") as file:
+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:

site/deconference.html

@@ -1,100 +1,138 @@
 <!DOCTYPE html>
-<html lang="sr">
+<html lang="en">
 <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">
-  <link rel="stylesheet" href="/styles/deconference.css">
   <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
-  <script src="/scripts/main.js" defer></script>
+  <title>Deconference</title>
-  <title>Dekonferencija Decentrala</title>
+<style>
-  <link rel="alternate" hreflang="en" href="/en/deconference" />
+    :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>
-    <a id="logo" href="/"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
+    <h1>Deconference</h1>
-    <button id="theme-switcher"></button>
-    <a class="lang" hreflang="en" href="/en/deconference">EN</a>
   </header>
   <main>
-    <div><img src='/img/students_bug.jpg' alt='Studenti su nasli bug' /></div><h1>Dekonferencija</h1>
+    <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="program"><a href="#program">Program</a></h2>
+    <h2 id="wwhen-and-where"><a href="#when-and-where">When & Where?</a></h2>
-<p>11:00  Otvaranje<p>
+    <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>
-<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>
+    <h2 id="why"><a href="#why">Why?</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>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>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>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>
 
-<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>
+    <h2 id="who"><a href="#who">Who?</a></h2>
 
-<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>
+    <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>
 
-<h2 id="who"><a href="#who">Ko?</a></h2>
+    <p>We will update this section as topics are confirmed.</p>
 
-<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>
+    <h2 id="how"><a href="#how">How?</a></h2>
 
-<p>Osvežićemo ovaj deo kako se teme događaja potvrde.</p>
+    <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>
 
-<h2 id="how"><a href="#how">Kako?</a></h2>
+    <p>Decentrala accepts donations exclusively from individuals.</p>
-
-<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>
 
   </main>
   <footer>
-    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
-    <nav>
-      <a href="/events">Događaji</a>
-      <a href="/services">Servisi</a>
-      <a href="/statute">Statut</a>
-      <a href="/about">O nama</>
-      <a class="account" href="/account">Nalog</a>
-      <a href="/support">Podrška</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 href="/webring"><img src="/img/w-light.svg" alt="Webring"></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>

template/event.ical

@@ -6,7 +6,7 @@ DTSTART;TZID=Europe/Belgrade:<!--DATE-->
 DTEND;TZID=Europe/Belgrade:<!--DATE-->
 GEO:+44.805613;+20.479234
 LAST-MODIFIED:<!--CREATED-->
-LOCATION:<!--LOCATION-->
+LOCATION:DC Krov\, Kraljice Marije 47\, 6\, Beograd\, Serbia
 STATUS:CONFIRMED
 SUMMARY:<!--TITLE-->
 URL;TYPE=URI:<!--URL-->

template/events-en.html

@@ -1,8 +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 />

template/events-sr.html

@@ -1,11 +0,0 @@
-<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 />

template/page-en.html

@@ -1,10 +1,10 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
-  <head>
+<head>
-    <meta charset="UTF-8" />
+  <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <!--
+  <!--
   <pre>
 
                                 *@@* 
@@ -30,49 +30,39 @@
   </pre>
   -->
 
-    <link rel="stylesheet" href="/styles/reset.css" />
+  <link rel="stylesheet" href="/styles/reset.css">
-    <link rel="stylesheet" href="/styles/style.css" />
+  <link rel="stylesheet" href="/styles/style.css">
-    <!--ADDITIONAL_STYLE-->
+  <!--ADDITIONAL_STYLE-->
-    <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon" />
+  <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
-    <script src="/scripts/main.js" defer></script>
+  <script src="/scripts/main.js" defer></script>
-    <title><!--TITLE--> Decentrala</title>
+  <title><!--TITLE--> Decentrala</title>
-    <link rel="alternate" hreflang="sr" href="/PAGE_NAME" />
+  <link rel="alternate" hreflang="sr" href="/PAGE_NAME" />
-  </head>
+</head>
-  <body>
+<body>
-    <header>
+  <header>
-      <a id="logo" href="/en/index"
+    <a id="logo" href="/en/index"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
-        ><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>
-      <button id="theme-switcher"></button>
+  </header>
-      <a class="lang" hreflang="sr" href="/PAGE_NAME">SR</a>
+  <main>
-    </header>
+    <!--MAIN-->
-    <main>
+  </main>
-      <!--MAIN-->
+  <footer>
-    </main>
+    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
-    <footer>
+    <nav>
-      <button id="sections-button" opened="false">
+      <a href="/en/events">Events</a>
-        <img src="/img/strelica-closed-light.svg" alt="OpenMenu" />
+      <a href="/en/services">Services</a>
-      </button>
+      <a href="/en/statute">Statute</a>
-      <nav>
+      <a href="/en/about">About</a>
-        <a href="/en/events">Events</a>
+      <a href="/en/account">Account</a>
-        <a href="/en/services">Services</a>
+      <a href="/en/donations">Donations</a>
-        <a href="/en/statute">Statute</a>
+    </nav>
-        <a href="/en/about">About</a>
+    <span class="links">
-        <a href="/en/account">Account</a>
+      <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>
-        <a href="/en/support">Support</a>
+      <a href="/en/webring"><img src="/img/w-light.svg" alt="Webring"></a>
-      </nav>
+      <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg" alt="SourceCode"></a>
-      <span class="links">
+      <a href="https://balkan.fedive.rs/@decentrala"><img src="/img/mastodon-light.svg" alt="Mastodon"></a>
-        <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"
+    </span>
-          ><img src="/img/cc-light.svg" alt="CreativeCommons"
+  </footer>
-        /></a>
+</body>
-        <a href="/en/webring"><img src="/img/w-light.svg" alt="Webring" /></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>

template/page-sr.html

@@ -53,9 +53,9 @@
       <a href="/events">Događaji</a>
       <a href="/services">Servisi</a>
       <a href="/statute">Statut</a>
-      <a href="/about">O nama</>
+      <a href="/about">O nama</a>
       <a class="account" href="/account">Nalog</a>
-      <a href="/support">Podrška</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>