Gitignore

Reorganize project. Page builder. Support for EN
Remove poster.html
2023-08-07 13:30:11 +02:00 · 2023-08-07 13:29:42 +02:00 · 2023-08-07 11:56:24 +02:00 · 2023-08-06 14:31:23 +00:00 · 2023-08-06 16:30:05 +02:00 · 2023-08-06 15:50:12 +02:00
67 changed files with 477 additions and 626 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 venv/
+site/*.html
+site/atom_blog.xml
+site/atom_events.xml
 poster.html
 poster.pdf
-atom_blog.xml
-atom_events.xml
+http.access.log
+http.error.log
--- a/README.md
+++ b/README.md
@@ -2,27 +2,39 @@

 Redisign of dmz.rs .

-# STILL NOT COMPLETED
+## Build site

-### TODO:
+Run

- [x] create themes switcher
-  - [x] "demo"
-  - [x] propagate to all pages
-  - [x] store theme to localStorage
-  - [x] read "user agent" for default theme
-  - [x] invert images and icons
- update projects section
- create blogging system
- create xmpp bot that connects to events section.
- [ ] make responsive
-  - create menus for smaller screens
-    - [x] created one menu
-      - this might be enough
-  - [x] adjust the mesh depending on the screen size
-    - no mesh on small screens
-  - tweak other random issues with layout
- make webring system
- make english version (localisation)
+```
+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:
+
+- [x] create page builder
+- [ ] create blogging system
+- [ ] create xmpp bot that connects to events section.
+- [ ] webring system
+  - [x] make page
+  - [ ] populate page
+- [ ] make english version (localisation)

-<!-- there is no place like ~/home -->
--- a/atom_gen.py
+++ b/atom_gen.py
@@ -67,7 +67,7 @@ def feedgen(blogs, events):
        fe_events.updated(datetime.datetime.now(datetime.timezone.utc))
        fe_events.content(content=event[2], type='html')

-    fg_blog.atom_file('atom_blog.xml')
-    fg_events.atom_file('atom_events.xml')
+    fg_blog.atom_file('site/atom_blog.xml')
+    fg_events.atom_file('site/atom_events.xml')

 feedgen(blogposts_list_gen(), events_list_gen())
--- a/build_pages.py
+++ b/build_pages.py
@@ -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()
--- a/img/favicon.ico
+++ b/img/favicon.ico
--- a/index.html
+++ b/index.html
@@ -1,70 +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">Decentrala</a>
-    <span>
-      <button id="theme-switcher"></button>
-      <a class="account" href="/pages/account.html">Nalog</a>
-    </span>
-  </header>
-  <div id="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">
-  </div>
-  <footer>
-    <div id="sections-menu">
-      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </div>
-    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
-    <span class="sections">
-      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </span>
-    <span class="copyleft">
-      <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>
-      <span>Decentrala &copy; 2023</span>
-    </span>
-  </footer>
-</body>
-
-</html>
--- a/nginx.dev.conf
+++ b/nginx.dev.conf
@@ -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;
+        }
+    }
+}
--- a/pages/account.html
+++ b/pages/account.html
@@ -1,57 +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">Decentrala</a>
-    <span>
-      <button id="theme-switcher"></button>
-      <a class="account" href="/pages/account.html">Nalog</a>
-    </span>
-  </header>
-  <div id="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">
-  </div>
-  <footer>
-    <div id="sections-menu">
-      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </div>
-    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
-    <span class="sections">
-      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </span>
-    <span class="copyleft">
-      <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>Decentrala &copy; 2023</span>
-    </span>
-  </footer>
-</body>
-
-</html>
--- a/pages/blog.html
+++ b/pages/blog.html
@@ -1,50 +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/blog.css">
-  <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
-  <script src="/scripts/main.js" defer></script>
-  <title>Decentrala - Blog</title>
-</head>
-
-<body>
-  <header>
-    <a id="logo" href="/index.html">Decentrala</a>
-    <span>
-      <button id="theme-switcher"></button>
-      <a class="account" href="/pages/account.html">Nalog</a>
-    </span>
-  </header>
-  <div id="main">
-    Ova stranica je trenutno u izradi...
-    <img id="mesh" src="/img/mesh-light.svg">
-  </div>
-  <footer>
-    <div id="sections-menu">
-      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </div>
-    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
-    <span class="sections">
-      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </span>
-    <span class="copyleft">
-      <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>Decentrala &copy; 2023</span>
-    </span>
-  </footer>
-</body>
-
-</html>
--- a/pages/contact.html
+++ b/pages/contact.html
@@ -1,55 +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">Decentrala</a>
-    <span>
-      <button id="theme-switcher"></button>
-      <a class="account" href="/pages/account.html">Nalog</a>
-    </span>
-  </header>
-  <div id="main">
-    <h1>Kontakt</h1>
-    <p>Možeš nam poslati mail na <a href="mailto:dmz@dmz.rs">dmz@dmz.rs</a> ili se mozes pridružiti našem <a
-        href="https://forum.dmz.rs">Forumu</a>.</p>
-    <p>Takođe smo i na <a href="https://balkan.fedive.rs/@decentrala">Fediversu!</a></p>
-    <p style="position: relative; top: 5rem;">U slucaju da nadjete <em>bug</em> na sajtu, bili bismo jako zahvalni
-      ako bi mogli da nam ga prijavite (npr. putem emaila).</p>
-    <img id="mesh" src="/img/mesh-light.svg">
-  </div>
-  <footer>
-    <div id="sections-menu">
-      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </div>
-    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
-    <span class="sections">
-      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </span>
-    <span class="copyleft">
-      <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>Decentrala &copy; 2023</span>
-    </span>
-  </footer>
-</body>
-
-</html>
--- a/pages/events.html
+++ b/pages/events.html
@@ -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">Decentrala</a>
-    <span>
-      <button id="theme-switcher"></button>
-      <a class="account" href="/pages/account.html">Nalog</a>
-    </span>
-  </header>
-  <div id="main">
-    <h1>Dogadjaji</h1>
-    <!-- dogadjaji start -->
-    <table>
-      <tr>
-        <th>Datum</th>
-        <th>Vreme</th>
-        <th>Mesto</th>
-        <th>Tema</th>
-      </tr>
-
-      <tr>
-        <td> Petak, 5. Maj 2023. </td>
-        <td> 15:30h </td>
-        <td> <a href="https://www.openstreetmap.org/node/256367543"> Cvijeta Zuzoric </a> </td>
-        <td> ULUS izlozba (Q&A) </td>
-      </tr>
-      <tr>
-        <td> Subota, 6. Maj 2023. </td>
-        <td> 12:00h </td>
-        <td> <a href="https://www.openstreetmap.org/node/256367543"> Cvijeta Zuzoric </a> </td>
-        <td> ULUS izlozba (Q&A) </td>
-      </tr>
-      <tr>
-        <td> Nedelja, 7. Maj 2023. </td>
-        <td> 16:00h </td>
-        <td> <a href="https://www.openstreetmap.org/node/256367543"> Cvijeta Zuzoric </a> </td>
-        <td> ULUS izlozba (diskusija) </td>
-      </tr>
-      <tr>
-        <td> Ponedeljak, 8. Maj 2023. </td>
-        <td> 19:00h </td>
-        <td> <a href="https://www.openstreetmap.org/node/10594728522"> DC Krov </a> </td>
-        <td> Linux install day </td>
-      </tr>
-      <tr>
-        <td> Utorak, 9. Maj 2023. </td>
-        <td> 19:00h </td>
-        <td> <a href="https://www.openstreetmap.org/node/10594728522"> DC Krov </a> </td>
-        <td> Cryptoparty - Uvod u privatnost </td>
-      </tr>
-      <tr>
-        <td> Cetvrtak, 11. Maj 2023. </td>
-        <td> 18:00h </td>
-        <td> <a href="https://www.openstreetmap.org/node/4856556781"> Polyhedra </a> </td>
-        <td> Uvod u racunarske mreze </td>
-      </tr>
-
-    </table>
-    <!-- dogadjaji end -->
-    <img id="mesh" src="/img/mesh-light.svg">
-  </div>
-  <footer>
-    <div id="sections-menu">
-      <a href="/pages/events.html">Dogadjaji</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </div>
-    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
-    <span class="sections">
-      <a href="/pages/events.html">Dogadjaji</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </span>
-    <span class="copyleft">
-      <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>Decentrala &copy; 2023</span>
-    </span>
-  </footer>
-</body>
-
-</html>
--- a/pages/projects.html
+++ b/pages/projects.html
@@ -1,50 +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">Decentrala</a>
-    <span>
-      <button id="theme-switcher"></button>
-      <a class="account" href="/pages/account.html">Nalog</a>
-    </span>
-  </header>
-  <div id="main">
-    Ova stranica je trenutno u izradi...
-    <img id="mesh" src="/img/mesh-light.svg">
-  </div>
-  <footer>
-    <div id="sections-menu">
-      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </div>
-    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
-    <span class="sections">
-      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </span>
-    <span class="copyleft">
-      <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>Decentrala &copy; 2023</span>
-    </span>
-  </footer>
-</body>
-
-</html>
--- a/pages/services.html
+++ b/pages/services.html
@@ -1,106 +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">Decentrala</a>
-    <span>
-      <button id="theme-switcher"></button>
-      <a class="account" href="/pages/account.html">Nalog</a>
-    </span>
-  </header>
-  <div id="main">
-    <h1>Servisi</h1>
-    <table>
-      <tr>
-        <th>Servis</th>
-        <th>Opis</th>
-      </tr>
-      <tr>
-        <td><a href="">Email</a></td>
-        <td>Email nalog koji mozes koristiti putem na bilo kom
-          email
-          klijentu generalne namene, na primer <a href="https://www.thunderbird.net/">Thunderbird-u</a>. Bolji od
-          Gmail-a. </td>
-      </tr>
-      <tr>
-        <td><a href="https://forum.dmz.rs/">Forum</a></td>
-        <td>Forum na kojem obicno organizujemo nase <a href="/pages/events.html">dogadjaje</a>. Bolji od Reddit-a.
-        </td>
-      </tr>
-      <tr>
-        <td>Chat</td>
-        <td>Odrzavamo svoj XMPP server, na kojem mozes napraviti nalog ili ako vec imas nalog mozes nas naci u grupi <a
-            href="decentrala@conference.dmz.rs">decentrala@conference.dmz.rs</a> . Bolji od WhatsApp-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 drzimo kod kao i ostale resurse za nase <a
-            href="/pages/projects.html">projekte</a>,
-          <a href="/pages/events.html">dogadjaje</a>, kao i neke nase random projekte kao i projekte nasih
-          prijatelja.
-          Ovo moze bit dom tvog sledeceg 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 nase <a
-            href="/pages/projects.html">projekte</a> kao i
-          ostale <a href="/pages/events.html">dogadjaje</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 da pretrazujemo Internet. 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 koja radi potpuno iz terminala
-          </td>
-      </tr>
-    </table>
-    <p>Ovo su neki od servisa koje trenutno odrzavamo na nasim serverima. Da bi koristio ove servise, <em>mozes</em> se
-      registrujes za svaki servis posebno, ali mozes i da da napravis <a href="/pages/account.html">nalog</a> na nasem
-      serveru i koristis sve servis sa istim nalogom.</p>
-    <img id="mesh" src="/img/mesh-light.svg">
-  </div>
-  <footer>
-    <div id="sections-menu">
-      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </div>
-    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
-    <span class="sections">
-      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </span>
-    <span class="copyleft">
-      <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>Decentrala &copy; 2023</span>
-    </span>
-  </footer>
-</body>
-
-</html>
--- a/pages/sr/account.html
+++ b/pages/sr/account.html
@@ -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>
--- a/pages/sr/blog.html
+++ b/pages/sr/blog.html
@@ -0,0 +1,2 @@
+Ova stranica je trenutno u izradi...
+    
--- a/pages/sr/contact.html
+++ b/pages/sr/contact.html
@@ -0,0 +1,5 @@
+<h1>Kontakt</h1>
+<p>Možeš nam poslati mejl na adresu <a href="mailto:dmz@dmz.rs">dmz@dmz.rs</a> ili se možeš pridružiti našem <a href="https://forum.dmz.rs">Forumu</a>.</p>
+<p>Takođe smo dostupni i na <a href="https://balkan.fedive.rs/@decentrala">Fediversu!</a></p>
+<br>
+<p>U slučaju da si pronašao <em>bug</em> na sajtu, bili bismo ti jako zahvalni ako bi nam ga prijavio/prijalvila.</p>
--- a/pages/sr/events.html
+++ b/pages/sr/events.html
@@ -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>
--- a/pages/sr/index.html
+++ b/pages/sr/index.html
@@ -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>
--- a/pages/sr/projects.html
+++ b/pages/sr/projects.html
@@ -0,0 +1 @@
+Ova stranica je trenutno u izradi...
--- a/pages/sr/services.html
+++ b/pages/sr/services.html
@@ -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>
--- a/pages/sr/webring.html
+++ b/pages/sr/webring.html
@@ -0,0 +1,3 @@
+<ul>
+  <li><a href="https://tilde.zone/explore">Tilde Zone</a></li>
+</ul>
--- a/pages/webring.html
+++ b/pages/webring.html
@@ -1,51 +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">Decentrala</a>
-    <span>
-      <button id="theme-switcher"></button>
-      <a class="account" href="/pages/account.html">Nalog</a>
-    </span>
-  </header>
-  <div id="main">
-    <list>
-    <li> <a href="https://tilde.zone/explore">Tilde Zone</a> </li>
-    </list>
-  </div>
-  <footer>
-    <div id="sections-menu">
-      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </div>
-    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
-    <span class="sections">
-      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/services.html">Servisi</a>
-      <a href="/pages/contact.html">Kontakt</a>
-    </span>
-    <span class="copyleft">
-      <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>Decentrala &copy; 2023</span>
-    </span>
-  </footer>
-</body>
-
-</html>
--- a/poster.html
+++ b/poster.html
@@ -1,9 +0,0 @@
-<html><head><link rel="stylesheet" href="styles/poster.css"><head><body><main><h1>DECENTRALA</h1><h2>Plan za Avgust</h2><table><tr><td>UTO</td><td>1.</td><td> Tehno veče</td></tr>
-<tr><td>PON</td><td>7.</td><td> Linux ricing</td></tr>
-<tr><td>UTO</td><td>8.</td><td> Lambda račun</td></tr>
-<tr><td>PON</td><td>14.</td><td> Linux distro diskusija</td></tr>
-<tr><td>UTO</td><td>15.</td><td> Pirati 777 mora</td></tr>
-<tr><td>PON</td><td>21.</td><td> Python vežbe</td></tr>
-<tr><td>UTO</td><td>22.</td><td> Autentifikacija na internetu</td></tr>
-<tr><td>PON</td><td>28.</td><td> Kviz</td></tr>
-</table><p>Radionice počinju u <strong>19h</strong> u Društvenom centru Krov u <strong>Kraljice Marije 47</strong>.</p><p>Ulaz u zgradu je u prolazu pored Štark prodavnice slatkiša, odmah pored menjačnice. DC Krov je na poslednjem spratu.</p><div id=link>dmz.rs</div></main></body></html>
--- a/poster.py
+++ b/poster.py
@@ -36,18 +36,18 @@ def render_table(events:list[dict])-> str:
    return html

 def render_page(table: str) -> str:
-    head = "<head>\n\t<meta charset=\"UTF-8\">\n\t<link rel=\"stylesheet\"\
-href=\"styles/poster.css\">\n<head>"
+    head = "<head><meta charset=\"UTF-8\"><link rel=\"stylesheet\"\
+href=\"styles/poster.css\"><head>"
    header = "<h1>DECENTRALA</h1>"
    subheader = f"<h2>Plan za {MONTHS_SR[NEXT_MONTH.month - 1]}</h2>"
-    link = "<div id=link>dmz.rs</div>"
+    link = "<div id=link><img src=\"/img/logo-light.svg\"> dmz.rs</div>"
    p1 = "<p>Radionice počinju u <strong>19h</strong> u Društvenom centru Krov\
 u <strong>Kraljice Marije 47</strong>.</p>"
    p2 = "<p>Ulaz u zgradu je u prolazu pored Štark prodavnice slatkiša, odmah\
 pored menjačnice. DC Krov je na poslednjem spratu.</p>"
-    return f"<html>\n{head}\n<body>\n\t<main>\n\t\t{header}\n\t\t{subheader}\
-\n\t\t<table>\n{table}\t\t</table>\n\t\t{p1}\n\t\t{p2}\n\t\t{link}\n\t</main>\
-\n</body>\n</html>"
+    footer = f"{p1}{p2}{link}"
+    return f"<html>{head}<body><main>{header}{subheader}\
+<table>{table}</table>{footer}</main></body></html>"
    
 def main():
    events = load_events(EVENTS_CSV_PATH)
--- a/styles/projects.css
+++ b/styles/projects.css
--- a/site/404.html
+++ b/site/404.html
@@ -0,0 +1,19 @@
+<!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/404.css">
+  <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
+  <script src="/scripts/main.js" defer></script>
+  <title>404</title>
+</head>
+<body>
+    <main>
+        <img src="/img/logo-light.svg" alt="Logo">
+        <p>Requested resource was not found</p>
+        <p><a href="/">Go back to Homepage</a></p>
+    </main>
+</body>
+</html>
--- a/site/font/Facade-Sud.woff
+++ b/site/font/Facade-Sud.woff
--- a/site/font/JetBrainsMono-Regular.ttf
+++ b/site/font/JetBrainsMono-Regular.ttf
--- a/site/font/iosevka-regular.woff
+++ b/site/font/iosevka-regular.woff
--- a/site/img/cc-dark.svg
+++ b/site/img/cc-dark.svg
--- a/site/img/cc-light.svg
+++ b/site/img/cc-light.svg
--- a/site/img/favicon.ico
+++ b/site/img/favicon.ico
--- a/site/img/git-dark.svg
+++ b/site/img/git-dark.svg
--- a/site/img/git-light.svg
+++ b/site/img/git-light.svg
--- a/site/img/logo-dark.svg
+++ b/site/img/logo-dark.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="20"
+   height="20"
+   viewBox="0 0 5.2916667 5.2916666"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><g
+     id="layer1"><path
+       id="path2"
+       style="fill:#ffffff;fill-opacity:1;stroke-width:0.352999;stroke-linejoin:round"
+       d="M 2.6434889,0.17372798 A 0.49603044,0.49603044 0 0 0 2.1474722,0.66974458 0.49603044,0.49603044 0 0 0 2.6434889,1.1657897 0.49603044,0.49603044 0 0 0 2.9134465,1.0850992 L 4.2150262,2.3807419 A 0.49603044,0.49603044 0 0 0 4.1463813,2.5645005 H 3.1320271 A 0.49603044,0.49603044 0 0 0 2.6434889,2.1505729 0.49603044,0.49603044 0 0 0 2.1604593,2.5645005 H 1.1507581 A 0.49603044,0.49603044 0 0 0 0.66221981,2.1505729 0.49603044,0.49603044 0 0 0 0.16620324,2.646618 0.49603044,0.49603044 0 0 0 0.66221981,3.1426345 0.49603044,0.49603044 0 0 0 1.145021,2.7301914 h 1.0156952 a 0.49603044,0.49603044 0 0 0 0.3724833,0.3949749 l -0.00122,1.0183782 A 0.49603044,0.49603044 0 0 0 2.1474801,4.6219219 0.49603044,0.49603044 0 0 0 2.6434968,5.1179387 0.49603044,0.49603044 0 0 0 3.1395417,4.6219219 0.49603044,0.49603044 0 0 0 3.036274,4.3197964 L 4.326465,3.0364841 A 0.49603044,0.49603044 0 0 0 4.6294466,3.1426345 0.49603044,0.49603044 0 0 0 5.1254634,2.646618 0.49603044,0.49603044 0 0 0 4.6294466,2.1505729 0.49603044,0.49603044 0 0 0 4.3258658,2.257323 L 3.0354385,0.97286893 A 0.49603044,0.49603044 0 0 0 3.1395339,0.66974458 0.49603044,0.49603044 0 0 0 2.6434889,0.17372798 Z M 3.1262902,2.7301914 h 1.0203475 a 0.49603044,0.49603044 0 0 0 0.068759,0.1830162 L 2.9144742,4.2072235 A 0.49603044,0.49603044 0 0 0 2.6976917,4.1289593 l 0.0012,-0.9950873 A 0.49603044,0.49603044 0 0 0 3.1262902,2.7301914 Z" /></g></svg>
--- a/site/img/logo-light.svg
+++ b/site/img/logo-light.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="20"
+   height="20"
+   viewBox="0 0 5.2916667 5.2916666"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><g
+     id="layer1"><path
+       id="path2"
+       style="fill:#000000;fill-opacity:1;stroke-width:0.352999;stroke-linejoin:round"
+       d="M 2.6434889,0.17372798 A 0.49603044,0.49603044 0 0 0 2.1474722,0.66974458 0.49603044,0.49603044 0 0 0 2.6434889,1.1657897 0.49603044,0.49603044 0 0 0 2.9134465,1.0850992 L 4.2150262,2.3807419 A 0.49603044,0.49603044 0 0 0 4.1463813,2.5645005 H 3.1320271 A 0.49603044,0.49603044 0 0 0 2.6434889,2.1505729 0.49603044,0.49603044 0 0 0 2.1604593,2.5645005 H 1.1507581 A 0.49603044,0.49603044 0 0 0 0.66221981,2.1505729 0.49603044,0.49603044 0 0 0 0.16620324,2.646618 0.49603044,0.49603044 0 0 0 0.66221981,3.1426345 0.49603044,0.49603044 0 0 0 1.145021,2.7301914 h 1.0156952 a 0.49603044,0.49603044 0 0 0 0.3724833,0.3949749 l -0.00122,1.0183782 A 0.49603044,0.49603044 0 0 0 2.1474801,4.6219219 0.49603044,0.49603044 0 0 0 2.6434968,5.1179387 0.49603044,0.49603044 0 0 0 3.1395417,4.6219219 0.49603044,0.49603044 0 0 0 3.036274,4.3197964 L 4.326465,3.0364841 A 0.49603044,0.49603044 0 0 0 4.6294466,3.1426345 0.49603044,0.49603044 0 0 0 5.1254634,2.646618 0.49603044,0.49603044 0 0 0 4.6294466,2.1505729 0.49603044,0.49603044 0 0 0 4.3258658,2.257323 L 3.0354385,0.97286893 A 0.49603044,0.49603044 0 0 0 3.1395339,0.66974458 0.49603044,0.49603044 0 0 0 2.6434889,0.17372798 Z M 3.1262902,2.7301914 h 1.0203475 a 0.49603044,0.49603044 0 0 0 0.068759,0.1830162 L 2.9144742,4.2072235 A 0.49603044,0.49603044 0 0 0 2.6976917,4.1289593 l 0.0012,-0.9950873 A 0.49603044,0.49603044 0 0 0 3.1262902,2.7301914 Z" /></g></svg>
--- a/site/img/mailsettings.png
+++ b/site/img/mailsettings.png
--- a/site/img/mastodon-dark.svg
+++ b/site/img/mastodon-dark.svg
--- a/site/img/mastodon-light.svg
+++ b/site/img/mastodon-light.svg
--- a/site/img/mesh-dark.svg
+++ b/site/img/mesh-dark.svg
--- a/site/img/mesh-light.svg
+++ b/site/img/mesh-light.svg
--- a/site/img/srce-dark.svg
+++ b/site/img/srce-dark.svg
--- a/site/img/srce-light.svg
+++ b/site/img/srce-light.svg
--- a/site/img/strelica-closed-dark.svg
+++ b/site/img/strelica-closed-dark.svg
--- a/site/img/strelica-closed-light.svg
+++ b/site/img/strelica-closed-light.svg
--- a/site/img/strelica-closed.svg
+++ b/site/img/strelica-closed.svg
--- a/site/img/strelica-opened-dark.svg
+++ b/site/img/strelica-opened-dark.svg
--- a/site/img/strelica-opened-light.svg
+++ b/site/img/strelica-opened-light.svg
--- a/site/img/strelica-opened.svg
+++ b/site/img/strelica-opened.svg
--- a/site/img/w-dark.svg
+++ b/site/img/w-dark.svg
--- a/site/img/w-light.svg
+++ b/site/img/w-light.svg
--- a/site/img/www-dark.svg
+++ b/site/img/www-dark.svg
--- a/site/img/www-light.svg
+++ b/site/img/www-light.svg
--- a/site/scripts/main.js
+++ b/site/scripts/main.js
@@ -1,8 +1,8 @@
 const theme_switcher = document.getElementById("theme-switcher");
 const imgs = document.getElementsByTagName("img");
 const sections_button = document.getElementById("sections-button");
-const sections_menu = document.getElementById("sections-menu");
-const main = document.getElementById("main");
+const sections_menu = document.getElementsByTagName("nav")[0];
+const main = document.getElementsByTagName("main")[0];

 let theme = window.localStorage.getItem("theme");

@@ -22,7 +22,8 @@ if (theme !== null) {
 }

 theme_switcher.addEventListener("click", () => {
-  if (theme_switcher.getAttribute("title").indexOf("off") !== -1) {
+  const attribute = theme_switcher.getAttribute("title") ?? "off"
+  if (attribute.indexOf("off") !== -1) {
    changeToDarkTheme();
  } else {
    changeToLightTheme();
@@ -30,7 +31,7 @@ theme_switcher.addEventListener("click", () => {
 });

 function changeToDarkTheme() {
-  theme_switcher.setAttribute("title", "turn the light on");
+  theme_switcher?.setAttribute("title", "turn the light on");
  document.documentElement.style.setProperty("--border", "var(--dark-border)");
  document.documentElement.style.setProperty("--text", "var(--dark-text)");
  document.documentElement.style.setProperty("--bg", "var(--dark-bg)");
@@ -41,7 +42,7 @@ function changeToDarkTheme() {
 }

 function changeToLightTheme() {
-  theme_switcher.setAttribute("title", "turn the light off");
+  theme_switcher?.setAttribute("title", "turn the light off");
  document.documentElement.style.setProperty("--border", "var(--light-border)");
  document.documentElement.style.setProperty("--text", "var(--light-text)");
  document.documentElement.style.setProperty("--bg", "var(--light-bg)");
--- a/site/styles/404.css
+++ b/site/styles/404.css
@@ -0,0 +1,12 @@
+main {
+    max-width: fit-content;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 1rem;
+    margin: 0 auto;
+}
+
+main img {
+    width: min(70vw, 15rem);
+}
--- a/site/styles/account.css
+++ b/site/styles/account.css
--- a/site/styles/blog.css
+++ b/site/styles/blog.css
--- a/site/styles/contact.css
+++ b/site/styles/contact.css
--- a/site/styles/events.css
+++ b/site/styles/events.css
--- a/site/styles/home.css
+++ b/site/styles/home.css
--- a/site/styles/poster.css
+++ b/site/styles/poster.css
@@ -62,7 +62,15 @@ td:nth-child(2) {
 }

 #link {
-    margin-top: 8rem;
-    text-align: right;
+    margin-top: 4rem;
    font-size: 3rem;
-}
+    width: fit-content;
+    float: right;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+#link img {
+    width: 4rem;
+}
--- a/site/styles/projects.css
+++ b/site/styles/projects.css
--- a/site/styles/reset.css
+++ b/site/styles/reset.css
--- a/site/styles/services.css
+++ b/site/styles/services.css
--- a/site/styles/style.css
+++ b/site/styles/style.css
@@ -33,9 +33,9 @@ body {
 body {
  display: grid;
  grid-template:
-    "header" 10vh
+    "header" 4rem
    "main" 1fr
-    "footer" 10vh
+    "footer" 4rem
    / 1fr;
  gap: 0;
  font-family: 'Iosevka';
@@ -50,18 +50,18 @@ footer {
 }

 header {
-  grid-area: "header";
+  grid-area: header;
  border-bottom: 2px solid var(--border);
 }

 footer {
-  grid-area: "footer";
+  grid-area: footer;
  border-top: 2px solid var(--border);
 }

-#main {
-  grid-area: "main";
-  padding: 3rem 3rem 3rem 3rem;
+main {
+  grid-area: main;
+  padding: 3rem;
  font-size: 1.3rem;
  line-height: 2rem;
  max-width: 120ch;
@@ -74,7 +74,7 @@ a:visited {
  color: var(--text);
 }

-#main a {
+main a {
  position: relative;
  top: 0.2rem;
 }
@@ -86,11 +86,18 @@ a:focus {
 }

 #logo {
+  display: flex;
+  flex-direction: row;
+  gap: 0.5rem;
  font-size: 2.5rem;
  font-weight: bold;
  font-variant: small-caps;
 }

+#logo img {
+  width: 3rem;
+}
+
 #theme-switcher {
  border: 3px solid var(--border);
  width: 1.5rem;
@@ -104,15 +111,14 @@ a:focus {
  border-color: var(--hightlight);
  background: linear-gradient(90deg, var(--hightlight) 0%, var(--hightlight) 50%, var(--bg) 51%, var(--bg) 100%);
 }
-.account,
-.sections,
-#sections-menu {
+
+.account {
  font-size: 2rem;
 }

 #mesh {
  position: absolute;
-  bottom: 10vh;
+  bottom: 4rem;
  right: 0;
  user-select: none;
  pointer-events: none;
@@ -120,41 +126,27 @@ a:focus {

 .links {
  display: flex;
+  gap: 2rem;
+}
+
+.links > a {
+  border-radius: 100%;
+}
+
+.links > a > img {
+  display: block;
 }

 #sections-button {
  display: none;
 }

-#sections-menu a {
-  margin-bottom: 1rem;
-}
-
-#sections-menu {
-  border: 2px solid var(--border);
-  background-color: var(--bg);
-  position: absolute;
-  bottom: calc(10vh - 2px);
-  left: calc(0px - 2px);
-  align-items: center;
-  padding: 2rem 3rem;
-  display: none;
-}
-
-.copyleft a,
-.sections a {
-  margin: 0 1rem 0 0;
-}
-
-.copyleft a:hover,
-.copyleft a:focus {
-  background-color: var(--bg);
-}
-
-.copyleft {
+nav {
+  font-variant: small-caps;
  display: flex;
  flex-direction: row;
-  align-items: center;
+  gap: 2rem;
+  font-size: 2rem;
 }

 button {
@@ -175,7 +167,17 @@ screen and (max-width: 1500px) {
 }

@media screen and (max-width: 1160px) {
-  .sections {
+  nav {
+    flex-direction: column;
+    border: 2px solid var(--border);
+    border-bottom: 0;
+    border-left: 0;
+    background-color: var(--bg);
+    position: absolute;
+    bottom: calc(4rem);
+    left: 0;
+    align-items: center;
+    padding: 2rem 3rem;
    display: none;
  }

@@ -189,12 +191,28 @@ screen and (max-width: 1500px) {
    font-size: 2.2rem;
  }

+  main {
+    padding: 1rem;
+  }
+
  .links {
-    display: none;
+    gap: 1.2rem;
+  }
+
+  .links a {
+    width: 1.5rem;
  }

  header,
  footer {
    padding: 0 1rem;
  }
+
+  #theme-switcher {
+    margin-right: 1rem;
+  }
+
+  .account {
+    font-size: 1rem;
+  }
 }
--- a/template/page-en.html
+++ b/template/page-en.html
@@ -0,0 +1,37 @@
+<!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">
+  <!--ADDITIONAL_STYLE-->
+  <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
+  <script src="/scripts/main.js" defer></script>
+  <title><!--TITLE--> Decentrala</title>
+</head>
+<body>
+  <header>
+    <a id="logo" href="/"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
+    <button id="theme-switcher"></button>
+    <a class="account" href="/en/account">Account</a>
+  </header>
+  <main>
+    <!--MAIN-->
+  </main>
+  <footer>
+    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
+    <nav>
+      <a href="/en/events">Događaji</a>
+      <a href="/en/services">Servisi</a>
+      <a href="/en/contact">Kontakt</a>
+    </nav>
+    <span class="links">
+      <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>
+      <a 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>
--- a/template/page-sr.html
+++ b/template/page-sr.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="sr">
+<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">
+  <!--ADDITIONAL_STYLE-->
+  <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
+  <script src="/scripts/main.js" defer></script>
+  <title><!--TITLE--> Decentrala</title>
+</head>
+<body>
+  <header>
+    <a id="logo" href="/"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
+    <button id="theme-switcher"></button>
+    <a class="account" href="/account">Nalog</a>
+  </header>
+  <main>
+    <!--MAIN-->
+  </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="/contact">Kontakt</a>
+    </nav>
+    <span class="links">
+      <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" alt="CreativeCommons"></a>
+      <a 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>
+  </footer>
+</body>
+</html>
Author	SHA1	Message	Date
Hugo	263d313f76	Gitignore	2023-08-07 13:30:11 +02:00
Hugo	3e7d0c04e3	Reorganize project. Page builder. Support for EN	2023-08-07 13:29:42 +02:00
Hugo	b8cec7decf	Remove poster.html	2023-08-07 11:56:24 +02:00
hugo	8202534ef9	Merge pull request 'New logo, 404 page, and many fixes' (#9 ) from hugo/website2:logo into v3.0 Reviewed-on: Decentrala/website#9	2023-08-06 14:31:23 +00:00
Hugo	dfb0078cc9	colorize .links on hover	2023-08-06 16:30:05 +02:00
Hugo	89f4ddc9ce	Update README with progress	2023-08-06 15:50:12 +02:00
Hugo	40e2875062	update events	2023-08-06 15:43:45 +02:00
Hugo	6e44770af0	fix: wording and markup	2023-08-06 15:41:25 +02:00
Hugo	9a0354dd7f	implement 404 page	2023-08-06 15:10:13 +02:00
Hugo	dc05908114	simplify navigation	2023-08-06 12:55:10 +02:00
Hugo	857d0b4663	add new logo	2023-08-06 12:18:34 +02:00
fram3d	289c6e93d9	Merge pull request 'More fixes for wording and CSS' (#8 ) from hugo/website2:fix-wording2 into v3.0 Reviewed-on: Decentrala/website#8	2023-08-05 15:43:17 +00:00
Hugo	2fd60b7a58	fix: mesh position	2023-08-05 16:30:42 +02:00
Hugo	571237f535	fix: layout on small screens	2023-08-05 16:11:21 +02:00
Hugo	1e87f2be84	fix: issue with button title	2023-08-05 15:41:41 +02:00
Hugo	b0f84486d8	fix: wording	2023-08-05 15:23:15 +02:00
Hugo	30cca3a33c	fix: mobile CSS and other mistakes	2023-08-05 15:20:35 +02:00
Hugo	0525100bc6	fix: use proper html tag	2023-08-05 15:20:26 +02:00
Hugo	cdf3849322	fix: theme switcher	2023-08-05 15:00:50 +02:00
Hugo	fa65e7c508	Remove copyright	2023-08-05 15:00:47 +02:00
Hugo	fde9f2341c	fix: wording	2023-08-05 15:00:16 +02:00