From: David Bremner <bremner@unb.ca>
Date: Mon, 1 Sep 2008 22:04:39 +0000 (-0300)
Subject: reorganize templates
X-Git-Tag: 0.1~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a24f71617a1fbe06ab17bf3f88acd2c671b6fdab;p=ikiwiki.git

reorganize templates
---

diff --git a/IkiWiki/Plugin/postal.pm b/IkiWiki/Plugin/postal.pm
index 345c48701..9f3f231cb 100644
--- a/IkiWiki/Plugin/postal.pm
+++ b/IkiWiki/Plugin/postal.pm
@@ -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
index f73cd1e76..000000000
--- a/examples/comments.mdwn
+++ /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/test-wiki/templates/page.tmpl b/examples/page.tmpl
similarity index 90%
rename from test-wiki/templates/page.tmpl
rename to examples/page.tmpl
index 9fe8994dc..2df38c4b5 100644
--- a/test-wiki/templates/page.tmpl
+++ b/examples/page.tmpl
@@ -87,10 +87,13 @@ Links:
 </div>
 </TMPL_IF>
 
-<TMPL_IF COMMENTS>
+<TMPL_IF POSTAL_COMMENTS>
 <div class="pagecomments">
 <a name="pagecomments"></a>
-<TMPL_VAR COMMENTS>
+<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>
 
diff --git a/examples/page.tmpl.snippet b/examples/page.tmpl.snippet
deleted file mode 100644
index fd410ddfb..000000000
--- a/examples/page.tmpl.snippet
+++ /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
index 88e659d46..000000000
--- a/test-wiki/in/_comments.mdwn
+++ /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
index 8508fd2f4..000000000
--- a/test-wiki/templates/email.tmpl
+++ /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/test.setup b/test-wiki/test.setup
index 002093989..cbd9f1fc8 100644
--- a/test-wiki/test.setup
+++ b/test-wiki/test.setup
@@ -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"
+	    
 }