summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2009-04-20 12:21:18 +0200
committerintrigeri <intrigeri@boum.org>2009-04-20 12:21:18 +0200
commit4558457402a4ab6bc795589a2e400fa66144f76e (patch)
tree8368320617a8febc3c9c9708f688b6591801f4c0 /templates
parent9db2438b3a0366738ba2e1b6e23ad3d8ae2fe36e (diff)
parent2cc3f5d057c5882e08d16746985c49a7dd1a4c01 (diff)
Merge commit 'upstream/master' into pub/po
Conflicts: debian/changelog debian/control
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>