2005-05-12 Davyd Madeley <[email protected]>

[planet-ucc.git] / XHTMLWriter.py
diff --git a/XHTMLWriter.py b/XHTMLWriter.py

index 93aa9de..caa01f3 100644 (file)
--- a/XHTMLWriter.py
+++ b/XHTMLWriter.py
@@ -24,9 +24,11 @@ class XHTMLWriter:
                         output += '<a class="image" href="%s"><img class="image" src="%s" alt="%s" /></a>\n' % (item.imageLink, item.imageURL, item.blogName)
                 output  +=      '(<a href="%s">%s</a>)\n' % (item.itemURL ,time.strftime('posted on %A %B %d, %Y at %H:%M AWST', time.localtime(item.itemDate)))
                 output  +=      '</p>\n'
-               output  +=      '<p class="body">\n'
+               output  +=      '<div class="itembody">\n'
                 output  +=      item.contents
-               output  +=      '\n</p>\n'
+               output  +=      '\n</div>\n'
+               if item.commentsURL:
+                       output += '<p class="comments"><a href="%s">Comments</a></p>' % item.commentsURL
                 output  +=      '</div>\n'
                 return output
         
@@ -40,6 +42,9 @@ class XHTMLWriter:
                 output  +=      '<title>Planet UCC</title>\n'
                 output  +=      '<link rel="stylesheet" href="planet.css" type="text/css" media="screen" />\n'
                 output  +=      '<link rel="icon" type="image/png" href="icon.png" />\n'
+               output  +=      '<link rel="SHORTCUT ICON" type="image/png" href="icon.png" />\n'
+               output  +=      '<link rel="alternate" type="application/rss+xml" title="RSS 1.0" href="rss1.xml" />\n'
+               output  +=      '<link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="rss2.xml" />\n'
                 output  +=      '</head>\n'
                 output  +=      '<body>\n'
                 output  +=      '<div class="header">\n'
@@ -48,6 +53,19 @@ class XHTMLWriter:
                 except:
                         pass
                 output  +=      '</div>\n'
+               output  +=      '<div class="items">\n'
+               for date in self.planet:
+                       output  += '<h1>%s</h1>\n' % time.strftime('%A %B %d, %Y', time.localtime(date.planetDate))
+                       for item in date.items:
+                               output  += self.__write_item__(item)
+                               # see how many items we've written
+                               itemcount += 1
+                               if itemcount >= self.maxitems:
+                                       break
+                       # again, check to see if we've written the maximum number of items
+                       if itemcount >= self.maxitems:
+                               break
+               output  +=      '</div>\n'
                 output  +=      '<div class="sidebar">\n'
                 try:
                         output  +=      open('sidebar.html').read()
@@ -66,19 +84,6 @@ class XHTMLWriter:
                                 output  += '<a href="%s">%s</a> (<a href="%s">feed</a>)<br />\n' % (blog.blogURL, blog.blogName, blog.feedURL)
                         output  +=      '</p>\n'
                 output  +=      '</div>\n'
-               output  +=      '<div class="items">\n'
-               for date in self.planet:
-                       output  += '<h1>%s</h1>\n' % time.strftime('%A %B %d, %Y', time.localtime(date.planetDate))
-                       for item in date.items:
-                               output  += self.__write_item__(item)
-                               # see how many items we've written
-                               itemcount += 1
-                               if itemcount >= self.maxitems:
-                                       break
-                       # again, check to see if we've written the maximum number of items
-                       if itemcount >= self.maxitems:
-                               break
-               output  +=      '</div>\n'
                 output  +=      '<div class="footer">\n'
                 try:
                         output  +=      open('footer.html').read()
@@ -90,7 +95,8 @@ class XHTMLWriter:
                 return output
         
         def __blog_sort__(self, blog1, blog2):
-               name1, name2    = blog1.blogName.split(' ')[-1], blog2.blogName.split(' ')[-1]
+               # name1, name2  = blog1.blogName.split(' ')[-1], blog2.blogName.split(' ')[-1]
+               name1, name2 = blog1.blogName, blog2.blogName
                 if name1 < name2: return -1
                 if name1 == name2: return 0
                 if name1 > name2: return 1