1
0
This commit is contained in:
Mike Schwörer 2020-01-16 10:56:12 +01:00
parent 987a0a3c12
commit dc483ea4fd
7 changed files with 31 additions and 48 deletions

View File

@ -12,7 +12,7 @@ require_once (__DIR__ . '/../internals/website.php');
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title><?php echo htmlspecialchars($FRAME_OPTIONS->title); ?></title> <title><?php echo ($FRAME_OPTIONS->title !== '') ? htmlspecialchars('Mikescher.com - ' . $FRAME_OPTIONS->title) : 'Mikescher.com'; ?></title>
<meta name="google-site-verification" content="pZOhmjeJcQbRMNa8xRLam4dwJ2oYwMwISY1lRKreSSs"/> <meta name="google-site-verification" content="pZOhmjeJcQbRMNa8xRLam4dwJ2oYwMwISY1lRKreSSs"/>
<link rel="icon" type="image/png" href="/data/images/favicon.png"/> <link rel="icon" type="image/png" href="/data/images/favicon.png"/>
<?php <?php

View File

@ -12,7 +12,7 @@ require_once (__DIR__ . '/../internals/website.php');
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title><?php echo htmlspecialchars($FRAME_OPTIONS->title); ?></title> <title><?php echo ($FRAME_OPTIONS->title !== '') ? htmlspecialchars('Mikescher.com - ' . $FRAME_OPTIONS->title) : 'Mikescher.com'; ?></title>
<meta name="google-site-verification" content="pZOhmjeJcQbRMNa8xRLam4dwJ2oYwMwISY1lRKreSSs"/> <meta name="google-site-verification" content="pZOhmjeJcQbRMNa8xRLam4dwJ2oYwMwISY1lRKreSSs"/>
<link rel="icon" type="image/png" href="/data/images/favicon.png"/> <link rel="icon" type="image/png" href="/data/images/favicon.png"/>
<link rel="stylesheet" href="/data/css/styles.css" /> <link rel="stylesheet" href="/data/css/styles.css" />

View File

@ -1,27 +1,20 @@
<!DOCTYPE html>
<html lang="en">
<?php <?php
require_once (__DIR__ . '/../internals/base.php'); require_once (__DIR__ . '/../internals/website.php');
require_once (__DIR__ . '/../internals/blog.php');
$allposts = Blog::listAllNewestFirst();
/** @var PageFrameOptions $FRAME_OPTIONS */ global $FRAME_OPTIONS;
/** @var URLRoute $ROUTE */ global $ROUTE;
/** @var Website $SITE */ global $SITE;
?> ?>
<head>
<meta charset="utf-8">
<title>Mikescher.com - Blog</title>
<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
<link rel="canonical" href="https://www.mikescher.com/blog"/>
<?php printHeaderCSS(); ?>
</head>
<body>
<div id="mastercontainer">
<?php $HEADER_ACTIVE='blog'; include (__DIR__ . '/../fragments/header.php'); ?> <?php
$FRAME_OPTIONS->title = 'Blog';
$FRAME_OPTIONS->canonical_url = 'https://www.mikescher.com/blog';
$FRAME_OPTIONS->activeHeader = 'blog';
<div id="content" class="content-responsive"> $allposts = $SITE->modules->Blog()->listAllNewestFirst();
?>
<div class="blockcontent"> <div class="blockcontent">
<div class="contentheader"><h1>Blogposts and other stuff</h1><hr/></div> <div class="contentheader"><h1>Blogposts and other stuff</h1><hr/></div>
@ -42,14 +35,4 @@ $allposts = Blog::listAllNewestFirst();
?> ?>
</div> </div>
</div>
</div> </div>
<?php include (__DIR__ . '/../fragments/footer.php'); ?>
</div>
<?php printAdditionalScripts(); ?>
<?php printAdditionalStylesheets(); ?>
</body>
</html>

View File

@ -13,7 +13,7 @@ $subview = $ROUTE->parameter['subview'];
$post = $SITE->modules->Blog()->getFullBlogpost($id, $subview, $err); $post = $SITE->modules->Blog()->getFullBlogpost($id, $subview, $err);
if ($post === null) { $FRAME_OPTIONS->setForced404($err); return; } if ($post === null) { $FRAME_OPTIONS->setForced404($err); return; }
$FRAME_OPTIONS->title = 'Mikescher.com - ' . $post['title']; $FRAME_OPTIONS->title = $post['title'];
$FRAME_OPTIONS->canonical_url = $post['canonical']; $FRAME_OPTIONS->canonical_url = $post['canonical'];
if ($post['type'] == 'euler') if ($post['type'] == 'euler')

View File

@ -9,7 +9,7 @@ require_once (__DIR__ . '/../internals/website.php');
<?php <?php
$message = isset($ROUTE->parameter['message']) ? $ROUTE->parameter['message'] : ''; $message = isset($ROUTE->parameter['message']) ? $ROUTE->parameter['message'] : '';
$FRAME_OPTIONS->title = 'Mikescher.com - ' . $message; $FRAME_OPTIONS->title = $message;
$FRAME_OPTIONS->canonical_url = null; $FRAME_OPTIONS->canonical_url = null;
$FRAME_OPTIONS->activeHeader = null; $FRAME_OPTIONS->activeHeader = null;
$FRAME_OPTIONS->contentCSSClasses []= 'content-fullheight'; $FRAME_OPTIONS->contentCSSClasses []= 'content-fullheight';

View File

@ -7,7 +7,7 @@ require_once (__DIR__ . '/../internals/website.php');
?> ?>
<?php <?php
$FRAME_OPTIONS->title = 'Mikescher.com - Error'; $FRAME_OPTIONS->title = 'Error';
$FRAME_OPTIONS->canonical_url = null; $FRAME_OPTIONS->canonical_url = null;
$FRAME_OPTIONS->activeHeader = null; $FRAME_OPTIONS->activeHeader = null;
$FRAME_OPTIONS->contentCSSClasses []= 'content-fullheight'; $FRAME_OPTIONS->contentCSSClasses []= 'content-fullheight';

View File

@ -7,7 +7,7 @@ require_once (__DIR__ . '/../internals/website.php');
?> ?>
<?php <?php
$FRAME_OPTIONS->title = 'Mikescher.com'; $FRAME_OPTIONS->title = '';
$FRAME_OPTIONS->canonical_url = 'https://www.mikescher.com'; $FRAME_OPTIONS->canonical_url = 'https://www.mikescher.com';
$FRAME_OPTIONS->activeHeader = 'home'; $FRAME_OPTIONS->activeHeader = 'home';
?> ?>