Make default template Use XHTML 1.0 Strict

[software/blitiri.git] / blitiri.cgi
diff --git a/blitiri.cgi b/blitiri.cgi

index f08247ee827feb87032cd8b2ba92c7300486ce17..f78ee0bbe8c3e7feb765eb2ab2fb29a7a2e5a64e 100755 (executable)
--- 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 = """
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+default_main_header = """\
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
  
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
  <head>
  <link rel="alternate" title="%(title)s" href="%(fullurl)s/atom"
         type="application/atom+xml" />
-<link href="%(css_url)s" rel="stylesheet"
-       type="text/css" />
+<link href="%(css_url)s" rel="stylesheet" type="text/css" />
  <title>%(title)s</title>
  </head>
  
@@ -79,8 +87,7 @@ default_main_header = """
  """
  
  default_main_footer = """
-</div><p/>
-<hr/><br/>
+</div>
  <div class="footer">
    %(showyear)s: %(monthlinks)s<br/>
    years: %(yearlinks)s<br/>
@@ -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;
  }
  
@@ -574,7 +578,7 @@ def render_atom(articles):
  
  
  def render_style():
-       print 'Content-type: text/plain\n'
+       print 'Content-type: text/css\r\n\r\n',
         print default_css
  
  def handle_cgi():