Author: achiumenti Date: Mon Sep 8 05:36:59 2008 New Revision: 89 Modified: trunk/main/claw-demo/src/frontend/commons.lisp trunk/main/claw-demo/src/frontend/docroot/css/style.css trunk/main/claw-demo/src/frontend/index.lisp trunk/main/claw-demo/src/frontend/login.lisp trunk/main/claw-demo/src/frontend/logout.lisp trunk/main/claw-demo/src/frontend/main.lisp Log: CLAW demo enhancement Modified: trunk/main/claw-demo/src/frontend/commons.lisp ============================================================================== --- trunk/main/claw-demo/src/frontend/commons.lisp (original) +++ trunk/main/claw-demo/src/frontend/commons.lisp Mon Sep 8 05:36:59 2008 @@ -59,7 +59,7 @@ (html> (head> (title> (site-template-title site-template)) - (link> :href (format nil "~a/docroot/css/style.css" (build-lisplet-location *claw-current-lisplet*)) + (link> :href (format nil "~a/docroot/css/style.css" *root-path*) :rel "stylesheet" :type "text/css")) (djbody> :is-debug "false" @@ -75,17 +75,17 @@ (djmenu> (djmenu-item> :id "loginMenu" :render-condition #'(lambda () (null principal)) - :on-click (ps:ps* `(location.replace ,(format nil "~a/login.html" (build-lisplet-location *claw-current-lisplet*)))) + :on-click (ps:ps* `(location.replace ,(format nil "~a/login.html" *root-path*))) "Login") (djmenu-item> :id "logoutMenu" :render-condition #'(lambda () principal) - :on-click (ps:ps* `(location.replace ,(format nil "~a/logout.html" (build-lisplet-location *claw-current-lisplet*)))) + :on-click (ps:ps* `(location.replace ,(format nil "~a/logout.html" *root-path*))) "Logout"))) (djdrop-down-button> :render-condition #'(lambda () principal) (span> "Anagraphics") (djmenu> (djmenu-item> :id "customersMenu" - :on-click (ps:ps* `(location.replace ,(format nil "~a/customers.html" (build-lisplet-location *claw-current-lisplet*)))) + :on-click (ps:ps* `(location.replace ,(format nil "~a/customers.html" *root-path*))) "Customers") (djmenu-item> :id "usersMenu" :render-condition #'(lambda () (user-in-role-p '("admin"))) Modified: trunk/main/claw-demo/src/frontend/docroot/css/style.css ============================================================================== --- trunk/main/claw-demo/src/frontend/docroot/css/style.css (original) +++ trunk/main/claw-demo/src/frontend/docroot/css/style.css Mon Sep 8 05:36:59 2008 @@ -23,10 +23,6 @@ margin-top:0; } -.unclosable .dijitDialogCloseIcon { - display: none; -} - .dialogLabel { width: 80px; text-align: right; Modified: trunk/main/claw-demo/src/frontend/index.lisp ============================================================================== --- trunk/main/claw-demo/src/frontend/index.lisp (original) +++ trunk/main/claw-demo/src/frontend/index.lisp Mon Sep 8 05:36:59 2008 @@ -38,6 +38,10 @@ (defmethod page-content ((o index-page)) (site-template> :title "Home test page" + (div> (format nil "~a" (claw-headers-in))) + (div> (format nil "~a" (claw-script-name))) + (div> (format nil "~a" "popopo" )) + (ul> (li> (a> :href "index.html" "Home")) (li> (a> :href "info.html" "HTTP Header info")) Modified: trunk/main/claw-demo/src/frontend/login.lisp ============================================================================== --- trunk/main/claw-demo/src/frontend/login.lisp (original) +++ trunk/main/claw-demo/src/frontend/login.lisp Mon Sep 8 05:36:59 2008 @@ -45,6 +45,7 @@ (djdialog> :id "loginDialog" :title "Login into system" :class "unclosable" + :closable "false" (djfloating-content> :static-id spinner-id (img> :alt "spinner" :src "docroot/img/spinner.gif")) @@ -73,7 +74,7 @@ (div> :static-id login-result-id (redirect> :render-condition #'current-principal :id "redirect" - :href (format nil "~a/index.html" (build-lisplet-location *claw-current-lisplet*))))) + :href (format nil "~a/index.html" *root-path*)))) (script> (ps:ps* `(dojo.add-on-load (lambda () (.show (dijit.by-id "loginDialog"))))))))) (lisplet-register-function-location *dojo-demo-lisplet* Modified: trunk/main/claw-demo/src/frontend/logout.lisp ============================================================================== --- trunk/main/claw-demo/src/frontend/logout.lisp (original) +++ trunk/main/claw-demo/src/frontend/logout.lisp Mon Sep 8 05:36:59 2008 @@ -39,7 +39,7 @@ (defmethod do-logout ((demo-page logout-page)) (claw-remove-session) - (claw-redirect (format nil "~a/index.html" (build-lisplet-location *claw-current-lisplet*)) :protocol :http)) + (claw-redirect (format nil "~a/index.html" *root-path*) :protocol :http)) (lisplet-register-function-location *dojo-demo-lisplet* (make-page-renderer 'logout-page #'claw-post-parameters #'claw-get-parameters) Modified: trunk/main/claw-demo/src/frontend/main.lisp ============================================================================== --- trunk/main/claw-demo/src/frontend/main.lisp (original) +++ trunk/main/claw-demo/src/frontend/main.lisp Mon Sep 8 05:36:59 2008 @@ -40,10 +40,9 @@ :base-path "/demo")) (defvar *ht-connector* (make-instance 'hunchentoot-connector + :address "localhost" :port 4242 - :sslport nil - :behind-apache-p t - :mod-lisp-p nil)) + :sslport 4343)) (defvar *sm* (make-instance 'default-session-manager)) @@ -53,7 +52,8 @@ :connector *ht-connector* :log-manager *ht-log-manager* :session-manager *sm* - :base-path "/claw")) + :base-path "/claw" + :reverse-proxy-path "/claw1")) (clawserver-register-lisplet *dojo-clawserver* *dojo-demo-lisplet*)