X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=web-utils-aserve.lisp;h=74a518a308aee40c5f42f20f67575e68234a7c82;hb=bb23129ae7ddabcbcb09c718545f69a52a8d1eaf;hp=92a89bdaa702d6cb72ee6f170b06c7dca06aa5d7;hpb=5e5cc3c20a925d8af5de153a118fdaf0792dd7e2;p=kmrcl.git
diff --git a/web-utils-aserve.lisp b/web-utils-aserve.lisp
index 92a89bd..74a518a 100644
--- a/web-utils-aserve.lisp
+++ b/web-utils-aserve.lisp
@@ -1,3 +1,4 @@
+
;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
@@ -7,18 +8,18 @@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: web-utils-aserve.lisp,v 1.1 2002/10/06 13:21:47 kevin Exp $
+;;;; $Id: web-utils-aserve.lisp,v 1.5 2002/10/16 17:37:18 kevin Exp $
;;;;
-;;;; This file, part of Webutils, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
-;;;; Webutils users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the GNU General Public License.
+;;;; KMRCL users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
;;;; *************************************************************************
-
-(in-package :webutils)
-(declaim (optimize (speed 3) (safety 1)))
+(in-package :kmrcl)
+(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
;;; AllegroServe interaction functions
@@ -84,10 +85,12 @@
(princ-http "Browser Home"))
(princ-http ""))
-(defun head (title-str)
+(defun head (title-str &key css)
+ (unless css
+ (setq css "http://b9.com/main.css"))
(net.html.generator:html
- (:head
- ""
+ (:head
+ (princ-http (format nil "" css))
(:title (:princ-safe title-str)))))
@@ -104,7 +107,7 @@
,@body)
(princ-http "")))
-(defmacro with-trans-page (title &rest body)
+(defmacro with-html-page ((title &key css) &rest body)
`(prog1
(progn
(print-http "")
@@ -112,7 +115,7 @@
(print-http " \"http://www.w3c.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">")
(print-http "")
(print-http "")
- (head ,title)
+ (head ,title :css ,css)
(print-http "")
(prog1
,@body