X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=a5ba6a2d388565ae9ac3f5dff29ca48f8126fb50;hb=49c44a83e5e434114dd90c1672579cf66ee46e86;hp=44b5131bb1435a0e2781f56a8583e108b52b0b75;hpb=bc824021236f6cec7008d4f4493f0a2b95ad1632;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index 44b5131..a5ba6a2 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -120,7 +120,7 @@ def send_guru(msg_text, msg_type):
print(cgi.escape(msg_text))
if msg_type == 'error':
print '\n Guru Meditation #DEADBEEF.ABADC0DE'
- print('' \
+ print('' \
% relative_url('sys/GuruMeditation.js'))
def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False, mtime=None):
@@ -621,7 +621,7 @@ class WikiFormatter:
class Page:
def __init__(self, page_name):
- self.page_name = page_name
+ self.page_name = page_name.rstrip('/');
self.msg_text = ''
self.msg_type = 'error'
@@ -667,16 +667,17 @@ class Page:
pathname = (pathname and pathname + '/' ) + dirname
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')
if maxwidth:
maxwidth = ' | maxwidth=' + str(maxwidth)
- out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth + ' | class=thumbleft}}\n'
+ images_out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth + ' | class=thumbleft}}\n'
else:
out += ' * [[' + self.page_name + '/' + filename + ']]\n'
- return out
+ return out + images_out
def pragmas(self):
if not '_pragmas' in self.__dict__: