page: split head/foot includes

Separate menu.html for site-specific navigation from head.inc.html,
and move mandatory div/body closing tags out of foot.inc.php.

diff --git a/foot.inc.php b/foot.inc.php
index e61346a1fab0b7e815bb94bbf1221a10ce748b1d..96b05ea2159f32e6101d48529d337b75615be778 100755 (executable)
--- a/foot.inc.php
+++ b/foot.inc.php
@@ -1,4 +1,3 @@
-</div>
 <hr class="footer" />
 <?php
 define('N', "\n");
@@ -36,4 +35,3 @@ EOT;
        echo '</p>'.N;
 }
 
-?></body></html>

diff --git a/head.inc.php b/head.inc.php
index 4489ce9856875a388a6e4a7022ce2a70ba92fe6b..f8435ffb8852c6fb1ec83a61d867884247b9492d 100644 (file)
--- a/head.inc.php
+++ b/head.inc.php
@@ -1,10 +1,14 @@
 <?php
-include 'head.inc.html';
+include_once 'head.inc.html';
+
+include 'menu.html';
 
 print '<div class="article">'."\n\n";
 
 include_once 'auth.inc.php';
 
 register_shutdown_function(function () {
+       print "</div>\n\n";
        include 'foot.inc.php';
+       print "</body></html>\n";
 });