[claw-cvs] r87 - trunk/main/claw-html.dojo/src

[achiumenti at common-lisp.net]

Author: achiumenti
Date: Mon Sep  8 05:35:07 2008
New Revision: 87

Modified:
   trunk/main/claw-html.dojo/src/djbody.lisp
   trunk/main/claw-html.dojo/src/djdialog.lisp
   trunk/main/claw-html.dojo/src/djform.lisp
   trunk/main/claw-html.dojo/src/misc.lisp
Log:
CLAW dojo bugfixex

Modified: trunk/main/claw-html.dojo/src/djbody.lisp
==============================================================================
--- trunk/main/claw-html.dojo/src/djbody.lisp	(original)
+++ trunk/main/claw-html.dojo/src/djbody.lisp	Mon Sep  8 05:35:07 2008
@@ -55,7 +55,7 @@
              :documentation "Additional dojo configurations"))
   (:metaclass metacomponent)
   (:default-initargs :class "" :theme "tundra"
-                     :themes-url (format nil "~a/dojotoolkit/dijit/themes/" (clawserver-base-path *clawserver*))
+                     :themes-url (format nil "~a/dojotoolkit/dijit/themes/" *server-path*)
                      :parse-on-load "true"
                      :load-dojo-js t
                      :is-debug nil
@@ -77,7 +77,7 @@
         (djconfig (djbody-djconfig o)))
     (when (load-dojo-js o)
       (script> :type "text/javascript"
-               :src  (format nil "~a/dojotoolkit/dojo/dojo.js" (clawserver-base-path *clawserver*))
+               :src  (format nil "~a/dojotoolkit/dojo/dojo.js" *server-path*)
                :djconfig (if (null djconfig)
                              (format nil
                                      "parseOnLoad:~a,usePlainJson:true,isDebug:~a"
@@ -90,8 +90,8 @@
 (defmethod htcomponent-stylesheet-files ((o djbody))
   (let ((theme (djbody-theme o)))
     (list
-     (format nil "~a/dojotoolkit/dojo/resources/dojo.css" (clawserver-base-path *clawserver*))
-     (format nil "~a/dojotoolkit/dijit/themes/dijit.css" (clawserver-base-path *clawserver*))
+     (format nil "~a/dojotoolkit/dojo/resources/dojo.css" *server-path*)
+     (format nil "~a/dojotoolkit/dijit/themes/dijit.css" *server-path*)
      (format nil "~a~a/~a.css" (djbody-themes-url o) theme theme))))
 
 

Modified: trunk/main/claw-html.dojo/src/djdialog.lisp
==============================================================================
--- trunk/main/claw-html.dojo/src/djdialog.lisp	(original)
+++ trunk/main/claw-html.dojo/src/djdialog.lisp	Mon Sep  8 05:35:07 2008
@@ -33,7 +33,7 @@
   ()
   (:metaclass metacomponent)
   (:documentation "Class for dojo dijit.Dialog component. More info at http://api.dojotoolkit.org/")
-  (:default-initargs :dojo-type "dijit.Dialog"))
+  (:default-initargs :dojo-type "claw.Dialog"))
 
 (defclass djdialog (wcomponent)
   ()

Modified: trunk/main/claw-html.dojo/src/djform.lisp
==============================================================================
--- trunk/main/claw-html.dojo/src/djform.lisp	(original)
+++ trunk/main/claw-html.dojo/src/djform.lisp	Mon Sep  8 05:35:07 2008
@@ -417,7 +417,7 @@
                      :translator *file-translator*))
 
 (defmethod htcomponent-stylesheet-files((djtext-box-file djtext-box-file))
-  (list (format nil "~a/dojotoolkit/dojox/widget/FileInput/FileInput.css" (clawserver-base-path *clawserver*))))
+  (list (format nil "~a/dojotoolkit/dojox/widget/FileInput/FileInput.css" *server-path*)))
 
 (defclass djeditor (djtextarea)
   ((form :initform nil

Modified: trunk/main/claw-html.dojo/src/misc.lisp
==============================================================================
--- trunk/main/claw-html.dojo/src/misc.lisp	(original)
+++ trunk/main/claw-html.dojo/src/misc.lisp	Mon Sep  8 05:35:07 2008
@@ -42,3 +42,4 @@
 (register-library-resource "dojotoolkit/claw/Form.js"  (make-pathname :directory (append (pathname-directory *dojo-misc-file*) '("js")) :name "Form" :type "js"))
 (register-library-resource "dojotoolkit/claw/Editor.js"  (make-pathname :directory (append (pathname-directory *dojo-misc-file*) '("js")) :name "Editor" :type "js"))
 (register-library-resource "dojotoolkit/claw/ActionLink.js"  (make-pathname :directory (append (pathname-directory *dojo-misc-file*) '("js")) :name "ActionLink" :type "js"))
+(register-library-resource "dojotoolkit/claw/Dialog.js"  (make-pathname :directory (append (pathname-directory *dojo-misc-file*) '("js")) :name "Dialog" :type "js"))