aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-05-19 13:06:35 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-05-19 13:06:35 -0400
commit53b1c6f559c1d09fbdbc28c8e4d5090dd455cd26 (patch)
treed379bb0acd2dd3e9370c37b27f03989398694977 /templates
parent18695056917a2f34a36e5e89df7f01deff9ab640 (diff)
parent4558457402a4ab6bc795589a2e400fa66144f76e (diff)
downloadikiwiki-53b1c6f559c1d09fbdbc28c8e4d5090dd455cd26.tar
ikiwiki-53b1c6f559c1d09fbdbc28c8e4d5090dd455cd26.tar.gz
Merge commit 'intrigeri/po' into po
Diffstat (limited to 'templates')
-rw-r--r--templates/archivepage.tmpl14
-rw-r--r--templates/microblog.tmpl22
-rw-r--r--templates/titlepage.tmpl8
3 files changed, 42 insertions, 2 deletions
diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl
index 6bc789dfb..28800e763 100644
--- a/templates/archivepage.tmpl
+++ b/templates/archivepage.tmpl
@@ -1,7 +1,19 @@
<p>
+<TMPL_IF NAME="PERMALINK">
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a><br />
+<TMPL_ELSE>
<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br />
+</TMPL_IF>
<i>
Posted <TMPL_VAR CTIME>
+<TMPL_IF NAME="AUTHOR">
+by <span class="author">
+<TMPL_IF NAME="AUTHORURL">
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR AUTHOR>
+</TMPL_IF>
+</span>
+</TMPL_IF>
</i>
-
</p>
diff --git a/templates/microblog.tmpl b/templates/microblog.tmpl
new file mode 100644
index 000000000..2e84441cc
--- /dev/null
+++ b/templates/microblog.tmpl
@@ -0,0 +1,22 @@
+<div class="microblog">
+
+<div class="inlinecontent">
+<TMPL_VAR CONTENT>
+</div>
+
+<div class="microblog-header">
+
+<TMPL_IF NAME="AUTHOR">
+<span class="author">
+<TMPL_IF NAME="AUTHORURL">
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR AUTHOR>
+</TMPL_IF>
+</span>
+</TMPL_IF>
+
+&mdash; <TMPL_VAR CTIME>
+
+</div> <!--.microblog-header-->
+</div> <!--.microblog-->
diff --git a/templates/titlepage.tmpl b/templates/titlepage.tmpl
index f5cd5bc53..8a11e693e 100644
--- a/templates/titlepage.tmpl
+++ b/templates/titlepage.tmpl
@@ -1 +1,7 @@
-<p><a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a></p>
+<p>
+<TMPL_IF NAME="PERMALINK">
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
+<TMPL_ELSE>
+<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
+</TMPL_IF>
+</p>