X-Git-Url: https://git.llucax.com/software/blitiri.git/blobdiff_plain/1ed8b3ab6ffa91ec28028bd442403d6f632970a7..e3c7d198b1679ff33fc1e4fc800aa61f22a5ab31:/blitiri.cgi?ds=sidebyside diff --git a/blitiri.cgi b/blitiri.cgi index f08247e..15c820e 100755 --- a/blitiri.cgi +++ b/blitiri.cgi @@ -50,6 +50,9 @@ import urllib import cgi from docutils.core import publish_parts +# Before importing the config, add our cwd to the Python path +sys.path.append(os.getcwd()) + # Load the config file, if there is one try: from config import * @@ -57,17 +60,22 @@ except: pass +# Pimp *_path config variables to support relative paths +data_path = os.path.realpath(data_path) +templates_path = os.path.realpath(templates_path) + # Default template -default_main_header = """ - +default_main_header = """\ + + - + - + %(title)s @@ -79,8 +87,7 @@ default_main_header = """ """ default_main_footer = """ -

-


+
%(showyear)s: %(monthlinks)s
years: %(yearlinks)s
@@ -124,16 +131,17 @@ default_css = """ body { font-family: sans-serif; font-size: small; + width: 52em; } div.content { - width: 50%; + width: 96%; } h1 { font-size: large; border-bottom: 2px solid #99F; - width: 60%; + width: 100%; margin-bottom: 1em; } @@ -171,15 +179,11 @@ div.article { margin-bottom: 2em; } -hr { - float: left; - height: 2px; - border: 0; - background-color: #99F; - width: 60%; -} - div.footer { + margin-top: 1em; + padding-top: 0.4em; + width: 100%; + border-top: 2px solid #99F; font-size: x-small; } @@ -245,29 +249,7 @@ class Templates (object): def get_article_header(self, article): avars = self.vars.copy() - avars.update( { - 'arttitle': article.title, - 'author': article.author, - 'date': article.created.isoformat(' '), - 'uuid': article.uuid, - 'created': article.created.isoformat(' '), - 'updated': article.updated.isoformat(' '), - 'tags': article.get_tags_links(), - - 'cyear': article.created.year, - 'cmonth': article.created.month, - 'cday': article.created.day, - 'chour': article.created.hour, - 'cminute': article.created.minute, - 'csecond': article.created.second, - - 'uyear': article.updated.year, - 'umonth': article.updated.month, - 'uday': article.updated.day, - 'uhour': article.updated.hour, - 'uminute': article.updated.minute, - 'usecond': article.updated.second, - } ) + avars.update(article.to_vars()) p = self.tpath + '/art_header.html' if os.path.isfile(p): @@ -276,29 +258,7 @@ class Templates (object): def get_article_footer(self, article): avars = self.vars.copy() - avars.update( { - 'arttitle': article.title, - 'author': article.author, - 'date': article.created.isoformat(' '), - 'uuid': article.uuid, - 'created': article.created.isoformat(' '), - 'updated': article.updated.isoformat(' '), - 'tags': article.get_tags_links(), - - 'cyear': article.created.year, - 'cmonth': article.created.month, - 'cday': article.created.day, - 'chour': article.created.hour, - 'cminute': article.created.minute, - 'csecond': article.created.second, - - 'uyear': article.updated.year, - 'umonth': article.updated.month, - 'uday': article.updated.day, - 'uhour': article.updated.hour, - 'uminute': article.updated.minute, - 'usecond': article.updated.second, - } ) + avars.update(article.to_vars()) p = self.tpath + '/art_footer.html' if os.path.isfile(p): @@ -403,6 +363,33 @@ class Article (object): writer_name = "html") return parts['body'].encode('utf8') + def to_vars(self): + return { + 'arttitle': self.title, + 'author': self.author, + 'date': self.created.isoformat(' '), + 'uuid': self.uuid, + 'tags': self.get_tags_links(), + + 'created': self.created.isoformat(' '), + 'ciso': self.created.isoformat(), + 'cyear': self.created.year, + 'cmonth': self.created.month, + 'cday': self.created.day, + 'chour': self.created.hour, + 'cminute': self.created.minute, + 'csecond': self.created.second, + + 'updated': self.updated.isoformat(' '), + 'uiso': self.updated.isoformat(), + 'uyear': self.updated.year, + 'umonth': self.updated.month, + 'uday': self.updated.day, + 'uhour': self.updated.hour, + 'uminute': self.updated.minute, + 'usecond': self.updated.second, + } + def get_tags_links(self): l = [] tags = list(self.tags) @@ -545,6 +532,11 @@ def render_atom(articles): } for a in articles: + vars = a.to_vars() + vars.update( { + 'url': full_url, + 'contents': a.to_html(), + } ) print """ %(arttitle)s @@ -552,29 +544,20 @@ def render_atom(articles): %(url)s/post/%(uuid)s %(arttitle)s - %(created)sZ - %(updated)sZ + %(ciso)sZ + %(uiso)sZ

%(contents)s

- """ % { - 'arttitle': a.title, - 'author': a.author, - 'uuid': a.uuid, - 'url': full_url, - 'created': a.created.isoformat(), - 'updated': a.updated.isoformat(), - 'contents': a.to_html(), - } - + """ % vars print "" def render_style(): - print 'Content-type: text/plain\n' + print 'Content-type: text/css\r\n\r\n', print default_css def handle_cgi():