From: Bernie Innocenti <bernie@codewiz.org>
Date: Fri, 1 May 2009 13:25:32 +0000 (+0200)
Subject: Merge branch 'master' of ssh://bernie@trinity.codewiz.org/~/public_html/wiki/git... 
X-Git-Tag: v4.0~9
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=refs%2Fremotes%2Fgiskard%2Fpython3;p=geekigeeki.git

Merge branch 'master' of ssh://bernie@trinity.codewiz.org/~/public_html/wiki/git/geekigeeki into python3
---

41e94725555d64df1b6e56ffd29a733c28e0bfdf
diff --cc geekigeeki.py
index b8aeee8,faf5902..4d50a3a
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@@ -216,13 -198,13 +216,13 @@@ def link_tag(params, text=None, link_cl
  
      return '<a %shref="%s">%s</a>' % (classattr, relative_url(params, privileged=privileged), text)
  
 -def link_inline(name, descr=None, args=''):
 -    if not descr: descr = name
 +def link_inline(name, descr=None, kvargs={}):
 +    if not descr: descr = humanlink(name)
      url = relative_url(name)
      if video_re.match(name):
-         return '<video src="%s">Your browser does not support the HTML5 video tag</video>' % url
+         return '<video controls="1" src="%s">Your browser does not support the HTML5 video tag</video>' % url
      elif img_re.match(name):
 -        return '<a href="%s"><img border="0" src="%s" alt="%s" /></a>' % (url, url + args, descr)
 +        return '<a href="%s"><img border="0" src="%s" alt="%s" /></a>' % (url, url + url_args(kvargs), descr)
      elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page
          return Page(name).send_naked()
      else: