]> git.cworth.org Git - cworth.org/commitdiff
projects / cworth.org / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 905880a)
Use upstream pagetemplate plugin instead of locally-hacked suppresstitle feature
authorCarl Worth <cworth@cworth.org>
Mon, 24 Dec 2007 16:39:16 +0000 (08:39 -0800)
committerCarl Worth <cworth@cworth.org>
Mon, 24 Dec 2007 16:39:16 +0000 (08:39 -0800)
ikiwiki.setup patch | blob | history
src/index.mdwn patch | blob | history
templates/indexpage.tmpl [new file with mode: 0644] patch | blob
templates/page.tmpl patch | blob | history

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 4e418aa471be4205990291273c53b2d180406842..cc2c2b940158a4d3bc0460359de8722d1fcbb2bb 100644 (file)
--- 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 a2e1a7d9cced26c680bb6c27f2ab43d114046784..562fefb43ba6f2951750a15be5d2396608681b72 100644 (file)
--- 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 (file)
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&#64;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 8198d5b4af26315d32a5a7db28d3e6cad01e8581..3f48960f0f9f738bdd62e8c8611afb5aacd7a336 100644 (file)
--- 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>
Content of the cworth.org website (ikiwiki source)