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

diff --git a/geekigeeki.py b/geekigeeki.py
index b8aeee89402cddc8bfe65b947e63c12d550cad27..4d50a3af5c0fd4aa29c24ec1918e59f801a2d047 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -220,7 +220,7 @@ 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 + url_args(kvargs), descr)
     elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page