From 8e531d24fccb59053a3eaf4e9806b181c9486e98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= Date: Mon, 18 Nov 2024 22:55:24 +0100 Subject: [PATCH] Update --- pages/account/files.html | 2 +- pages/account/index.php | 2 +- pages/account/settings.php | 2 +- pages/account/testing.html | 2 +- pages/home/index.html | 2 +- pages/news/index.php | 12 ++++++------ templates/403.html | 6 +++--- templates/404.html | 6 +++--- templates/500.html | 6 +++--- templates/footer.html | 3 ++- templates/newsArticles.html | 2 +- 11 files changed, 23 insertions(+), 22 deletions(-) diff --git a/pages/account/files.html b/pages/account/files.html index dcc89c4..bd50f84 100644 --- a/pages/account/files.html +++ b/pages/account/files.html @@ -1,5 +1,5 @@ - +
diff --git a/pages/account/index.php b/pages/account/index.php index 8cb3995..109b131 100644 --- a/pages/account/index.php +++ b/pages/account/index.php @@ -17,6 +17,6 @@ return [ [ "minimal_permission_level" => 1, "secret" => "no", - "page_title" => "Účet" + "page_title" => "Account" ] ]; \ No newline at end of file diff --git a/pages/account/settings.php b/pages/account/settings.php index e594cdd..8ac851c 100644 --- a/pages/account/settings.php +++ b/pages/account/settings.php @@ -16,6 +16,6 @@ return [ [ "minimal_permission_level" => 2, "secret" => "no", - "page_title" => "Nastavenia" + "page_title" => "Settings" ] ]; diff --git a/pages/account/testing.html b/pages/account/testing.html index b9c86fc..2bed491 100644 --- a/pages/account/testing.html +++ b/pages/account/testing.html @@ -1,4 +1,4 @@ - +
diff --git a/pages/home/index.html b/pages/home/index.html index 8436b64..f0ad2dc 100644 --- a/pages/home/index.html +++ b/pages/home/index.html @@ -1,5 +1,5 @@ - +

Who are we?

We are a team of talented and ambitious high school students from Adlerka electrical engineering school, diff --git a/pages/news/index.php b/pages/news/index.php index bad0da3..897d8e5 100644 --- a/pages/news/index.php +++ b/pages/news/index.php @@ -23,12 +23,12 @@ foreach ($articles as $article){ //$articleWrittenBy = $article["WrittenBy"]; $articleWrittenAt = htmlspecialchars($article["WrittenAt"]); $articleWrittenByName = htmlspecialchars($article["WrittenByName"]); - $articleTemplate = str_replace("__TEMPLATE_ARTICLE_TITLE__", $articleTitle, $articleTemplate); - $articleTemplate = str_replace("__TEMPLATE_ARTICLE_AUTHOR__", $articleWrittenByName, $articleTemplate); - $articleTemplate = str_replace("__TEMPLATE_ARTICLE_DATE__", $articleWrittenAt, $articleTemplate); - $articleTemplate = str_replace("__TEMPLATE_ARTICLE_BODY__", $articleBody, $articleTemplate); + $articleTemplateTemp = str_replace("__TEMPLATE_ARTICLE_TITLE__", $articleTitle, $articleTemplate); + $articleTemplateTemp = str_replace("__TEMPLATE_ARTICLE_AUTHOR__", $articleWrittenByName, $articleTemplateTemp); + $articleTemplateTemp = str_replace("__TEMPLATE_ARTICLE_DATE__", $articleWrittenAt, $articleTemplateTemp); + $articleTemplateTemp = str_replace("__TEMPLATE_ARTICLE_BODY__", $articleBody, $articleTemplateTemp); - $articles_out .= $articleTemplate; + $articles_out .= $articleTemplateTemp; } $output = str_replace("__TEMPLATE__ARTICLES_HERE__", $articles_out, $output); @@ -39,6 +39,6 @@ return [ [ "minimal_permission_level" => 1, "secret" => "no", - "page_title" => "Novinky" + "page_title" => "Articles" ] ]; diff --git a/templates/403.html b/templates/403.html index 4e68328..9b32be9 100644 --- a/templates/403.html +++ b/templates/403.html @@ -1,7 +1,7 @@

-

NECHOĎ SEM

+

FORBIDDEN

403

-

Našli sme stránku ktorú hľadáš, ale nemáš práva na ňu pristupovať: __TEMPLATE_PAGE_TITLE__.

+

You are not authorized to view this page: __TEMPLATE_PAGE_TITLE__.

- SPÄŤ DOMOV + BACK HOME
\ No newline at end of file diff --git a/templates/404.html b/templates/404.html index 7ffa684..8db7ffa 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,7 +1,7 @@
-

TY KÁR KAM TO DEŠ

+

NOT FOUND

404

-

Nenašli sme stránku ktorú hľadáš: __TEMPLATE_PAGE_TITLE__.

+

This page was not found: __TEMPLATE_PAGE_TITLE__.

- SPÄŤ DOMOV + BACK HOME
\ No newline at end of file diff --git a/templates/500.html b/templates/500.html index c8d3600..475fdcb 100644 --- a/templates/500.html +++ b/templates/500.html @@ -1,7 +1,7 @@
-

Niekto to pobabral

+

Someone messed up

500

-

Nejaký neschopný vývojár nevedel robiť túto stránku.

+

Some incompetent developer messed up.

- SPÄŤ DOMOV + BACK HOME
\ No newline at end of file diff --git a/templates/footer.html b/templates/footer.html index de38eca..e6e7849 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -13,4 +13,5 @@
-Adlerka school \ No newline at end of file +Adlerka school +CanSat \ No newline at end of file diff --git a/templates/newsArticles.html b/templates/newsArticles.html index bec8f06..e980863 100644 --- a/templates/newsArticles.html +++ b/templates/newsArticles.html @@ -15,7 +15,7 @@


- +