Merge remote branch 'davrieb/autotag' into autotag

[ikiwiki.git] / templates / page.tmpl
diff --git a/templates/page.tmpl b/templates/page.tmpl

index e71ba316db79a3492db66ddb2299d9f905c807c8..7e850a56bacd93549d07f4920e4bc35b9507f414 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -3,12 +3,17 @@
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Cache-Control" content="must-revalidate" />
  <title><TMPL_VAR TITLE></title>
  <TMPL_IF NAME="FAVICON">
  <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
  </TMPL_IF>
  <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
+<TMPL_IF NAME="LOCAL_CSS">
+<link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" />
+<TMPL_ELSE>
  <link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
+</TMPL_IF>
  <TMPL_IF NAME="EDITURL">
  <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
  </TMPL_IF>
@@ -87,7 +92,7 @@
  </div> <!-- .pageheader -->
  
  <TMPL_IF SIDEBAR>
-<div id="sidebar">
+<div class="sidebar">
  <TMPL_VAR SIDEBAR>
  </div>
  </TMPL_IF>