X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=XMLWriter.py;h=38904dcf3874d6e216ac760d3387d068af81dd29;hb=8afc0d268787b7b3cb06dcc50e06707d31a5af68;hp=fdd95c2289f23744ccdb17c53d4c696af3a92a80;hpb=e20f77cf858089e8f241ee9b1197bba6d8968dec;p=planet-ucc.git

diff --git a/XMLWriter.py b/XMLWriter.py
index fdd95c2..38904dc 100644
--- a/XMLWriter.py
+++ b/XMLWriter.py
@@ -96,7 +96,7 @@ class XHTMLWriter:
 		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 %Z', time.gmtime(item.itemDate)))
+		output	+=	'(<a href="%s">%s</a>)\n' % (item.itemURL ,time.strftime('%A %B %d, %Y %H:%M AWST', time.localtime(item.itemDate)))
 		output	+=	'</p>\n'
 		output	+=	'<p class="body">\n'
 		output	+=	item.contents
@@ -129,18 +129,20 @@ class XHTMLWriter:
 			pass
 		output	+=	'<h2>Last Updated</h2>\n'
 		output	+=	'<p>\n'
-		output	+=	'%s\n' % time.strftime('%A %B %d, %Y %H:%M', time.localtime())
+		output	+=	'%s\n' % time.strftime('%A %B %d, %Y %H:%M AWST', time.localtime())
 		output	+=	'</p>\n'
 		if self.parent:
 			output	+=	'<h2>Feeds</h2>\n'
 			output	+=	'<p>\n'
-			for blog in self.parent.blogs:
-				output	+= '<a href="%s">%s</a><br />\n' % (blog.blogURL, blog.blogTitle)
+			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	+=	'</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.gmtime(date.planetDate))
+			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
@@ -160,3 +162,9 @@ class XHTMLWriter:
 		output	+=	'</body>\n'
 		output	+=	'</html>'
 		return output
+	
+	def __blog_sort__(self, blog1, blog2):
+		name1, name2	= blog1.blogTitle.split(' ')[-1], blog2.blogTitle.split(' ')[-1]
+		if name1 < name2: return -1
+		if name1 == name2: return 0
+		if name1 > name2: return 1