X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=624a8c72abd7e6b644fc8762d589334d0f357395;hb=74ea71bcbb270f0114dd4946c831dc0d76983958;hp=a5ba6a2d388565ae9ac3f5dff29ca48f8126fb50;hpb=49c44a83e5e434114dd90c1672579cf66ee46e86;p=geekigeeki.git

diff --git a/geekigeeki.py b/geekigeeki.py
index a5ba6a2..624a8c7 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')
@@ -195,8 +198,9 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
 
 def send_httperror(status="403 Not Found", query=""):
     print("Status: %s" % status)
+    page = Page()
     send_title(None, msg_text=("%s: on query '%s'" % (status, query)))
-    send_footer()
+    page.send_footer()
 
 def link_tag(dest, text=None, privileged=False, **kvargs):
     if text is None:
@@ -304,7 +308,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,16 +348,6 @@ 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):
-    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))
-    })
-    print("</body></html>")
-
 def _macro_ELAPSED_TIME(*args, **kvargs):
     return "%03f" % (clock() - start_time)
 
@@ -620,7 +614,7 @@ class WikiFormatter:
         print('</p></div>')
 
 class Page:
-    def __init__(self, page_name):
+    def __init__(self, page_name="Limbo"):
         self.page_name = page_name.rstrip('/');
         self.msg_text = ''
         self.msg_type = 'error'
@@ -720,6 +714,17 @@ class Page:
     def can_read(self):
         return self.can("read", True)
 
+    def send_footer(mtime=None, footer="sys/footer"):
+        if config_get('debug_cgi', False):
+            cgi.print_arguments()
+            cgi.print_form(form)
+            cgi.print_environ()
+        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 send_naked(self, kvargs=None):
         if self.can_read():
             WikiFormatter(self.get_raw_body(), kvargs).print_html()
@@ -734,9 +739,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())
+        self.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)
@@ -756,7 +762,7 @@ class Page:
             print("<div class='preview'>")
             WikiFormatter(preview).print_html()
             print("</div>")
-        send_footer()
+        self.send_footer()
 
     def send_raw(self, mimetype='text/plain', args=[]):
         if not self.can_read():
@@ -833,6 +839,6 @@ except Exception:
         send_guru(msg_text, "error")
     else:
         send_title(None, msg_text=msg_text)
-    send_footer()
+    Page().send_footer()
 
 sys.stdout.flush()