diff -r -C 2 ucw-boxset/start-common.lisp /tmp/ucw-boxset/start-common.lisp *** ucw-boxset/start-common.lisp Fri Nov 16 23:56:32 2007 --- /tmp/ucw-boxset/start-common.lisp Fri Sep 14 17:14:44 2007 *************** *** 78,82 **** (when error (format *debug-io* "***** Failed to load cl-l10n, the l10n examples won't be available:~%~A" error))) ! (asdf:oos 'asdf:load-op :ucw)) ;; Copyright (c) 2003-2006 Edward Marco Baringer --- 78,99 ---- (when error (format *debug-io* "***** Failed to load cl-l10n, the l10n examples won't be available:~%~A" error))) ! (asdf:oos 'asdf:load-op :ucw) ! (asdf:oos 'asdf:load-op :ucw.admin) ! (asdf:oos 'asdf:load-op :ucw.examples)) ! ! ;;;; Tell UCW which apps to serve ! (setf ucw.system:*ucw-applications* '(ucw-user::*example-application* ! ucw::*admin-application* ! (when (boundp 'ucw-user::*l10n-example-application*) ! ucw-user::*l10n-example-application*) ! (when (boundp 'ucw-user::*shared-counter-application*) ! ucw-user::*shared-counter-application*))) ! ! ;;;; * Finally startup the server ! (ucw:create-server) ! ! (terpri) ! (write-line "*** UCW Started. Point your browser to http://127.0.0.1:8080/") ! (terpri) ;; Copyright (c) 2003-2006 Edward Marco Baringer diff -r -C 2 ucw-boxset/ucw_ajax/examples/src/examples.lisp /tmp/ucw-boxset/ucw_ajax/examples/src/examples.lisp *** ucw-boxset/ucw_ajax/examples/src/examples.lisp Wed Aug 6 19:52:47 2008 --- /tmp/ucw-boxset/ucw_ajax/examples/src/examples.lisp Fri Sep 14 17:15:40 2007 *************** *** 91,95 **** (<:li (example-ajax-link 'transaction-example "Component Transaction")) (<:li (example-ajax-link 'example-form "Form demo")) ! (<:li (example-link 'dynamic-form "Dynamic Form demo")) (<:li (example-ajax-link 'file-upload-example "Form upload example")) (<:li (example-ajax-link 'sum "Add some numbers.")) --- 91,95 ---- (<:li (example-ajax-link 'transaction-example "Component Transaction")) (<:li (example-ajax-link 'example-form "Form demo")) ! (<:li (example-ajax-link 'dynamic-form "Dynamic Form demo")) (<:li (example-ajax-link 'file-upload-example "Form upload example")) (<:li (example-ajax-link 'sum "Add some numbers.")) diff -r -C 2 ucw-boxset/ucw_ajax/src/admin/admin.lisp /tmp/ucw-boxset/ucw_ajax/src/admin/admin.lisp *** ucw-boxset/ucw_ajax/src/admin/admin.lisp Thu Feb 14 00:29:47 2008 --- /tmp/ucw-boxset/ucw_ajax/src/admin/admin.lisp Fri Sep 14 17:15:39 2007 *************** *** 5,9 **** (defvar *admin-application* (make-instance 'standard-application ! :url-prefix "/admin/" :tal-generator (make-instance 'yaclml:file-system-generator :cachep t --- 5,9 ---- (defvar *admin-application* (make-instance 'standard-application ! :url-prefix "/ucw/" :tal-generator (make-instance 'yaclml:file-system-generator :cachep t *************** *** 19,23 **** :accessor admin-app.body :component admin-login)) ! (:default-initargs :title "UCW Administration" :stylesheet "/static/ucw/ucw.css")) (defmethod render-html-body ((app admin-app)) --- 19,23 ---- :accessor admin-app.body :component admin-login)) ! (:default-initargs :title "UCW Administration" :stylesheet "/admin/ucw/ucw.css")) (defmethod render-html-body ((app admin-app)) *************** *** 50,55 **** (cons "Control Panel" control-panel) (cons "Server REPL" server-repl) ! ;;(cons "Applications" applications) ! ) :key-test #'string= :current-component-key "Control Panel"))) --- 50,54 ---- (cons "Control Panel" control-panel) (cons "Server REPL" server-repl) ! (cons "Applications" applications)) :key-test #'string= :current-component-key "Control Panel"))) *************** *** 73,78 **** (defmethod/cc toggle-inspectors ((self admin-control-panel)) ! ;;(setf *inspect-components* (not *inspect-components*)) ! (call 'info-message :message (strcat "(fake for security) Inspectors " (if *inspect-components* "" --- 72,77 ---- (defmethod/cc toggle-inspectors ((self admin-control-panel)) ! (setf *inspect-components* (not *inspect-components*)) ! (call 'info-message :message (strcat "Inspectors " (if *inspect-components* "" *************** *** 106,112 **** (ucw.admin.info "Starting slime server.") (call 'info-message ! :message (format nil "(fake for security) Swank server started on port ~D." 0 ! ;;(swank:create-server) ! ))) ;;;; The REPL --- 105,109 ---- (ucw.admin.info "Starting slime server.") (call 'info-message ! :message (format nil "Swank server started on port ~D." (swank:create-server)))) ;;;; The REPL *************** *** 127,131 **** :cols 60)) (form-value :accessor admin-repl.form-value :initarg :form-value :initform nil)) ! (:default-initargs :template-name "../admin/admin-repl.tal")) (defun admin-do-eval (repl) --- 124,128 ---- :cols 60)) (form-value :accessor admin-repl.form-value :initarg :form-value :initform nil)) ! (:default-initargs :template-name "ucw/admin/admin-repl.tal")) (defun admin-do-eval (repl) *************** *** 136,142 **** (let* ((*package* (value package-select)) (form (read-from-string (value input)))) ! (setf form-value nil ! ;;(eval form) ! )))) (defmethod/cc submit ((self admin-repl)) --- 133,137 ---- (let* ((*package* (value package-select)) (form (read-from-string (value input)))) ! (setf form-value (eval form))))) (defmethod/cc submit ((self admin-repl)) diff -r -C 2 ucw-boxset/ucw_ajax/src/components/ajax.lisp /tmp/ucw-boxset/ucw_ajax/src/components/ajax.lisp *** ucw-boxset/ucw_ajax/src/components/ajax.lisp Wed Aug 6 19:52:08 2008 --- /tmp/ucw-boxset/ucw_ajax/src/components/ajax.lisp Fri Sep 14 17:15:40 2007 *************** *** 63,67 **** (defun call-in-restored-rendering-environment (component trunk) (let ((parents)) ! (iter (for parent :first component :then (parent parent)) (while parent) (push parent parents)) --- 63,67 ---- (defun call-in-restored-rendering-environment (component trunk) (let ((parents)) ! (iter (for parent :first (parent component) :then (parent parent)) (while parent) (push parent parents))