aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2013-02-20 21:16:19 -0500
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2013-02-20 21:16:19 -0500
commitd77ee60b1506302ca6e2a5bd2023c380334167c0 (patch)
tree2e52a21303a4449826da703ac0032faeaf50a243 /templates
parenta629b276b27bb900ec9e544820cd42aa140e8bdc (diff)
downloadikiwiki-d77ee60b1506302ca6e2a5bd2023c380334167c0.tar
ikiwiki-d77ee60b1506302ca6e2a5bd2023c380334167c0.tar.gz
Render fancy podcast enclosures.
Simple podcast feeds didn't have content tags and I made sure to keep it that way. This may be unnecessarily conservative. Changing the behavior to include empty content tags might be fine, but I don't want to think about it right now, I just want my tests to keep passing! The new fancy-podcast tests are copy-pasted-edited from the simple-podcast tests. These tests shall be refactored.
Diffstat (limited to 'templates')
-rw-r--r--templates/atomitem.tmpl5
-rw-r--r--templates/rssitem.tmpl5
2 files changed, 6 insertions, 4 deletions
diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 4ed17bc62..9b056e0f4 100644
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -34,11 +34,12 @@
<published><TMPL_VAR CDATE_3339></published>
<TMPL_IF ENCLOSURE>
<link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
-<TMPL_ELSE>
+</TMPL_IF>
+<TMPL_UNLESS SIMPLEPODCAST>
<content type="html" xml:lang="en">
<TMPL_VAR CONTENT ESCAPE=HTML>
</content>
-</TMPL_IF>
+</TMPL_UNLESS>
<TMPL_IF COMMENTSURL>
<link rel="comments" href="<TMPL_VAR COMMENTSURL>" type="text/html" />
</TMPL_IF>
diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index 831daa871..2d315173b 100644
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -20,9 +20,10 @@
<dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified>
<TMPL_IF ENCLOSURE>
<enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
-<TMPL_ELSE>
- <description><TMPL_VAR CONTENT ESCAPE=HTML></description>
</TMPL_IF>
+<TMPL_UNLESS SIMPLEPODCAST>
+ <description><TMPL_VAR CONTENT ESCAPE=HTML></description>
+</TMPL_UNLESS>
<TMPL_IF COMMENTSURL>
<comments><TMPL_VAR COMMENTSURL></comments>
</TMPL_IF>