Merge branch 'fancypodcast' of github.com:schmonz/ikiwiki into fancypodcast

6 files changed, 20 insertions, 15 deletions

diff --git a/doc/style.css b/doc/style.css
index 424d43816..81b6a0a28 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -58,7 +58,8 @@ nav {
 	border-bottom: 1px solid #000;
 }
 
-.inlinecontent {
+.inlinecontent,
+.inlineenclosure {
 	margin-top: .4em;
 }
 
diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index 2d315173b..9acefb5d3 100644
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -1,16 +1,14 @@
 <item>
-<TMPL_IF AUTHOR>
-	<title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title>
-	<dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
-<TMPL_ELSE>
 	<title><TMPL_VAR TITLE></title>
-</TMPL_IF>
 <TMPL_IF GUID>
 	<guid isPermaLink="false"><TMPL_VAR GUID></guid>
 <TMPL_ELSE>
 	<guid isPermaLink="false"><TMPL_VAR URL></guid>
 </TMPL_IF>
 	<link><TMPL_VAR PERMALINK></link>
+<TMPL_IF AUTHOR>
+	<dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
+</TMPL_IF>
 <TMPL_IF CATEGORIES>
 <TMPL_LOOP CATEGORIES>
 	<category><TMPL_VAR CATEGORY></category>
diff --git a/themes/actiontabs/style.css b/themes/actiontabs/style.css
index f6cb5c04e..d4afc0915 100644
--- a/themes/actiontabs/style.css
+++ b/themes/actiontabs/style.css
@@ -76,7 +76,7 @@ body {
 	padding: 2px;
 }
 
-#content, #comments, #footer {
+#content, #enclosure, #comments, #footer {
 	margin: 1em 2em;
 }
 
diff --git a/themes/blueview/style.css b/themes/blueview/style.css
index 40a940f26..af1434574 100644
--- a/themes/blueview/style.css
+++ b/themes/blueview/style.css
@@ -143,7 +143,7 @@ p,fieldset,table,pre {
  * Copyright (C) 2010 Bernd Zeimetz
  * Licensed under same license as ikiwiki: GPL v2 or later */
 
-.page, .pageheader, .sidebar, #content, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody {
+.page, .pageheader, .sidebar, #content, #enclosure, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody {
 	border: none;
 }
 
@@ -223,7 +223,7 @@ body {
 	clear: none;
 }
 
-#content a, #comments a, .sidebar a {
+#content a, #enclosure a, #comments a, .sidebar a {
 	color: #315485;
 	text-decoration: none;
 	font-weight: bold;
@@ -271,7 +271,7 @@ body {
 	.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
 		color #315485;
 	}
-	#content, #comments, #pagebody {
+	#content, #enclosure, #comments, #pagebody {
 		margin-right: 0;
 		*margin-right: 0;
 		border-right: none;
diff --git a/themes/goldtype/style.css b/themes/goldtype/style.css
index 9c217c746..b0e29dfad 100644
--- a/themes/goldtype/style.css
+++ b/themes/goldtype/style.css
@@ -14,10 +14,12 @@ html, body {
 	background-color: #f2d98d;
 }
 
-#content a:hover, #comments a:hover, .sidebar a:hover,
-#content a:visited:hover, #comments a:visited:hover, .sidebar a:visited:hover {
+#content a:hover, #enclosure a:hover, #comments a:hover, .sidebar a:hover,
+#content a:visited:hover, #enclosure a:visited:hover, #comments a:visited:hover,
+.sidebar a:visited:hover {
     color: red;
 }
-#content a:visited, #comments a:visited, .sidebar a:visited {
+#content a:visited, #enclosure a:visited, #comments a:visited,
+.sidebar a:visited {
     color: #37485e;
 }
diff --git a/themes/monochrome/style.css b/themes/monochrome/style.css
index 41a3a4441..bd3fdf593 100644
--- a/themes/monochrome/style.css
+++ b/themes/monochrome/style.css
@@ -36,12 +36,16 @@ body {
  * thanks to <http://www.kryogenix.org/days/2002/08/30/external>
  */
 #content a[href^="http:"]:after,
-#content a[href^="https:"]:after {
+#content a[href^="https:"]:after,
+#enclosure a[href^="http:"]:after,
+#enclosure a[href^="https:"]:after {
   content: "↗";
 }
 /* you will want to replicate this for your own domain in local.css */
 #content a[href^="http://localhost"]:after,
-#content a[href^="http://ikiwiki.info"]:after {
+#content a[href^="http://ikiwiki.info"]:after,
+#enclosure a[href^="http://localhost"]:after,
+#enclosure a[href^="http://ikiwiki.info"]:after {
   content: none;
 }