From 99a78157a4adfae93d0d19fedbaba219c472b3d1 Mon Sep 17 00:00:00 2001 From: fram3d Date: Mon, 15 Apr 2024 20:56:29 +0200 Subject: [PATCH] move statute from index to new about --- build_pages.py | 2 +- pages/en/about.html | 12 ++++++++++++ pages/en/contact.html | 5 ----- pages/en/index.html | 2 -- pages/sr/about.html | 10 ++++++++++ pages/sr/contact.html | 5 ----- pages/sr/index.html | 2 -- site/styles/about.css | 11 +++++++++++ site/styles/contact.css | 0 template/page-en.html | 2 +- template/page-sr.html | 2 +- 11 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 pages/en/about.html delete mode 100644 pages/en/contact.html create mode 100644 pages/sr/about.html delete mode 100644 pages/sr/contact.html create mode 100644 site/styles/about.css delete mode 100644 site/styles/contact.css diff --git a/build_pages.py b/build_pages.py index d6f5b421..786549ab 100755 --- a/build_pages.py +++ b/build_pages.py @@ -4,7 +4,7 @@ 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': 'about', 'titleSR': 'O nama', 'titleEN': 'About us', 'style': 'about'}, {'name': 'statute', 'titleSR': 'Statut', 'titleEN': 'Statute', 'style': 'statute'}, {'name': 'events', 'titleSR': 'Događaji', 'titleEN': 'Events', 'style': 'events'}, {'name': 'events_archive', 'titleSR': 'Arhiva događaja', 'titleEN': 'Events archive', 'style': 'events'}, diff --git a/pages/en/about.html b/pages/en/about.html new file mode 100644 index 00000000..6a31b474 --- /dev/null +++ b/pages/en/about.html @@ -0,0 +1,12 @@ +

About us

+
+
Statute:
+
We make decisions by direct democracy. Our statute can be found at statute page
+ +
Contact:
+
+ You can send mail to dmz@dmz.rs or you can register on our Forum. + Also, we are available on the Fediverse! + If you find a bug on the site, please do tell us. We would be very grateful. +
+
diff --git a/pages/en/contact.html b/pages/en/contact.html deleted file mode 100644 index 866a0cf0..00000000 --- a/pages/en/contact.html +++ /dev/null @@ -1,5 +0,0 @@ -

Contact

-

You can send mail to dmz@dmz.rs or you can register on our Forum.

-

Also, we are available on the Fediverse!

-
-

If you find a bug on the site, please do tell us. We would be very grateful.

diff --git a/pages/en/index.html b/pages/en/index.html index 6d3fd511..78868a84 100644 --- a/pages/en/index.html +++ b/pages/en/index.html @@ -13,8 +13,6 @@
From time to time we organize actions, hackathons, crypto parties, exhibitions, etc.
Services:
Our servers run various services (like e-mail, git, wiki, etc...) that are open to everyone.
-
Statute:
-
We make decisions by direct democracy. Our statute can be found at statute page

If you are still interested, you can create an account diff --git a/pages/sr/about.html b/pages/sr/about.html new file mode 100644 index 00000000..286fcf57 --- /dev/null +++ b/pages/sr/about.html @@ -0,0 +1,10 @@ +

O nama

+
+
Statut:
+
Sve odluke se donose po principu direktne demokratije. Nas statut mozete pogledati na stranici za statut.
+ +
Kontakt:
+
Možeš nam poslati mejl na adresu dmz@dmz.rs ili se možeš pridružiti našem Forumu.
+
Takođe smo dostupni i na Fediversu!
+
U slučaju da pronađeš bug na sajtu, bili bismo ti jako zahvalni ako nam ga prijaviš.
+
diff --git a/pages/sr/contact.html b/pages/sr/contact.html deleted file mode 100644 index b6e2c500..00000000 --- a/pages/sr/contact.html +++ /dev/null @@ -1,5 +0,0 @@ -

Kontakt

-

Možeš nam poslati mejl na adresu dmz@dmz.rs ili se možeš pridružiti našem Forumu.

-

Takođe smo dostupni i na Fediversu!

-
-

U slučaju da pronađeš bug na sajtu, bili bismo ti jako zahvalni ako nam ga prijaviš.

diff --git a/pages/sr/index.html b/pages/sr/index.html index aba9fae4..482a0505 100644 --- a/pages/sr/index.html +++ b/pages/sr/index.html @@ -14,8 +14,6 @@
Servisi:
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.
-
Statut:
-
Sve odluke se donose po principu direktne demokratije. Nas statut mozete pogledati na stranici za statut.

Ako si i dalje zainteresovan, možeš napraviti nalog na našem serveru koji će ti diff --git a/site/styles/about.css b/site/styles/about.css new file mode 100644 index 00000000..22974421 --- /dev/null +++ b/site/styles/about.css @@ -0,0 +1,11 @@ +dl { + padding: 1rem 0; +} + +dt { + font-weight: bold; +} + +dd { + margin: 0 0 1rem 1rem; +} \ No newline at end of file diff --git a/site/styles/contact.css b/site/styles/contact.css deleted file mode 100644 index e69de29b..00000000 diff --git a/template/page-en.html b/template/page-en.html index 19f9a1a2..17ce805d 100644 --- a/template/page-en.html +++ b/template/page-en.html @@ -25,7 +25,7 @@

diff --git a/template/page-sr.html b/template/page-sr.html index db6bda3f..df499276 100644 --- a/template/page-sr.html +++ b/template/page-sr.html @@ -25,7 +25,7 @@