Changeset 3653

Timestamp:

07/28/08 12:48:50 (4 months ago)

Author:

ksprotte

Message:

poi-handlers changed to get them up-to-date with hunchentoot - all the old functionality is working now again

Files:

• trunk/projects/bos/payment-website/static/MochiKit (added)
• trunk/projects/bos/payment-website/static/cms.js (modified) (1 diff)
• trunk/projects/bos/web/poi-handlers.lisp (modified) (19 diffs)
• trunk/projects/bos/web/webserver.lisp (modified) (1 diff)

trunk/projects/bos/payment-website/static/cms.js

@@ -93 +93 @@
-    }
-}
+
+function confirm_delete(field_name, value, confirm_string)
+{
+    $(field_name).value = value;
+    return confirm(confirm_string);
+}

trunk/projects/bos/web/poi-handlers.lisp

@@ -1 @@
-
-(in-package :bos.web)
-
@@ -6 +5 @@
-(defclass make-poi-handler (page-handler)
-  ())
-
+
-(defmethod handle ((handler make-poi-handler))
-  (with-query-params (name)
@@ -65 +64 @@
-        (setf (nth old-position new-images) (nth (+ shift-by old-position) new-images))
-        (setf (nth (+ shift-by old-position) new-images) tmp)
-
+
+
-    (with-bos-cms-page (:title "Edit POI")
-      (content-language-chooser)
@@ -112 +112 @@
-                   do (html (:td ((:a :href (format nil "/edit-poi-image/~a?poi=~A" (store-object-id image) (store-object-id poi)))
-                                  ((:img :border "0" :src (format nil "/image/~a/thumbnail,,55,55" (store-object-id image)))))
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+
+
+
+
+
+
+
+
+
+
+
+
+
-              (unless (eql 6 (length (poi-images poi)))
-                (html
@@ -140 +140 @@
-                            :br
-                            (submit-button "upload-airal" "upload-airal")))))
-
+
+
-             (:td (dolist (panorama (poi-panoramas poi))
-                    (html (:princ-safe (format-date-time (blob-timestamp panorama)))
-                          ((:a :href (format nil "/image/~D" (store-object-id panorama)) :target "_new" :class "cmslink")
-                           " view ")
-
+
+
-                          :br))
-                  (html "Upload new panorama view"
@@ -192 +194 @@
-      (error "no file uploaded in upload handler"))
-    (with-image-from-upload* (uploaded-file)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defmethod handle-object-form ((handler edit-poi-handler)
@@ -213 +216 @@
-                               (poi poi))
-  (let ((airals (poi-airals poi)))
-
+
+
-    (mapc #'delete-object airals))
-  (redirect (format nil "/edit-poi/~D"
@@ -221 +225 @@
-                               (action (eql :delete-movie))
-                               (poi poi))
-
+
+
-  (redirect (format nil "/edit-poi/~D" (store-object-id poi))))
-
@@ -230 +235 @@
-    (unless uploaded-file
-      (error "no file uploaded in upload handler"))
-
-
-
-
-
-
+
+
+
+
-  (redirect (format nil "/edit-poi/~D"
-                    (store-object-id poi))))
@@ -244 +247 @@
-  (with-query-params (panorama-id)
-    (let ((panorama (find-store-object (parse-integer panorama-id))))
-
-
+
+
+
-  (redirect (format nil "/edit-poi/~D"
-                    (store-object-id poi))))
@@ -293 +297 @@
-      (if poi-image
-          (blob-from-file poi-image uploaded-file)
-(upload-pathname uploaded-file)
+uploaded-file
-                                        :class-name 'poi-image
-                                        :initargs `(:poi ,poi))))
@@ -315 +319 @@
-                (:tr (:td "upload new image")
-                     (:td ((:input :type "file" :name "image-file"))
-    
-    
+
+
-                (:tr (:td "title")
-                     (:td (text-field "title"
@@ -365 +369 @@
-                         (reduce #'max last-paid-contracts
-                                 :key (lambda (contract) (store-object-last-change contract 0))))))
-  
+
-    (setf (hunchentoot:header-out :last-modified)
-          (hunchentoot:rfc-1123-date timestamp))
-    
+
-      (with-http-body ()
-        (html
@@ -410 +414 @@
-               (with-element "image"
-                 (attribute "id" (princ-to-string (store-object-id image)))
-                   
+
-                   (attribute "title" (slot-string image 'title language))
-                   
+
-                   (with-element "description" (text (slot-string image 'description language))))
-                 (with-element "url" (text (format nil "http://createrainforest.org/image/~D"
-                 
+
-                 (with-element "width" (text (princ-to-string (store-image-width image))))
-                 (with-element "height" (text (princ-to-string (store-image-height image)))))))
@@ -481 +485 @@
-             (with-element "tr"
-               (dolist (image images)
-                    
+
-             ;; titles
-             (with-element "tr"
@@ -488 +492 @@
-    (handler-case
-        (with-xml-output (make-string-sink)
-    
+
-            (with-element "head")
-            (with-element "body"
-              (with-element "table"
-                (attribute "cellspacing" "0") (attribute "width" "500") (attribute "cellpadding" "5") (attribute "border" "0")
-                
+
-                (with-element "tbody"
-                  (with-element "tr"
@@ -567 +571 @@
-(defmethod handle-object ((handler poi-xml-handler) poi)
-  (let ((timestamp (store-object-last-change poi 1)))
-  
+
-    (setf (hunchentoot:header-out :last-modified)
-          (hunchentoot:rfc-1123-date timestamp))
@@ -581 +585 @@
-(defmethod handle-object ((handler poi-kml-handler) poi)
-  (with-query-params ((lang "en"))
-      
+
-      (with-namespace (nil "http://earth.google.com/kml/2.1")
-        (with-element "kml"
@@ -611 +615 @@
-              (kml-region (make-rectangle2 (list 0 0 +width+ +width+)) '(:min 600 :max -1))
-              (mapc #'(lambda (poi) (write-poi-kml poi lang)) relevant-pois))))))))
-
-

trunk/projects/bos/web/webserver.lisp

@@ -226 +226 @@
-                 :site-logo-url "/images/bos-logo.gif"
-                 :style-sheet-urls '("/static/cms.css")
-
+ "/static/MochiKit/MochiKit.js"
-
-  (publish-directory :prefix "/static/"