Show link to twitter feed on the frontpage, if one is

configured.

diff --git a/generator.py b/generator.py
index 5ef1d38546d600c26ef8f87ae6fe3c1a5ba6f45d..b38f21799ff196b3592d04163cff332ede29ebf7 100755 (executable)
--- a/generator.py
+++ b/generator.py
@@ -23,8 +23,8 @@ from HTMLParser import HTMLParser
 from planethtml import *
 
 class Generator:
-       def __init__(self,db):
-               self.db = db
+       def __init__(self,cfg):
+               self.db = psycopg2.connect(cfg.get('planet','db'))
                self.tidyopts = dict(   drop_proprietary_attributes=1,
                                        alt_text='',
                                        hide_comments=1,
@@ -39,6 +39,10 @@ class Generator:
                self.allposters = []
                self.allteams = []
                self.staticfiles = ['policy','add']
+               if cfg.has_option('twitter','account'):
+                       self.twittername = cfg.get('twitter','account')
+               else:
+                       self.twittername = None
 
                settings.configure(
                        TEMPLATE_DIRS=('template',),
@@ -136,6 +140,7 @@ WHERE approved ORDER BY teams.name,feeds.name,blogurl
                        'allposters': self.allposters,
                        'allteams': self.allteams,
                        'posts': self.items,
+                       'twittername': self.twittername,
                })).encode('utf-8'))
                f.close()
 
@@ -232,4 +237,4 @@ class HtmlTruncator(HTMLParser):
 if __name__=="__main__":
        c = ConfigParser.ConfigParser()
        c.read('planet.ini')
-       Generator(psycopg2.connect(c.get('planet','db'))).Generate()
+       Generator(c).Generate()

diff --git a/template/index.tmpl b/template/index.tmpl
index b88c6682e055d8e56825adb9c549a504828deab5..46b8293904d6d3fe6bfd3402a6b9b726e6755b71 100644 (file)
--- a/template/index.tmpl
+++ b/template/index.tmpl
@@ -32,6 +32,12 @@
       <li><a href="rss20.xml"><img src="img/feed-icon-14x14.png" alt="rss" /></a> <a href="rss20.xml">All feeds (full entries)</a></li>
       <li><a href="rss20_short.xml"><img src="img/feed-icon-14x14.png" alt="rss" /></a> <a href="rss20_short.xml">All feeds (short entries)</a></li>
      </ul>
+{%if twittername %}
+     <div class="planetRightTitle">Twitter</div>
+     <ul>
+      <li>Follow @<a href="http://twitter.com/{{twittername}}">{{twittername}}</a> on Twitter for the latest updates!</li>
+     </ul>
+{%endif%}
      <div class="planetRightTitle">Planet</div>
      <ul>
       <li><a href="policy.html">Policy</a> for being listed on Planet PostgreSQL.</li>