diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-09-30 13:46:59 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-09-30 13:46:59 (EDT) |
| commit | cf29488c587334874cf491a01a1f74ba3ac7de45 (patch) | |
| tree | 45235a0b54955394d6817515cffb46b6ef0d9217 /includes | |
| parent | 512a14145021dc6304f0e03a7a9386f4fca0d793 (diff) | |
| parent | 6bef1357e5906d92bba0e836be5880acf47a15cc (diff) | |
| download | www-cf29488c587334874cf491a01a1f74ba3ac7de45.zip www-cf29488c587334874cf491a01a1f74ba3ac7de45.tar.gz www-cf29488c587334874cf491a01a1f74ba3ac7de45.tar.bz2 | |
Merge branch 'new'.
Diffstat (limited to 'includes')
| -rwxr-xr-x | includes/footer.html | 12 | ||||
| -rwxr-xr-x | includes/header.html | 81 |
2 files changed, 70 insertions, 23 deletions
diff --git a/includes/footer.html b/includes/footer.html index 314100a..4cbebd6 100755 --- a/includes/footer.html +++ b/includes/footer.html @@ -1,6 +1,6 @@ <p style="clear: both;"></p> - </div> - <div class="footer"> + </section> + <footer> <p class="copyright"> Copyright © 2011-2012 Patrick "P. J." M<span class="super">c</span>Dermott </p> @@ -9,10 +9,10 @@ <img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/88x31.png"> </a> Except where otherwise noted, you may use this document and all works herein under the terms of the <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported license</a>.<br> - More permissive terms may be granted upon <a href="/contact.html">request</a>. + More permissive terms may be granted upon <a href="<!--#echo var="DOCUMENT_BASE" -->/contact.html">request</a>. </p> <p class="tos"> - By using this Web site, you agree to the <a href="/terms.html">Terms of Service</a>. + By using this Web site, you agree to the <a href="<!--#echo var="DOCUMENT_BASE" -->/terms.html">Terms of Service</a>. </p> <p class="standards"> <a href="http://validator.w3.org/check?uri=referer">Valid HTML5</a> - <a href="http://jigsaw.w3.org/css-validator/check/referer">Valid CSS level 2.1</a> @@ -21,12 +21,12 @@ <p class="web-site">This Web site is <a href="http://odin1.pehjota.net/git/pehjota.net/">managed with Git</a>.<br> - <a href="/server.html">About this server</a> + <a href="<!--#echo var="DOCUMENT_BASE" -->/server.html">About this server</a> </p> <p class="dates"> Last modified: <!--#echo var="LAST_MODIFIED" --> EDT<br> Retrieved: <!--#echo var="DATE_LOCAL" --> EDT </p> - </div> + </footer> </body> </html> diff --git a/includes/header.html b/includes/header.html index 5eb7577..e952fe7 100755 --- a/includes/header.html +++ b/includes/header.html @@ -1,44 +1,91 @@ <!DOCTYPE html> +<!--#if expr="'$__SSIC__' eq '__SSIC__'" --> + <!-- Apache HTTPd mod_include --> + <!--#if expr="$DOCUMENT_BASE = ''" --> + <!--#set var="DOCUMENT_BASE" value="" --> + <!--#endif --> + <!--#if expr="$MEDIA_BASE = ''" --> + <!--#set var="MEDIA_BASE" value="" --> + <!--#endif --> +<!--#else --> + <!-- Server Side Includes Compiler --> + <!--#if expr="'$DOCUMENT_BASE' eq ''" --> + <!--#set var="DOCUMENT_BASE" value="" --> + <!--#endif --> + <!--#if expr="'$MEDIA_BASE' eq ''" --> + <!--#set var="MEDIA_BASE" value="" --> + <!--#endif --> +<!--#endif --> + <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <meta charset="utf-8"> <meta name="author" content="Patrick 'P. J.' McDermott <mailto:pjm@nac.net>"> <meta name="description" content="The resume, software, and essays of P. J. McDermott -- a software and hardware hacker and advocate for software and cultural freedom."> -<!--#if expr="${title} = /^$/" --> +<!--#if expr="'$__SSIC__' eq '__SSIC__'" --> + <!-- Apache HTTPd mod_include --> + <!--#if expr="$title = ''" --> <title>P. J. McDermott</title> + <!--#else --> + <title><!--#echo var="title" --> - P. J. McDermott</title> + <!--#endif --> <!--#else --> + <!-- Server Side Includes Compiler --> + <!--#if expr="'$title' eq ''" --> + <title>P. J. McDermott</title> + <!--#else --> <title><!--#echo var="title" --> - P. J. McDermott</title> + <!--#endif --> <!--#endif --> - <link rel="stylesheet" type="text/css" href="/main.css"> + <link rel="stylesheet" type="text/css" href="<!--#echo +var="MEDIA_BASE" -->/main.css"> </head> <body> - <div class="header"> - <a href="#body" class="skip">Skip to body</a> - <h1><a href="/">P. J. M<span class="super">c</span>Dermott</a></h1> + <a href="#body" class="skip">Skip to body</a> + <header> + <h1><a href="<!--#echo var="DOCUMENT_BASE" -->/">P. J. M<span class="super">c</span>Dermott</a></h1> <p>Software and hardware hacker and advocate for software and cultural freedom.</p> - </div> - <div class="menu"> + </header> + <nav> <ul> <li> - <a href="/contact.html">Contact</a> + <a href="<!--#echo var="DOCUMENT_BASE" +-->/contact.html">Contact</a> </li> <li> - <a href="/resume.html">Résumé</a> + <a href="<!--#echo var="DOCUMENT_BASE" +-->/resume.html">Résumé</a> </li> <li> - <a href="/guides/">Guides</a> + <a href="<!--#echo var="DOCUMENT_BASE" +-->/guides/">Guides</a> </li> <li> - <a href="/essays/">Essays</a> + <a href="<!--#echo var="DOCUMENT_BASE" +-->/essays/">Essays</a> </li> <li> - <a href="/talks/">Talks</a> + <a href="<!--#echo var="DOCUMENT_BASE" +-->/talks/">Talks</a> </li> <li> - <a href="/projects/">Projects</a> + <a href="<!--#echo var="DOCUMENT_BASE" +-->/projects/">Projects</a> </li> </ul> - </div> - <div class="body"> - <a id="body"></a> + </nav> + <section id="body"> +<!--#if expr="'$__SSIC__' eq '__SSIC__'" --> + <!-- Apache HTTPd mod_include --> + <!--#if expr="$title != ''" --> + <!--#else --> + <h1><!--#echo var="title" --></h1> + <!--#endif --> +<!--#else --> + <!-- Server Side Includes Compiler --> + <!--#if expr="'$title' ne ''" --> + <h1><!--#echo var="title" --></h1> + <!--#endif --> +<!--#endif --> + <article> |