projects / geekigeeki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ad79f38)
HTML5 fixes
authorBernie Innocenti <bernie@codewiz.org>
Fri, 20 Nov 2009 07:44:29 +0000 (02:44 -0500)
committerBernie Innocenti <bernie@codewiz.org>
Fri, 20 Nov 2009 07:44:29 +0000 (02:44 -0500)
geekigeeki.py patch | blob | history

diff --git a/geekigeeki.py b/geekigeeki.py
index e7d7f7d69e63c915c3c3526b5acdcf1307f20733..b8e4a7b31e5735cbc15f0e850dcf228f98274e0d 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -127,14 +127,11 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
     global title_done
     if title_done: return
 
-    # Head
+    # HEAD
     emit_header(mtime)
-    print('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"')
-    print('  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">')
-    print('<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">')
-
+    print('<!doctype html>\n<html lang="en">')
     print("<head><title>%s: %s</title>" % (config_get('site_name', "Unconfigured Wiki"), text))
-    print(' <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />')
+    print(' <meta charset="UTF-8">')
     if not name:
         print(' <meta name="robots" content="noindex,nofollow" />')
 
@@ -157,7 +154,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
 
     print('</head>')
 
-    # Body
+    # BODY
     if editable:
         print('<body ondblclick="location.href=\'' + relative_url('?a=edit&q=' + name, privileged=True) + '\'">')
     else:
@@ -166,8 +163,8 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
     title_done = True
     send_guru(msg_text, msg_type)
 
-    # Navbar
-    print('<div class="nav">')
+    # NAVBAR
+    print('<nav><div class="nav">')
     print link_tag('FrontPage', config_get('site_icon', 'Home'), cssclass='navlink')
     if name:
         print('  <b>' + link_tag('?fullsearch=' + name, text, cssclass='navlink') + '</b> ')
@@ -194,7 +191,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
     if user != 'AnonymousCoward':
         print(' | <span class="login"><i><b>' + link_tag('User/' + user, user) + '</b></i></span>')
 
-    print('<hr /></div>')
+    print('<hr /></div></nav>')
 
 def send_httperror(status="403 Not Found", query=""):
     print("Status: %s" % status)
@@ -205,7 +202,7 @@ def link_tag(dest, text=None, privileged=False, **kvargs):
     if text is None:
         text = humanlink(dest)
     elif image_re.match(text):
-        text = '<img border="0" src="' + relative_url(text) + '" alt="' + text + '" />'
+        text = '<img style="border: 0" src="' + relative_url(text) + '" alt="' + text + '" />'
 
     link_class = kvargs.get('class', kvargs.get('cssclass', None))
     if not link_class:
GeekiGeeki, minimalistic wiki a Git backend