From da9733ff6aaef1b051664bb566e279204a3db591 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Wed, 22 Oct 2008 20:20:33 +0000 Subject: [PATCH] Make the output use the full width of the page. In passing, fix a number of XHTML errors. --- planethtml.py | 27 ++++++++++++++++----------- www/css/planet.css | 25 ++++++++++++++++++------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/planethtml.py b/planethtml.py index 3e3afe4..6fd14de 100644 --- a/planethtml.py +++ b/planethtml.py @@ -9,6 +9,7 @@ Copyright (C) 2008 PostgreSQL Global Development Group """ import datetime +import urllib class PlanetHtml: def __init__(self): @@ -25,9 +26,9 @@ class PlanetHtml: -

+

-

+

The world's most advanced open source database

@@ -64,15 +65,19 @@ class PlanetHtml:

%s

-

Posted by %s on %s at %s

-

+

Posted by %s on %s at %s

+

%s

-

+

""" % (post[1], post[3], posterstr, post[2].date(), post[2].time(), txt) self.str += """

""" + def quoteurl(self, str): + p = str.split(":",2) + return p[0] + ":" + urllib.quote(p[1]) + def BuildRight(self): self.str += """

Subscriptions

@@ -80,24 +85,24 @@ class PlanetHtml: for feed in self.feeds: self.str += "

" if feed[1] != '': - self.str += """%s""" % (feed[1], feed[0]) + self.str += """%s""" % (self.quoteurl(feed[1]), feed[0]) else: self.str += feed[0] self.str += """ -

""" % (feed[2]) - self.str += """ +

""" % (feed[2]) + self.str += """ +

Feeds

""" def WriteFile(self,filename): - self.BuildPosts() self.BuildRight() + self.BuildPosts() self.str += """ - diff --git a/www/css/planet.css b/www/css/planet.css index 19dc089..b21bd6a 100644 --- a/www/css/planet.css +++ b/www/css/planet.css @@ -8,21 +8,28 @@ body { } div#planetHeader { - width: 800px; + width: 90%; background: url(http://www.postgresql.org/layout/images/hdr_fill.png); padding: 0 0 0 0; height: 80px; margin: 5px 0 2px 0; } -div#planetMain { - width: 800px; +div#planetWrap { + margin-left: 20px; +} + +div#planetWrap img { + /* applies to all images */ border: none; } +div#planetMain { + width: 90%; +} + div#planetLeft { - width: 590px; - float:left; + margin-right: 270px; padding-top: 10px; } @@ -105,25 +112,29 @@ max-width: 100px; } div#planetRight { - width: 190px; + width: 250px; margin-top: 10px; float: right; text-align: left; + border-left: 1px solid #dadada; + clear: both; } div#planetRight div.planetRightTitle { font-weight: bold; font-size: 20px; + padding-left: 10px; } div#planetRight ul { list-style: none; - padding-left: 5px; + padding-left: 15px; } div.fl { float: left; border: none; text-align: left; } div.fr { float: right; } div.cb { clear: both; } +div.cl { clear: left; } a:link { color:#0085B0; text-decoration: underline; } a:visited { color:#004E66; text-decoration: underline; } -- 2.39.5