Don't have duplicate DOCTYPE and other tags

This commit is contained in:
Jacob 2023-07-01 19:05:57 +02:00
parent b37c9162fa
commit 9ecf1acc24
5 changed files with 34 additions and 46 deletions

View file

@ -58,18 +58,14 @@ function printHeader($title, $action, $html) {
$nhtml = truncate($nhtml, 512);
}
print "<!DOCTYPE html>\n";
print "<html lang=\"en\">\n";
if (ENABLE_HEAD) {
print "<!DOCTYPE html>\n";
print "<head>\n";
if (META_ENC) {
print " <meta charset=\"UTF-8\">\n";
}
if (META_DESC && $action != 'home') {
print "<meta name=\"description\" content=\"$nhtml\">\n";
} else if (META_DESC) {
print "<meta name=\"description\" content=". BLOG_DESC .">\n";
}
if (ENABLE_TITLE) {
@ -91,8 +87,11 @@ function printHeader($title, $action, $html) {
function printFooter() {
if (ENABLE_FOOTER) {
print " </body>\n";
print "<footer>\n";
include("php/footer.php");
print "</footer>\n";
}
}
@ -289,5 +288,5 @@ printHeader($title, $action, $html);
print " <div class=\"content\">\n\n";
print " $html\n";
print " </div>\n";
print " </html>\n";
printFooter();
print "</html>\n";

View file

@ -1,8 +1,3 @@
<!DOCTYPE html>
<html>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="/css/footer.css">
<body>
<div class="column">
<a class="links" href="/privacy.php">Licensing</a>
<a class="links" href="/credits.php">Credits</a>
@ -10,5 +5,3 @@
<a class="links" href="https://ls.speedie.site">Downloads</a>
</div>
<img src="/img/leave_the_kids_alone_pride.svg" alt="image" class="banner">
</body>
</html>

4
php/header-meta.php Normal file
View file

@ -0,0 +1,4 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="/css/header.css">
<link rel="stylesheet" href="/css/main.css">
<link rel="icon" type="image/x-icon" href="/img/favicon.svg">

18
php/header-navbar.php Normal file
View file

@ -0,0 +1,18 @@
<div class="navbar">
<span>speedie's page
<img src="/img/home.png" width="16" height="16">
<a href="https://speedie.site">Home</a>
<img src="/img/projects.png" width="16" height="16">
<a href="/project-list.php">Projects</a>
<img src="/img/blog.png" width="16" height="16">
<a href="/blog.php">Blog</a>
<img src="/img/rss.svg" width="16" height="16">
<a href="/rss.xml">RSS</a>
<img src="/img/git.svg" width="16" height="16">
<a href="https://git.speedie.site">Git</a>
<img src="/img/chat.png" width="16" height="16">
<a href="https://matrix.speedie.site">Matrix space</a>
<img src="/img/monero.svg" width="16" height="16">
<a href="/donate.php">Donate</a>
</span>
</div>

View file

@ -1,28 +1,2 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="/css/header.css">
<link rel="stylesheet" href="/css/main.css">
<link rel="icon" type="image/x-icon" href="/img/favicon.svg">
</head>
<body>
<div class="navbar">
<span>speedie's page
<img src="/img/home.png" width="16" height="16">
<a href="https://speedie.site">Home</a>
<img src="/img/projects.png" width="16" height="16">
<a href="/project-list.php">Projects</a>
<img src="/img/blog.png" width="16" height="16">
<a href="/blog.php">Blog</a>
<img src="/img/rss.svg" width="16" height="16">
<a href="/rss.xml">RSS</a>
<img src="/img/git.svg" width="16" height="16">
<a href="https://git.speedie.site">Git</a>
<img src="/img/chat.png" width="16" height="16">
<a href="https://matrix.speedie.site">Matrix space</a>
<img src="/img/monero.svg" width="16" height="16">
<a href="/donate.php">Donate</a>
</span>
</div>
<div class="content">
<?php include 'header-meta.php';?>
<?php include 'header-navbar.php';?>