Decentrala/website
14
1
Fork 10
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

Compare commits

base: Decentrala:b32f92e70b0ef6a9dd4dd11bbe0a64cde1983098
Branches Tags
Decentrala:master
Decentrala:fix/fix-ical-template
Decentrala:requirements
Decentrala:Makefiles
Decentrala:feat/statute-link-on-navbar
Decentrala:v3.0
Decentrala:poster
Decentrala:markdown
Decentrala:v4.0
Decentrala:v2.0
..
compare: Decentrala:89df73f4cf24387cee0feea5faa982f011c52db4
Branches Tags
Decentrala:master
Decentrala:fix/fix-ical-template
Decentrala:requirements
Decentrala:Makefiles
Decentrala:feat/statute-link-on-navbar
Decentrala:v3.0
Decentrala:poster
Decentrala:markdown
Decentrala:v4.0
Decentrala:v2.0

No commits in common. "b32f92e70b0ef6a9dd4dd11bbe0a64cde1983098" and "89df73f4cf24387cee0feea5faa982f011c52db4" have entirely different histories.
b32f92e70b ... 89df73f4cf

7 changed files with 9 additions and 82 deletions
Show Stats Expand all files Collapse all files

9
chat.html
View File

@ -1,5 +1,4 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="stylesheet" href="./static/reset.css">
@ -9,12 +8,16 @@
<body>
<div class="container">
<div class="header">
<h1 class="logo">Decentrala<a id="d" href="/index.html">▮</a></h1>
<h1 class="logo">Decentrala_</h1>
</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> Za koriscenje XMPP (Jabber) mozete koristiti <a target="blank" href="https://gajim.org/">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> <a href="/account/register/"> Registruj XMPP nalog na dmz.rs domenu </a> <p>
<p> <a href="/account/unregister/"> Izbrisi XMPP nalog </a> <p>
<p> <a href="/account/changepassword/"> Promeni lozinku </a> <p>
<p> Mozete nas naci u XMPP grupi <a href="xmpp:decentrala@conference.dmz.rs?join"> decentrala@conference.dmz.rs </a> <p>
<p> Ako ste napravili XMPP nalog na dmz.rs serveru mozete koristi i email adresu na dmz.rs domenu. Za primer podesavanja na <a href="https://www.thunderbird.net/">Thundebird<a/a> mail klijentu mozete pogledati <a href="/mailsettings.png">sliku</a>. <p>
</main>
</div>
</body>

20
dogadjaji.html
View File

@ -1,20 +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<a id="d" href="/index.html">▮</a></h1>
</div>
<main>
<h2>Dogadjaji</h2>
<p> Svakog utorka u DC Krovu (Beograd, Kraljice Marije 47, zadnji sprat) u 19h radionica Uvod u mreze <p>
</main>
</div>
</body>
</html>

21
forum.html
View File

@ -1,21 +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<a id="d" href="/index.html">▮</a></h1>
</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>
</main>
</div>
</body>
</html>

8
index.html
View File

@ -12,12 +12,10 @@
<h1 class="logo">Decentrala<a id="d" href="/index.html">▮</a></h1>
</div>
<main>
<p id="about"> Decentrala je zajednica okupljena oko decentralizacije tehnologija i sirenja znanja. <p>
<ul class="nav">
<li><a href="/dogadjaji.html">Dogadjaji</a></li>
<li><a href="/forum.html">Forum</a></li>
<li><a href="/chat.html">Chat</a></li>
<li><a href="/nalog.html">Nalog</a></li>
<li><a href="#">Dogadjaji</a></li>
<li><a href="https://forum.dmz.rs">Forum</a></li>
<li><a href="./chat.html">Chat</a></li>
</ul>
</main>
</div>

BIN
mailsettings.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 41 KiB

28
nalog.html
View File

@ -1,28 +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<a id="d" href="/index.html">▮</a></h1>
</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/a> mail klijentu mozete pogledati <a href="/mailsettings.png">sliku</a>. <p>
<ul class="nav">
<li><a href="/account/register/">Registruj se</a></li>
<li><a href="/account/unregister/">Izbrisi nalog</a></li>
<li><a href="/account/changepassword/">Promeni lozinku</a></li>
</ul>
</main>
</div>
</body>
</html>

5
static/main.css
View File

@ -25,11 +25,6 @@ main {
color: #24ea26;
}
#about {
font-size: 2rem;
margin-bottom: 2rem;
}
a {
text-decoration: none;
color: #24ea26;