picowiki

commit 440c64205ef572a4073e34b52a816c7e62363d27
parent 63a29c9ab6b488b8c81fb9816fc5e09b4b1746c7
Author: tomas <tomas@logand.com>
Date:   Thu, 22 Jul 2010 19:37:14 +0200

picowiki.l updated

Diffstat:
M
picowiki.l
 | 
14
+++++++-------

1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/picowiki.l b/picowiki.l
@@ -1,7 +1,7 @@
 #!/home/thlavaty/picolisp/bin/picolisp /home/thlavaty/picolisp/lib.l
 # -*- picolisp -*-
 
-(setq *Dir "/home/thlavaty/public_html/picoWiki")
+(setq *Dir "/home/thlavaty/Web/logand.com/picoWiki")
 (setq *Host "logand.com") # TODO remove this
 
 (load "@ext.l" "@lib/http.l" "@lib/xhtml.l" "@lib/form.l" "@lib/xml.l")
@@ -409,7 +409,8 @@
       (T
    (let F (pageFile Page)
       (html
-         NIL # TODO allow caching (if Edit 0 (* 60 60 24 1)) # 1 day
+         # TODO allow caching (if Edit 0 (* 60 60 24 1)) # 1 day
+         (unless (= Mode 'view) 0)
          (pack "picoWiki: " Page)
          (pack "http://" *Host "/picoWiki/picoWiki.css") NIL
          #==
@@ -417,9 +418,10 @@
             (<p> 'menu
                "picoWiki:"
                " " (<href2> 'i "Home" (pageUrl "picoWiki" 'view))
-               " " (<href2> 'i "Changes" (pageUrl "Changes" 'view))
-               " " (<href2> 'i "Formatting" (pageUrl "Formatting" 'view))
-               " " (<href2> 'i "Sandbox" (pageUrl "Sandbox" 'view))
+               " " (<ilink> "All")
+               " " (<ilink> "Changes")
+               " " (<ilink> "Formatting")
+               " " (<ilink> "Sandbox")
                (when (and (info F) (editablePage Page))
                   (prin " | ") (<href> ,"Edit"  (pageUrl Page 'edit))
                   (prin " ") (<href> ,"History"  (pageUrl Page 'changes)))
@@ -458,8 +460,6 @@
                      (pack "http://validator.w3.org/check?uri="
                         "http://" *Host "/picoWiki/" (pageUrl Page 'view))))
                (prin " | "))
-            (<ilink> "All")
-            " "
             (<href> ,"RSS" (pageUrl "rss" 'view))
             (<sup>
                (<href2> 'e "V"