From: drewc <drewc@tech.coop>
Date: Thu, 5 Oct 2006 04:57:31 +0000 (-0700)
Subject: Form types
X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/commitdiff_plain/e9c163726f466dee83a8dbe7d952f6aaff4345b6?hp=fb04c0a8c71cd64e3a36cfed59a0224d44de2474;ds=sidebyside

Form types

Added types to the form attribute, as well as avoiding nesting with the usual pattern.

darcs-hash:20061005045731-39164-f910484fbc78ddcd353c24416baa8bc84b3de8c8.gz
---

diff --git a/src/standard-wrappers.lisp b/src/standard-wrappers.lisp
index 690ac6d..110bdd3 100644
--- a/src/standard-wrappers.lisp
+++ b/src/standard-wrappers.lisp
@@ -57,9 +57,12 @@
 ;;; wrap-a-form
 (deflayer wrap-form)
 
+(defvar *in-form-p* nil)
+
 (define-layered-class description
   :in-layer wrap-form ()
-  ((form-buttons :initarg :form-buttons :initform nil :special t :accessor form-buttons)))
+  ((form-buttons :initarg :form-buttons :initform nil :special t :accessor form-buttons)
+   (form-type :initarg :form-type :initform '<ucw:simple-form :special t :accessor form-type)))
 
 (defattribute form-button-attribute ()
   ((form-buttons :initarg :form-buttons :initform nil :special t :accessor form-buttons)))
@@ -81,19 +84,28 @@
 				   action))))))))
 
 
-
-(defdisplay :in-layer wrap-form :around (description object)
-  (<ucw:form
-   :action (refresh-component self)
-   (with-inactive-layers (wrap-form)
-     (call-next-method)
-     (with-inactive-layers (show-attribute-labels)
-       (display-attribute
-	(make-instance
-	 'form-button-attribute
-	 :form-buttons
-	 (form-buttons description))
-	object)))))
+(defdisplay
+  :in-layer wrap-form
+  :around (description object)
+  (flet ((body ()
+	   (with-inactive-layers (wrap-form)
+	     (call-next-method)
+	     (with-inactive-layers (show-attribute-labels)
+	       (display-attribute
+		(make-instance
+		 'form-button-attribute
+		 :form-buttons
+		 (form-buttons description))
+		object)))))
+    (ecase (form-type description)
+      ('<ucw:simple-form
+       (<ucw:simple-form
+	:action (refresh-component self)
+	(body)))
+      ('<ucw:form
+       (<ucw:form
+	:action (refresh-component self)
+	(body))))))
 
 ;;;; wrap a DIV
 
diff --git a/src/validation/standard-validation.lisp b/src/validation/standard-validation.lisp
index 8856b07..3d616f2 100644
--- a/src/validation/standard-validation.lisp
+++ b/src/validation/standard-validation.lisp
@@ -50,7 +50,7 @@
 	       (<:li (<:as-html (message c)))))
 	    (funcall next-method))))
 
-(defattribute string-attribute ()
+(defattribute base-attribute ()
   ()
   (:in-layer validate)
   (:default-properties