X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/81d7061052c90867a26b50e69e35f5d96b17686a..2548f0540da69973512f1827b2bfd2360470bb27:/src/ucw/html-description.lisp

diff --git a/src/ucw/html-description.lisp b/src/ucw/html-description.lisp
index a77c24a..4ec32cc 100644
--- a/src/ucw/html-description.lisp
+++ b/src/ucw/html-description.lisp
@@ -2,72 +2,217 @@
 
 (export '(html-description) (find-package :lisp-on-lines))
 
+(defvar *escape-html* t)
+
+(defmethod generic-format ((display lol-ucw:component) string &rest args)
+  (<:as-html (with-output-to-string (stream)
+	       (apply #'call-next-method stream string args))))
+      
+
 (define-description html-description ()
   ())
 
-
 (define-description t ()
-  ((css-class  :value "lol-description")
+  ((css-class  :value "lol-description" :activep nil)
    (dom-id :function (lambda (x)
 		       (declare (ignore x))
 		       (symbol-name 
-			(gensym "DOM-ID-")))))
+			(gensym "DOM-ID-")))
+	   :activep nil))
   (:in-description html-description))
 
 (define-layered-class html-attribute ()
   ((css-class :accessor attribute-css-class 
 	      :initform "lol-attribute")
-   (dom-id :accessor attribute-dom-id :initform nil)))
+   (dom-id :accessor attribute-dom-id :initform nil)
+   (display-empty-label :accessor attribute-display-empty-label-p :initarg :display-empty-label-p :initform t)))
 
 (define-layered-class standard-attribute
   :in-layer #.(defining-description 'html-description)
  (html-attribute)
  ())
 
-(define-display 
-  :in-description html-description ((description t))
- (with-attributes (css-class dom-id) description
-   (<:style
-    (<:as-html "
+(define-layered-function display-html-attribute-label (object attribute)
+  (:method (object attribute)
+    
+    (let ((label (attribute-label attribute)))
+      (when (or label (attribute-display-empty-label-p attribute))
+      	   (<:td (<:label 
+	    :class "lol-attribute-label"
+	    (when label 
+	      (<:as-html 
+	       (with-output-to-string (*display*)
+		 (display-attribute-label attribute)))))))))
+  (:method 
+      :in-layer #.(defining-description 'inline)
+      (object attribute)
+    (let ((label (attribute-label attribute)))
+      (when label
+		 (<:as-html
+	  (with-output-to-string (*display*)
+	    (display-attribute-label attribute)))))))
+
+(define-layered-function display-html-attribute-value (object attribute)
+  (:method (object attribute)
+    (<:td 
+	:class "lol-attribute-value"
+	(<:as-html   
+	 (display-attribute-value attribute))))
+
+  (:method 
+    :in-layer #.(defining-description 'inline) (object attribute)
+    (display-attribute-value attribute)))
+
+(define-layered-function display-html-attribute (object attribute)
+  
+  (:method (object attribute)
+    (<:tr 
+     :class (attribute-css-class attribute)
+     (when (attribute-dom-id attribute) 
+       :id (attribute-dom-id attribute))
+     (display-html-attribute-label object attribute)
+     (display-html-attribute-value object attribute)))
+  
+  (:method 
+      :in-layer #.(defining-description 'inline) 
+      (object attribute)
+      (<:span 
+       :class (attribute-css-class attribute)
+       (when (attribute-dom-id attribute) 
+	 :id (attribute-dom-id attribute))
+       (display-html-attribute-label object attribute)
+       (display-html-attribute-value object attribute))))
+
+(define-layered-method display-using-description 
+  :in-layer #.(defining-description 'html-description)
+  :around ((attribute standard-attribute) display object &rest args)
+ (declare (ignore args))
+ (display-html-attribute object attribute))
+
+
+(defun capture-description (attribute function)
+   (let ((obj (described-object (attribute-description attribute))))
+   (lambda (&rest args)
+     (dletf (((described-object attribute) obj))
+       (apply function args)))))
+
+(defun make-attribute-value-writer (attribute)
+ (let ((obj (described-object (attribute-description attribute)))
+       (value (attribute-value attribute)))
+   (lambda (val)
+     (dletf (((described-object attribute) obj))
+       (with-active-descriptions (editable)
+	 (unless (and (unbound-slot-value-p value)
+		      (equal "" val))
+	 (setf (attribute-value attribute) 
+	     (parse-attribute-value attribute val))))))))
+
+
+(defmethod html-attribute-value (attribute)
+  (let ((val (attribute-value attribute)))
+    (if (unbound-slot-value-p val)
+	""
+	val)))
+
+(defmethod display-html-attribute-editor (attribute editor)
+  (<lol:input :type "text"
+	      :reader (html-attribute-value attribute)
+	      :writer (make-attribute-value-writer attribute)))
+
+(defmethod display-html-attribute-editor ((attribute slot-definition-attribute) editor)
+  (call-next-method))
+
+(defmethod display-html-attribute-editor (attribute (editor password-attribute-editor))
+  (<lol:input :type "password"
+	      :reader (html-attribute-value attribute)
+	      :writer (make-attribute-value-writer attribute)))
+
 
-.lol-attribute-label, .lol-attribute-value {
+(define-layered-method display-attribute-editor 
+   :in-layer #.(defining-description 'html-description) (attribute)
+   (display-html-attribute-editor attribute (attribute-editor attribute)))
+					     
+
+(define-layered-method display-html-attribute-value 
+  :in-layer #.(defining-description 'editable) (object attribute)
+
+    (<:td
+	:class "lol-attribute-value"
+    (if (attribute-editp attribute)	
+	(display-attribute-editor attribute)
+	(call-next-method))))		
+
+(define-layered-function display-html-description (description display object &optional next-method)
+  (:method (description display object &optional (next-method #'display-using-description))
+    (<:style
+     (<:as-html "
+
+
+
+div.lol-description .lol-attribute-label, 
+div.lol-description .lol-attribute-value {
       display: block;
-      width: 70%;
+      width: 69%;
       float: left;
-      margin-bottom: 10px;
+      margin-bottom: 1em;
+border:1px solid black;
 
 }
+div.lol-description 
 .lol-attribute-label {
      text-align: right;
      width: 24%;
-     padding-right: 20px;
+     padding-right: 1em;
 }
 
-.lol-attribute-value {
-  
-  }
+span.lol-attribute-value .lol-attribute-value (
+ border: 1px solid red;}
+
 
+div.lol-description 
 br {
 clear: left;
-}"))
+}
+
+.clear {clear:left}"
+
+))
+		       
+    (with-attributes (css-class dom-id) description
+   
+
+      (<:table
+       :class (list (attribute-value css-class) "lol-description" "t")
+       :id    (attribute-value dom-id)
+       (funcall next-method)
+       (<:br :class "clear")))))
+		       
+
+(define-layered-method display-html-description 
+  :in-layer #.(defining-description 'inline) (description display object &optional next-method)
+  (with-attributes (css-class dom-id) description
+    (<:span
+     :class (list (attribute-value css-class) "lol-description")
+     :id    (attribute-value dom-id)
+     (funcall next-method))))
+
+
+(define-display 
+  :in-description html-description ((description t) 
+				    (display lol-ucw:component) 
+				    object)
+  (display-html-description description display object (lambda ()
+							 (call-next-method))))
+
+(define-layered-method display-html-attribute-value 
+  (object (attribute list-attribute))
+   (<:ul
+     (arnesi:dolist* (item (attribute-value attribute))
+       (<:li (apply #'display *display* item (slot-value attribute 'item-args))))))
+
+
+
 
-   (<:div 
-    :class (list (attribute-value* css-class) "lol-description")
-    :id    (attribute-value* dom-id)
-    (dolist (attribute (attributes description))
-      (<:div 
-       :class (attribute-css-class attribute)
-       (when (attribute-dom-id attribute) 
-	 :id (attribute-dom-id attribute))
-       (let ((label (attribute-label attribute)))
-	 (when label
-	   (<:label 
-	    :class "lol-attribute-label"
-	    (<:as-html label))))
-       (<:span 
-	:class "lol-attribute-value"
-	(<:as-html (format nil "~A" (attribute-value* attribute))))
-       (<:br))))))