X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=XHTMLWriter.py;h=caa01f3ae5067739aa61e7397477e88b3beaadf3;hb=db27278f66a4cde57cfa271859cc6d1376a16825;hp=3ef84c9e77d4609883ab7775b0f05b51ebf95f57;hpb=7c1189be656d2ab9f484d9d0f1ab1b8f287de4c8;p=planet-ucc.git diff --git a/XHTMLWriter.py b/XHTMLWriter.py index 3ef84c9..caa01f3 100644 --- a/XHTMLWriter.py +++ b/XHTMLWriter.py @@ -17,15 +17,18 @@ class XHTMLWriter: def __write_item__(self, item): output = '' output += '
\n' - output += '

%s: %s

\n' % (item.blogTitle, item.itemTitle) + output += '

%s: %s

\n' % (item.blogURL, item.blogTitle, item.blogName, + item.itemURL, item.itemTitle) output += '

\n' if item.imageURL: - output += '%s\n' % (item.imageLink, item.imageURL, item.blogTitle) - output += '(%s)\n' % (item.itemURL ,time.strftime('%A %B %d, %Y %H:%M AWST', time.localtime(item.itemDate))) + output += '%s\n' % (item.imageLink, item.imageURL, item.blogName) + output += '(%s)\n' % (item.itemURL ,time.strftime('posted on %A %B %d, %Y at %H:%M AWST', time.localtime(item.itemDate))) output += '

\n' - output += '

\n' + output += '

\n' output += item.contents - output += '\n

\n' + output += '\n
\n' + if item.commentsURL: + output += '

Comments

' % item.commentsURL output += '
\n' return output @@ -39,6 +42,9 @@ class XHTMLWriter: output += 'Planet UCC\n' output += '\n' output += '\n' + output += '\n' + output += '\n' + output += '\n' output += '\n' output += '\n' output += '
\n' @@ -47,6 +53,19 @@ class XHTMLWriter: except: pass output += '
\n' + output += '
\n' + for date in self.planet: + output += '

%s

\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 += '
\n' output += '
\n' try: output += open('sidebar.html').read() @@ -62,22 +81,9 @@ class XHTMLWriter: blogscopy = self.parent.blogs + [] blogscopy.sort(self.__blog_sort__) for blog in blogscopy: - output += '%s (feed)
\n' % (blog.blogURL, blog.blogTitle, blog.feedURL) + output += '%s (feed)
\n' % (blog.blogURL, blog.blogName, blog.feedURL) output += '

\n' output += '
\n' - output += '
\n' - for date in self.planet: - output += '

%s

\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 += '
\n' output += '
\n' try: output += open('footer.html').read() @@ -89,7 +95,8 @@ 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] + name1, name2 = blog1.blogName, blog2.blogName if name1 < name2: return -1 if name1 == name2: return 0 if name1 > name2: return 1