[noctool-cvs] CVS source

[jprewett]

Update of /project/noctool/cvsroot/source
In directory cl-net:/tmp/cvs-serv17710

Modified Files:
	web.lisp 
Log Message:

more web fixups
	- now web ui is *independant* in different tabs



--- /project/noctool/cvsroot/source/web.lisp	2008/12/19 21:14:23	1.7
+++ /project/noctool/cvsroot/source/web.lisp	2008/12/19 22:19:26	1.8
@@ -297,7 +297,8 @@
 
 (defmethod initialize-instance :AFTER ((eqp eqp) &key)
   (with-slots (system namebox monitorbox) eqp
-    (let ((namelink (mk-link (ensure-noc-host-widget system))))
+    (let ((namelink (mk-link (ensure-noc-host-widget system)))
+          (info-show NIL))
       (add-to namebox namelink)
       (add-to eqp namebox)
       (setf (css-class-of monitorbox) "hide")
@@ -306,23 +307,24 @@
               (lambda (&rest rest)
                 (declare (ignore rest))
                 (remove-all (cadr (children-of *root*)))                
-                (funcall h/s))))
+                (funcall h/s)
+                (setf (visible *app*) NIL))))
       (add-to eqp monitorbox)
       (loop for mon in (noctool::monitors system) do 
            (let ((link (mk-link (ensure-monitor-widget mon) :href "#"))
                  (mon2 mon))
              (add-to monitorbox link)
-             (let ((info-show NIL))
                (setf (on-click-of link)
                      (iambda
-                       (if (eql info-show mon2)
+                       (if (equal (visible *app*) mon2)
                            (progn
+                             (warn "~A and ~A are same" mon2 (visible *app*))
                              (remove-all (cadr (children-of *root*)))
-                             (setf info-show NIL))
+                             (setf (visible *app*) NIL))
                            (let ((info (display-monitor-info mon2)))
                              (remove-all (cadr (children-of *root*)))
                              (add-to (cadr (children-of *root*)) info)
-                             (setf info-show mon2)))))))))))
+                             (setf (visible *app*) mon2))))))))))
 
 (defmethod display-monitor-info (mon)
   (mk-container
@@ -418,7 +420,8 @@
             ;; :allocation :class
             :initform (loop for eqp in noctool::*equipment*
                          collect
-                           (make-instance 'eqp :system eqp)))))
+                           (make-instance 'eqp :system eqp)))
+   (visible :accessor visible :initform NIL)))
 
 (set-uri 'noctool-app "/")