se meta plugin for titles instead of just h1 tags

This eliminates the doubled-up titles I had before on every
inlined page. The reason I hadn't done this originally is that
I didn't want the title to appear on the main page. I've fixed
that now with a little suppresstitle hack in the ikiwiki source,
(should do a customizable template feature instead to be able
to push something upstream).

diff --git a/src/anikas_traveling_turtle.mdwn b/src/anikas_traveling_turtle.mdwn
index cf2e2ae494484d5a7b478a3c0cc5921d5776f118..519a4ca0336f52317dc07cfcdd5a34d83fb783ce 100644 (file)
--- a/src/anikas_traveling_turtle.mdwn
+++ b/src/anikas_traveling_turtle.mdwn
@@ -1,7 +1,7 @@
+[[meta title="Anika's Traveling Turtle"]]
 [[tag family]]
 
 [[img cover.jpg size="300x300" class="floatright"]]
-# Anika's Traveling Turtle
 
 Confession time.
 

diff --git a/src/exa/understanding_rectangles.mdwn b/src/exa/understanding_rectangles.mdwn
index 5973620c6d2a60c78fb7496a8a3f2c123660f253..8c92fc402be27bcfc9ca071c4f5e50720c792a59 100644 (file)
--- a/src/exa/understanding_rectangles.mdwn
+++ b/src/exa/understanding_rectangles.mdwn
@@ -1,6 +1,6 @@
-[[tag cairo exa xorg]]
+[[meta title="Understanding the cairo rectangles performance test case"]]
 
-# Understanding the cairo rectangles performance test case
+[[tag cairo exa xorg]]
 
 About a month ago (can it have been that long already?) I started an
 effort to try to [baseline EXA performance on an r100

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 9ff833a0f00b898c2eeb97f410aa5ed1809664a7..b675911ab3467564af6a8cf4c4397d5c320bf547 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -18,6 +18,11 @@
 <div id="logo">
   <img alt="Carl Worth" src="/cworth-banner.png">
 </div>
+<TMPL_UNLESS NAME="SUPPRESSTITLE">
+<span>
+<TMPL_VAR TITLE>
+</span>
+</TMPL_UNLESS>
 <TMPL_IF NAME="SEARCHFORM">
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>