]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
projects / git.ikiwiki.info.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5b6993d)
add examples of email.tmpl, mailbox.css in examples directory, move template dir
authorDavid Bremner <bremner@unb.ca>
Mon, 1 Sep 2008 21:54:39 +0000 (18:54 -0300)
committerDavid Bremner <bremner@unb.ca>
Mon, 1 Sep 2008 22:29:37 +0000 (19:29 -0300)
examples/email.tmpl [new file with mode: 0644] patch | blob
examples/mailbox.css [new file with mode: 0644] patch | blob
templates/email.tmpl [deleted file] patch | blob | history
templates/page.tmpl [deleted file] patch | blob | history
test/templates/email.tmpl [new file with mode: 0644] patch | blob
test/templates/page.tmpl [new file with mode: 0644] patch | blob
test/test.setup patch | blob | history

diff --git a/examples/email.tmpl b/examples/email.tmpl
new file mode 100644 (file)
index 0000000..8508fd2
--- /dev/null
+++ b/examples/email.tmpl
@@ -0,0 +1,16 @@
+<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/examples/mailbox.css b/examples/mailbox.css
new file mode 100644 (file)
index 0000000..d4f7ad0
--- /dev/null
+++ b/examples/mailbox.css
@@ -0,0 +1,15 @@
+
+
+div.mailmessage{
+    border-top: 1px solid;
+    margin-top: 1%
+
+}
+.headername {
+font-weight: bold;
+  }
+
+.emailthreadindent{
+position: relative;
+left: 5%;
+}
\ No newline at end of file
diff --git a/templates/email.tmpl b/templates/email.tmpl
deleted file mode 100644 (file)
index 8508fd2..0000000
--- a/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/templates/page.tmpl b/templates/page.tmpl
deleted file mode 100644 (file)
index 9fe8994..0000000
--- a/templates/page.tmpl
+++ /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>
diff --git a/test/templates/email.tmpl b/test/templates/email.tmpl
new file mode 100644 (file)
index 0000000..8508fd2
--- /dev/null
+++ b/test/templates/email.tmpl
@@ -0,0 +1,16 @@
+<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/templates/page.tmpl b/test/templates/page.tmpl
new file mode 100644 (file)
index 0000000..9fe8994
--- /dev/null
+++ b/test/templates/page.tmpl
@@ -0,0 +1,123 @@
+<!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>
diff --git a/test/test.setup b/test/test.setup
index 7b16fb98d76989ea205fb77c4a9eea09813580dd..002093989b05bdd2903bccdd9544e4433b6db764 100644 (file)
--- a/test/test.setup
+++ b/test/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}."/templates",
        #underlaydir => "/usr/share/ikiwiki/basewiki",
 
        # Subversion stuff.
Unnamed repository; edit this file 'description' to name the repository.