Merge remote-tracking branch 'giskard/master'

[geekigeeki.git] / geekigeeki.py
diff --git a/geekigeeki.py b/geekigeeki.py

index 6262c4a6e7393694590234624da7f5167a2fd57f..4cb7b43c018c39e109b52fe50cdf4372f38d9b55 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -20,9 +20,9 @@ title_done = False
  
  import cgi, sys, os, re, errno, stat, glob
  
-image_ext = 'png|gif|jpg|jpeg|bmp|ico'
+image_ext = 'png|gif|jpg|jpeg|svg|bmp|ico'
  video_ext = 'avi|webm|mkv|ogv'
-image_re = re.compile(r".*\.(" + image_ext + "|" +  video_ext + ")$", re.IGNORECASE)
+image_re = re.compile(r".*\.(" + image_ext + ")$", re.IGNORECASE)
  video_re = re.compile(r".*\.(" + video_ext + ")$", re.IGNORECASE)
  # FIXME: we accept stuff like foo/../bar and we shouldn't
  file_re  = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/ ]*)$")
@@ -586,7 +586,7 @@ class Page:
              out += '[[' + pathname + '|' + dirname + ']]/'
          out += ' ==\n'
          images_out = '\n'
- 
+
          for filename in page_list(self._filename(), file_re):
              if image_re.match(filename):
                  maxwidth = config_get('image_maxwidth', '400')
@@ -647,6 +647,7 @@ class Page:
          print('<!doctype html>\n<html lang="en">')
          print("<head><title>%s: %s</title>" % (config_get('site_name', "Unconfigured Wiki"), text))
          print(' <meta charset="utf-8">')
+        print(' <meta name="viewport" content="width=device-width, initial-scale=1.0">')
          if not name:
              print(' <meta name="robots" content="noindex,nofollow" />')