tons of small changes to bring this up to date with maxclaims 2.0

[clinton/lisp-on-lines.git] / src / ucw / standard-components.lisp

diff --git a/src/ucw/standard-components.lisp b/src/ucw/standard-components.lisp
index c017657..8ffe33d 100644 (file)
--- a/src/ucw/standard-components.lisp
+++ b/src/ucw/standard-components.lisp
@@ -7,8 +7,7 @@
   (:metaclass closer-mop:funcallable-standard-class))
 
 
-(setf ucw-standard::*default-action-class* 'lisp-on-lines-action)
-
+(setf ucw-core::*default-action-class* 'lisp-on-lines-action)
 
 
 (defmethod ucw-core:call-action :around ((action lisp-on-lines-action) application session frame)
@@ -19,11 +18,11 @@
                          (call-next-method))))))
     (let ((layer-context (action-layer-context action)))
       (if layer-context 
-         (funcall-with-layer-context layer-context next-method)
+         (contextl:funcall-with-layer-context layer-context next-method)
          (funcall next-method)))
     ))
 
-(defmethod ucw-core:handle-action :around ((action lisp-on-lines-action) application session frame)
+(defmethod ucw-core:handle-action :wrap-around ((action lisp-on-lines-action) application session frame)
      (let ((lol::*invalid-objects* (make-hash-table)))
        (handler-bind ((lol::validation-condition 
                       (lambda (c)
@@ -37,7 +36,7 @@
        (call-next-method))))
 
 
-(define-layered-function layered-call-action (action application session frame next-method)
+(contextl:define-layered-function layered-call-action (action application session frame next-method)
   (:method (action application session frame next-method)
     (funcall next-method)))
 
@@ -56,41 +55,41 @@
 
 
 
-(defcomponent standard-window-component 
-  (ucw-standard::basic-window-component)
-  ((body
-    :initform nil
-    :accessor window-body
-    :component t
-    :initarg :body)))
-
-(defmethod render-html-head ((window standard-window-component))
-  (let* ((app (context.application *context*))
-        (url-prefix (application.url-prefix app)))
-    (<:meta :http-equiv "Content-Type" :content (window-component.content-type window))
-    (awhen (window-component.title window)
-      (<:title (if (functionp it)
-                  (funcall it window)
-                  (<:as-html it))))
-    (awhen (window-component.icon window)
-      (<:link :rel "icon"
-             :type "image/x-icon"
-             :href (concatenate 'string url-prefix it)))
-    (dolist (stylesheet (effective-window-stylesheets window))
-      (<:link :rel "stylesheet"
-             :href stylesheet
-             :type "text/css"))))
-
-(defmethod render-html-body ((window standard-window-component))
-  (render (window-body window)))
-
-(defcomponent info-message ()
-  ((message :accessor message :initarg :message)))
-
-(defmethod render ((m info-message))
-  (<:div
-   :class "info-mssage" 
-   (<:as-html (message m)))
-   (<lol:a :action (answer-component m nil) "Ok"))
+;; (defcomponent standard-window-component 
+;;   (ucw-standard::basic-window-component)
+;;   ((body
+;;     :initform nil
+;;     :accessor window-body
+;;     :component t
+;;     :initarg :body)))
+
+;; (defmethod render-html-head ((window standard-window-component))
+;;   (let* ((app (context.application *context*))
+;;      (url-prefix (application.url-prefix app)))
+;;     (<:meta :http-equiv "Content-Type" :content (window-component.content-type window))
+;;     (awhen (window-component.title window)
+;;       (<:title (if (functionp it)
+;;                (funcall it window)
+;;                (<:as-html it))))
+;;     (awhen (window-component.icon window)
+;;       (<:link :rel "icon"
+;;           :type "image/x-icon"
+;;           :href (concatenate 'string url-prefix it)))
+;;     (dolist (stylesheet (effective-window-stylesheets window))
+;;       (<:link :rel "stylesheet"
+;;           :href stylesheet
+;;           :type "text/css"))))
+
+;; (defmethod render-html-body ((window standard-window-component))
+;;   (render (window-body window)))
+
+;; (defcomponent info-message ()
+;;   ((message :accessor message :initarg :message)))
+
+;; (defmethod render ((m info-message))
+;;   (<:div
+;;    :class "info-mssage" 
+;;    (<:as-html (message m)))
+;;    (<ucw:a :action (answer-component m nil) "Ok"))