1 Commits

Author SHA1 Message Date
a2b03f8d02 redesign 2023-01-16 17:01:30 +01:00
21 changed files with 315 additions and 243 deletions

1
.gitignore vendored
View File

@@ -1 +0,0 @@
public

View File

@@ -1,22 +0,0 @@
output : all
public:
mkdir public
public/static: static
cp -r static public/
public/%.html : %.md
@cp start.html $@
@cat $< | sed 's#.md)#.html)#g' | pandoc -f markdown -t html5 -o- >> $@
@cat end.html >> $@
HTML := $(patsubst %.md,public/%.html,$(wildcard *.md))
all : public $(HTML) public/static
test:
echo $(HTML)
clean :
rm -rf public

View File

@@ -1,12 +0,0 @@
This repo builds the website `dmz.rs`.
## Dependencies
- `make`
- `pandoc`
## Usage
`make`
The output will appear in the `public` directory.

35
chat.html Normal file
View File

@@ -0,0 +1,35 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<div class="container">
<div class="header">
<h1 class="logo">DECENTRALA</h1>
</div>
<main>
<ul class="nav">
<li><a href="/dogadjaji.html"><span class="leadingsign"> &gt; </span>DOGAĐAJI</a></li>
<li><a href="/forum.html"><span class="leadingsign"> &gt; </span>FORUM</a></li>
<li><a href="/chat.html"><span class="leadingsign"> &gt; </span>CHAT</a></li>
<li><a href="/nalog.html"><span class="leadingsign"> &gt; </span>NALOG</a></li>
<li><a href="/onama.html"><span class="leadingsign"> &gt; </span>O NAMA</a></li>
<li><a href="/kontakt.html"><span class="leadingsign"> &gt; </span>KONTAKT</a></li>
</ul>
<h2>Chat</h2>
<p> Za koriscenje XMPP (Jabber) mozete koristiti <a target="blank" href="https://gajim.org/download/">Gajim</a> na racunaru , <a target="blank" href="https://conversations.im/">Conversations</a> na Andoroid-u (ne pravite nalog na conversations.im serveru, mozete na dmz.rs ili nekom drugom) i <a target="blank" href="https://monal-im.org/">Monal</a> na Apple proizvodima. <p>
<p> Mozete nas naci u XMPP grupi <a href="xmpp:decentrala@conference.dmz.rs?join"> decentrala@conference.dmz.rs </a> <p>
<div class="back">
<ul class="nav">
<a href="../"><li>Nazad</li></a>
</ul>
</div>
</main>
</div>
</body>
</html>

12
chat.md
View File

@@ -1,12 +0,0 @@
## Chat
Za koriscenje XMPP (Jabber) mozete koristiti
[Gajim](https://gajim.org/download/){target="blank"} na racunaru ,
[Conversations](https://conversations.im/){target="blank"} na Andoroid-u
(ne pravite nalog na conversations.im serveru, mozete na dmz.rs ili
nekom drugom) i [Monal](https://monal-im.org/){target="blank"} na Apple
proizvodima.
Mozete nas naci u XMPP grupi
[decentrala@conference.dmz.rs](xmpp:decentrala@conference.dmz.rs?join)

37
dogadjaji.html Normal file
View File

@@ -0,0 +1,37 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<marquee scrollamount='10'>
<a href="/dogadjaji.html">RADIONICE SVAKOG UTORKA U 19H U DC KROVU</a>
</marquee>
<div class="container">
<div class="header">
<h1 class="logo">DECENTRALA</h1>
</div>
<main>
<ul class="nav">
<li><a href="/dogadjaji.html"><span class="leadingsign"> &gt; </span>DOGAĐAJI</a></li>
<li><a href="/forum.html"><span class="leadingsign"> &gt; </span>FORUM</a></li>
<li><a href="/chat.html"><span class="leadingsign"> &gt; </span>CHAT</a></li>
<li><a href="/nalog.html"><span class="leadingsign"> &gt; </span>NALOG</a></li>
<li><a href="/onama.html"><span class="leadingsign"> &gt; </span>O NAMA</a></li>
<li><a href="/kontakt.html"><span class="leadingsign"> &gt; </span>KONTAKT</a></li>
</ul>
<h2>Dogadjaji</h2>
<p> > Svakog utorka u DC Krovu (Beograd, Kraljice Marije 47, zadnji sprat) u 19h radionica Uvod u mreze <p>
<div class="back">
<ul class="nav">
<a href="../"><li>Nazad</li></a>
</ul>
</div>
</main>
</div>
</body>
</html>

View File

@@ -1,36 +0,0 @@
# DECENTRALA
## Dogadjaji
\> Ponedeljak (5. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), Sifre
(predavanje)
\> Utorak (6. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), Genersianje
random podataka (predavanje)
\> Ponedeljak (12. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), Uvod u Blender,
3D modelovanje (radionica)
\> Utorak (13. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), Cybersecurity
odbrana (predavanje)
\> Ponedeljak (19. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), BASH skripte
(predavanje)
\> Utorak (20. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), Cybersecurity
odbrana (predavanje)
\> Ponedeljak (26. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), Python vezbe
(radionica)
\> Utorak (27. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), Cybersecurity
odbrana (predavanje)

View File

@@ -1,6 +0,0 @@
</main>
</div>
</body>
</html>

35
forum.html Normal file
View File

@@ -0,0 +1,35 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<div class="container">
<div class="header">
<h1 class="logo">DECENTRALA</h1>
</div>
<main>
<ul class="nav">
<li><a href="/dogadjaji.html"><span class="leadingsign"> &gt; </span>DOGAĐAJI</a></li>
<li><a href="/forum.html"><span class="leadingsign"> &gt; </span>FORUM</a></li>
<li><a href="/chat.html"><span class="leadingsign"> &gt; </span>CHAT</a></li>
<li><a href="/nalog.html"><span class="leadingsign"> &gt; </span>NALOG</a></li>
<li><a href="/onama.html"><span class="leadingsign"> &gt; </span>O NAMA</a></li>
<li><a href="/kontakt.html"><span class="leadingsign"> &gt; </span>KONTAKT</a></li>
</ul>
<h2>Forum</h2>
<p> Forum je na <a href="https://forum.dmz.rs">forum.dmz.rs</a> <p>
<p> Nalog na forumu nije povezan sa nalogom na xmpp i mail serveru <p>
<div class="back">
<ul class="nav">
<a href="../"><li>Nazad</li></a>
</ul>
</div>
</main>
</div>
</body>
</html>

View File

@@ -1,6 +0,0 @@
## Forum
Forum je na [forum.dmz.rs](https://forum.dmz.rs)
Nalog na forumu nije povezan sa nalogom na xmpp i mail serveru

30
index.html Normal file
View File

@@ -0,0 +1,30 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<marquee scrollamount='10'>
<a href="/dogadjaji.html">RADIONICE SVAKOG UTORKA U 19H U DC KROVU</a>
</marquee>
<div class="container">
<div class="header">
<h1 class="logo">DECENTRALA</h1>
</div>
<main>
<ul class="nav">
<li><a href="/dogadjaji.html"><span class="leadingsign"> &gt; </span>DOGAĐAJI</a></li>
<li><a href="/forum.html"><span class="leadingsign"> &gt; </span>FORUM</a></li>
<li><a href="/chat.html"><span class="leadingsign"> &gt; </span>CHAT</a></li>
<li><a href="/nalog.html"><span class="leadingsign"> &gt; </span>NALOG</a></li>
<li><a href="/onama.html"><span class="leadingsign"> &gt; </span>O NAMA</a></li>
<li><a href="/kontakt.html"><span class="leadingsign"> &gt; </span>KONTAKT</a></li>
</ul>
</main>
</div>
</body>
</html>

View File

@@ -1,10 +0,0 @@
Decentrala je zajednica okupljena oko decentralizacije tehnologija i
sirenja znanja.
- [DOGAĐAJI](dogadjaji.md)
- [FORUM](forum.md)
- [CHAT](chat.md)
- [NALOG](nalog.md)
- [O NAMA](onama.md)
- [SERVISI](servisi.md)
- [KONTAKT](kontakt.md)

36
kontakt.html Normal file
View File

@@ -0,0 +1,36 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<div class="container">
<div class="header">
<h1 class="logo">DECENTRALA</h1>
</div>
<main>
<ul class="nav">
<li><a href="/dogadjaji.html"><span class="leadingsign"> &gt; </span>DOGAĐAJI</a></li>
<li><a href="/forum.html"><span class="leadingsign"> &gt; </span>FORUM</a></li>
<li><a href="/chat.html"><span class="leadingsign"> &gt; </span>CHAT</a></li>
<li><a href="/nalog.html"><span class="leadingsign"> &gt; </span>NALOG</a></li>
<li><a href="/onama.html"><span class="leadingsign"> &gt; </span>O NAMA</a></li>
<li><a href="/kontakt.html"><span class="leadingsign"> &gt; </span>KONTAKT</a></li>
</ul>
<h2>Kontakt</h2>
<p> Mozete nam poslati email na dmz@dmz.rs <p>
<p> Ili nas kontaktiraje na <a href="/forum.html">forumu</a> ili <a href="/chat.html">chat kanalu</a> <p>
<p> Takodje mozete i doci na neku od dogadjaja i upoznati nas uzivo <p>
<div class="back">
<ul class="nav">
<a href="../"><li>Nazad</li></a>
</ul>
</div>
</main>
</div>
</body>
</html>

View File

@@ -1,9 +0,0 @@
## Kontakt
Mozete nam poslati email na dmz@dmz.rs
Ili nas kontaktiraje na [forumu](/forum.html) ili [chat
kanalu](/chat.html)
Takodje mozete i doci na neku od dogadjaja i upoznati nas uzivo

40
nalog.html Normal file
View File

@@ -0,0 +1,40 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<div class="container">
<div class="header">
<h1 class="logo">DECENTRALA</h1>
</div>
<main>
<ul class="nav">
<li><a href="/dogadjaji.html"><span class="leadingsign"> &gt; </span>DOGAĐAJI</a></li>
<li><a href="/forum.html"><span class="leadingsign"> &gt; </span>FORUM</a></li>
<li><a href="/chat.html"><span class="leadingsign"> &gt; </span>CHAT</a></li>
<li><a href="/nalog.html"><span class="leadingsign"> &gt; </span>NALOG</a></li>
<li><a href="/onama.html"><span class="leadingsign"> &gt; </span>O NAMA</a></li>
<li><a href="/kontakt.html"><span class="leadingsign"> &gt; </span>KONTAKT</a></li>
</ul>
<h2>Nalog</h2>
<p> Ako ste napravili nalog na dmz.rs mozete koristi nas xmpp i email server. <p>
<p> Za vise o XMPP pogledajte <a href="/chat.html">Chat</a> stranicu. <p>
<p> Za primer podesavanja na <a href="https://www.thunderbird.net/">Thundebird</a> mail klijentu mozete pogledati <a href="/static/img/mailsettings.png">sliku</a>. <p>
<ul class="nav">
<a href="/account/register/"><li>Registruj se</li></a>
<a href="/account/unregister/"><li>Izbrisi nalog</li></a>
<a href="/account/changepassword/"><li>Promeni lozinku</li></a>
</ul>
<div class="back">
<ul class="nav">
<a href="../"><li>Nazad</li></a>
</ul>
</div>
</main>
</body>
</html>

View File

@@ -1,14 +0,0 @@
## Nalog
Ako ste napravili nalog na dmz.rs mozete koristi nas xmpp i email
server.
Za vise o XMPP pogledajte [Chat](/chat.html) stranicu.
Za primer podesavanja na [Thundebird](https://www.thunderbird.net/) mail
klijentu mozete pogledati [sliku](/static/img/mailsettings.png).
- Registruj se
- Izbrisi nalog
- Promeni lozinku

52
onama.html Normal file
View File

@@ -0,0 +1,52 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<div class="container">
<div class="header">
<h1 class="logo">DECENTRALA</h1>
</div>
<main>
<ul class="nav">
<li><a href="/dogadjaji.html"><span class="leadingsign"> &gt; </span>DOGAĐAJI</a></li>
<li><a href="/forum.html"><span class="leadingsign"> &gt; </span>FORUM</a></li>
<li><a href="/chat.html"><span class="leadingsign"> &gt; </span>CHAT</a></li>
<li><a href="/nalog.html"><span class="leadingsign"> &gt; </span>NALOG</a></li>
<li><a href="/onama.html"><span class="leadingsign"> &gt; </span>O NAMA</a></li>
<li><a href="/kontakt.html"><span class="leadingsign"> &gt; </span>KONTAKT</a></li>
</ul>
<h2>Sta je Decentrala</h2>
<p> Decentrala je zajednica okupljena oko decentralizacije tehnologija i sirenja znanja. <p>
<div id="onama">
<div class="box">
<h3> Znanje </h3>
<p> Svako moze drzati predavanje na bilo koju temu, samo se najavite na forumu. <p>
<p> Decentrala veruje da svako treba da ima pristup znanju, zbog cega su predavanja uvek besplatna i bez promocija. <p>
<p> Ako zelite nesto da podelite sa drugima sto ste naucili, prijavite se da drzite jedno ili vise predavanja! <p>
</div>
<div class="box">
<h3> Akcija </h3>
<p> Organizovanje dogadjaja programiranja ili instalacije servisa koje pomazu u decentralizaciji Interneta. <p>
<p> Organizujemo hackathone kao posebne dogadjaje na kojima se okupljamo da radimo na zajednickom cilju. <p>
</div>
<div class="box">
<h3> Druzenje </h3>
<p> Drustvene dogadjaje u cilju socijalizacije. <p>
<p> Ako zelite da se druzite sa ljudima zainteresovanim za ravnopravnost koriscenja tehnologija, slobodnog softvera, privatnost i bezbednost, posetite neku od okupljanja Decentrale. <p>
</div>
</div>
<div class="back">
<ul class="nav">
<a href="../"><li>Nazad</li></a>
</ul>
</div>
</main>
</div>
</body>
</html>

View File

@@ -1,32 +0,0 @@
## Sta je Decentrala
Decentrala je zajednica okupljena oko decentralizacije tehnologija i
sirenja znanja.
### Znanje
Svako moze drzati predavanje na bilo koju temu, samo se najavite na
forumu.
Decentrala veruje da svako treba da ima pristup znanju, zbog cega su
predavanja uvek besplatna i bez promocija.
Ako zelite nesto da podelite sa drugima sto ste naucili, prijavite se da
drzite jedno ili vise predavanja!
### Akcija
Organizovanje dogadjaja programiranja ili instalacije servisa koje
pomazu u decentralizaciji Interneta.
Organizujemo hackathone kao posebne dogadjaje na kojima se okupljamo da
radimo na zajednickom cilju.
### Druzenje
Drustvene dogadjaje u cilju socijalizacije.
Ako zelite da se druzite sa ljudima zainteresovanim za ravnopravnost
koriscenja tehnologija, slobodnog softvera, privatnost i bezbednost,
posetite neku od okupljanja Decentrale.

View File

@@ -1,24 +0,0 @@
# DECENTRALA {#decentrala .logo}
## Servisi
[FORUM](https://forum.dmz.rs)
[XMPP](../chat.html)
[GITEA](https://gitea.dmz.rs)
[WIKI](https://wiki.dmz.rs)
[EMAIL](../nalog.html)
[SOFT SERVE](ssh://soft.dmz.rs:2222)
[LibreX](https://search.dmz.rs)
[CGIT](https://git.dmz.rs)
[PrivateBin](https://pastebin.dmz.rs)
[CryptPad](https://cryptpad.dmz.rs)

View File

@@ -1,16 +0,0 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<div class="container">
<div class="header">
<h1 class="logo">DECENTRALA</h1>
</div>
<main>

View File

@@ -31,20 +31,12 @@ body {
justify-content: center;
margin: 0 auto;
font-family: facade;
font-size: 12vw;
color: #24ea26;
}
#d {
float: right;
margin-right: 6vw;
margin-left: 1vw;
margin-bottom: 2vw;
background-color: #24ea26;
font-size: 20vw;
color: #81fc54;
}
main {
color: #24ea26;
color: #81fc54;
}
main h2 {
@@ -67,40 +59,10 @@ main h3 {
a {
font-family: sligoil;
text-decoration: underline;
color: #24ea26;
color: #81fc54;
}
a:visited {
text-decoration: none;
}
a:active {
text-decoration: none;
}
a:hover {
text-decoration: none;
}
main ul li {
font-size: 3vw;
}
main ul li:hover {
background-color: #008000;
}
main ul li:hover a {
color: #000000;
}
main ul li:before {
content: ">";
padding-right: 5px;
color: #24ea26;
}
.back ul li {
text-align: right;
clear: both;
@@ -109,7 +71,7 @@ main ul li:before {
.back ul li:before {
content: "<";
padding-right: 5px;
color: #24ea26;
color: #81fc54;
}
#onama p {
@@ -122,3 +84,48 @@ main ul li:before {
text-align: center;
padding: 1vw;
}
marquee {
border-bottom: 0.1vw solid;
border-color: #81fc54;
}
marquee a {
color: #a19cff;
text-decoration: none;
font-family: sligoil;
font-size: 2vw;
}
.nav {
display: flex;
align-items: center;
justify-content: center;
border-bottom: 0.1vw solid;
border-top: 0.1vw solid;
border-color: #81fc54;
padding: 0.5vw 5vw ;
}
.nav a {
text-decoration: none;
color: #a19cff;
margin-right: 5vw;
font-size: 2vw;
}
.nav a:hover {
text-decoration: underline;
}
.nav a:hover > .leadingsign {
opacity: 1;
}
.leadingsign {
opacity: 0;
}
.leadingsign:hover {
opacity: 1;
}