Fix some bugs related to URI generation.

darcs-hash:37dcf0fe41750beaaa3bee462bee67049d494983

1 files changed, 6 insertions, 4 deletions

diff --git a/journal.lisp b/journal.lisp
index 9753cf7..eb8d05e 100755
--- a/journal.lisp
+++ b/journal.lisp
@@ -382,8 +382,7 @@ after another in any arbitrary order."
                          ;; When testing on the local webserver, don't
                          ;; use /journal as a relative URI, because it
                          ;; won't work.
-                         (if (search ".cgi"
-                                     (gethash "REQUEST_URI" *http-env* ""))
+                         (if (eq *site* :mst-plus)
                              (gethash "SCRIPT_NAME" *http-env* "")
                              "/journal")))
     (multiple-value-call
@@ -393,7 +392,10 @@ after another in any arbitrary order."
         (:view-atom-feed (values "/feed"))
         (:view (values "/~D" post-id))
         (:edit (values "/~D?action=edit" post-id))
-        (:post-comment (values "/~D" post-id))))))
+        (:post-comment (values "/~D" post-id))
+        (:css (if (eq *site* :mst-plus)
+                  "/../../journal.css"
+                  "/../journal.css"))))))
 
 
 (defun show-atom-feed ()
@@ -600,7 +602,7 @@ after another in any arbitrary order."
             :type "application/atom+xml"
             :href (link-to :view-atom-feed)
             :title "Kompottkins weiser Atom-Feed")
-    (<:link :rel "stylesheet" :type "text/css" :href "../journal.css"))
+    (<:link :rel "stylesheet" :type "text/css" :href (link-to :css)))
    (<:body
     (<:div :id :main-title-box
      (<:h1 :id :main-title