allow channel and action page names to vary by site (for facebook apps)

vii · Apr 25, 2010 · 557b47c · 557b47c
1 parent e59a740
commit 557b47c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/webapp/actions.lisp b/src/webapp/actions.lisp
@@ -16,7 +16,7 @@
      ,@body))
 
 (defmacro page-action-link (&body body)
-  `(page-link +action-page-name+ :.id. (register-action-id (page-action-lambda ,@body))))
+  `(page-link (action-page-name (current-site)) :.id. (register-action-id (page-action-lambda ,@body))))
 
 (defmacro html-replace-link (text &body body)
   (with-unique-names (body-func)
@@ -124,7 +124,8 @@
     (channel-respond-body .channels. :always-body t)))
 
 (defun register-action-page ()
-  (defpage-lambda +action-page-name+ #'action-respond-body :defaulting-lambda-list (.id. .javascript.)))
+  (defpage-lambda (site-action-page-name (current-site)) 
+      #'action-respond-body :defaulting-lambda-list (.id. .javascript.)))
 
 
 (my-defun frame 'simple-channel-body-ml ()

diff --git a/src/webapp/channel.lisp b/src/webapp/channel.lisp
@@ -105,7 +105,7 @@
 		      (apply original-hangup-handler args)))))))))))
 
 (defun register-channel-page ()
-  (dispatcher-register-path (site-dispatcher (current-site)) +channel-page-name+ #'channel-respond-page))
+  (dispatcher-register-path (site-dispatcher (current-site)) (site-channel-page-name (current-site)) #'channel-respond-page))
 
 (my-defun channel 'object-to-ml ()
   (js-html-script (channel (unquote (force-string (my id))) (unquote (my state)))))

diff --git a/src/webapp/site.lisp b/src/webapp/site.lisp
@@ -18,6 +18,8 @@
 	       `(with-ml-output
 		  (<title ,title)
 		  (webapp-default-page-head-contents))))
+  (action-page-name +action-page-name+)
+  (channel-page-name +channel-page-name+)
   (page-body-start 
    (lambda(title)
      `(<h1 ,title)))

diff --git a/teepeedee2.asd b/teepeedee2.asd
@@ -88,7 +88,7 @@
 							   (:file "site")
 							   (:file "default-site" :depends-on ("site" "webapp" "js-library"))
 							   (:file "js-library" :depends-on ("html-constants" "page"))
-							   (:file "actions" :depends-on ("page" "html-constants" "frame"))
+							   (:file "actions" :depends-on ("page" "html-constants" "frame" "site"))
 							   (:file "channel" :depends-on ("page" "html-constants"))
 							   (:file "webapp" :depends-on ("actions"))
 							   (:file "message-channel" :depends-on ("channel"))))