Load templates instead of old pages for events_archive

.~lock.dogadjaji.csv#

@@ -1 +0,0 @@
-,user,localhost,03.05.2025 20:05,file:///home/user/.config/libreoffice/4;

README.md

@@ -6,7 +6,7 @@ Redisign of dmz.rs .
 
 Run
 
-```sh
+```
 python atom_gen.py
 python prep.py
 python build_pages.py
@@ -18,35 +18,25 @@ Complete website will be contained in `site/`. You can copy this to server.
 
 To start a development server, first build site, then run (possibly with `sudo`)
 
-```sh
+```
 nginx -p . -c nginx.dev.conf
 ```
 
 To stop it:
 
-```sh
+```
 nginx -p . -s stop
 ```
 
-## Events
-
-To update events, update the `events.csv` then run commands
-
-```sh
-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

@@ -102,7 +102,7 @@ datum, vreme, lokacija, tema, tip, link
 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", ,
+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,
@@ -217,81 +217,6 @@ datum, vreme, lokacija, tema, tip, link
 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,
+18-12-2024, 18:00, Matematički fakultet (Učionica 153) https://www.openstreetmap.org/node/12291697569, Git basics (en), lecture,
 23-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Osnove Elektrotehnike (OET), lecture,
 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, 
-22-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,
-05-05-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Standalone gamedev u gzdoom-u,workshop,
-06-05-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Degoogled phone radionica - custom ROM,workshop,
-12-05-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Predavanje: Zašto Golang?,lecture,
-13-05-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Prosveceni humanizam,lecture,
-19-05-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Embedded rust na esp32 mikrokontroleru,lecture,
-20-05-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,LAN party,party,
-26-05-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Sysadmin radionica,workshop,
-27-05-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Lighting talks,lighting,
-02-06-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Razgovor o moderaciji,discussion,
-03-06-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Uvod u Radio-amaterizam,lecture,
-09-06-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Terminal Lighting talks,lighting,
-10-06-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Sysadmin radionica,workshop,
-16-06-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Introduction to x86,lecture,
-17-06-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,The Plan 9 Operating System,lecture,
-23-06-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Lighting talks,lighting,
-24-06-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Malware forensics,workshop,
-30-06-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Hardverski hakaton,hack,
-01-07-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Lan party,party,
-07-07-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Nevinost bez zastite - prvi domaci audio film,movie,
-08-07-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,OverTheWire: Bandit,workshop,
-14-07-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Sysadmin radionica,workshop,
-15-07-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,LLMs,lecture,
-21-07-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Technotise: Edit & I,movie,
-22-07-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Lighting talks,lighting,
-28-07-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Hardverski hakaton,hack,
-29-07-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Terminal lighting talks,lighting,
-04-08-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,OpenWRT radionica,workshop,
-05-08-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Mobile phones radionica,workshop,
-11-08-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,FIlm - The Luddites (1988),movie,
-12-08-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Software hackatron, workshop,
-18-08-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Diskusija - transparentnost plata na poslu,discussion,
-19-08-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Hardware hackatron, workshop,
-25-08-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Sysadmin Radionica, workshop,
-26-08-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Lighting talks,lighting,
-01-09-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Podrska protesta,meeting,
-02-09-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,LAN party, party,
-08-09-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Hardverski hakaton - lab fix,workshop,
-09-09-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Idejno-politicka diskusija,discussion,
-15-09-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,GZdoom engine,lecture, 
-16-09-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Lighting talks,lighting,
-22-09-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Web dev in Go,lecture,
-23-09-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Web dev in Go 2,lecture,
-29-09-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Software hackatron, workshop,
-30-09-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522,Linux ricing,lighting,

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

@@ -1,4 +1,4 @@
-<h1>Support</h1>
+<h1>Donations</h1>
 <dd>
   <p>
     Decentrala accepts donations exclusively from the natural person and without
@@ -10,7 +10,7 @@
     (permacomputing).
   </p>
   <p>
-    Support can also be by contributing to our
+    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.
@@ -21,8 +21,8 @@
     participate in one of our events, probably host one.
   </p>
   <p>
-    By simply using services we are hosting, conts as contributing, because in
+    Simple usage of our software also counts as a contribution, because that way
-    that way you joining the decetralization.
+    you will join the decetralization.
   </p>
   <p>
     Also, we accept donations in bitcoin and monero to the following addresses:

pages/en/services.html

@@ -6,85 +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>
-    <td><a href="https://jitsi.dmz.rs/">Jitsi</a></td>
-    <td>
-      <a href="https://jitsi.org/">Jitsi.org</a> meeting app, conferences, group video calls, online events, alternative to zoom.
-    </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>
-  <!--<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

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

pages/sr/donations.html

@@ -1,4 +1,4 @@
-<h1>Podrška</h1>
+<h1>Donacije</h1>
 <dd>
   <p>
     Decentrala prihvata donacije isključivo od fizičkih lica i bez obaveza.

pages/sr/services.html

@@ -6,88 +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>
-    <td><a href="https://jitsi.dmz.rs/">Jitsi</a></td>
+    <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://jitsi.org/">Jitsi.org</a> aplikacija za sastanke, groupne video pozive, online dogadjaje, alternativa za zoom.
     </td>
   </tr>
-  <!--<tr>
+  <tr>
-    <td><a href="https://nextcloud.dmz.rs/">Nextcloud</a></td>
+  </tr>
-    <td>
-      <a href="https://nextcloud.com/">Nextcloud</a> instanca koju koristimo da
-      zapisujemo stvari koje planiramo da uradimo i kao kalendar.
-    </td>
-  <tr>-->
-  <!--<tr>
-    <td><a href="https://cryptpad.dmz.rs/">CryptPad</a></td>
-    <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

@@ -6,16 +6,13 @@
     znanja. Decentralizacija uključuje ravnopravnost korišćenja tehnologije,
     slobodnog softvera, privatnost i bezbednost.
   </p>
-  <p>
-    Na Decentralinoj arhitekturi hostuju se samo servisi koji su otvorenog koda
-  </p>
   <p>
     Decentrala prihvata donacije iskljucivo od fizičkog lica, bez uslova i
     obaveza.
   </p>
   <p>
-    Delovi statuta mogu biti definisati kao nepromenjivi i protiv nepromenjivih
+    Delovi statua mogu biti definisati kao nepromenjivi i protiv nepromenjivog
-    delova statuta se ne može glasati.
+    delova statua se ne može glasati.
   </p>
   <p>
     Svaki pojedinac i grupa ima pravo da sprovodi akcije u duhu ciljeva
@@ -51,9 +48,9 @@
     dodavanja novog clana, ako je prisutan na tom sastanku.
   </p>
   <p>
-    Trenutni članovi glasačkog tela su pod pseudonimom climatechanged,
+    Trenutni članovi glasačkog tela su pod pseudonimom fram3d, climatechanged,
-    anonionman, malin, goodv1bes, coja, bora, mad3v, wingaxe, nothke, duchman,
+    anonionman, goodv1bes, coja, vuk, bora, mad3v, wingaxe, nothke, duchman,
-    txrpe, fl3ka, euffrat.
+    texhno, txrpe, fl3ka, euffrat.
   </p>
 </div>
 

requirements.txt

@@ -1,4 +0,0 @@
-cairosvg
-markdown
-freetype-py
-python-dateutil

site/deconference.html

@@ -45,7 +45,7 @@
     <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>
+    <h1>Dekonferencija</h1>
 
 <h2 id="program"><a href="#program">Program</a></h2>
 <p>11:00  Otvaranje<p>
@@ -87,10 +87,9 @@
     <nav>
       <a href="/events">Događaji</a>
       <a href="/services">Servisi</a>
-      <a href="/statute">Statut</a>
+      <a href="/about">O nama</a>
-      <a href="/about">O nama</>
       <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>

template/events-sr.html

@@ -9,8 +9,3 @@
   <a href="https://dmz.rs/events.ical">ical</a> datotekom.
 </p>
 <br />
-<p>
-  <a href="https://wiki.dmz.rs/en/kako-pronaci-prostor" target="_blank">Kratako uputstvo</a> kako pronaci prostor
-</p>
-<br />
-<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,38 @@
   </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/about">About</a>
-      <nav>
+      <a href="/en/account">Account</a>
-        <a href="/en/events">Events</a>
+      <a href="/en/donations">Donations</a>
-        <a href="/en/services">Services</a>
+    </nav>
-        <a href="/en/statute">Statute</a>
+    <span class="links">
-        <a href="/en/about">About</a>
+      <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>
-        <a href="/en/account">Account</a>
+      <a href="/en/webring"><img src="/img/w-light.svg" alt="Webring"></a>
-        <a href="/en/support">Support</a>
+      <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg" alt="SourceCode"></a>
-      </nav>
+      <a href="https://balkan.fedive.rs/@decentrala"><img src="/img/mastodon-light.svg" alt="Mastodon"></a>
-      <span class="links">
+    </span>
-        <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"
+  </footer>
-          ><img src="/img/cc-light.svg" alt="CreativeCommons"
+</body>
-        /></a>
-        <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

@@ -52,10 +52,9 @@
     <nav>
       <a href="/events">Događaji</a>
       <a href="/services">Servisi</a>
-      <a href="/statute">Statut</a>
+      <a href="/about">O nama</a>
-      <a href="/about">O nama</>
       <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>