Addition of new features++, read ChangeLog

[planet-ucc.git] / XHTMLWriter.py

diff --git a/XHTMLWriter.py b/XHTMLWriter.py
index 3ef84c9..93aa9de 100644 (file)
--- a/XHTMLWriter.py
+++ b/XHTMLWriter.py
@@ -17,11 +17,12 @@ class XHTMLWriter:
        def __write_item__(self, item):
                output  =       ''
                output  +=      '<div class="item">\n'
-               output  +=      '<h2>%s: %s</h2>\n' % (item.blogTitle, item.itemTitle)
+               output  +=      '<h2><a href="%s" title="%s">%s</a>: <a href="%s">%s</a></h2>\n' % (item.blogURL, item.blogTitle, item.blogName,
+                                                                                                       item.itemURL, item.itemTitle)
                output  +=      '<p class="time">\n'
                if item.imageURL:
-                       output += '<a class="image" href="%s"><img class="image" src="%s" alt="%s" /></a>\n' % (item.imageLink, item.imageURL, item.blogTitle)
-               output  +=      '(<a href="%s">%s</a>)\n' % (item.itemURL ,time.strftime('%A %B %d, %Y %H:%M AWST', time.localtime(item.itemDate)))
+                       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  +=      item.contents
@@ -62,7 +63,7 @@ class XHTMLWriter:
                        blogscopy       = self.parent.blogs + []
                        blogscopy.sort(self.__blog_sort__)
                        for blog in blogscopy:
-                               output  += '<a href="%s">%s</a> (<a href="%s">feed</a>)<br />\n' % (blog.blogURL, blog.blogTitle, blog.feedURL)
+                               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'
@@ -89,7 +90,7 @@ class XHTMLWriter:
                return output
        
        def __blog_sort__(self, blog1, blog2):
-               name1, name2    = blog1.blogTitle.split(' ')[-1], blog2.blogTitle.split(' ')[-1]
+               name1, name2    = blog1.blogName.split(' ')[-1], blog2.blogName.split(' ')[-1]
                if name1 < name2: return -1
                if name1 == name2: return 0
                if name1 > name2: return 1