hugo/website2
2
0
Fork 0
forked from Decentrala/website
Code Pull Requests Activity

Compare commits

base: hugo:v3.0
Branches Tags
hugo:master hugo:poster hugo:v3.0 hugo:markdown hugo:v4.0 hugo:v2.0 Decentrala:master Decentrala:test Decentrala:requirements Decentrala:Makefiles Decentrala:feat/statute-link-on-navbar Decentrala:v3.0 Decentrala:markdown Decentrala:v4.0 Decentrala:v2.0
..
compare: hugo:857d0b4663ba9ee085d8b021aa1fc2c6edfe535b
Branches Tags
hugo:master hugo:poster hugo:v3.0 hugo:markdown hugo:v4.0 hugo:v2.0 Decentrala:master Decentrala:test Decentrala:requirements Decentrala:Makefiles Decentrala:feat/statute-link-on-navbar Decentrala:v3.0 Decentrala:markdown Decentrala:v4.0 Decentrala:v2.0

11 Commits
v3.0 ... 857d0b4663

Author SHA1 Message Date
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
16 changed files with 172 additions and 142 deletions
Expand all files Collapse all files

BIN
img/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 134 KiB

After

Width:  |  Height:  |  Size: 66 KiB

17
img/logo-dark.svg Normal file
View File

@@ -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>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

17
img/logo-light.svg Normal file
View File

@@ -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>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

17
index.html
View File

@@ -14,13 +14,11 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<span> <button id="theme-switcher"></button>
<button id="theme-switcher"></button> <a class="account" href="/pages/account.html">Nalog</a>
<a class="account" href="/pages/account.html">Nalog</a>
</span>
</header> </header>
<div id="main"> <main>
<h1>Dobrodošao!</h1> <h1>Dobrodošao!</h1>
<p> <p>
Mi smo <em>Decentrala</em> - grupa entuzijasta okupljena oko ideja decentralizacije i slobodnog širenja znanja. Mi smo <em>Decentrala</em> - grupa entuzijasta okupljena oko ideja decentralizacije i slobodnog širenja znanja.
@@ -40,7 +38,7 @@
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! 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> </p>
<img id="mesh" src="/img/mesh-light.svg"> <img id="mesh" src="/img/mesh-light.svg">
</div> </main>
<footer> <footer>
<div id="sections-menu"> <div id="sections-menu">
<a href="/pages/events.html">Događaji</a> <a href="/pages/events.html">Događaji</a>
@@ -53,16 +51,13 @@
<a href="/pages/services.html">Servisi</a> <a href="/pages/services.html">Servisi</a>
<a href="/pages/contact.html">Kontakt</a> <a href="/pages/contact.html">Kontakt</a>
</span> </span>
<span class="copyleft"> <span class="links">
<span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
alt="CreativeCommons"></a> alt="CreativeCommons"></a>
<a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></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" <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg"
alt="SourceCode"></a> 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>Decentrala &copy; 2023</span>
</span> </span>
</footer> </footer>
</body> </body>

15
pages/account.html
View File

@@ -13,13 +13,11 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<span> <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="/pages/account.html">Nalog</a>
</span>
</header> </header>
<div id="main"> <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> 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 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> Za primer podesavanja na <a href="https://thunderbird.org">Thundebird</a> mail klijentu mozete pogledati <a href="/img/mailsettings.png">sliku</a>. <p>
@@ -29,7 +27,7 @@
<p><a href="/account/changepassword/">Promeni lozinku</a><p> <p><a href="/account/changepassword/">Promeni lozinku</a><p>
<img id="mesh" src="/img/mesh-light.svg"> <img id="mesh" src="/img/mesh-light.svg">
</div> </main>
<footer> <footer>
<div id="sections-menu"> <div id="sections-menu">
<a href="/pages/events.html">Događaji</a> <a href="/pages/events.html">Događaji</a>
@@ -42,14 +40,13 @@
<a href="/pages/services.html">Servisi</a> <a href="/pages/services.html">Servisi</a>
<a href="/pages/contact.html">Kontakt</a> <a href="/pages/contact.html">Kontakt</a>
</span> </span>
<span class="copyleft"> <span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
alt="CreativeCommons"></a> alt="CreativeCommons"></a>
<a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></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" <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg"
alt="SourceCode"></a> 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>Decentrala &copy; 2023</span>
</span> </span>
</footer> </footer>
</body> </body>

15
pages/blog.html
View File

@@ -13,16 +13,14 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<span> <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="/pages/account.html">Nalog</a>
</span>
</header> </header>
<div id="main"> <main>
Ova stranica je trenutno u izradi... Ova stranica je trenutno u izradi...
<img id="mesh" src="/img/mesh-light.svg"> <img id="mesh" src="/img/mesh-light.svg">
</div> </main>
<footer> <footer>
<div id="sections-menu"> <div id="sections-menu">
<a href="/pages/events.html">Događaji</a> <a href="/pages/events.html">Događaji</a>
@@ -35,14 +33,13 @@
<a href="/pages/services.html">Servisi</a> <a href="/pages/services.html">Servisi</a>
<a href="/pages/contact.html">Kontakt</a> <a href="/pages/contact.html">Kontakt</a>
</span> </span>
<span class="copyleft"> <span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
alt="CreativeCommons"></a> alt="CreativeCommons"></a>
<a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></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" <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg"
alt="SourceCode"></a> 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>Decentrala &copy; 2023</span>
</span> </span>
</footer> </footer>
</body> </body>

15
pages/contact.html
View File

@@ -13,13 +13,11 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<span> <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="/pages/account.html">Nalog</a>
</span>
</header> </header>
<div id="main"> <main>
<h1>Kontakt</h1> <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 <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> href="https://forum.dmz.rs">Forumu</a>.</p>
@@ -27,7 +25,7 @@
<p style="position: relative; top: 5rem;">U slucaju da nadjete <em>bug</em> na sajtu, bili bismo jako zahvalni <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> ako bi mogli da nam ga prijavite (npr. putem emaila).</p>
<img id="mesh" src="/img/mesh-light.svg"> <img id="mesh" src="/img/mesh-light.svg">
</div> </main>
<footer> <footer>
<div id="sections-menu"> <div id="sections-menu">
<a href="/pages/events.html">Događaji</a> <a href="/pages/events.html">Događaji</a>
@@ -40,14 +38,13 @@
<a href="/pages/services.html">Servisi</a> <a href="/pages/services.html">Servisi</a>
<a href="/pages/contact.html">Kontakt</a> <a href="/pages/contact.html">Kontakt</a>
</span> </span>
<span class="copyleft"> <span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
alt="CreativeCommons"></a> alt="CreativeCommons"></a>
<a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></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" <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg"
alt="SourceCode"></a> 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>Decentrala &copy; 2023</span>
</span> </span>
</footer> </footer>
</body> </body>

21
pages/events.html
View File

@@ -13,14 +13,12 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<span> <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="/pages/account.html">Nalog</a>
</span>
</header> </header>
<div id="main"> <main>
<h1>Dogadjaji</h1> <h1>Događaji</h1>
<!-- dogadjaji start --> <!-- dogadjaji start -->
<table> <table>
<tr> <tr>
@@ -70,27 +68,26 @@
</table> </table>
<!-- dogadjaji end --> <!-- dogadjaji end -->
<img id="mesh" src="/img/mesh-light.svg"> <img id="mesh" src="/img/mesh-light.svg">
</div> </main>
<footer> <footer>
<div id="sections-menu"> <div id="sections-menu">
<a href="/pages/events.html">Dogadjaji</a> <a href="/pages/events.html">Događaji</a>
<a href="/pages/services.html">Servisi</a> <a href="/pages/services.html">Servisi</a>
<a href="/pages/contact.html">Kontakt</a> <a href="/pages/contact.html">Kontakt</a>
</div> </div>
<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>
<span class="sections"> <span class="sections">
<a href="/pages/events.html">Dogadjaji</a> <a href="/pages/events.html">Događaji</a>
<a href="/pages/services.html">Servisi</a> <a href="/pages/services.html">Servisi</a>
<a href="/pages/contact.html">Kontakt</a> <a href="/pages/contact.html">Kontakt</a>
</span> </span>
<span class="copyleft"> <span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
alt="CreativeCommons"></a> alt="CreativeCommons"></a>
<a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></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" <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg"
alt="SourceCode"></a> 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>Decentrala &copy; 2023</span>
</span> </span>
</footer> </footer>
</body> </body>

15
pages/projects.html
View File

@@ -13,16 +13,14 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<span> <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="/pages/account.html">Nalog</a>
</span>
</header> </header>
<div id="main"> <main>
Ova stranica je trenutno u izradi... Ova stranica je trenutno u izradi...
<img id="mesh" src="/img/mesh-light.svg"> <img id="mesh" src="/img/mesh-light.svg">
</div> </main>
<footer> <footer>
<div id="sections-menu"> <div id="sections-menu">
<a href="/pages/events.html">Događaji</a> <a href="/pages/events.html">Događaji</a>
@@ -35,14 +33,13 @@
<a href="/pages/services.html">Servisi</a> <a href="/pages/services.html">Servisi</a>
<a href="/pages/contact.html">Kontakt</a> <a href="/pages/contact.html">Kontakt</a>
</span> </span>
<span class="copyleft"> <span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
alt="CreativeCommons"></a> alt="CreativeCommons"></a>
<a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></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" <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg"
alt="SourceCode"></a> 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>Decentrala &copy; 2023</span>
</span> </span>
</footer> </footer>
</body> </body>

59
pages/services.html
View File

@@ -13,13 +13,11 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<span> <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="/pages/account.html">Nalog</a>
</span>
</header> </header>
<div id="main"> <main>
<h1>Servisi</h1> <h1>Servisi</h1>
<table> <table>
<tr> <tr>
@@ -27,41 +25,40 @@
<th>Opis</th> <th>Opis</th>
</tr> </tr>
<tr> <tr>
<td><a href="">Email</a></td> <td><a href="/account.html">Email</a></td>
<td>Email nalog koji mozes koristiti putem na bilo kom <td>Email nalog koji možeš koristiti sa bilo kojim email
email klijentom generalne namene (na primer <a href="https://www.thunderbird.net/">Thunderbird-u</a>).</td>
klijentu generalne namene, na primer <a href="https://www.thunderbird.net/">Thunderbird-u</a>. Bolji od
Gmail-a. </td>
</tr> </tr>
<tr> <tr>
<td><a href="https://forum.dmz.rs/">Forum</a></td> <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>Forum na kom obično organizujemo naše <a href="/pages/events.html">događaje</a>.
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Chat</td> <td>Chat</td>
<td>Odrzavamo svoj XMPP server, na kojem mozes napraviti nalog ili ako vec imas nalog mozes nas naci u grupi <a <td>Održavamo sopstveni XMPP server, na kojem možeš napraviti nalog.
href="decentrala@conference.dmz.rs">decentrala@conference.dmz.rs</a> . Bolji od WhatsApp-a.</td> 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>
<tr> <tr>
<td><a href="https://gitea.dmz.rs/">Git</a></td> <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 <td><a href="https://gitea.io/en-us/">Gitea</a> instanca na kojoj držimo kod kao i ostale resurse za naše
href="/pages/projects.html">projekte</a>, <a href="/pages/projects.html">projekte</a>, <a href="/pages/events.html">dogadjaje</a>, kao i projekte naših prijatelja.
<a href="/pages/events.html">dogadjaje</a>, kao i neke nase random projekte kao i projekte nasih Ovo može biti dom tvog sledećeg projekta. Bolji od Github-a.
prijatelja.
Ovo moze bit dom tvog sledeceg projekta. Bolji od Github-a.
</td> </td>
</tr> </tr>
<tr> <tr>
<td><a href="https://wiki.dmz.rs/">Wiki</a></td> <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 <td><a href="https://js.wiki/">Wiki.js</a> instanca koju koristimo da dokumentujemo naše
href="/pages/projects.html">projekte</a> kao i <a href="/pages/projects.html">projekte</a> kao i
ostale <a href="/pages/events.html">dogadjaje</a>. </td> ostale <a href="/pages/events.html">događaje</a>.
</td>
</tr> </tr>
<tr> <tr>
<td><a href="https://search.dmz.rs/">Search</a></td> <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><a href="https://github.com/hnhx/librex/">LibreX</a> instanca koju koristimo za pretraživanje Interneta.
</td> Bolji od Google-a.
</td>
</tr> </tr>
<tr> <tr>
<td><a href="https://pastebin.dmz.rs/">Pastebin</a></td> <td><a href="https://pastebin.dmz.rs/">Pastebin</a></td>
@@ -70,15 +67,16 @@
</tr> </tr>
<tr> <tr>
<td><a href="ssh://soft.dmz.rs:2222/">Soft Serve</a></td> <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><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> </td>
</tr> </tr>
</table> </table>
<p>Ovo su neki od servisa koje trenutno odrzavamo na nasim serverima. Da bi koristio ove servise, <em>mozes</em> se <p>Ovo su neki od servisa koje trenutno održavamo na našim serverima. Da bi koristio ove servise, <em>možes</em> se
registrujes za svaki servis posebno, ali mozes i da da napravis <a href="/pages/account.html">nalog</a> na nasem registovati na svaki servis posebno, a možeš i napraviti jedinstveni <a href="/pages/account.html">nalog</a> na nasem
serveru i koristis sve servis sa istim nalogom.</p> serveru i koristiti sve servise sa istim nalogom.</p>
<img id="mesh" src="/img/mesh-light.svg"> <img id="mesh" src="/img/mesh-light.svg">
</div> </main>
<footer> <footer>
<div id="sections-menu"> <div id="sections-menu">
<a href="/pages/events.html">Događaji</a> <a href="/pages/events.html">Događaji</a>
@@ -91,14 +89,13 @@
<a href="/pages/services.html">Servisi</a> <a href="/pages/services.html">Servisi</a>
<a href="/pages/contact.html">Kontakt</a> <a href="/pages/contact.html">Kontakt</a>
</span> </span>
<span class="copyleft"> <span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
alt="CreativeCommons"></a> alt="CreativeCommons"></a>
<a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></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" <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg"
alt="SourceCode"></a> 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>Decentrala &copy; 2023</span>
</span> </span>
</footer> </footer>
</body> </body>

15
pages/webring.html
View File

@@ -13,17 +13,15 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<span> <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="/pages/account.html">Nalog</a>
</span>
</header> </header>
<div id="main"> <main>
<list> <list>
<li> <a href="https://tilde.zone/explore">Tilde Zone</a> </li> <li> <a href="https://tilde.zone/explore">Tilde Zone</a> </li>
</list> </list>
</div> </main>
<footer> <footer>
<div id="sections-menu"> <div id="sections-menu">
<a href="/pages/events.html">Događaji</a> <a href="/pages/events.html">Događaji</a>
@@ -36,14 +34,13 @@
<a href="/pages/services.html">Servisi</a> <a href="/pages/services.html">Servisi</a>
<a href="/pages/contact.html">Kontakt</a> <a href="/pages/contact.html">Kontakt</a>
</span> </span>
<span class="copyleft"> <span class="links">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg" <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
alt="CreativeCommons"></a> alt="CreativeCommons"></a>
<a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></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" <a href="https://gitea.dmz.rs/eline/decentrala-website-static-new"><img src="/img/git-light.svg"
alt="SourceCode"></a> 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>Decentrala &copy; 2023</span>
</span> </span>
</footer> </footer>
</body> </body>

10
poster.html
View File

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

12
poster.py
View File

@@ -36,18 +36,18 @@ def render_table(events:list[dict])-> str:
return html return html
def render_page(table: str) -> str: def render_page(table: str) -> str:
head = "<head>\n\t<meta charset=\"UTF-8\">\n\t<link rel=\"stylesheet\"\ head = "<head><meta charset=\"UTF-8\"><link rel=\"stylesheet\"\
href=\"styles/poster.css\">\n<head>" href=\"styles/poster.css\"><head>"
header = "<h1>DECENTRALA</h1>" header = "<h1>DECENTRALA</h1>"
subheader = f"<h2>Plan za {MONTHS_SR[NEXT_MONTH.month - 1]}</h2>" 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\ p1 = "<p>Radionice počinju u <strong>19h</strong> u Društvenom centru Krov\
u <strong>Kraljice Marije 47</strong>.</p>" u <strong>Kraljice Marije 47</strong>.</p>"
p2 = "<p>Ulaz u zgradu je u prolazu pored Štark prodavnice slatkiša, odmah\ p2 = "<p>Ulaz u zgradu je u prolazu pored Štark prodavnice slatkiša, odmah\
pored menjačnice. DC Krov je na poslednjem spratu.</p>" 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}\ footer = f"{p1}{p2}{link}"
\n\t\t<table>\n{table}\t\t</table>\n\t\t{p1}\n\t\t{p2}\n\t\t{link}\n\t</main>\ return f"<html>{head}<body><main>{header}{subheader}\
\n</body>\n</html>" <table>{table}</table>{footer}</main></body></html>"
def main(): def main():
events = load_events(EVENTS_CSV_PATH) events = load_events(EVENTS_CSV_PATH)

5
scripts/main.js
View File

@@ -2,7 +2,7 @@ const theme_switcher = document.getElementById("theme-switcher");
const imgs = document.getElementsByTagName("img"); const imgs = document.getElementsByTagName("img");
const sections_button = document.getElementById("sections-button"); const sections_button = document.getElementById("sections-button");
const sections_menu = document.getElementById("sections-menu"); const sections_menu = document.getElementById("sections-menu");
const main = document.getElementById("main"); const main = document.getElementsByTagName("main")[0];
let theme = window.localStorage.getItem("theme"); let theme = window.localStorage.getItem("theme");
@@ -22,7 +22,8 @@ if (theme !== null) {
} }
theme_switcher.addEventListener("click", () => { 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(); changeToDarkTheme();
} else { } else {
changeToLightTheme(); changeToLightTheme();

14
styles/poster.css
View File

@@ -62,7 +62,15 @@ td:nth-child(2) {
} }
#link { #link {
margin-top: 8rem; margin-top: 4rem;
text-align: right;
font-size: 3rem; font-size: 3rem;
} width: fit-content;
float: right;
display: flex;
flex-direction: column;
align-items: center;
}
#link img {
width: 4rem;
}

67
styles/style.css
View File

@@ -33,9 +33,9 @@ body {
body { body {
display: grid; display: grid;
grid-template: grid-template:
"header" 10vh "header" 4rem
"main" 1fr "main" 1fr
"footer" 10vh "footer" 4rem
/ 1fr; / 1fr;
gap: 0; gap: 0;
font-family: 'Iosevka'; font-family: 'Iosevka';
@@ -50,18 +50,18 @@ footer {
} }
header { header {
grid-area: "header"; grid-area: header;
border-bottom: 2px solid var(--border); border-bottom: 2px solid var(--border);
} }
footer { footer {
grid-area: "footer"; grid-area: footer;
border-top: 2px solid var(--border); border-top: 2px solid var(--border);
} }
#main { main {
grid-area: "main"; grid-area: main;
padding: 3rem 3rem 3rem 3rem; padding: 3rem;
font-size: 1.3rem; font-size: 1.3rem;
line-height: 2rem; line-height: 2rem;
max-width: 120ch; max-width: 120ch;
@@ -74,7 +74,7 @@ a:visited {
color: var(--text); color: var(--text);
} }
#main a { main a {
position: relative; position: relative;
top: 0.2rem; top: 0.2rem;
} }
@@ -86,11 +86,18 @@ a:focus {
} }
#logo { #logo {
display: flex;
flex-direction: row;
gap: 0.5rem;
font-size: 2.5rem; font-size: 2.5rem;
font-weight: bold; font-weight: bold;
font-variant: small-caps; font-variant: small-caps;
} }
#logo img {
width: 3rem;
}
#theme-switcher { #theme-switcher {
border: 3px solid var(--border); border: 3px solid var(--border);
width: 1.5rem; width: 1.5rem;
@@ -104,6 +111,7 @@ a:focus {
border-color: var(--hightlight); border-color: var(--hightlight);
background: linear-gradient(90deg, var(--hightlight) 0%, var(--hightlight) 50%, var(--bg) 51%, var(--bg) 100%); background: linear-gradient(90deg, var(--hightlight) 0%, var(--hightlight) 50%, var(--bg) 51%, var(--bg) 100%);
} }
.account, .account,
.sections, .sections,
#sections-menu { #sections-menu {
@@ -112,7 +120,7 @@ a:focus {
#mesh { #mesh {
position: absolute; position: absolute;
bottom: 10vh; bottom: 4rem;
right: 0; right: 0;
user-select: none; user-select: none;
pointer-events: none; pointer-events: none;
@@ -120,6 +128,11 @@ a:focus {
.links { .links {
display: flex; display: flex;
gap: 2rem;
}
.links > a:hover{
background-color: var(--bg);
} }
#sections-button { #sections-button {
@@ -134,29 +147,21 @@ a:focus {
border: 2px solid var(--border); border: 2px solid var(--border);
background-color: var(--bg); background-color: var(--bg);
position: absolute; position: absolute;
bottom: calc(10vh - 2px); bottom: calc(4rem - 2px);
left: calc(0px - 2px); left: calc(0px - 2px);
align-items: center; align-items: center;
padding: 2rem 3rem; padding: 2rem 3rem;
display: none; display: none;
} }
.copyleft a, .sections, #sections-menu {
font-variant: small-caps;
}
.sections a { .sections a {
margin: 0 1rem 0 0; margin: 0 1rem 0 0;
} }
.copyleft a:hover,
.copyleft a:focus {
background-color: var(--bg);
}
.copyleft {
display: flex;
flex-direction: row;
align-items: center;
}
button { button {
font-style: italic; font-style: italic;
font-weight: lighter; font-weight: lighter;
@@ -189,12 +194,28 @@ screen and (max-width: 1500px) {
font-size: 2.2rem; font-size: 2.2rem;
} }
main {
padding: 1rem;
}
.links { .links {
display: none; gap: 1.2rem;
}
.links a {
width: 1.5rem;
} }
header, header,
footer { footer {
padding: 0 1rem; padding: 0 1rem;
} }
#theme-switcher {
margin-right: 1rem;
}
.account {
font-size: 1rem;
}
} }