From 37d8577629d808d5b63bf29c7981ff6fda3cab2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= Date: Thu, 22 Feb 2024 18:16:42 +0100 Subject: [PATCH] Fix articles --- assets/script.js | 4 ++-- assets/style.css | 12 +++++++----- lib/inliner.php | 4 ++-- lib/navigation.php | 3 +++ lib/newsarticle.php | 2 +- pages/home/index.html | 1 + pages/memes/index.html | 1 + pages/notes/index.html | 1 + pages/smp/index.html | 1 + pages/smp/info.html | 1 + 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/assets/script.js b/assets/script.js index 71318ae..f2ef051 100644 --- a/assets/script.js +++ b/assets/script.js @@ -213,13 +213,13 @@ async function submitarticle(){ "Nastala chyba pri pridávaní článku", false ); - togglearticlecreate(); + await togglearticlecreate(); } async function articleInit(){ let articleContainerElement = document.getElementById("articlecreatecontainer"); articleContainerElement.addEventListener("keyup", function (ev) { - if(ev.which === 27){ + if(ev.key === "Escape"){ togglearticlecreate(); } }) diff --git a/assets/style.css b/assets/style.css index 7e22470..1b8cf18 100644 --- a/assets/style.css +++ b/assets/style.css @@ -355,14 +355,12 @@ button:hover { } header.ye-span:hover + body{ - background: url('/assets/images/ye.jpg') !important; - background-repeat: repeat !important; + background: url('/assets/images/ye.jpg') repeat !important; background-size: 10% !important; } body:has(.ye-span:hover) { - background: url('/assets/images/ye.jpg') !important; - background-repeat: repeat !important; + background: url('/assets/images/ye.jpg') repeat !important; background-size: 10% !important; } @@ -396,7 +394,11 @@ div#articleslist{ position: relative; } -div#articleslist > article > div#articleinfo{ +div#articleslist > article > div.articleinfo > *{ + width: fit-content; +} + +div#articleslist > article > div.articleinfo{ display: flex; flex-direction: row; } diff --git a/lib/inliner.php b/lib/inliner.php index 4761191..04fc11a 100644 --- a/lib/inliner.php +++ b/lib/inliner.php @@ -27,7 +27,7 @@ function inlineLocalStylesFromHref($inputString): string // Minify the CSS content $cssContent = minifyCss($cssContent); - return ""; + return ""; }, $inputString); } @@ -41,7 +41,7 @@ function inlineScriptFromSrc($inputString): string // Minify the JavaScript content $jsContent = minifyJs($jsContent); - return ""; + return ""; }, $inputString); } diff --git a/lib/navigation.php b/lib/navigation.php index df9fe06..f4a7d50 100644 --- a/lib/navigation.php +++ b/lib/navigation.php @@ -41,6 +41,9 @@ function generateNavigation(): string $site_location = "/" . $site_dir . "/" . $routerConfig["default_page"]; + $stnm = $routerRequest["site_name"]; + + echo "a: $site_dir b: $stnm"; if ($routerRequest["site_name"] == $site_dir) { //this is the current page $site_class = "class=\"navsite_link active\""; diff --git a/lib/newsarticle.php b/lib/newsarticle.php index 99e003f..65745b3 100644 --- a/lib/newsarticle.php +++ b/lib/newsarticle.php @@ -54,7 +54,7 @@ function addNewsArticle($title="Nazov", $body="Obsah") :array if ($query->affected_rows > 0) { $output["Status"] = "Success"; } + $query->close(); } - $query->close(); return $output; } \ No newline at end of file diff --git a/pages/home/index.html b/pages/home/index.html index e5fb4fd..24dd0d9 100644 --- a/pages/home/index.html +++ b/pages/home/index.html @@ -1,3 +1,4 @@ +

Vitaj, na tejto úžasnej stránke

diff --git a/pages/memes/index.html b/pages/memes/index.html index 61637f3..7e7387b 100644 --- a/pages/memes/index.html +++ b/pages/memes/index.html @@ -1,3 +1,4 @@ +

Adlerka Memes

diff --git a/pages/notes/index.html b/pages/notes/index.html index 9e63fb2..536def0 100644 --- a/pages/notes/index.html +++ b/pages/notes/index.html @@ -1,3 +1,4 @@ +

Adlerka Zošit

diff --git a/pages/smp/index.html b/pages/smp/index.html index 030f031..b2382d4 100644 --- a/pages/smp/index.html +++ b/pages/smp/index.html @@ -1,3 +1,4 @@ +

Vitaj na oficiálnej AdlerkaSMP stránke

diff --git a/pages/smp/info.html b/pages/smp/info.html index 11686e8..e762a5e 100644 --- a/pages/smp/info.html +++ b/pages/smp/info.html @@ -1,2 +1,3 @@ +

Vitaj na oficiálnej stránke Informácii o AdlerkaSMP

\ No newline at end of file