Mikescher/www.mikescher.com
1
0
Fork 0
Code Actions Activity

AoC single + prism + better additional css/js handling

Browse Source
This commit is contained in:
Mike Schwörer
2019-11-03 15:33:23 +01:00
parent 65f75c26ef
commit bdda2001e3
27 changed files with 565 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/pages/about.php
View File

@@ -10,8 +10,8 @@ global $OPTIONS;
<title>Mikescher.com - About</title>
<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
<link rel="canonical" href="https://www.mikescher.com/about"/>
<?php printCSS(); ?>
<?php includeScriptOnce("/data/javascript/egh.js", true, 'defer') ?>
<?php printHeaderCSS(); ?>
<?php includeAdditionalScript("/data/javascript/egh.js", 'defer', true) ?>
</head>
<body>
<div id="mastercontainer">
@@ -102,5 +102,7 @@ global $OPTIONS;
<?php include (__DIR__ . '/../fragments/footer.php'); ?>
</div>
<?php printAdditionalScripts(); ?>
<?php printAdditionalStylesheets(); ?>
</body>
</html>

8
www/pages/admin.php
View File

@@ -39,9 +39,9 @@ function dumpConsistency($c) {
<title>Mikescher.com - Admin</title>
<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
<link rel="canonical" href="https://www.mikescher.com/about"/>
<?php printCSS(); ?>
<?php includeScriptOnce("https://code.jquery.com/jquery-latest.min.js", true, '') ?>
<?php includeScriptOnce("/data/javascript/admin.js", true, 'defer') ?>
<?php printHeaderCSS(); ?>
<?php includeAdditionalScript("https://code.jquery.com/jquery-latest.min.js", '', true) ?>
<?php includeAdditionalScript("/data/javascript/admin.js", 'defer', true) ?>
</head>
<body>
<div id="mastercontainer">
@@ -218,5 +218,7 @@ function dumpConsistency($c) {
<?php include (__DIR__ . '/../fragments/footer.php'); ?>
</div>
<?php printAdditionalScripts(); ?>
<?php printAdditionalStylesheets(); ?>
</body>
</html>

4
www/pages/blog_list.php
View File

@@ -12,7 +12,7 @@ $allposts = Blog::listAllNewestFirst();
<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 printCSS(); ?>
<?php printHeaderCSS(); ?>
</head>
<body>
<div id="mastercontainer">
@@ -49,5 +49,7 @@ $allposts = Blog::listAllNewestFirst();
<?php include (__DIR__ . '/../fragments/footer.php'); ?>
</div>
<?php printAdditionalScripts(); ?>
<?php printAdditionalStylesheets(); ?>
</body>
</html>

5
www/pages/blog_view.php
View File

@@ -44,9 +44,8 @@ if ($isSubAdventOfCode) $canonical = $adventofcodeday['canonical'];
<meta charset="utf-8">
<title>Mikescher.com - <?php echo $htmltitle; ?></title>
<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
<?php printCSS(); ?>
<?php printHeaderCSS(); ?>
<?php echo '<link rel="canonical" href="' . $canonical . '"/>'; ?>
</head>
<body>
<div id="mastercontainer">
@@ -89,5 +88,7 @@ if ($isSubAdventOfCode) $canonical = $adventofcodeday['canonical'];
<?php include (__DIR__ . '/../fragments/footer.php'); ?>
</div>
<?php printAdditionalScripts(); ?>
<?php printAdditionalStylesheets(); ?>
</body>
</html>

4
www/pages/books_list.php
View File

@@ -12,7 +12,7 @@ $allbooks = Books::listAllNewestFirst();
<title>Mikescher.com - Converted Books</title>
<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
<link rel="canonical" href="https://www.mikescher.com/books"/>
<?php printCSS(); ?>
<?php printHeaderCSS(); ?>
</head>
<body>
<div id="mastercontainer">
@@ -58,5 +58,7 @@ $allbooks = Books::listAllNewestFirst();
<?php include (__DIR__ . '/../fragments/footer.php'); ?>
</div>
<?php printAdditionalScripts(); ?>
<?php printAdditionalStylesheets(); ?>
</body>
</html>

6
www/pages/books_view.php
View File

@@ -15,9 +15,9 @@ if ($book === NULL) httpError(404, 'Book not found');
<meta charset="utf-8">
<title>Mikescher.com - <?php echo $book['title']; ?></title>
<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
<?php printCSS(); ?>
<?php printHeaderCSS(); ?>
<?php echo '<link rel="canonical" href="' . $book['url'] . '"/>'; ?>
<?php includeScriptOnce("/data/javascript/ms_basic.js", true, 'defer') ?>
<?php includeAdditionalScript("/data/javascript/ms_basic.js", 'defer', true) ?>
</head>
<body>
<div id="mastercontainer">
@@ -96,5 +96,7 @@ if ($book === NULL) httpError(404, 'Book not found');
<?php include (__DIR__ . '/../fragments/footer.php'); ?>
</div>
<?php printAdditionalScripts(); ?>
<?php printAdditionalStylesheets(); ?>
</body>
</html>

4
www/pages/errorview.php
View File

@@ -11,7 +11,7 @@
<meta charset="utf-8">
<title>Mikescher.com - <?php echo $errormsg; ?></title>
<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
<?php printCSS(); ?>
<?php printHeaderCSS(); ?>
</head>
<body>
<div id="mastercontainer">
@@ -28,5 +28,7 @@
</div>
</div>
<?php printAdditionalScripts(); ?>
<?php printAdditionalStylesheets(); ?>
</body>
</html>

4
www/pages/login.php
View File

@@ -28,7 +28,7 @@ $redirect = $OPTIONS['login_target'];
<title>Mikescher.com - Login</title>
<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
<link rel="canonical" href="https://www.mikescher.com/login"/>
<?php printCSS(); ?>
<?php printHeaderCSS(); ?>
</head>
<body>
<div id="mastercontainer">
@@ -85,5 +85,7 @@ $redirect = $OPTIONS['login_target'];
<?php include (__DIR__ . '/../fragments/footer.php'); ?>
</div>
<?php printAdditionalScripts(); ?>
<?php printAdditionalStylesheets(); ?>
</body>
</html>

2
www/pages/logout.php
View File

@@ -21,5 +21,7 @@ You have been logged out
<script>
setTimeout(function () { window.location.href = "<?php echo $redirect; ?>"; }, 1000);
</script>
<?php printAdditionalScripts(); ?>
<?php printAdditionalStylesheets(); ?>
</body>
</html>

4
www/pages/main.php
View File

@@ -7,7 +7,7 @@
<meta name="google-site-verification" content="pZOhmjeJcQbRMNa8xRLam4dwJ2oYwMwISY1lRKreSSs"/>
<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
<link rel="canonical" href="https://www.mikescher.com/"/>
<?php printCSS(); ?>
<?php printHeaderCSS(); ?>
</head>
<body>
<div id="mastercontainer">
@@ -29,5 +29,7 @@
<?php include (__DIR__ . '/../fragments/footer.php'); ?>
</div>
<?php printAdditionalScripts(); ?>
<?php printAdditionalStylesheets(); ?>
</body>
</html>

4
www/pages/programs_list.php
View File

@@ -14,7 +14,7 @@ $allprograms = Programs::listAllNewestFirst($filter);
<title>Mikescher.com - Programs</title>
<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
<link rel="canonical" href="https://www.mikescher.com/programs"/>
<?php printCSS(); ?>
<?php printHeaderCSS(); ?>
</head>
<body>
<div id="mastercontainer">
@@ -63,5 +63,7 @@ $allprograms = Programs::listAllNewestFirst($filter);
<?php include (__DIR__ . '/../fragments/footer.php'); ?>
</div>
<?php printAdditionalScripts(); ?>
<?php printAdditionalStylesheets(); ?>
</body>
</html>

6
www/pages/programs_view.php
View File

@@ -18,8 +18,8 @@ if ($prog === NULL) httpError(404, 'Program not found');
<title>Mikescher.com - <?php echo $prog['name']; ?></title>
<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
<link rel="canonical" href="<?php echo $prog['url']; ?>"/>
<?php printCSS(); ?>
<?php if ($prog['has_extra_images']) includeScriptOnce("/data/javascript/ms_basic.js", true, 'defer') ?>
<?php printHeaderCSS(); ?>
<?php if ($prog['has_extra_images']) includeAdditionalScript("/data/javascript/ms_basic.js", 'defer', true) ?>
</head>
<body>
<div id="mastercontainer">
@@ -117,5 +117,7 @@ if ($prog === NULL) httpError(404, 'Program not found');
<?php include (__DIR__ . '/../fragments/footer.php'); ?>
</div>
<?php printAdditionalScripts(); ?>
<?php printAdditionalStylesheets(); ?>
</body>
</html>

4
www/pages/webapps_list.php
View File

@@ -12,7 +12,7 @@ $allapps = WebApps::listAllNewestFirst();
<title>Mikescher.com - Tools</title>
<link rel="icon" type="image/png" href="/data/images/favicon.png"/>
<link rel="canonical" href="https://www.mikescher.com/webapps"/>
<?php printCSS(); ?>
<?php printHeaderCSS(); ?>
</head>
<body>
<div id="mastercontainer">
@@ -46,5 +46,7 @@ $allapps = WebApps::listAllNewestFirst();
<?php include (__DIR__ . '/../fragments/footer.php'); ?>
</div>
<?php printAdditionalScripts(); ?>
<?php printAdditionalStylesheets(); ?>
</body>
</html>