]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
reorganize templates
authorDavid Bremner <bremner@unb.ca>
Mon, 1 Sep 2008 22:04:39 +0000 (19:04 -0300)
committerDavid Bremner <bremner@unb.ca>
Tue, 2 Sep 2008 00:51:20 +0000 (21:51 -0300)
IkiWiki/Plugin/postal.pm
examples/comments.mdwn [deleted file]
examples/page.tmpl [new file with mode: 0644]
examples/page.tmpl.snippet [deleted file]
test-wiki/in/_comments.mdwn [deleted file]
test-wiki/templates/email.tmpl [deleted file]
test-wiki/templates/page.tmpl [deleted file]
test-wiki/test.setup

index 345c487011e9a499f8225c2c1fd4d30434f9acb7..9f3f231cbd201be1572f23d206cc399e59e80c18 100644 (file)
@@ -67,10 +67,11 @@ sub pagetemplate (@)
 
            debug("comment blurb: ". $content);
 
-           $template->param (comments =>
-                             IkiWiki::linkify ($page, $destpage, $content)) 
-       }
-    }
+    $template->param(POSTAL_COMMENTS=>1,
+                    POSTAL_PREFIX=>$config{postal_prefix},
+                    POSTAL_KEY=>$key,
+                    POSTAL_HOST=>$config{postal_host},
+                    POSTAL_COMMENT_LINK=>$comment_link );
 }
 
 
diff --git a/examples/comments.mdwn b/examples/comments.mdwn
deleted file mode 100644 (file)
index f73cd1e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<a href="mailto:user-comment-%%KEY%%@host.some.org">Send Comment</a>
-
-[[Read Comments|%%PAGE%%/comments]]
diff --git a/examples/page.tmpl b/examples/page.tmpl
new file mode 100644 (file)
index 0000000..2df38c4
--- /dev/null
@@ -0,0 +1,126 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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">
+<span>
+<TMPL_LOOP NAME="PARENTLINKS">
+<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>/ 
+</TMPL_LOOP>
+<TMPL_VAR TITLE>
+</span>
+<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>
+
+<TMPL_IF NAME="BACKLINKS">
+<div id="backlinks">
+Links:
+<TMPL_LOOP NAME="BACKLINKS">
+<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>
+</TMPL_LOOP>
+<TMPL_IF NAME="MORE_BACKLINKS">
+<span class="popup">...
+<span class="balloon">
+<TMPL_LOOP NAME="MORE_BACKLINKS">
+<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>
+</TMPL_LOOP>
+</span>
+</span>
+</TMPL_IF>
+</div>
+</TMPL_IF>
+
+<TMPL_IF POSTAL_COMMENTS>
+<div class="pagecomments">
+<a name="pagecomments"></a>
+<a href="mailto:<TMPL_VAR NAME="POSTAL_PREFIX"><TMPL_VAR NAME="POSTAL_KEY">@<TMPL_VAR NAME="POSTAL_HOST">">Send Comment</a>
+<TMPL_IF POSTAL_COMMENTS_LINK>
+  <a href="<TMPL_VAR NAME="POSTAL_COMMENTS_LINK">">Read Comments</a>
+</TMPL_IF>
+</div>
+</TMPL_IF>
+
+<TMPL_IF COPYRIGHT>
+<div class="pagecopyright">
+<a name="pagecopyright"></a>
+<TMPL_VAR COPYRIGHT>
+</div>
+</TMPL_IF>
+
+
+<TMPL_IF LICENSE>
+<div class="pagelicense">
+<a name="pagelicense"></a>
+License: <TMPL_VAR LICENSE>
+</div>
+</TMPL_IF>
+
+<div class="pagedate">
+Last edited <TMPL_VAR NAME=MTIME>
+<!-- Created <TMPL_VAR NAME=CTIME> -->
+</div>
+
+</div>
+<TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
+<!-- from <TMPL_VAR NAME=WIKINAME> -->
+</div>
+
+</body>
+</html>
diff --git a/examples/page.tmpl.snippet b/examples/page.tmpl.snippet
deleted file mode 100644 (file)
index fd410dd..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<TMPL_IF COMMENTS>
-<div class="pagecomments">
-<a name="pagecomments"></a>
-<TMPL_VAR COMMENTS>
-</div>
-</TMPL_IF>
-
diff --git a/test-wiki/in/_comments.mdwn b/test-wiki/in/_comments.mdwn
deleted file mode 100644 (file)
index 88e659d..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<a href="mailto:bremner-testwiki-%%KEY%%@pivot.cs.unb.ca">Send Comment</a>
-
-[[Read Comments|%%PAGE%%/comments]]
diff --git a/test-wiki/templates/email.tmpl b/test-wiki/templates/email.tmpl
deleted file mode 100644 (file)
index 8508fd2..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="mailmessage">
-  <div class="mailheaders">
-    <TMPL_LOOP NAME="HEADERS">
-      <span class="headername"><TMPL_VAR NAME="HEADERNAME"></span>:
-      <span class="headerval">
-       <TMPL_VAR NAME="VAL">
-      </span>
-      <br>
-    </TMPL_LOOP>
-  </div><!--.mailheaders-->
-
-  <div class="mailbody">
-    <TMPL_VAR NAME="BODY">
-  </div><!--.mailbody-->
-
-</div><!--.mailmessage-->
diff --git a/test-wiki/templates/page.tmpl b/test-wiki/templates/page.tmpl
deleted file mode 100644 (file)
index 9fe8994..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<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">
-<span>
-<TMPL_LOOP NAME="PARENTLINKS">
-<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>/ 
-</TMPL_LOOP>
-<TMPL_VAR TITLE>
-</span>
-<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>
-
-<TMPL_IF NAME="BACKLINKS">
-<div id="backlinks">
-Links:
-<TMPL_LOOP NAME="BACKLINKS">
-<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>
-</TMPL_LOOP>
-<TMPL_IF NAME="MORE_BACKLINKS">
-<span class="popup">...
-<span class="balloon">
-<TMPL_LOOP NAME="MORE_BACKLINKS">
-<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>
-</TMPL_LOOP>
-</span>
-</span>
-</TMPL_IF>
-</div>
-</TMPL_IF>
-
-<TMPL_IF COMMENTS>
-<div class="pagecomments">
-<a name="pagecomments"></a>
-<TMPL_VAR COMMENTS>
-</div>
-</TMPL_IF>
-
-<TMPL_IF COPYRIGHT>
-<div class="pagecopyright">
-<a name="pagecopyright"></a>
-<TMPL_VAR COPYRIGHT>
-</div>
-</TMPL_IF>
-
-
-<TMPL_IF LICENSE>
-<div class="pagelicense">
-<a name="pagelicense"></a>
-License: <TMPL_VAR LICENSE>
-</div>
-</TMPL_IF>
-
-<div class="pagedate">
-Last edited <TMPL_VAR NAME=MTIME>
-<!-- Created <TMPL_VAR NAME=CTIME> -->
-</div>
-
-</div>
-<TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
-<!-- from <TMPL_VAR NAME=WIKINAME> -->
-</div>
-
-</body>
-</html>
index 002093989b05bdd2903bccdd9544e4433b6db764..cbd9f1fc86af1963e0d922faca7eafc7e41bd1ef 100644 (file)
@@ -16,7 +16,7 @@ use IkiWiki::Setup::Standard {
 
        url => "file:///tmp/postaltest-wiki/",
        #cgiurl => "http://example.org/wiki/ikiwiki.cgi",
-       templatedir => $ENV{PWD}."/templates",
+       templatedir => $ENV{PWD}."/../examples",
        #underlaydir => "/usr/share/ikiwiki/basewiki",
 
        # Subversion stuff.
@@ -204,6 +204,7 @@ use IkiWiki::Setup::Standard {
        # For use with the attachment plugin, a program that returns
        # nonzero if its standard input contains an virus.
        #virus_checker => "clamdscan -",
-        postal_prefix=>"bremner-testwiki-",
-
+        postal_prefix=>"user-testwiki-",
+        postal_host=>"we.love.spam.com"
+           
 }