Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Incorporate patches and suggestions from Jacques Distler and Michael …

…Koziarski
  • Loading branch information...
commit 7b13eece4d6e53c8140dec6d7531cc82614e965a 1 parent 600303a
@rubys authored
View
8 THANKS
@@ -1,6 +1,8 @@
-DeWitt Clinton - Mac OSX
-Mary Gardiner - PythonPath
-Elias Torres - FOAF OnlineAccounts
+DeWitt Clinton - Mac OSX
+Mary Gardiner - PythonPath
+Elias Torres - FOAF OnlineAccounts
+Jacques Distler - Template patches
+Michael Koziarski - HTTP Auth fix
This codebase represents a radical refactoring of Planet 2.0, which lists
the following contributors:
View
2  planet/spider.py
@@ -191,7 +191,7 @@ def spiderFeed(feed):
elif data.status == 500:
data.feed['planet_message'] = "internal server error"
elif data.status >= 400:
- data.feed['planet_message'] = "http status %s" % status
+ data.feed['planet_message'] = "http status %s" % data.status
# perform user configured scrub operations on the data
scrub(feed, data)
View
19 planet/splice.py
@@ -34,11 +34,20 @@ def splice():
createTextElement(author, 'email', config.owner_email())
feed.appendChild(author)
- createTextElement(feed, 'id', config.feed())
- link = doc.createElement('link')
- link.setAttribute('rel', 'self')
- link.setAttribute('href', config.feed())
- feed.appendChild(link)
+ if config.feed():
+ createTextElement(feed, 'id', config.feed())
+ link = doc.createElement('link')
+ link.setAttribute('rel', 'self')
+ link.setAttribute('href', config.feed())
+ if config.feedtype():
+ link.setAttribute('type', "application/%s+xml" % config.feedtype())
+ feed.appendChild(link)
+
+ if config.link():
+ link = doc.createElement('link')
+ link.setAttribute('rel', 'alternate')
+ link.setAttribute('href', config.link())
+ feed.appendChild(link)
# insert entry information
for mtime,file in dir[:items]:
View
1  themes/asf/config.ini
@@ -17,3 +17,4 @@ bill_of_materials:
images/feed-icon-10x10.png
images/opml.png
images/foaf.png
+ images/venus.png
View
19 themes/asf/index.html.xslt
@@ -15,7 +15,7 @@
<meta name="robots" content="noindex,nofollow" />
<meta name="generator" content="{atom:generator}" />
<xsl:if test="atom:link[@rel='self']">
- <link rel="alternate" href="{atom:link[@rel='self']/@uri}"
+ <link rel="alternate" href="{atom:link[@rel='self']/@href}"
title="{atom:title}" type="{atom:link[@rel='self']/@type}" />
</xsl:if>
<link rel="shortcut icon" href="/favicon.ico" />
@@ -92,8 +92,8 @@
<dt>Powered by:</dt>
<dd>
<a href="http://intertwingly.net/code/venus/">
- <img src="images/planet.png" width="80" height="15"
- alt="Planet" border="0"/>
+ <img src="images/venus.png" width="80" height="15"
+ alt="Venus" border="0"/>
</a>
</dd>
<dt>Export:</dt>
@@ -212,7 +212,7 @@
</xsl:attribute>
</xsl:if>
<xsl:attribute name="class">content</xsl:attribute>
- <xsl:copy-of select="@*|node()"/>
+ <xsl:apply-templates select="@*|node()"/>
</xsl:copy>
</xsl:template>
@@ -227,4 +227,15 @@
<xsl:copy-of select="."/>
</div>
</xsl:template>
+
+ <!-- Feedburner detritus -->
+ <xsl:template match="xhtml:div[@class='feedflare']"/>
+
+ <!-- pass through everything else -->
+ <xsl:template match="@*|node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
+
</xsl:stylesheet>
View
BIN  themes/common/images/venus.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
1  themes/mobile/config.ini
@@ -20,3 +20,4 @@ bill_of_materials:
images/feed-icon-10x10.png
images/opml.png
images/foaf.png
+ images/venus.png
View
4 themes/mobile/mobile.html.xslt
@@ -54,8 +54,8 @@
<dt>Powered by:</dt>
<dd>
<a href="http://intertwingly.net/code/venus/">
- <img src="images/planet.png" width="80" height="15"
- alt="Planet" border="0"/>
+ <img src="images/venus.png" width="80" height="15"
+ alt="Venus" border="0"/>
</a>
</dd>
<dt>Export:</dt>
Please sign in to comment.
Something went wrong with that request. Please try again.