[Move pane switch link rendering into TAL
clinton@unknownlamer.org**20090428195619
 Ignore-this: 47df3a90c28755b74af8b5b517e94637
] hunk ./src/packages.lisp 33
-  (:import-from :arnesi :when-bind)
+  (:import-from :arnesi :if-bind :when-bind :with-call/cc)
hunk ./src/web-frontend.lisp 22
-(defvar *switch-key* nil)
+(defclass bee-switch-link-action (standard-action)
+  ((target-component :initarg :target :accessor target-component :initform nil))
+  (:metaclass c2mop:funcallable-standard-class))
hunk ./src/web-frontend.lisp 26
-(defmethod update-url ((c bee-frontend-pane) uri)
-  (when *switch-key*
-    (append-path-to-uri uri (format nil "pages/~(~A~)" *switch-key*)))
-  uri)
+(defmethod compute-url ((action bee-switch-link-action) (pane bee-frontend-pane))
+  (let ((url (call-next-method)))
+    (when-bind target (target-component action)
+      (append-path-to-uri url (format nil "pages/~(~A~)" (car target))))
+    url))
hunk ./src/web-frontend.lisp 32
-(defun render-frontend-pane-switch-link (pane component selectedp)
-  (let ((*switch-key* (car component)))
-    (<ucw:a :action (switch-component pane (car component))
-	    (<:img :src (format nil "~A~A~A~D.png"
-				(application.url-prefix (context.application *context*))
-				(slot-value pane 'img-root)
-				(string-downcase (symbol-name (car component)))
-				(if selectedp 2 1))
-		   :alt (symbol-name (car component))))))
+(defun switch-link (pane component)
+  (make-action (lambda ()
+		 (with-call/cc
+		   (switch-component pane (car component))))
+	       :class 'bee-switch-link-action
+	       :target component))
hunk ./src/web-frontend.lisp 44
-     'contents (mapcar (lambda (component)
-			 (yaclml:tal-env 'value component
-					 'selected (funcall (container.key-test pane)
-							    (car component)
-							    (container.current-component-key pane))))
-		       (container.contents pane))
+     'contents
+     (mapcar (lambda (component)
+	       (let ((selectedp (funcall (container.key-test pane)
+					 (car component)
+					 (container.current-component-key pane))))
+		 (yaclml:tal-env
+		  'value component
+		  'selected selectedp
+		  'navbar-image-url (format nil "~A~A~A~D.png"
+					    (application.url-prefix
+					     (context.application *context*))
+					    (slot-value pane 'img-root)
+					    (string-downcase
+					     (symbol-name (car component)))
+					    (if selectedp 2 1)))))
+	     (container.contents pane))
hunk ./tal/frontend-pane.tal 7
-	<tal:lisp>(render-frontend-pane-switch-link $component $value $selected)</tal:lisp>
+	<ucw:a ucw:actiono="(switch-link $component $value)">
+	  <img src="${$navbar-image-url}" alt="${(symbol-name (car $value))}" />
+	</ucw:a>