15 Commits

Author SHA1 Message Date
andonome fd90371b1a add readme 2023-07-08 00:24:22 +02:00
andonome 65b5d1bd44 convert markdown to html 2023-07-08 00:17:35 +02:00
andonome bb691259bb remove markdown guff 2023-07-07 23:59:11 +02:00
andonome b5434ff46f convert site to markdown 2023-07-07 00:00:19 +02:00
fram3d 4be1d0e579 add services and events 2023-06-13 17:17:34 +02:00
fram3d 6af847150c add servisi.html 2023-05-05 17:36:40 +02:00
fram3d e93c1ea05e rename saznaj vise to o nama 2023-01-12 21:32:33 +01:00
fram3d d5a06ed5eb add favico 2023-01-12 20:23:46 +01:00
fram3d 0e89645131 change title to lowercase 2023-01-12 20:18:36 +01:00
fram3d 5668ee1078 change logo to uppercase and remove box 2023-01-12 20:11:05 +01:00
fram3d 3071fb2ed8 add kontakt.html and saznajvise.html 2023-01-12 20:04:31 +01:00
fram3d c258c4c94d fix link in forum 2023-01-12 18:33:26 +01:00
fram3d ca10ef8df3 change from old fonts to new 2023-01-12 18:28:53 +01:00
fram3d 0a9fb5ce14 add fonts 2023-01-12 18:15:20 +01:00
fram3d 1fd4a19440 Merge pull request 'Folder za slike i <a> tagovi' (#1) from arhetip/decentrala-website-static:master into master
Reviewed-on: fram3d/decentrala-website-static#1
2023-01-06 02:54:50 +00:00
46 changed files with 243 additions and 140 deletions
+1
View File
@@ -0,0 +1 @@
public
+22
View File
@@ -0,0 +1,22 @@
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
+12
View File
@@ -0,0 +1,12 @@
This repo builds the website `dmz.rs`.
## Dependencies
- `make`
- `pandoc`
## Usage
`make`
The output will appear in the `public` directory.
-27
View File
@@ -1,27 +0,0 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<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>
<a id="d" href="/index.html"><div id="d"></div></a>
</div>
<main>
<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
View File
@@ -0,0 +1,12 @@
## 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)
-26
View File
@@ -1,26 +0,0 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<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>
<a id="d" href="/index.html"><div id="d"></div></a>
</div>
<main>
<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>
+36
View File
@@ -0,0 +1,36 @@
# 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)
+6
View File
@@ -0,0 +1,6 @@
</main>
</div>
</body>
</html>
-27
View File
@@ -1,27 +0,0 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<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>
<a id="d" href="/index.html"><div id="d"></div></a>
</div>
<main>
<h2>Forum</h2>
<p> Forum je na https://forum.dmz.rs <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>
+6
View File
@@ -0,0 +1,6 @@
## Forum
Forum je na [forum.dmz.rs](https://forum.dmz.rs)
Nalog na forumu nije povezan sa nalogom na xmpp i mail serveru
-26
View File
@@ -1,26 +0,0 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<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>
<a id="d" href="/index.html"><div id="d"></div></a>
</div>
<main>
<p id="about"> Decentrala je zajednica okupljena oko decentralizacije tehnologija i sirenja znanja. <p>
<ul class="nav">
<a href="/dogadjaji.html"><li>Dogadjaji</li></a>
<a href="/forum.html"><li>Forum</li></a>
<a href="/chat.html"><li>Chat</li></a>
<a href="/nalog.html"><li>Nalog</li></a>
</ul>
</main>
</div>
</body>
</html>
+10
View File
@@ -0,0 +1,10 @@
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)
+9
View File
@@ -0,0 +1,9 @@
## 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
-32
View File
@@ -1,32 +0,0 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<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>
<a id="d" href="/index.html"><div id="d"></div></a>
</div>
<main>
<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>
+14
View File
@@ -0,0 +1,14 @@
## 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
+32
View File
@@ -0,0 +1,32 @@
## 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.
+24
View File
@@ -0,0 +1,24 @@
# 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)
+16
View File
@@ -0,0 +1,16 @@
<!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>
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1
View File
@@ -0,0 +1 @@
2f069ecf-a1fc-4aaf-924c-de17efcde7a8
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+42 -2
View File
@@ -1,6 +1,23 @@
@font-face {
font-family: Facade;
src: url(fonts/facade/Facade-Sud.woff);
}
@font-face {
font-family: sligoil;
src: url(fonts/sligoil/Sligoil-Micro.woff);
}
@font-face {
font-family: jetbrains-mono;
src: url(fonts/jetbrains-mono/JetBrainsMono-Regular.ttf);
}
body { body {
background-color: rgb(0, 0, 0); background-color: rgb(0, 0, 0);
font: 3vw "Monospace", sans-serif; font-family: jetbrains-mono;
font-size: 3vw;
} }
.container { .container {
@@ -13,7 +30,8 @@ body {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin: 0 auto; margin: 0 auto;
font: 12vw "Monospace", sans-serif; font-family: facade;
font-size: 12vw;
color: #24ea26; color: #24ea26;
} }
@@ -30,14 +48,24 @@ main {
} }
main h2 { main h2 {
font-family: sligoil;
font-size: 5vw; font-size: 5vw;
} }
main h3 {
font-family: sligoil;
font-size: 4vw;
margin: 2rem auto;
margin-left: 2vw;
margin-right: 1vw;
}
#about { #about {
margin-bottom: 2rem; margin-bottom: 2rem;
} }
a { a {
font-family: sligoil;
text-decoration: underline; text-decoration: underline;
color: #24ea26; color: #24ea26;
@@ -75,6 +103,7 @@ main ul li:before {
.back ul li { .back ul li {
text-align: right; text-align: right;
clear: both;
} }
.back ul li:before { .back ul li:before {
@@ -82,3 +111,14 @@ main ul li:before {
padding-right: 5px; padding-right: 5px;
color: #24ea26; color: #24ea26;
} }
#onama p {
font-size: 2vw;
}
.box {
float: left;
width: 25vw;
text-align: center;
padding: 1vw;
}