Compare commits

...

4 Commits

Author SHA1 Message Date
af65cde58f fix events path 2023-08-07 17:05:30 +02:00
263d313f76 Gitignore 2023-08-07 13:30:11 +02:00
3e7d0c04e3 Reorganize project. Page builder. Support for EN 2023-08-07 13:29:42 +02:00
b8cec7decf Remove poster.html 2023-08-07 11:56:24 +02:00
64 changed files with 284 additions and 461 deletions

7
.gitignore vendored
View File

@ -1,5 +1,8 @@
venv/ venv/
site/*.html
site/atom_blog.xml
site/atom_events.xml
poster.html poster.html
poster.pdf poster.pdf
atom_blog.xml http.access.log
atom_events.xml http.error.log

View File

@ -2,9 +2,35 @@
Redisign of dmz.rs . Redisign of dmz.rs .
## Build site
Run
```
python atom_gen.py
python prep.py
python build_pages.py
```
Complete website will be contained in `site/`. You can copy this to server.
## Development server
To start a development server, first build site, then run (possibly with `sudo`)
```
nginx -p . -c nginx.dev.conf
```
To stop it:
```
nginx -p . -s stop
```
## TODO: ## TODO:
- [ ] create page builder - [x] create page builder
- [ ] create blogging system - [ ] create blogging system
- [ ] create xmpp bot that connects to events section. - [ ] create xmpp bot that connects to events section.
- [ ] webring system - [ ] webring system

View File

@ -67,7 +67,7 @@ def feedgen(blogs, events):
fe_events.updated(datetime.datetime.now(datetime.timezone.utc)) fe_events.updated(datetime.datetime.now(datetime.timezone.utc))
fe_events.content(content=event[2], type='html') fe_events.content(content=event[2], type='html')
fg_blog.atom_file('atom_blog.xml') fg_blog.atom_file('site/atom_blog.xml')
fg_events.atom_file('atom_events.xml') fg_events.atom_file('site/atom_events.xml')
feedgen(blogposts_list_gen(), events_list_gen()) feedgen(blogposts_list_gen(), events_list_gen())

33
build_pages.py Normal file
View File

@ -0,0 +1,33 @@
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': 'events', 'titleSR': 'Događaji', 'titleEN': 'Events', 'style': 'events'},
{'name': 'services', 'titleSR': 'Servisi', 'titleEN': 'Services', 'style': 'services'},
{'name': 'webring', 'titleSR': 'Webring', 'titleEN': 'Webring', 'style': ''},
]
def buildPage(pageTitle: str, pageHtml: str, pageStyle: str, template: str) -> str:
template = template.replace('<!--TITLE-->', pageTitle)
style = '' if not pageStyle else f'<link rel=\"stylesheet\" href=\"/styles/{pageStyle}.css\">'
template = template.replace('<!--ADDITIONAL_STYLE-->', style)
template = template.replace('<!--MAIN-->', pageHtml)
return template
def main():
os.makedirs('site/en/', exist_ok=True)
with open('template/page-en.html') as fTempEN, open('template/page-sr.html') as fTempSR:
templateSR = fTempSR.read()
templateEN = fTempEN.read()
for page in PAGES:
with open(f'pages/sr/{page["name"]}.html') as f:
pageHtml = f.read()
html = buildPage(page['titleSR'], pageHtml, page['style'], templateSR)
f = open(f'site/{page["name"]}.html', 'w')
f.write(html)
f.close()
if __name__ == '__main__':
main()

View File

@ -1,58 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/styles/reset.css">
<link rel="stylesheet" href="/styles/style.css">
<link rel="stylesheet" href="/styles/home.css">
<link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
<script src="/scripts/main.js" defer></script>
<title>Decentrala</title>
</head>
<body>
<header>
<a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher"></button>
<a class="account" href="/pages/account.html">Nalog</a>
</header>
<main>
<h1>Dobrodošao!</h1>
<p>
Mi smo <em>Decentrala</em> - grupa entuzijasta okupljena oko ideja decentralizacije i slobodnog širenja znanja.
Zvuči interesantno? Evo još nekih stvari o nama:
</p>
<dl>
<dt>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!</dd>
<dt>Akcije:</dt>
<dd>Povremeno organizujemo različite akcije, hakatone, crypto-partije, izložbe i slične događaje otvorene za sve zainteresovane. </dd>
<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>
</dl>
<p>
Ako si i dalje zainteresovan, možeš napraviti <a href="/pages/account.html">nalog</a> na našem serveru koji će ti omogućiti korišćenje svih naših <a href="/pages/services.html">servisa</a>.
Ako želiš prvo da vidiš kako to sve izgleda u realnosti, možeš doći na neki od naših <a href="/pages/events.html">događaja</a>, i tu nas upoznati!
</p>
<img id="mesh" src="/img/mesh-light.svg">
</main>
<footer>
<button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
<nav>
<a href="/pages/events.html">Događaji</a>
<a href="/pages/services.html">Servisi</a>
<a href="/pages/contact.html">Kontakt</a>
</nav>
<span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>
<a href="/pages/webring.html"><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>

23
nginx.dev.conf Normal file
View File

@ -0,0 +1,23 @@
# Start nginx in this directory with `nginx -p . -c nginx.conf`
# Stop nginx with `nginx -p . -s stop`
events {}
http {
# edit this for your system
include /etc/nginx/mime.types;
server {
listen 9001;
access_log http.access.log;
error_log http.error.log;
root site/;
error_page 404 /404.html;
location / {
autoindex off;
default_type "text/html";
try_files $uri $uri.html /$uri/index.html /index.html;
}
}
}

View File

@ -1,47 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/styles/style.css">
<link rel="stylesheet" href="/styles/account.css">
<link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
<script src="/scripts/main.js" defer></script>
<title>Decentrala - Nalog</title>
</head>
<body>
<header>
<a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher" title="turn light off"></button>
<a class="account" href="/pages/account.html">Nalog</a>
</header>
<main>
<p> Ako ste napravili nalog na dmz.rs mozete koristi nas xmpp i email server i ostale servise koji podrzavaju LDAP login. <p>
<p> Za vise o XMPP pogledajte <a href="https://wiki.dmz.rs/en/tutorial/conversations">tutorial</a>. <p>
<p> Za primer podesavanja na <a href="https://thunderbird.org">Thundebird</a> mail klijentu mozete pogledati <a href="/img/mailsettings.png">sliku</a>. <p>
<p><a href="/account/register/">Registruj se</a><p>
<p><a href="/account/unregister/">Izbrisi nalog</a><p>
<p><a href="/account/changepassword/">Promeni lozinku</a><p>
<img id="mesh" src="/img/mesh-light.svg">
</main>
<footer>
<button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
<nav>
<a href="/pages/events.html">Događaji</a>
<a href="/pages/services.html">Servisi</a>
<a href="/pages/contact.html">Kontakt</a>
</nav>
<span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>
<a href="/pages/webring.html"><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>

View File

@ -1,46 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/styles/style.css">
<link rel="stylesheet" href="/styles/contact.css">
<link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
<script src="/scripts/main.js" defer></script>
<title>Decentrala - Kontakt</title>
</head>
<body>
<header>
<a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher" title="turn light off"></button>
<a class="account" href="/pages/account.html">Nalog</a>
</header>
<main>
<h1>Kontakt</h1>
<p>Možeš nam poslati mejl na adresu <a href="mailto:dmz@dmz.rs">dmz@dmz.rs</a> ili se možeš pridružiti našem <a
href="https://forum.dmz.rs">Forumu</a>.</p>
<p>Takođe smo dostupni i na <a href="https://balkan.fedive.rs/@decentrala">Fediversu!</a></p>
<br>
<p>U slučaju da si pronašao <em>bug</em> na sajtu, bili bismo ti jako zahvalni
ako bi nam ga prijavio/prijalvila.</p>
<img id="mesh" src="/img/mesh-light.svg">
</main>
<footer>
<button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
<nav>
<a href="/pages/events.html">Događaji</a>
<a href="/pages/services.html">Servisi</a>
<a href="/pages/contact.html">Kontakt</a>
</nav>
<span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>
<a href="/pages/webring.html"><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>

View File

@ -1,98 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/styles/style.css">
<link rel="stylesheet" href="/styles/events.css">
<link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
<script src="/scripts/main.js" defer></script>
<title>Decentrala - Dogadjaji</title>
</head>
<body>
<header>
<a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher" title="turn light off"></button>
<a class="account" href="/pages/account.html">Nalog</a>
</header>
<main>
<h1>Događaji</h1>
<!-- dogadjaji start -->
<table>
<tbody><tr>
<th>Datum</th>
<th>Vreme</th>
<th>Mesto</th>
<th>Tema</th>
</tr>
<tr>
<td> Ponedeljak, 7. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Linux ricing </td>
</tr>
<tr>
<td> Utorak, 8. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Lambda račun </td>
</tr>
<tr>
<td> Ponedeljak, 14. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Linux distro diskusija </td>
</tr>
<tr>
<td> Utorak, 15. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Pirati 777 mora </td>
</tr>
<tr>
<td> Ponedeljak, 21. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Python vežbe </td>
</tr>
<tr>
<td> Utorak, 22. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Autentifikacija na internetu </td>
</tr>
<tr>
<td> Ponedeljak, 28. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Podesavanje Mail servera </td>
</tr>
<tr>
<td> Utorak, 29. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Prevodjenje wiki-a </td>
</tr>
</tbody></table>
<!-- dogadjaji end -->
<img id="mesh" src="/img/mesh-light.svg">
</main>
<footer>
<button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
<nav>
<a href="/pages/events.html">Događaji</a>
<a href="/pages/services.html">Servisi</a>
<a href="/pages/contact.html">Kontakt</a>
</nav>
<span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>
<a href="/pages/webring.html"><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>

View File

@ -1,96 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/styles/style.css">
<link rel="stylesheet" href="/styles/services.css">
<link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
<script src="/scripts/main.js" defer></script>
<title>Decentrala - Servisi</title>
</head>
<body>
<header>
<a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher" title="turn light off"></button>
<a class="account" href="/pages/account.html">Nalog</a>
</header>
<main>
<h1>Servisi</h1>
<table>
<tr>
<th>Servis</th>
<th>Opis</th>
</tr>
<tr>
<td><a href="/account.html">Email</a></td>
<td>Email nalog koji možeš koristiti sa bilo kojim email
klijentom generalne namene (na primer <a href="https://www.thunderbird.net/">Thunderbird-u</a>).</td>
</tr>
<tr>
<td><a href="https://forum.dmz.rs/">Forum</a></td>
<td>Forum na kom obično organizujemo naše <a href="/pages/events.html">događaje</a>.
</td>
</tr>
<tr>
<td>Chat</td>
<td>Održavamo sopstveni XMPP server, na kojem možeš napraviti nalog.
Ako već poseduješ nalog možeš nas naći u grupi <a href="decentrala@conference.dmz.rs">decentrala@conference.dmz.rs</a>.
</td>
</tr>
<tr>
<td><a href="https://gitea.dmz.rs/">Git</a></td>
<td><a href="https://gitea.io/en-us/">Gitea</a> instanca na kojoj držimo kod kao i ostale resurse za naše
<a href="/pages/projects.html">projekte</a>, <a href="/pages/events.html">dogadjaje</a>, kao i projekte naših prijatelja.
Ovo može biti dom tvog sledećeg projekta. Bolji od Github-a.
</td>
</tr>
<tr>
<td><a href="https://wiki.dmz.rs/">Wiki</a></td>
<td><a href="https://js.wiki/">Wiki.js</a> instanca koju koristimo da dokumentujemo naše
<a href="/pages/projects.html">projekte</a> kao i
ostale <a href="/pages/events.html">događaje</a>.
</td>
</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
</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> instanca koju koristimo kao zamenu za Gitea servis.
Soft Serve radi potpuno iz terminala
</td>
</tr>
</table>
<p>Ovo su neki od servisa koje trenutno održavamo na našim serverima. Da bi koristio ove servise, <em>možes</em> se
registovati na svaki servis posebno, a možeš i napraviti jedinstveni <a href="/pages/account.html">nalog</a> na nasem
serveru i koristiti sve servise sa istim nalogom.</p>
<img id="mesh" src="/img/mesh-light.svg">
</main>
<footer>
<button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
<nav>
<a href="/pages/events.html">Događaji</a>
<a href="/pages/services.html">Servisi</a>
<a href="/pages/contact.html">Kontakt</a>
</nav>
<span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>
<a href="/pages/webring.html"><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>

7
pages/sr/account.html Normal file
View File

@ -0,0 +1,7 @@
<p> Ako ste napravili nalog na dmz.rs mozete koristi nas xmpp i email server i ostale servise koji podrzavaju LDAP login. <p>
<p> Za vise o XMPP pogledajte <a href="https://wiki.dmz.rs/en/tutorial/conversations">tutorial</a>. <p>
<p> Za primer podesavanja na <a href="https://thunderbird.org">Thundebird</a> mail klijentu mozete pogledati <a href="/img/mailsettings.png">sliku</a>. <p>
<p><a href="/account/register/">Registruj se</a><p>
<p><a href="/account/unregister/">Izbrisi nalog</a><p>
<p><a href="/account/changepassword/">Promeni lozinku</a><p>

2
pages/sr/blog.html Normal file
View File

@ -0,0 +1,2 @@
Ova stranica je trenutno u izradi...

5
pages/sr/contact.html Normal file
View File

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

59
pages/sr/events.html Normal file
View File

@ -0,0 +1,59 @@
<h1>Događaji</h1>
<table>
<tbody>
<tr>
<th>Datum</th>
<th>Vreme</th>
<th>Mesto</th>
<th>Tema</th>
</tr>
<tr>
<td> Ponedeljak, 7. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Linux ricing </td>
</tr>
<tr>
<td> Utorak, 8. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Lambda račun </td>
</tr>
<tr>
<td> Ponedeljak, 14. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Linux distro diskusija </td>
</tr>
<tr>
<td> Utorak, 15. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Pirati 777 mora </td>
</tr>
<tr>
<td> Ponedeljak, 21. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Python vežbe </td>
</tr>
<tr>
<td> Utorak, 22. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Autentifikacija na internetu </td>
</tr>
<tr>
<td> Ponedeljak, 28. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Podesavanje Mail servera </td>
</tr>
<tr>
<td> Utorak, 29. Avgust 2023. </td>
<td> 19:00h </td>
<td> DC Krov </td>
<td> Prevodjenje wiki-a </td>
</tr>
</tbody>
</table>

23
pages/sr/index.html Normal file
View File

@ -0,0 +1,23 @@
<h1>Dobrodošao!</h1>
<p>
Mi smo <em>Decentrala</em> - grupa entuzijasta okupljena oko ideja decentralizacije i slobodnog širenja znanja.
Zvuči interesantno? Evo još nekih stvari o nama:
</p>
<dl>
<dt>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!
</dd>
<dt>Akcije:</dt>
<dd>Povremeno organizujemo različite akcije, hakatone, crypto-partije, izložbe i slične događaje otvorene za sve
zainteresovane. </dd>
<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>
</dl>
<p>
Ako si i dalje zainteresovan, možeš napraviti <a href="/pages/account.html">nalog</a> na našem serveru koji će ti
omogućiti korišćenje svih naših <a href="/pages/services.html">servisa</a>.
Ako želiš prvo da vidiš kako to sve izgleda u realnosti, možeš doći na neki od naših <a
href="/pages/events.html">događaja</a>, i tu nas upoznati!
</p>

1
pages/sr/projects.html Normal file
View File

@ -0,0 +1 @@
Ova stranica je trenutno u izradi...

60
pages/sr/services.html Normal file
View File

@ -0,0 +1,60 @@
<h1>Servisi</h1>
<table>
<tr>
<th>Servis</th>
<th>Opis</th>
</tr>
<tr>
<td><a href="/account.html">Email</a></td>
<td>Email nalog koji možeš koristiti sa bilo kojim email
klijentom generalne namene (na primer <a href="https://www.thunderbird.net/">Thunderbird-u</a>).</td>
</tr>
<tr>
<td><a href="https://forum.dmz.rs/">Forum</a></td>
<td>Forum na kom obično organizujemo naše <a href="/pages/events.html">događaje</a>.
</td>
</tr>
<tr>
<td>Chat</td>
<td>Održavamo sopstveni XMPP server, na kojem možeš napraviti nalog.
Ako već poseduješ nalog možeš nas naći u grupi <a
href="decentrala@conference.dmz.rs">decentrala@conference.dmz.rs</a>.
</td>
</tr>
<tr>
<td><a href="https://gitea.dmz.rs/">Git</a></td>
<td><a href="https://gitea.io/en-us/">Gitea</a> instanca na kojoj držimo kod kao i ostale resurse za naše
<a href="/pages/projects.html">projekte</a>, <a href="/pages/events.html">dogadjaje</a>, kao i projekte naših
prijatelja.
Ovo može biti dom tvog sledećeg projekta. Bolji od Github-a.
</td>
</tr>
<tr>
<td><a href="https://wiki.dmz.rs/">Wiki</a></td>
<td><a href="https://js.wiki/">Wiki.js</a> instanca koju koristimo da dokumentujemo naše
<a href="/pages/projects.html">projekte</a> kao i
ostale <a href="/pages/events.html">događaje</a>.
</td>
</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
</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> instanca koju koristimo kao zamenu za Gitea
servis.
Soft Serve radi potpuno iz terminala
</td>
</tr>
</table>
<p>Ovo su neki od servisa koje trenutno održavamo na našim serverima. Da bi koristio ove servise, <em>možes</em> se
registovati na svaki servis posebno, a možeš i napraviti jedinstveni <a href="/pages/account.html">nalog</a> na nasem
serveru i koristiti sve servise sa istim nalogom.</p>

3
pages/sr/webring.html Normal file
View File

@ -0,0 +1,3 @@
<ul>
<li><a href="https://tilde.zone/explore">Tilde Zone</a></li>
</ul>

View File

@ -1,41 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/styles/style.css">
<link rel="stylesheet" href="/styles/projects.css">
<link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
<script src="/scripts/main.js" defer></script>
<title>Decentrala - Projekti</title>
</head>
<body>
<header>
<a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher" title="turn light off"></button>
<a class="account" href="/pages/account.html">Nalog</a>
</header>
<main>
<ul>
<li><a href="https://tilde.zone/explore">Tilde Zone</a></li>
</ul>
</main>
<footer>
<button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
<nav>
<a href="/pages/events.html">Događaji</a>
<a href="/pages/services.html">Servisi</a>
<a href="/pages/contact.html">Kontakt</a>
</nav>
<span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>
<a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></a>
<a href="https://gitea.dmz.rs/eline/decentrala-website-static-new"><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>

View File

@ -1 +0,0 @@
<html><head><meta charset="UTF-8"><link rel="stylesheet"href="styles/poster.css"><head><body><main><h1>DECENTRALA</h1><h2>Plan za Septembar</h2><table></table><p>Radionice počinju u <strong>19h</strong> u Društvenom centru Krovu <strong>Kraljice Marije 47</strong>.</p><p>Ulaz u zgradu je u prolazu pored Štark prodavnice slatkiša, odmahpored menjačnice. DC Krov je na poslednjem spratu.</p><div id=link><img src="/img/logo-light.svg"> dmz.rs</div></main></body></html>

51
prep.py
View File

@ -7,7 +7,7 @@ days = [
"Ponedeljak", "Ponedeljak",
"Utorak", "Utorak",
"Sreda", "Sreda",
"Cetvrtak", "Četvrtak",
"Petak", "Petak",
"Subota", "Subota",
"Nedelja", "Nedelja",
@ -70,9 +70,7 @@ events = load_events()
events = sort_events(events) events = sort_events(events)
write_events(events) write_events(events)
start = "<table>\n<tr>\n<th>Datum</th>\n<th>Vreme</th>\n<th>Mesto</th>\n<th>Tema</th>\n</tr>\n" events = []
end="\n</table>"
future_events = []
for event in events: for event in events:
date, time, location, title = event.split(", ") date, time, location, title = event.split(", ")
@ -90,41 +88,14 @@ for event in events:
else: else:
future_event.append("<td> "+location.strip()+" </td>") future_event.append("<td> "+location.strip()+" </td>")
future_event.append("<td> "+title+" </td>") future_event.append("<td> "+title+" </td>")
future_events.append("<tr>\n"+"\n".join(future_event)+"\n</tr>") events.append("<tr>\n"+"\n".join(future_event)+"\n</tr>")
events = [] with open("pages/sr/events.html","wt") as file:
events.append(start) file.writelines(["<h1>Događaji</h1>\n", "<table>\n", "<tr><th>Datum</th><th>Vreme</th><th>Mesto</th><th>Tema</th></tr>\n"])
file.writelines(events)
file.writelines(["</table>"])
for event in future_events: #with open("pages/en/events.html","wt") as file:
events.append(event) # file.writelines(["<h1>Events</h1>", "<table>", "<tr>\n<th>Date</th>\n<th>Time</th>\n<th>Place</th>\n<th>Theme</th>\n</tr>"])
# file.writelines(events)
events.append(end) # file.writelines(["</table>"])
with open("pages/events.html","rt") as file:
html = file.readlines()
new_html = []
i=0
while i<len(html):
original_line = html[i]
line = original_line.strip()
if line == '<!-- dogadjaji start -->':
new_html.append(original_line)
for event in events:
new_html.append(event+"\n")
new_html.append(" <!-- dogadjaji end -->\n")
while line!='<!-- dogadjaji end -->':
i+=1
line=html[i].strip()
i+=1
while i<len(html):
new_html.append(html[i])
i+=1
else:
new_html.append(original_line)
i+=1
with open("pages/events.html","wt") as file:
file.writelines(new_html)

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 66 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 602 B

After

Width:  |  Height:  |  Size: 602 B

View File

Before

Width:  |  Height:  |  Size: 773 B

After

Width:  |  Height:  |  Size: 773 B

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 566 B

After

Width:  |  Height:  |  Size: 566 B

View File

Before

Width:  |  Height:  |  Size: 799 B

After

Width:  |  Height:  |  Size: 799 B

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

0
site/styles/projects.css Normal file
View File

View File

@ -1,40 +1,37 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <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">
<link rel="stylesheet" href="/styles/reset.css">
<link rel="stylesheet" href="/styles/style.css"> <link rel="stylesheet" href="/styles/style.css">
<link rel="stylesheet" href="/styles/blog.css"> <!--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>Decentrala - Blog</title> <title><!--TITLE--> Decentrala</title>
</head> </head>
<body> <body>
<header> <header>
<a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a> <a id="logo" href="/"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher" title="turn light off"></button> <button id="theme-switcher"></button>
<a class="account" href="/pages/account.html">Nalog</a> <a class="account" href="/en/account">Account</a>
</header> </header>
<main> <main>
Ova stranica je trenutno u izradi... <!--MAIN-->
<img id="mesh" src="/img/mesh-light.svg">
</main> </main>
<footer> <footer>
<button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button> <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
<nav> <nav>
<a href="/pages/events.html">Događaji</a> <a href="/en/events">Događaji</a>
<a href="/pages/services.html">Servisi</a> <a href="/en/services">Servisi</a>
<a href="/pages/contact.html">Kontakt</a> <a href="/en/contact">Kontakt</a>
</nav> </nav>
<span class="links"> <span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a> <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>
<a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></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://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> <a href="https://balkan.fedive.rs/@decentrala"><img src="/img/mastodon-light.svg" alt="Mastodon"></a>
</span> </span>
</footer> </footer>
</body> </body>
</html> </html>

View File

@ -1,40 +1,37 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="sr">
<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">
<link rel="stylesheet" href="/styles/reset.css">
<link rel="stylesheet" href="/styles/style.css"> <link rel="stylesheet" href="/styles/style.css">
<link rel="stylesheet" href="/styles/projects.css"> <!--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>Decentrala - Projekti</title> <title><!--TITLE--> Decentrala</title>
</head> </head>
<body> <body>
<header> <header>
<a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a> <a id="logo" href="/"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher" title="turn light off"></button> <button id="theme-switcher"></button>
<a class="account" href="/pages/account.html">Nalog</a> <a class="account" href="/account">Nalog</a>
</header> </header>
<main> <main>
Ova stranica je trenutno u izradi... <!--MAIN-->
<img id="mesh" src="/img/mesh-light.svg">
</main> </main>
<footer> <footer>
<button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button> <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
<nav> <nav>
<a href="/pages/events.html">Događaji</a> <a href="/events">Događaji</a>
<a href="/pages/services.html">Servisi</a> <a href="/services">Servisi</a>
<a href="/pages/contact.html">Kontakt</a> <a href="/contact">Kontakt</a>
</nav> </nav>
<span class="links"> <span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a> <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>
<a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></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://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> <a href="https://balkan.fedive.rs/@decentrala"><img src="/img/mastodon-light.svg" alt="Mastodon"></a>
</span> </span>
</footer> </footer>
</body> </body>
</html> </html>