diff -r -C 2 --exclude='*.fasl' --exclude=dependencies --exclude='*~' ucw-boxset/start-ajax.lisp ../orig/ucw-boxset/start-ajax.lisp *** ucw-boxset/start-ajax.lisp 2009-04-09 00:54:30.000000000 +0200 --- ../orig/ucw-boxset/start-ajax.lisp 2007-09-14 19:14:44.000000000 +0200 *************** *** 5,9 **** (in-package :common-lisp-user) ! (defparameter *ucw-directory* (directory-namestring (merge-pathnames #P"ucw_ajax/" *load-truename*))) (load (merge-pathnames #P"start-common.lisp" *load-truename*)) --- 5,9 ---- (in-package :common-lisp-user) ! (defparameter *ucw-directory* (merge-pathnames #P"ucw_ajax/" *load-truename*)) (load (merge-pathnames #P"start-common.lisp" *load-truename*)) diff -r -C 2 --exclude='*.fasl' --exclude=dependencies --exclude='*~' ucw-boxset/start-common.lisp ../orig/ucw-boxset/start-common.lisp *** ucw-boxset/start-common.lisp 2009-04-09 00:54:30.000000000 +0200 --- ../orig/ucw-boxset/start-common.lisp 2007-09-14 19:14:44.000000000 +0200 *************** *** 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 --exclude='*.fasl' --exclude=dependencies --exclude='*~' ucw-boxset/ucw_ajax/examples/src/examples.lisp ../orig/ucw-boxset/ucw_ajax/examples/src/examples.lisp *** ucw-boxset/ucw_ajax/examples/src/examples.lisp 2009-04-10 11:25:58.000000000 +0200 --- ../orig/ucw-boxset/ucw_ajax/examples/src/examples.lisp 2007-09-14 19:15:40.000000000 +0200 *************** *** 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 --exclude='*.fasl' --exclude=dependencies --exclude='*~' ucw-boxset/ucw_ajax/src/admin/admin.lisp ../orig/ucw-boxset/ucw_ajax/src/admin/admin.lisp *** ucw-boxset/ucw_ajax/src/admin/admin.lisp 2009-04-10 10:55:53.000000000 +0200 --- ../orig/ucw-boxset/ucw_ajax/src/admin/admin.lisp 2007-09-14 19:15:39.000000000 +0200 *************** *** 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)) *************** *** 124,128 **** :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) diff -r -C 2 --exclude='*.fasl' --exclude=dependencies --exclude='*~' ucw-boxset/ucw_ajax/src/components/ajax.lisp ../orig/ucw-boxset/ucw_ajax/src/components/ajax.lisp *** ucw-boxset/ucw_ajax/src/components/ajax.lisp 2009-04-10 11:02:29.000000000 +0200 --- ../orig/ucw-boxset/ucw_ajax/src/components/ajax.lisp 2007-09-14 19:15:40.000000000 +0200 *************** *** 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)) diff -r -C 2 --exclude='*.fasl' --exclude=dependencies --exclude='*~' ucw-boxset/ucw_ajax/src/components/ucw-inspector.lisp ../orig/ucw-boxset/ucw_ajax/src/components/ucw-inspector.lisp *** ucw-boxset/ucw_ajax/src/components/ucw-inspector.lisp 2009-04-10 13:09:54.000000000 +0200 --- ../orig/ucw-boxset/ucw_ajax/src/components/ucw-inspector.lisp 2007-09-14 19:15:39.000000000 +0200 *************** *** 24,30 **** (defmethod render ((insp ucw-inspector)) ! (multiple-value-bind (content) ! (swank::emacs-inspect (slot-value insp 'datum)) ! (<:h2 (<:as-html (prin1-to-string (slot-value insp 'datum)))) (dolist (part content) (etypecase part --- 24,31 ---- (defmethod render ((insp ucw-inspector)) ! (multiple-value-bind (title content) ! (swank::inspect-for-emacs (slot-value insp 'datum) ! (swank::make-default-inspector)) ! (<:h2 (<:as-html title)) (dolist (part content) (etypecase part