diff options
| author | Frankie B <floppydisk05@aol.com> | 2022-11-15 22:20:35 +0000 |
|---|---|---|
| committer | Frankie B <floppydisk05@aol.com> | 2022-11-15 22:20:35 +0000 |
| commit | 41efcbfbe5be1aafea665332f55cce74b27d6a3d (patch) | |
| tree | 948cd688a7530d45c00d7c79f79e50e22027d5f6 | |
| parent | d750dcc4d266ed5576599fcca4c9a996efc83ec4 (diff) | |
Move header and footer to .inc.php
| -rwxr-xr-x | blank/index.php | 6 | ||||
| -rwxr-xr-x | bookmarks/index.php | 6 | ||||
| -rwxr-xr-x | calculators/index.php | 6 | ||||
| -rwxr-xr-x | computers/index.php | 6 | ||||
| -rwxr-xr-x | guestbook/index.php | 6 | ||||
| -rwxr-xr-x | guestbook/submit.php | 6 | ||||
| -rw-r--r-- | inc/footer.inc.php (renamed from inc/footer.php) | 2 | ||||
| -rw-r--r-- | inc/header.inc.php (renamed from inc/head.html) | 0 | ||||
| -rw-r--r-- | inc/nav.inc.php (renamed from inc/nav.php) | 5 | ||||
| -rwxr-xr-x | index.php | 167 | ||||
| -rwxr-xr-x | me/index.php | 4 | ||||
| -rwxr-xr-x | pics/index.php | 6 | ||||
| -rwxr-xr-x | projects/index.php | 6 |
13 files changed, 63 insertions, 163 deletions
diff --git a/blank/index.php b/blank/index.php index 3f2dfc0..ae08eb1 100755 --- a/blank/index.php +++ b/blank/index.php @@ -3,7 +3,7 @@ <html lang="en"> <head> <!-- Global --> - <?php require('../inc/head.html'); ?> + <?php require('../inc/header.inc.php'); ?> <!-- Page-specific --> <title>Bookmarks</title> @@ -14,7 +14,7 @@ </head> <body> <div class="page"> -<?php require('../inc/nav.php') ?> +<?php require('../inc/nav.inc.php') ?> <div id="pagebody"> <div id="content"> @@ -22,7 +22,7 @@ </div> <!-- content --> <div id="footer" class="pagefooter"> - <?php $file = __FILE__;require('../inc/footer.php'); ?> + <?php $file = __FILE__;require('../inc/footer.inc.php'); ?> </div> <!-- footer --> </div> <!-- pagebody --> </div> <!-- page --> diff --git a/bookmarks/index.php b/bookmarks/index.php index 7bdb1ea..cdfa7bc 100755 --- a/bookmarks/index.php +++ b/bookmarks/index.php @@ -3,7 +3,7 @@ <html lang="en"> <head> <!-- Global --> - <?php require('../inc/head.html'); ?> + <?php require('../inc/header.inc.php'); ?> <!-- Page-specific --> <title>Bookmarks</title> @@ -14,7 +14,7 @@ </head> <body> <div class="page"> -<?php require('../inc/nav.php') ?> +<?php require('../inc/nav.inc.php') ?> <div id="pagebody"> <div id="content"> @@ -48,7 +48,7 @@ </div> <!-- content --> <div id="footer" class="pagefooter"> - <?php $file = __FILE__;require('../inc/footer.php'); ?> + <?php $file = __FILE__;require('../inc/footer.inc.php'); ?> </div> <!-- footer --> </div> <!-- pagebody --> </div> <!-- page --> diff --git a/calculators/index.php b/calculators/index.php index 1a9a600..c320f46 100755 --- a/calculators/index.php +++ b/calculators/index.php @@ -2,7 +2,7 @@ <html lang="en"> <head> <!-- Global --> - <?php require('../inc/head.html'); ?> + <?php require('../inc/header.inc.php'); ?> <!-- Page-specific --> <title>Calculators</title> @@ -13,7 +13,7 @@ </head> <body> <div class="page"> -<?php require('../inc/nav.php') ?> +<?php require('../inc/nav.inc.php') ?> <div id="pagebody"> <div id="content"> @@ -134,7 +134,7 @@ </div> <!-- content --> <div id="footer" class="pagefooter"> - <?php $file = __FILE__;require('../inc/footer.php'); ?> + <?php $file = __FILE__;require('../inc/footer.inc.php'); ?> </div> <!-- footer --> </div> <!-- pagebody --> </div> <!-- page --> diff --git a/computers/index.php b/computers/index.php index 1c85924..ea2b683 100755 --- a/computers/index.php +++ b/computers/index.php @@ -3,7 +3,7 @@ <html lang="en"> <head> <!-- Global --> - <?php require('../inc/head.html'); ?> + <?php require('../inc/header.inc.php'); ?> <!-- Page-specific --> <title>Computers</title> @@ -14,7 +14,7 @@ </head> <body> <div class="page"> -<?php require('../inc/nav.php') ?> +<?php require('../inc/nav.inc.php') ?> <div id="pagebody"> <div id="content"><table class="computers" border="0"> @@ -266,7 +266,7 @@ </tr></table></div> <!-- content --> <div id="footer" class="pagefooter"> - <?php $file = __FILE__;require('../inc/footer.php'); ?> + <?php $file = __FILE__;require('../inc/footer.inc.php'); ?> </div> <!-- footer --> </div> <!-- pagebody --> </div> <!-- page --> diff --git a/guestbook/index.php b/guestbook/index.php index c608664..b3ca930 100755 --- a/guestbook/index.php +++ b/guestbook/index.php @@ -3,7 +3,7 @@ <html lang="en"> <head> <!-- Global --> - <?php require('../inc/head.html'); ?> + <?php require('../inc/header.inc.php'); ?> <!-- Page-specific --> <title>Guestbook</title> @@ -14,7 +14,7 @@ </head> <body> <div class="page"> -<?php require('../inc/nav.php') ?> +<?php require('../inc/nav.inc.php') ?> <div id="pagebody"> <div id="content"> @@ -64,7 +64,7 @@ </div> <!-- content --> <div id="footer" class="pagefooter"> - <?php $file = __FILE__;require('../inc/footer.php'); ?> + <?php $file = __FILE__;require('../inc/footer.inc.php'); ?> </div> <!-- footer --> </div> <!-- pagebody --> </div> <!-- page --> diff --git a/guestbook/submit.php b/guestbook/submit.php index ffaf4a6..6c377b3 100755 --- a/guestbook/submit.php +++ b/guestbook/submit.php @@ -3,7 +3,7 @@ <html lang="en"> <head> <!-- Global --> - <?php require('../inc/head.html'); ?> + <?php require('../inc/header.inc.php'); ?> <!-- Page-specific --> <title>Guestbook</title> @@ -12,7 +12,7 @@ </head> <body> <div class="page"> -<?php require('../inc/nav.php') ?> +<?php require('../inc/nav.inc.php') ?> <div id="pagebody"> <div id="content"> @@ -49,7 +49,7 @@ </div> <!-- content --> <div id="footer" class="pagefooter"> - <?php $file = __FILE__;require('../inc/footer.php'); ?> + <?php $file = __FILE__;require('../inc/footer.inc.php'); ?> </div> <!-- footer --> </div> <!-- pagebody --> </div> <!-- page --> diff --git a/inc/footer.php b/inc/footer.inc.php index 13644a5..adc7fc4 100644 --- a/inc/footer.php +++ b/inc/footer.inc.php @@ -1,5 +1,5 @@ <hr> <div style="text-align: center;"> - <img src="/res/img/buttons/browser.gif"> <a href="https://www.linux.org/"><img src="/res/img/buttons/linuxnow.gif"></a> <a href="https://www.vim.org/"><img src="/res/img/buttons/vim.gif"></a> <a href="http://jigsaw.w3.org/css-validator/check/referer"><img style="border:0;width:88px;height:31px" src="/res/img/buttons/vcss-blue" alt="Valid CSS!"></a> <a href=""><img style="border:0;width:88px;height:31px" src="/res/img/buttons/valid-html401-blue.png" alt="Valid HTML 4.01!"></a><br> + <img src="/res/img/buttons/browser.gif"> <a href="https://www.linux.org/"><img src="/res/img/buttons/linuxnow.gif"></a> <a href="https://www.vim.org/"><img src="/res/img/buttons/vim.gif"></a> <a href="http://jigsaw.w3.org/css-validator/check/referer"><img style="border:0;width:88px;height:31px" src="/res/img/buttons/vcss-blue.gif" alt="Valid CSS!"></a> <a href=""><img style="border:0;width:88px;height:31px" src="/res/img/buttons/valid-html401-blue.png" alt="Valid HTML 4.01!"></a><br> Last Modified <span class="date"><?=date('Y-m-d H:i:s', filemtime($file) + 3600);?> GMT</span> </div> diff --git a/inc/head.html b/inc/header.inc.php index 93953e9..93953e9 100644 --- a/inc/head.html +++ b/inc/header.inc.php diff --git a/inc/nav.php b/inc/nav.inc.php index d0cc29c..7fa3348 100644 --- a/inc/nav.php +++ b/inc/nav.inc.php @@ -2,11 +2,6 @@ <div class="header"> <nav> <div> - <!--<a href="/me/">about</a> | - <a href="/projects/">projects</a> | - <a href="/pics/">pics</a> |--> - <!--<a href="/dog/">dog</a> |--> - <!--<a href="/pics/">pictures</a> |--> <a href="/projects/">projects</a> | <a href="https://github.com/floppydisk05?tab=repositories">repos</a> | <a href="/calculators/">calculators</a> | @@ -1,143 +1,48 @@ + <!DOCTYPE html> <html lang="en"> <head> - <!-- Global --> - <?php require('./inc/head.html'); ?> - - <!-- Page-specific --> - <title>~floppydisk</title> - <meta property="og:title" content="~floppydisk"> - <meta property="og:description" content="This is the personal homepage of floppydisk. Every now and then, I dabble in software/hardware projects, take pictures, or write blogposts."> - <meta property="og:image" content="/favicon.png"> + <!-- Global --> + <?php require('./inc/header.inc.php'); ?> + + <!-- Page-specific --> + <title>~floppydisk</title> + <meta property="og:title" content="~floppydisk"> + <meta property="og:description" content="This is the personal homepage of floppydisk. Every now and then, I dabble in software/hardware projects, take pictures, or write blogposts."> + <meta property="og:image" content="/favicon.png"> + <style>td{padding:0px;}</style> </head> <body> <div class="page"> -<?php require('./inc/nav.php') ?> -<div id="pagebody"> - <div id="content"> - <!--<br><table class="banner"><tr><td class="banner"><b>Service Message:</b> This is more related to <a class="bannerlink" href="//www.nickandfloppy.com/">nickandfloppy.com</a> but our Gitea service is currently in the process of being migrated to a new VPS. Due to the lengthly migration process, <a class="bannerlink" href="//git.nickandfloppy.com/">git.nickandfloppy.com</a> may periodically be unavailable, though this isn't expected until the final transition.<br><br>~ nick and floppy</td></tr></table>--> - <p>Hi!</p> - <p>This is the personal homepage of <a href="./me/">floppydisk</a>. Every now and then, I - dabble in software/hardware <a href="./projects/">projects</a>, take <a href="./pics/">pictures</a>, or write - <a href="./interblag/">blogposts</a>. - </p> - - <h1>Music <small>(that I like)</small></h1> - <table class="skami"> - <tr> - <td><img src="https://ia804502.us.archive.org/8/items/mbid-b1d2802a-73a9-43e0-a704-f3641cdd8841/mbid-b1d2802a-73a9-43e0-a704-f3641cdd8841-29578599476.jpg" width="64" ></td> - <td width="500"><pre class="music"><b>Title:</b> Goodbye -<b>Album:</b> Inside (The Songs) -<b>Artist:</b> Bo Burnham - </pre></td> - </tr> - <tr> - <td><img src="https://geo-media.beatsource.com/image_size/64x64/2/1/9/21919d1e-4c70-4525-864e-73be29a56f2c.jpg"></td> - <td width="500"><pre class="music"><b>Title:</b> Enjoy the Silence -<b>Album:</b> The Singles 86>98 -<b>Artist:</b> Depeche Mode - </pre></td> - </tr> - <tr> - <td><img src="https://via.placeholder.com/64"></td> - <td width="500"><pre class="music"><b>Title:</b> Bizarre Love Triangle -<b>Album:</b> album -<b>Artist:</b> New Order - </pre></td> - </tr> - <tr> - <td><img src="https://via.placeholder.com/64"></td> - <td width="500"><pre class="music"><b>Title:</b> Crying in the Rain -<b>Album:</b> album -<b>Artist:</b> a-ha - </pre></td> - </tr> - <tr> - <td><img src="https://via.placeholder.com/64"></td> - <td width="500"><pre class="music"><b>Title:</b> Drama! -<b>Album:</b> album -<b>Artist:</b> Erasure - </pre></td> - </tr> - <tr> - <td><img src="https://via.placeholder.com/64"></td> - <td width="500"><pre class="music"><b>Title:</b> Stop! -<b>Album:</b> album -<b>Artist:</b> Erasure - </pre></td> - </tr> - <tr> - <td><img src="https://via.placeholder.com/64"></td> - <td width="500"><pre class="music"><b>Title:</b> Is This Love? -<b>Album:</b> album -<b>Artist:</b> Alisson Moyet - </pre></td> - </tr> - <tr> - <td><img src="https://via.placeholder.com/64"></td> - <td width="500"><pre class="music"><b>Title:</b> Two Birds -<b>Album:</b> Far -<b>Artist:</b> Regina Spektor - </pre></td> - </tr> - <tr> - <td><img src="https://via.placeholder.com/64"></td> - <td width="500"><pre class="music"><b>Title:</b> Maid Of Orleans -<b>Album:</b> album -<b>Artist:</b> Orchestral Manoeuvres in the Dark - </pre></td> - </tr> - <tr> - <td><img src="https://ia600508.us.archive.org/15/items/mbid-08159cda-2db5-4bd4-94ca-8d6c75522cb7/mbid-08159cda-2db5-4bd4-94ca-8d6c75522cb7-9970486444.jpg" width="64"></td> - <td width="500"><pre class="music"><b>Title:</b> Go! -<b>Album:</b> The Race For Space -<b>Artist:</b> Public Service Broadcasting - </pre></td> - </tr> - </table> - - <!--<h1>Projects <small>(Individual project pages TBD)</small></h1> - <p>Various Projects I've worked on</p> - <h2>Personal Projects</h2> - <p>Projects I prefer to work on solo</p> - <div class="project"> - <span class="name"><a href="http://weather.diskfloppy.me/">weather.diskfloppy.me</a></span> - <br> - <a href="/projects/weatherdata">A page to display data from my weather station</a> - </div> +<?php require('./inc/nav.inc.php') ?> - <div class="project"> - <span class="name"><a href="http://trivia.diskfloppy.me/">trivia.diskfloppy.me</a></span> - <br> - <a href="/projects/trivia-api">A REST API to get trivia questions</a> - </div> - - <h2>Group Projects</h2> - <p>Projects I do/have done with friends</p> - <div class="project"> - <span class="name"><a href="https://drivers.nickandfloppy.com/">drivers.nickandfloppy.com</a> (<a href="http://drivers.nickandfloppy.com/">HTTP</a>)</span> - <br> - <a href="/projects/netdrivers/">Driver indexing and storage website</a> - </div> - - <h1>News</h1> - <p>No news... <i>yet!</i></p>--> - - <h1>Contact</h1> - <p><strong>Mail</strong>: floppydisk05@aol.com<br> - <strong>IRC</strong>: floppydisk @ r-type<br> - </p> - - <h1>Elsewhere</h1> - <p><strong>Twitter</strong>: <a href="https://twitter.com/floppydisk__">@floppydisk__</a><br> - <strong>GitHub</strong>: <a href="https://github.com/floppydisk05">floppydisk05</a><br> - </p> - </div> <!-- content --> - <div id="footer" class="pagefooter"> - <?php $file = __FILE__;require('./inc/footer.php'); ?> - </div> <!-- footer --> +<div id="pagebody"> + <div id="content"> + <!--<br><table class="banner"><tr><td class="banner"><b>Service Message:</b> This is more related to <a class="bannerlink" href="//www.nickandfloppy.com/">nickandfloppy.com</a> but our Gitea service is currently in the process of being migrated to a new VPS. Due to the lengthly migration process, <a class="bannerlink" href="//git.nickandfloppy.com/">git.nickandfloppy.com</a> may periodically be unavailable, though this isn't expected until the final transition.<br><br>~ nick and floppy</td></tr></table>--> + <p>Hi!</p> + <p>This is the personal homepage of <a href="./me/">floppydisk</a>. Every now and then, I + dabble in software/hardware <a href="./projects/">projects</a>, take <a href="./pics/">pictures</a>, or write + <a href="./interblag/">blogposts</a>. + </p> + + <?php require('./inc/lastfm.inc.php') ?> + + <h1>Contact</h1> + <p><strong>Mail</strong>: contact@diskfloppy.me<br> + <strong>IRC</strong>: floppydisk @ r-type<br> + </p> + + <h1>Elsewhere</h1> + <p><strong>Twitter</strong>: <a href="https://twitter.com/floppydisk__">@floppydisk__</a><br> + <strong>GitHub</strong>: <a href="https://github.com/floppydisk05">floppydisk05</a><br> + <strong>SDF</strong>: <a href="http://floppydisk.sdf.org/">floppydisk.sdf. + </p> + </div> <!-- content --> + <div id="footer" class="pagefooter"> + <?php $file = __FILE__;require('./inc/footer.inc.php'); ?> + </div> <!-- footer --> </div> <!-- pagebody --> </div> <!-- page --> </body> diff --git a/me/index.php b/me/index.php index 3b634cd..7cfdff3 100755 --- a/me/index.php +++ b/me/index.php @@ -3,7 +3,7 @@ <html lang="en"> <head> <!-- Global --> - <?php require('../inc/head.html'); ?> + <?php require('../inc/header.inc.php'); ?> <!-- Page-specific --> <title>Calculators</title> @@ -14,7 +14,7 @@ </head> <body> <div class="page"> -<?php require('../inc/nav.php') ?> +<?php require('../inc/nav.inc.php') ?> <div id="pagebody"> <div id="content"> diff --git a/pics/index.php b/pics/index.php index baca07a..7d578c2 100755 --- a/pics/index.php +++ b/pics/index.php @@ -3,7 +3,7 @@ <html lang="en"> <head> <!-- Global --> - <?php require('../inc/head.html'); ?> + <?php require('../inc/header.inc.php'); ?> <!-- Page-specific --> <title>Pictures</title> @@ -14,7 +14,7 @@ </head> <body> <div class="page"> -<?php require('../inc/nav.php') ?> +<?php require('../inc/nav.inc.php') ?> <div id="pagebody"> <div id="content"> @@ -22,7 +22,7 @@ </div> <!-- content --> <div id="footer" class="pagefooter"> - <?php $file = __FILE__;require('../inc/footer.php'); ?> + <?php $file = __FILE__;require('../inc/footer.inc.php'); ?> </div> <!-- footer --> </div> <!-- pagebody --> </div> <!-- page --> diff --git a/projects/index.php b/projects/index.php index cd58291..03483ec 100755 --- a/projects/index.php +++ b/projects/index.php @@ -3,7 +3,7 @@ <html lang="en"> <head> <!-- Global --> - <?php require('../inc/head.html'); ?> + <?php require('../inc/header.inc.php'); ?> <!-- Page-specific --> <title>Projects</title> @@ -14,7 +14,7 @@ </head> <body> <div class="page"> -<?php require('../inc/nav.php') ?> +<?php require('../inc/nav.inc.php') ?> <div id="pagebody"> <div id="content"> @@ -39,7 +39,7 @@ </div> <!-- content --> <div id="footer" class="pagefooter"> - <?php $file = __FILE__;require('../inc/footer.php'); ?> + <?php $file = __FILE__;require('../inc/footer.inc.php'); ?> </div> <!-- footer --> </div> <!-- pagebody --> </div> <!-- page --> |