X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=b00838ae923d45ac5320579096b7d6f1cebb1b8d;hb=2bb00b8d6473a767cba8616e18d587f98c773354;hp=317e9ca64a78e50649a3a2549b64a9ba201bc07c;hpb=8e6f34588270b805d4151da2a66abf3f2f35c891;p=geekigeeki.git

diff --git a/geekigeeki.py b/geekigeeki.py
index 317e9ca..b00838a 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -123,7 +123,7 @@ def send_guru(msg_text, msg_type):
     print('</pre><script type="text/javascript" src="%s" defer="defer"></script>' \
         % relative_url('sys/GuruMeditation.js'))
 
-def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False, mtime=None):
+def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False, mtime=None, navbar="on"):
     global title_done
     if title_done: return
 
@@ -163,6 +163,9 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
     title_done = True
     send_guru(msg_text, msg_type)
 
+    if navbar != "on":
+        return
+
     # NAVBAR
     print('<nav><div class="nav">')
     print link_tag('FrontPage', config_get('site_icon', 'Home'), cssclass='navlink')
@@ -304,7 +307,7 @@ def handle_edit(pagename, form):
         send_httperror("403 Forbidden", pagename)
         return
 
-    pg = Page(form['q'].value)
+    pg  = Page(form['q'].value)
     if 'save' in form:
         if form['file'].value:
             pg.save(form['file'].file.read(), form['changelog'].value)
@@ -344,14 +347,15 @@ def page_list(dirname=None, search_re=None):
         search_re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$")
     return sorted(filter(search_re.match, os.listdir(dirname or '.')))
 
-def send_footer(mtime=None):
+def send_footer(mtime=None, footer="sys/footer"):
     if config_get('debug_cgi', False):
         cgi.print_arguments()
         cgi.print_form(form)
         cgi.print_environ()
-    link_inline("sys/footer", kvargs = {
-        'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%a %d %b %Y %I:%M %p'), localtime(mtime))
-    })
+    if footer != "off":
+        link_inline(footer, kvargs = {
+            'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%a %d %b %Y %I:%M %p'), localtime(mtime))
+        })
     print("</body></html>")
 
 def _macro_ELAPSED_TIME(*args, **kvargs):
@@ -621,7 +625,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 +671,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__:
@@ -733,9 +738,10 @@ class Page:
             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(), mtime=self._mtime())
+            msg_text=self.msg_text, msg_type=self.msg_type, writable=self.can_write(), mtime=self._mtime(),
+            navbar=self.pragma("navbar", "on"))
         self.send_naked()
-        send_footer(mtime=self._mtime())
+        send_footer(mtime=self._mtime(), footer=self.pragma("footer", "sys/footer"))
 
     def send_editor(self, preview=None):
         send_title(None, 'Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)