Author: hhubner Date: 2006-02-19 12:18:42 -0600 (Sun, 19 Feb 2006) New Revision: 1852 Modified: branches/xml-class-rework/bknr/src/web/menu.lisp branches/xml-class-rework/bknr/src/web/templates.lisp Log: Fix quoting, "fix" menu. Modified: branches/xml-class-rework/bknr/src/web/menu.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/menu.lisp 2006-02-19 18:13:33 UTC (rev 1851) +++ branches/xml-class-rework/bknr/src/web/menu.lisp 2006-02-19 18:18:42 UTC (rev 1852) @@ -50,6 +50,7 @@ (dolist (item (menu-items menu)) (let ((item-is-active (in-subtree (puri:uri-path (net.aserve:request-uri *req*)) (item-url item)))) (with-slots (url title active-image inactive-image) item + (setf url (format nil "/~A" url)) ; XXX Fixme only absolute URLs are possible ATM (cond ((and active-image inactive-image) (if item-is-active Modified: branches/xml-class-rework/bknr/src/web/templates.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/templates.lisp 2006-02-19 18:13:33 UTC (rev 1851) +++ branches/xml-class-rework/bknr/src/web/templates.lisp 2006-02-19 18:18:42 UTC (rev 1852) @@ -6,12 +6,12 @@ (defvar *template-expander*) (defvar *template-env*) -(defvar *template-dtd-catalog* '(;; libxml standard +(defvar *template-dtd-catalog* `(;; libxml standard "/etc/xml/catalog" ;; FreeBSD "/usr/local/share/xml/catalog.ports" ;; Find from environment - (cdr (assoc :xmlcatalog ext:*environment-list*)))) + ,@(cdr (assoc :xmlcatalog ext:*environment-list*)))) ;; user-error is supposed to be raised when an error is provoced by ;; the user (i.e. by supplying invalid form data).