[Lisppaste-cvs] CVS update: lisppaste2/web-server.lisp

[Brian Mastenbrook]

Update of /project/lisppaste/cvsroot/lisppaste2
In directory common-lisp.net:/tmp/cvs-serv15474

Modified Files:
	web-server.lisp 
Log Message:
Cosmetic changes, and fix to use *display-paste-url*

Date: Tue Nov 11 09:55:37 2003
Author: bmastenbrook

Index: lisppaste2/web-server.lisp
diff -u lisppaste2/web-server.lisp:1.7 lisppaste2/web-server.lisp:1.8
--- lisppaste2/web-server.lisp:1.7	Tue Nov 11 09:42:03 2003
+++ lisppaste2/web-server.lisp	Tue Nov 11 09:55:37 2003
@@ -1,4 +1,4 @@
-;;;; $Id: web-server.lisp,v 1.7 2003/11/11 14:42:03 bmastenbrook Exp $
+;;;; $Id: web-server.lisp,v 1.8 2003/11/11 14:55:37 bmastenbrook Exp $
 ;;;; $Source: /project/lisppaste/cvsroot/lisppaste2/web-server.lisp,v $
 
 ;;;; See the LICENSE file for licensing information.
@@ -54,9 +54,8 @@
          ((th :valign top) "Enter your paste:")
          (td ((textarea :rows 24 :cols 80 :name "text"))))
         (tr
-         ((td :colspan 2) ((input :type submit))))
-        (tr
-         ((td :colspan 2) ((input :type reset))))))))))
+	 ((th) "Submit your paste:")
+         ((td) ((input :type submit :value "Submit paste")) " " ((input :type reset :value "Clear paste"))))))))))
 
 (defmethod araneida:handle-request-response ((handler submit-paste-handler) method request)
   (setf (username handler) (araneida:body-param "username" (araneida:request-body request))
@@ -79,7 +78,7 @@
                      (araneida:merge-url *display-paste-url*
                                          (prin1-to-string *paste-counter*))))
                (external-url (araneida:urlstring
-                              (araneida:merge-url *paste-external-url*
+                              (araneida:merge-url *display-paste-url*
                                                   (prin1-to-string *paste-counter*))))
                (paste (make-paste :number *paste-counter*
                                   :user username
@@ -114,8 +113,8 @@
            (head
             (title "Paste number " ,paste-number))
            (body
-            (h2 "Paste number " ,paste-number ,(encode-for-pre (paste-title paste)))
-            (p "Pasted by " ,(encode-for-pre (paste-user paste)))
+            (h2 "Paste number " ,paste-number ": " ,(encode-for-pre (paste-title paste)))
+            (p "Pasted by: " ,(encode-for-pre (paste-user paste)))
             (hr)
             (pre ,(encode-for-pre (paste-contents paste))))))
         (araneida:html-stream