Use generic head links instead of ad-hoc mechanisms

diff --git a/geekigeeki.conf.py b/geekigeeki.conf.py
index 1080e49c9cc02c2cb6ceb6e859729a5c1f6d8dd5..59b85305a19138e88b4d016147c489baf07d111b 100644 (file)
--- a/geekigeeki.conf.py
+++ b/geekigeeki.conf.py
@@ -8,8 +8,13 @@ privileged_url = 'https://www.develer.com/~bernie/wiki'
 data_dir = '/home/bernie/public_html/wiki/data'
 
 # default page links
-icon_url = 'hacker-favicon.ico'
-css_url = ['../wikidata/geekigeeki.css']
+link_urls = [
+    # rel                href                              type
+    [ 'icon',            'hacker-favicon.ico' ],
+    [ 'stylesheet',      '../wikidata/geekigeeki.css' ],
+    [ 'openid.server',   'http://www.codewiz.org/openid' ],
+    [ 'openid.delegate', 'http://www.codewiz.org/openid' ],
+]
 
 history_url = '../wikigit/wiki.git'
 

diff --git a/geekigeeki.py b/geekigeeki.py
index 341bbad351166596fcad2701f2e2138f869232bc..5abd90f3f2c72d2a49ddf0df4a9390e66a79733b 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -125,18 +125,18 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
     print ' <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />'
     if not name:
         print ' <meta name="robots" content="noindex,nofollow" />'
-    for css in css_url:
-        print ' <link rel="stylesheet" type="text/css" href="%s" />' % relative_url(css)
-    if icon_url:
-        print ' <link rel="icon" href="%s" />' % relative_url(icon_url)
+
+    for link in link_urls:
+        rel, href = link
+        print ' <link rel="%s" href="%s" />' % (rel, relative_url(href))
 
     if name and writable and privileged_url is not None:
-        print ' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" \>' \
+        print ' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
             % (privileged_path() + '?edit=' + name)
 
     if history_url is not None:
         print ' <link rel="alternate" type="application/rss+xml" title="RSS" href="%s" />' \
-            % (history_url + '?a=rss')
+            % relative_url(history_url + '?a=rss')
 
     print '</head>'
 
@@ -158,9 +158,9 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
     print ' | ' + link_tag('FrontPage', 'Home', 'navlink')
     print ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
     if 'history_url' in globals():
-        print ' | <a href="' + history_url + '" class="navlink">Recent Changes</a>'
+        print ' | <a href="' + relative_url(history_url) + '" class="navlink">Recent Changes</a>'
         if name:
-            print ' | <a href="' + history_url + '?a=history;f=' + name + '" class="navlink">Page History</a>'
+            print ' | <a href="' + relative_url(history_url + '?a=history;f=' + name) + '" class="navlink">Page History</a>'
 
     if name:
         print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink')
@@ -657,9 +657,11 @@ class Page:
             send_guru("Read access denied by ACLs", "notice")
 
     def format(self):
-        #css foo.css bar.css
-        global css_url
-        css_url = self.get_attr("css", "").split() + css_url
+        #css foo.css
+        value = self.get_attr("css", None)
+        if value:
+            global link_urls
+            link_urls += { "stylesheet": value }
 
         send_title(self.page_name, self.split_title(),
             msg_text=self.msg_text, msg_type=self.msg_type, writable=self.can_write())