From: Carl Worth <cworth@cworth.org> Date: Mon, 24 Dec 2007 16:39:16 +0000 (-0800) Subject: Use upstream pagetemplate plugin instead of locally-hacked suppresstitle feature X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=c368f349b015804fb7a4ce81a8a52126c0eedd6d;p=cworth.org Use upstream pagetemplate plugin instead of locally-hacked suppresstitle feature --- diff --git a/ikiwiki.setup b/ikiwiki.setup index 4e418aa..cc2c2b9 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -82,7 +82,7 @@ use IkiWiki::Setup::Standard { # To add plugins, list them here. #add_plugins => [qw{goodstuff search wikitext camelcase # htmltidy fortune sidebar map rst anonok}], - add_plugins => [qw{goodstuff}], + add_plugins => [qw{goodstuff pagetemplate}], # If you want to disable any of the default plugins, list them here. #disable_plugins => [qw{inline htmlscrubber passwordauth openid}], disable_plugins => [qw{smiley htmlscrubber}], diff --git a/src/index.mdwn b/src/index.mdwn index a2e1a7d..562fefb 100644 --- a/src/index.mdwn +++ b/src/index.mdwn @@ -1,3 +1,4 @@ +[[pagetemplate template=indexpage.tmpl]] # News Recent ramblings from me can be found on my [[blog]]. diff --git a/templates/indexpage.tmpl b/templates/indexpage.tmpl new file mode 100644 index 0000000..94559b0 --- /dev/null +++ b/templates/indexpage.tmpl @@ -0,0 +1,88 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<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" /> +<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" /> +<TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF> +<TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF> +</head> +<body> + +<div class="header"> +<div id="logo"> + <img alt="Carl Worth" src="/cworth-banner.png"> +</div> +<TMPL_IF NAME="SEARCHFORM"> +<TMPL_VAR SEARCHFORM> +</TMPL_IF> +</div> + +<TMPL_IF NAME="HAVE_ACTIONS"> +<div class="actions"> +<ul> +<TMPL_IF NAME="EDITURL"> +<li><a href="<TMPL_VAR EDITURL>">Edit</a></li> +</TMPL_IF> +<TMPL_IF NAME="RECENTCHANGESURL"> +<li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li> +</TMPL_IF> +<TMPL_IF NAME="HISTORYURL"> +<li><a href="<TMPL_VAR HISTORYURL>">History</a></li> +</TMPL_IF> +<TMPL_IF NAME="PREFSURL"> +<li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li> +</TMPL_IF> +<TMPL_IF NAME="DISCUSSIONLINK"> +<li><TMPL_VAR DISCUSSIONLINK><br /></li> +</TMPL_IF> +</ul> +</div> +</TMPL_IF> + +<TMPL_IF SIDEBAR> +<div id="sidebar"> +<TMPL_VAR SIDEBAR> +</div> +</TMPL_IF> + +<div id="content"> +<TMPL_VAR CONTENT> +</div> + +<div id="footer"> +<div id="pageinfo"> + +<TMPL_IF NAME="TAGS"> +<div class="tags"> +Tags: +<TMPL_LOOP NAME="TAGS"> +<TMPL_VAR NAME=LINK> +</TMPL_LOOP> +</div> +</TMPL_IF> + +<div class="pagedate"> +Last edited <TMPL_VAR NAME=MTIME> +</div> +<div id="contact"> +Comments? Please feel free to email me: cworth@redhat.com +</div> +<div id="legal"> +Copyright © 2007 Carl D. Worth. Verbatim copying and distribution of +this entire article are permitted worldwide, without royalty, in any +medium, provided this notice is preserved. +</div> + +</div> +<TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF> +<!-- from <TMPL_VAR NAME=WIKINAME> --> +</div> + +</body> +</html> diff --git a/templates/page.tmpl b/templates/page.tmpl index 8198d5b..3f48960 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -18,11 +18,9 @@ <div id="logo"> <img alt="Carl Worth" src="/cworth-banner.png"> </div> -<TMPL_UNLESS NAME="SUPPRESSTITLE"> <h1> <TMPL_VAR TITLE> </h1> -</TMPL_UNLESS> <TMPL_IF NAME="SEARCHFORM"> <TMPL_VAR SEARCHFORM> </TMPL_IF>