- bknr-cvs@common-lisp.net - mailman3.common-lisp.net

[bknr-cvs] hans changed trunk/projects/bos/web/startup.lisp
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3560 Author: hans URL: http://bknr.net/trac/changeset/3560 repair hunchentoot startup arguments U trunk/projects/bos/web/startup.lisp Modified: trunk/projects/bos/web/startup.lisp =================================================================== --- trunk/projects/bos/web/startup.lisp 2008-07-22 14:56:17 UTC (rev 3559) +++ trunk/projects/bos/web/startup.lisp 2008-07-22 16:07:52 UTC (rev 3560) @@ -45,8 +45,8 @@ (hunchentoot:stop-server *webserver*)) (setf hunchentoot:*hunchentoot-default-external-format* (flex:make-external-format :utf-8 :eol-style :lf) hunchentoot:*rewrite-for-session-urls* nil) - (setq *webserver* (hunchentoot:start-server :port *port* (not debug) - :persistent-connections-p nil)) + (setq *webserver* (hunchentoot:start-server :port *port* :threaded (not debug) + :persistent-connections-p (not debug))) (if start-frontend (start-frontend :host host :backend-port port :port frontend-port) (warn "frontend not started - to achieve this specify :start-frontend t"))

1 0

[bknr-cvs] ksprotte changed trunk/xhtmlgen/xhtmlgen.lisp
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3559 Author: ksprotte URL: http://bknr.net/trac/changeset/3559 xhtmlgen: added 2 new special-html tags. :format and :format-safe U trunk/xhtmlgen/xhtmlgen.lisp Modified: trunk/xhtmlgen/xhtmlgen.lisp =================================================================== --- trunk/xhtmlgen/xhtmlgen.lisp 2008-07-22 14:41:01 UTC (rev 3558) +++ trunk/xhtmlgen/xhtmlgen.lisp 2008-07-22 14:56:17 UTC (rev 3559) @@ -225,6 +225,18 @@ `(prin1-safe-http ,bod)) body)))) +(def-special-html :format + ;; example: + ;; (html (:p (:format "hi ~A!" "paul"))) + #'(lambda (ent args argsp body) + (declare (ignore ent args argsp)) + `(princ-http (format nil ,@body)))) + +(def-special-html :format-safe + #'(lambda (ent args argsp body) + (declare (ignore ent args argsp)) + `(princ-safe-http (format nil ,@body)))) + (def-special-html :comment #'(lambda (ent args argsp body) (declare (ignore ent args argsp body))

1 0

[bknr-cvs] hans changed trunk/projects/bos/
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3558 Author: hans URL: http://bknr.net/trac/changeset/3558 Language related fixes. U trunk/projects/bos/payment-website/infosystem/javascript.js U trunk/projects/bos/payment-website/static/bos.js U trunk/projects/bos/payment-website/templates/da/infosystem.xml U trunk/projects/bos/payment-website/templates/da/quittung.xml U trunk/projects/bos/payment-website/templates/da/ring-detail.xml U trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml U trunk/projects/bos/payment-website/templates/da/toplevel.xml U trunk/projects/bos/payment-website/templates/da/toplevel_extra.xml U trunk/projects/bos/payment-website/templates/da/toplevel_main.xml U trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml U trunk/projects/bos/payment-website/templates/da/versand_info.xml U trunk/projects/bos/payment-website/templates/de/infosystem.xml U trunk/projects/bos/payment-website/templates/de/quittung.xml U trunk/projects/bos/payment-website/templates/de/ring-detail.xml U trunk/projects/bos/payment-website/templates/de/sponsor_canceled.xml U trunk/projects/bos/payment-website/templates/de/toplevel.xml U trunk/projects/bos/payment-website/templates/de/toplevel_extra.xml U trunk/projects/bos/payment-website/templates/de/toplevel_main.xml U trunk/projects/bos/payment-website/templates/de/toplevel_news.xml U trunk/projects/bos/payment-website/templates/de/versand_geschenk.xml U trunk/projects/bos/payment-website/templates/en/infosystem.xml U trunk/projects/bos/payment-website/templates/en/quittung.xml U trunk/projects/bos/payment-website/templates/en/ring-detail.xml U trunk/projects/bos/payment-website/templates/en/sponsor_canceled.xml U trunk/projects/bos/payment-website/templates/en/toplevel.xml U trunk/projects/bos/payment-website/templates/en/toplevel_extra.xml U trunk/projects/bos/payment-website/templates/en/toplevel_main.xml U trunk/projects/bos/payment-website/templates/en/versand_geschenk.xml U trunk/projects/bos/payment-website/templates/en/versand_info.xml U trunk/projects/bos/web/webserver.lisp Modified: trunk/projects/bos/payment-website/infosystem/javascript.js =================================================================== --- trunk/projects/bos/payment-website/infosystem/javascript.js 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/infosystem/javascript.js 2008-07-22 14:41:01 UTC (rev 3558) @@ -158,7 +158,7 @@ dbg("<br/> -> lade POI"); poicomplete = false; - window.frames['data'].window.location.replace(http_pfad + "/poi-javascript"); + window.frames['data'].window.location.replace(http_pfad + "/poi-javascript?lang=" + document.language); poi_warten(); // starten der Wartenfunktion return true; Modified: trunk/projects/bos/payment-website/static/bos.js =================================================================== --- trunk/projects/bos/payment-website/static/bos.js 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/static/bos.js 2008-07-22 14:41:01 UTC (rev 3558) @@ -22,7 +22,7 @@ // *** extrafenster fuer satellitenkarte *** // function window_infosys() { - var url = "/infosystem"; + var url = "/infosystem/" + document.body.lang + "/satellitenkarte.htm"; var sponsorid_input = document.getElementById('sponsorid-input'); var password_input = document.getElementById('password-input'); Modified: trunk/projects/bos/payment-website/templates/da/infosystem.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/infosystem.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/infosystem.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -11,7 +11,7 @@ <title>Regnskov i SAMBOJA LESTARI - Infosystem</title> </head> -<body> +<body bos:lang="$(language)"> <div id="header_infosystem"> </div> <div id="content_infosystem"> Modified: trunk/projects/bos/payment-website/templates/da/quittung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/quittung.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/quittung.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -10,7 +10,7 @@  <title>Regnskov i SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/da/ring-detail.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/ring-detail.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/ring-detail.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -13,7 +13,7 @@ </script> <title>Scheme for the "ring"</title> </head> - <body> + <body bos:lang="$(language)"> <div id="content_extra"> <h1 class="ringschema">Scheme for the "ring"</h1> <img src="/images/ring_detail_en.jpg" /> Modified: trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -10,7 +10,7 @@  <title>Regnskov i SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/da/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/toplevel.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -12,7 +12,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(titel)</title> </head> -<body> +<body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/da/toplevel_extra.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel_extra.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/toplevel_extra.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -11,7 +11,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(titel)</title> </head> - <body> + <body bos:lang="$(language)"> <div id="header_extra"> </div> <div id="content_extra"> Modified: trunk/projects/bos/payment-website/templates/da/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel_main.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/toplevel_main.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -10,7 +10,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(title)</title> </head> - <body> + <body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@  <title>REGENWALD für SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/da/versand_info.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/versand_info.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/da/versand_info.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -10,7 +10,7 @@  <title>Regnskov i SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/de/infosystem.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/infosystem.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/infosystem.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -12,7 +12,7 @@ <title>REGENWALD für SAMBOJA LESTARI - Infosystem</title> </head> -<body> +<body bos:lang="$(language)"> <div id="header_infosystem"> </div> <div id="content_infosystem"> Modified: trunk/projects/bos/payment-website/templates/de/quittung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/quittung.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/quittung.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@  <title>REGENWALD für SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/de/ring-detail.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/ring-detail.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/ring-detail.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -13,7 +13,7 @@ </script> <title>Ringschema</title> </head> - <body> + <body bos:lang="$(language)"> <div id="content_extra"> <h1 class="ringschema">Ringschema</h1> <img src="/images/ring_detail.jpg" /> Modified: trunk/projects/bos/payment-website/templates/de/sponsor_canceled.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/sponsor_canceled.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/sponsor_canceled.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@  <title>REGENWALD für SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/de/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/toplevel.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -15,7 +15,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(title)</title> </head> -<body> +<body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/de/toplevel_extra.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel_extra.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/toplevel_extra.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(title)</title> </head> - <body> + <body bos:lang="$(language)"> <div id="header_extra"> </div> <div id="content_extra"> Modified: trunk/projects/bos/payment-website/templates/de/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel_main.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/toplevel_main.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -17,7 +17,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(title)</title> </head> - <body> + <body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/de/toplevel_news.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel_news.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/toplevel_news.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -14,7 +14,7 @@  <title>$(title)</title> </head> - <body> + <body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/de/versand_geschenk.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/versand_geschenk.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/de/versand_geschenk.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@  <title>REGENWALD für SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/en/infosystem.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/infosystem.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/infosystem.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -12,7 +12,7 @@ <title>RAINFOREST for SAMBOJA LESTARI - Infosystem</title> </head> -<body> +<body bos:lang="$(language)"> <div id="header_infosystem"> </div> <div id="content_infosystem"> Modified: trunk/projects/bos/payment-website/templates/en/quittung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/quittung.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/quittung.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@  <title>RAINFOREST for SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/en/ring-detail.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/ring-detail.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/ring-detail.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -13,7 +13,7 @@ </script> <title>Scheme for the "ring"</title> </head> - <body> + <body bos:lang="$(language)"> <div id="content_extra"> <h1 class="ringschema">Scheme for the "ring"</h1> <img src="/images/ring_detail_en.jpg" /> Modified: trunk/projects/bos/payment-website/templates/en/sponsor_canceled.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/sponsor_canceled.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/sponsor_canceled.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@  <title>RAINFOREST for SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/en/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/toplevel.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/toplevel.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -17,7 +17,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(title)</title> </head> -<body> +<body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/en/toplevel_extra.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/toplevel_extra.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/toplevel_extra.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(title)</title> </head> - <body> + <body bos:lang="$(language)"> <div id="header_extra"> </div> <div id="content_extra"> Modified: trunk/projects/bos/payment-website/templates/en/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/toplevel_main.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/toplevel_main.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -15,7 +15,7 @@ <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" /> <title>$(title)</title> </head> - <body> + <body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/en/versand_geschenk.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/versand_geschenk.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/versand_geschenk.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@  <title>REGENWALD für SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/payment-website/templates/en/versand_info.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/versand_info.xml 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/payment-website/templates/en/versand_info.xml 2008-07-22 14:41:01 UTC (rev 3558) @@ -16,7 +16,7 @@  <title>RAINFOREST for SAMBOJA LESTARI</title> </head> - <body> + <body bos:lang="$(language)">  <div id="header"> Modified: trunk/projects/bos/web/webserver.lisp =================================================================== --- trunk/projects/bos/web/webserver.lisp 2008-07-22 14:08:27 UTC (rev 3557) +++ trunk/projects/bos/web/webserver.lisp 2008-07-22 14:41:01 UTC (rev 3558) @@ -54,7 +54,8 @@ (call-next-method handler template-name)) (defmethod initial-template-environment ((expander worldpay-template-handler)) - (append (list (cons :website-url *website-url*)) + (append (list (cons :website-url *website-url*) + (cons :language (request-language))) (call-next-method))) (define-persistent-class website-language () @@ -104,17 +105,6 @@ *default-language*)) :code hunchentoot:+http-moved-permanently+)) -(defclass infosystem-handler (page-handler) - ()) - -(defmethod handle ((handler infosystem-handler)) - ;; XXX hier logout-parameter implementieren - (with-query-params (logout) - (when logout - (hunchentoot:remove-session hunchentoot:*session*))) - (let ((language (request-language))) - (redirect #?"/infosystem/$(language)/satellitenkarte.htm"))) - (defclass certificate-handler (object-handler) () (:default-initargs :class 'contract)) @@ -182,7 +172,7 @@ (or (hunchentoot:aux-request-value :language) *default-language*)) -(defmethod handle :before ((handler page-handler)) +(defmethod handle :before ((handler page-handler)) (setf (hunchentoot:aux-request-value :language) (or (query-param "language") (query-param "lang") @@ -238,7 +228,6 @@ ("/cert-regen" cert-regen-handler) ("/admin" admin-handler) ("/languages" languages-handler) - ("/infosystem" infosystem-handler) ("/overview" image-tile-handler) ("/enlarge-overview" enlarge-tile-handler) ("/create-contract" create-contract-handler)

1 0

[bknr-cvs] hans changed trunk/projects/bos/web/
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3557 Author: hans URL: http://bknr.net/trac/changeset/3557 Sessionless request language handling. U trunk/projects/bos/web/contract-rss.lisp U trunk/projects/bos/web/news-handlers.lisp U trunk/projects/bos/web/news-rss.lisp U trunk/projects/bos/web/news-tags.lisp U trunk/projects/bos/web/poi-handlers.lisp U trunk/projects/bos/web/rss.lisp U trunk/projects/bos/web/startup.lisp U trunk/projects/bos/web/tags.lisp U trunk/projects/bos/web/web-utils.lisp U trunk/projects/bos/web/webserver.lisp Modified: trunk/projects/bos/web/contract-rss.lisp =================================================================== --- trunk/projects/bos/web/contract-rss.lisp 2008-07-22 12:39:27 UTC (rev 3556) +++ trunk/projects/bos/web/contract-rss.lisp 2008-07-22 14:08:27 UTC (rev 3557) @@ -7,7 +7,7 @@ (contract-paidp contract)) (defmethod rss-item-title ((contract contract)) - (format nil (case (intern (bos.web::current-website-language)) + (format nil (case (intern (bos.web::request-language)) (de "~A Quadratmeter wurden ~@[von ~A ~]gekauft") (t "~A square meters bought~@[ by ~A~]")) (length (contract-m2s contract)) @@ -18,11 +18,11 @@ (defmethod rss-item-link ((contract contract)) #+(or) - (format nil "http://createrainforest.org/~A/news-extern/~A" (bos.web::current-website-language) (store-object-id item))) + (format nil "http://createrainforest.org/~A/news-extern/~A" (bos.web::request-language) (store-object-id item))) (defmethod rss-item-guid ((item contract)) #+(or) - (format nil "http://createrainforest.org/~A/news-extern/~A" (bos.web::current-website-language) (store-object-id item))) + (format nil "http://createrainforest.org/~A/news-extern/~A" (bos.web::request-language) (store-object-id item))) (defmethod rss-item-pub-date ((contract contract)) (contract-date contract)) Modified: trunk/projects/bos/web/news-handlers.lisp =================================================================== --- trunk/projects/bos/web/news-handlers.lisp 2008-07-22 12:39:27 UTC (rev 3556) +++ trunk/projects/bos/web/news-handlers.lisp 2008-07-22 14:08:27 UTC (rev 3557) @@ -10,7 +10,7 @@ ()) (defmethod handle-object-form ((handler edit-news-handler) action (news-item (eql nil))) - (let ((language (hunchentoot:session-value :language))) + (let ((language (request-language))) (with-bos-cms-page (:title "Edit news items") (content-language-chooser) (:h2 "Create new item") @@ -33,7 +33,7 @@ (redirect (format nil "/edit-news/~D" (store-object-id (make-news-item))))) (defmethod handle-object-form ((handler edit-news-handler) action news-item) - (let ((language (hunchentoot:session-value :language))) + (let ((language (request-language))) (with-bos-cms-page (:title "Edit news item") (content-language-chooser) ((:script :type "text/javascript") @@ -49,7 +49,7 @@ (:tr (:td (submit-button "save" "save") (submit-button "delete" "delete" :confirm "Really delete the news item?")))))))) (defmethod handle-object-form ((handler edit-news-handler) (action (eql :save)) news-item) - (let ((language (hunchentoot:session-value :language))) + (let ((language (request-language))) (with-query-params (title text) (update-news-item news-item language :title title :text text) (with-bos-cms-page (:title "News item updated") Modified: trunk/projects/bos/web/news-rss.lisp =================================================================== --- trunk/projects/bos/web/news-rss.lisp 2008-07-22 12:39:27 UTC (rev 3556) +++ trunk/projects/bos/web/news-rss.lisp 2008-07-22 14:08:27 UTC (rev 3557) @@ -4,19 +4,19 @@ "news") (defmethod rss-item-published ((item news-item)) - (news-item-published item (bos.web::current-website-language))) + (news-item-published item (bos.web::request-language))) (defmethod rss-item-title ((item news-item)) - (news-item-title item (bos.web::current-website-language))) + (news-item-title item (bos.web::request-language))) (defmethod rss-item-description ((item news-item)) - (news-item-text item (bos.web::current-website-language))) + (news-item-text item (bos.web::request-language))) (defmethod rss-item-link ((item news-item)) - (format nil "http://createrainforest.org/~A/news-extern/~A" (bos.web::current-website-language) (store-object-id item))) + (format nil "http://createrainforest.org/~A/news-extern/~A" (bos.web::request-language) (store-object-id item))) (defmethod rss-item-guid ((item news-item)) - (format nil "http://createrainforest.org/~A/news-extern/~A" (bos.web::current-website-language) (store-object-id item))) + (format nil "http://createrainforest.org/~A/news-extern/~A" (bos.web::request-language) (store-object-id item))) (defmethod rss-item-pub-date ((item news-item)) (news-item-time item)) Modified: trunk/projects/bos/web/news-tags.lisp =================================================================== --- trunk/projects/bos/web/news-tags.lisp 2008-07-22 12:39:27 UTC (rev 3556) +++ trunk/projects/bos/web/news-tags.lisp 2008-07-22 14:08:27 UTC (rev 3557) @@ -7,7 +7,7 @@ do (html (:princ-safe line) :br))) (define-bknr-tag news-headlines (&key archive) - (let ((language (hunchentoot:session-value :language))) + (let ((language (request-language))) (let* ((now (get-universal-time)) (news-items (if archive (all-news-items language) @@ -34,7 +34,7 @@ (define-bknr-tag news-item () (let ((news-item (find-store-object (parse-integer (nth-value 1 (parse-url))))) - (language (hunchentoot:session-value :language))) + (language (request-language))) (html ((:h1 :class "extra") (:princ-safe (format-date-time (news-item-time news-item) :show-time nil)) ", " Modified: trunk/projects/bos/web/poi-handlers.lisp =================================================================== --- trunk/projects/bos/web/poi-handlers.lisp 2008-07-22 12:39:27 UTC (rev 3556) +++ trunk/projects/bos/web/poi-handlers.lisp 2008-07-22 14:08:27 UTC (rev 3557) @@ -18,7 +18,7 @@ (html (:h2 "Bad technical name") "Please use only alphanumerical characters, - and _ for technical POI names"))) (t - (redirect (edit-object-url (make-poi (hunchentoot:session-value :language) name))))))) + (redirect (edit-object-url (make-poi (request-language) name))))))) (defclass edit-poi-handler (editor-only-handler edit-object-handler) () @@ -34,7 +34,7 @@ do (html (:li (cmslink (edit-object-url poi) (:princ-safe (poi-name poi)) " - " - (:princ-safe (slot-string poi 'title (hunchentoot:session-value :language))))))))) + (:princ-safe (slot-string poi 'title (request-language))))))))) (html (:h2 "No POIs created yet"))) ((:form :method "post" :action "/make-poi") "Make new POI named " @@ -52,7 +52,7 @@ (defmethod handle-object-form ((handler edit-poi-handler) action (poi poi)) (with-query-params (language shift shift-by) - (unless language (setq language (hunchentoot:session-value :language))) + (unless language (setq language (request-language))) (when shift ;; change image order (setq shift (find-store-object (parse-integer shift))) @@ -65,7 +65,6 @@ (setf (nth old-position new-images) (nth (+ shift-by old-position) new-images)) (setf (nth (+ shift-by old-position) new-images) tmp) (change-slot-values poi 'bos.m2::images new-images))) - (setf (hunchentoot:session-value :language) language) (with-bos-cms-page (:title "Edit POI") (content-language-chooser) (unless (poi-complete poi language) @@ -169,7 +168,7 @@ (defmethod handle-object-form ((handler edit-poi-handler) (action (eql :save)) (poi poi)) (with-query-params (published title subtitle description language x y icon movie) - (unless language (setq language (hunchentoot:session-value :language))) + (unless language (setq language (request-language))) (let ((args (list :title title :published published :subtitle subtitle @@ -301,7 +300,7 @@ (defmethod handle-object-form ((handler edit-poi-image-handler) action poi-image) (with-query-params (language poi) - (unless language (setq language (hunchentoot:session-value :language))) + (unless language (setq language (request-language))) (with-bos-cms-page (:title "Edit POI Image") (html (cmslink (edit-object-url (poi-image-poi poi-image)) "Back to POI") @@ -331,7 +330,7 @@ (defmethod handle-object-form ((handler edit-poi-image-handler) (action (eql :save)) poi-image) (with-query-params (title subtitle description language) - (unless language (setq language (hunchentoot:session-value :language))) + (unless language (setq language (request-language))) (update-poi-image poi-image language :title title :subtitle subtitle @@ -371,7 +370,7 @@ (with-http-body () (html ((:script :language "JavaScript") - (:princ (make-poi-javascript (or (hunchentoot:session-value :language) *default-language*))) + (:princ (make-poi-javascript (request-language))) (:princ "parent.poi_fertig(pois, anzahlSponsoren, anzahlVerkauft);") (:princ (format nil "parent.last_sponsors([~{~A~^,~%~}]);" (mapcar #'contract-js last-paid-contracts))))))))) Modified: trunk/projects/bos/web/rss.lisp =================================================================== --- trunk/projects/bos/web/rss.lisp 2008-07-22 12:39:27 UTC (rev 3556) +++ trunk/projects/bos/web/rss.lisp 2008-07-22 14:08:27 UTC (rev 3557) @@ -6,18 +6,18 @@ "news") (defmethod rss-item-published ((item news-item)) - (format t "Language: ~A~%" (current-website-language)) + (format t "Language: ~A~%" (request-language)) t) (defmethod rss-item-title ((item news-item)) - (news-item-title item (current-website-language))) + (news-item-title item (request-language))) (defmethod rss-item-description ((item news-item)) - (news-item-text item (current-website-language))) + (news-item-text item (request-language))) (defmethod rss-item-link ((item news-item)) - (format nil "http://createrainforest.org/~A/news-extern/~A" (current-website-language) (store-object-id item))) + (format nil "http://createrainforest.org/~A/news-extern/~A" (request-language) (store-object-id item))) (defmethod rss-item-guid ((item news-item)) - (format nil "http://createrainforest.org/~A/news-extern/~A" (current-website-language) (store-object-id item))) + (format nil "http://createrainforest.org/~A/news-extern/~A" (request-language) (store-object-id item))) Modified: trunk/projects/bos/web/startup.lisp =================================================================== --- trunk/projects/bos/web/startup.lisp 2008-07-22 12:39:27 UTC (rev 3556) +++ trunk/projects/bos/web/startup.lisp 2008-07-22 14:08:27 UTC (rev 3557) @@ -41,12 +41,11 @@ :worldpay-test-mode *worldpay-test-mode*) (format t "~&; Starting hunchentoot~@[ in debug mode~].~%" debug) (force-output) - (setq hunchentoot:*catch-errors-p* (not debug)) (when *webserver* (hunchentoot:stop-server *webserver*)) - (setf *hunchentoot-default-external-format* (flex:make-external-format :utf-8 :eol-style :lf) + (setf hunchentoot:*hunchentoot-default-external-format* (flex:make-external-format :utf-8 :eol-style :lf) hunchentoot:*rewrite-for-session-urls* nil) - (setq *webserver* (hunchentoot:start-server :port *port* #+not-yet :threaded #+not-yet (not debug) + (setq *webserver* (hunchentoot:start-server :port *port* (not debug) :persistent-connections-p nil)) (if start-frontend (start-frontend :host host :backend-port port :port frontend-port) Modified: trunk/projects/bos/web/tags.lisp =================================================================== --- trunk/projects/bos/web/tags.lisp 2008-07-22 12:39:27 UTC (rev 3556) +++ trunk/projects/bos/web/tags.lisp 2008-07-22 14:08:27 UTC (rev 3557) @@ -15,10 +15,10 @@ (define-bknr-tag language-chooser (name) (html ((:select :name name) - (language-options-1 (current-website-language))))) + (language-options-1 (request-language))))) (define-bknr-tag language-options () - (language-options-1 (current-website-language))) + (language-options-1 (request-language))) (define-bknr-tag worldpay-receipt () (emit-without-quoting "<WPDISPLAY ITEM=banner>")) @@ -41,7 +41,7 @@ (let ((contract (find-store-object (parse-integer (get-template-var :contract-id))))) (when (equal want-print "no") (contract-set-download-only-p contract t)) - (contract-issue-cert contract name :address address :language (hunchentoot:session-value :language)) + (contract-issue-cert contract name :address address :language (request-language)) (mail-worldpay-sponsor-data) (bknr.web::redirect-request :target (if gift "index" (format nil "profil_setup?name=~A&email=~A&sponsor-id=~A" @@ -78,7 +78,7 @@ (manual-transfer (or (scan #?r"rweisen" action) (scan #?r"rweisung" action) (scan #?r"verf" action))) - (language (hunchentoot:session-value :language)) + (language (request-language)) (sponsor (make-sponsor :language language)) (contract (make-contract sponsor numsqm :download-only download-only @@ -133,7 +133,7 @@ vorname name strasse plz ort) - :language (hunchentoot:session-value :language)) + :language (request-language)) (mail-manual-sponsor-data)))) (define-bknr-tag when-certificate () Modified: trunk/projects/bos/web/web-utils.lisp =================================================================== --- trunk/projects/bos/web/web-utils.lisp 2008-07-22 12:39:27 UTC (rev 3556) +++ trunk/projects/bos/web/web-utils.lisp 2008-07-22 14:08:27 UTC (rev 3557) @@ -30,19 +30,14 @@ (html "not logged in")) " - current content language is " (cmslink "change-language" - (:princ-safe (current-website-language)) + (:princ-safe (request-language)) " (" - (:princ-safe (language-name (current-website-language))) + (:princ-safe (language-name (request-language))) ")")))) (defun language-name (language-short-name) (cadr (assoc language-short-name (website-languages) :test #'equal))) -(defun current-website-language () - (unless (hunchentoot:session-value :language) - (setf (hunchentoot:session-value :language) *default-language*)) - (hunchentoot:session-value :language)) - (defun content-language-chooser () (html ((:p :class "languages") @@ -51,7 +46,7 @@ do (labels ((show-language-link () (html (cmslink (format nil "~A?language=~A" (hunchentoot:request-uri*) language-symbol) (:princ-safe language-name))))) - (if (equal (hunchentoot:session-value :language) language-symbol) + (if (equal (request-language) language-symbol) (html "[" (show-language-link) "]") (html (show-language-link))) (html " ")))))) Modified: trunk/projects/bos/web/webserver.lisp =================================================================== --- trunk/projects/bos/web/webserver.lisp 2008-07-22 12:39:27 UTC (rev 3556) +++ trunk/projects/bos/web/webserver.lisp 2008-07-22 14:08:27 UTC (rev 3557) @@ -112,7 +112,7 @@ (with-query-params (logout) (when logout (hunchentoot:remove-session hunchentoot:*session*))) - (let ((language (hunchentoot:session-value :language))) + (let ((language (request-language))) (redirect #?"/infosystem/$(language)/satellitenkarte.htm"))) (defclass certificate-handler (object-handler) @@ -178,18 +178,19 @@ (call-next-method))) (call-next-method)))) -(defmethod authorize :after ((authorizer bos-authorizer)) - (let ((new-language (or (language-from-url (hunchentoot:request-uri*)) - (query-param "language"))) - (current-language (hunchentoot:session-value :language))) - (when (or (not current-language) - (and new-language - (not (equal new-language current-language)))) - (setf (hunchentoot:session-value :language) - (or new-language - (find-browser-prefered-language) - *default-language*))))) +(defun request-language () + (or (hunchentoot:aux-request-value :language) + *default-language*)) +(defmethod handle :before ((handler page-handler)) + (setf (hunchentoot:aux-request-value :language) + (or (query-param "language") + (query-param "lang") + (language-from-url (hunchentoot:request-uri*)) + (hunchentoot:session-value :language) + (find-browser-prefered-language) + *default-language*))) + ;;; TODOreorg (defun publish-directory (&key prefix destination) (push (hunchentoot:create-folder-dispatcher-and-handler prefix destination) hunchentoot:*dispatch-table*)) @@ -212,7 +213,7 @@ ("/kml-root" kml-root-handler) ("/country-stats" country-stats-handler) ("/contract-tree-kml" contract-tree-kml-handler) - ("/contract-tree-image" contract-tree-image-handler) + ("/contract-tree-image" contract-tree-image-handler) ("/contract-image" contract-image-handler) ("/contract" contract-handler) ("/sat-tree-kml" sat-tree-kml-handler)

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3556 Author: ksprotte URL: http://bknr.net/trac/changeset/3556 content of root kml document in GE is now opened by default U trunk/projects/bos/payment-website/static/kml-root-da.kml U trunk/projects/bos/payment-website/static/kml-root-de.kml U trunk/projects/bos/payment-website/static/kml-root-en.kml U trunk/projects/bos/web/kml-handlers.lisp Modified: trunk/projects/bos/payment-website/static/kml-root-da.kml =================================================================== --- trunk/projects/bos/payment-website/static/kml-root-da.kml 2008-07-22 12:03:12 UTC (rev 3555) +++ trunk/projects/bos/payment-website/static/kml-root-da.kml 2008-07-22 12:39:27 UTC (rev 3556) @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <kml> <Document> - <name>BOS [da]</name> + <name>BOS</name> + <open>1</open> <LookAt> <longitude>116.988156014724</longitude> <latitude>-1.045791509671129</latitude> Modified: trunk/projects/bos/payment-website/static/kml-root-de.kml =================================================================== --- trunk/projects/bos/payment-website/static/kml-root-de.kml 2008-07-22 12:03:12 UTC (rev 3555) +++ trunk/projects/bos/payment-website/static/kml-root-de.kml 2008-07-22 12:39:27 UTC (rev 3556) @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <kml> <Document> - <name>BOS [de]</name> + <name>BOS</name> + <open>1</open> <LookAt> <longitude>116.988156014724</longitude> <latitude>-1.045791509671129</latitude> Modified: trunk/projects/bos/payment-website/static/kml-root-en.kml =================================================================== --- trunk/projects/bos/payment-website/static/kml-root-en.kml 2008-07-22 12:03:12 UTC (rev 3555) +++ trunk/projects/bos/payment-website/static/kml-root-en.kml 2008-07-22 12:39:27 UTC (rev 3556) @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <kml> <Document> - <name>BOS [en]</name> + <name>BOS</name> + <open>1</open> <LookAt> <longitude>116.988156014724</longitude> <latitude>-1.045791509671129</latitude> Modified: trunk/projects/bos/web/kml-handlers.lisp =================================================================== --- trunk/projects/bos/web/kml-handlers.lisp 2008-07-22 12:03:12 UTC (rev 3555) +++ trunk/projects/bos/web/kml-handlers.lisp 2008-07-22 12:39:27 UTC (rev 3556) @@ -66,7 +66,8 @@ (hunchentoot:rfc-1123-date (timestamp handler))) (with-query-params ((lang "en")) (with-element "Document" - (with-element "name" (text (format nil "BOS [~A]" lang))) + (with-element "name" (text "BOS")) + (with-element "open" (text "1")) (when contract (with-element "Style" (attribute "id" "contractPlacemarkIcon")

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/payment-website/templates/
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3555 Author: ksprotte URL: http://bknr.net/trac/changeset/3555 although satmap does only exist in german, changed GE links to be language dependent U trunk/projects/bos/payment-website/templates/da/satmap.xml U trunk/projects/bos/payment-website/templates/en/satmap.xml Modified: trunk/projects/bos/payment-website/templates/da/satmap.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/satmap.xml 2008-07-22 12:02:48 UTC (rev 3554) +++ trunk/projects/bos/payment-website/templates/da/satmap.xml 2008-07-22 12:03:12 UTC (rev 3555) @@ -77,7 +77,7 @@ <tr> <td colspan="3"> <img alt="" height="9" width="10" src="/images/pfeil_link_on.gif"/> - <a shape="rect" class="more" href="/static/kml-root-de.kml"> + <a shape="rect" class="more" href="/static/kml-root-da.kml"> zu Google Earth </a> </td> Modified: trunk/projects/bos/payment-website/templates/en/satmap.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/satmap.xml 2008-07-22 12:02:48 UTC (rev 3554) +++ trunk/projects/bos/payment-website/templates/en/satmap.xml 2008-07-22 12:03:12 UTC (rev 3555) @@ -77,7 +77,7 @@ <tr> <td colspan="3"> <img alt="" height="9" width="10" src="/images/pfeil_link_on.gif"/> - <a shape="rect" class="more" href="/static/kml-root-de.kml"> + <a shape="rect" class="more" href="/static/kml-root-en.kml"> zu Google Earth </a> </td>

1 0

[bknr-cvs] hans changed trunk/
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3554 Author: hans URL: http://bknr.net/trac/changeset/3554 Never block in contract-issue-cert. In the frontend, the user will always spend enough time on the following pages so that the certificate will be generated. In order to support the CMS workflow, the /certificate handler now waits until the certificates have been generated before serving the PDF. U trunk/bknr/datastore/src/data/object.lisp U trunk/projects/bos/m2/m2.lisp U trunk/projects/bos/m2/packages.lisp U trunk/projects/bos/web/contract-handlers.lisp U trunk/projects/bos/web/kml-handlers.lisp U trunk/projects/bos/web/webserver.lisp Modified: trunk/bknr/datastore/src/data/object.lisp =================================================================== --- trunk/bknr/datastore/src/data/object.lisp 2008-07-22 11:48:19 UTC (rev 3553) +++ trunk/bknr/datastore/src/data/object.lisp 2008-07-22 12:02:48 UTC (rev 3554) @@ -41,7 +41,7 @@ (let ((instance-count (length (class-instances class)))) (when (plusp instance-count) (unless *suppress-schema-warnings* - (warn "updating ~A instances of ~A for class changes" instance-count class)) + (format *trace-output* "~&; updating ~A instances of ~A for class changes~%" instance-count class)) (mapc #'reinitialize-instance (class-instances class))))) (defmethod instance :after ((class persistent-class) &rest args) Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2008-07-22 11:48:19 UTC (rev 3553) +++ trunk/projects/bos/m2/m2.lisp 2008-07-22 12:02:48 UTC (rev 3554) @@ -342,15 +342,6 @@ (delete-file (contract-pdf-pathname contract)) (delete-file (contract-pdf-pathname contract :print t)))) -(defun wait-for-certificates (contract) - "Wait until the PDF generating process has generated the certificates" - (dotimes (i 10) - (when (contract-certificates-generated-p contract) - (return)) - (sleep 1)) - (unless (contract-certificates-generated-p contract) - (error "Cannot generate certificate"))) - (defmethod contract-issue-cert ((contract contract) name &key address language) (when (contract-cert-issued contract) (warn "re-issuing cert for ~A" contract)) @@ -358,7 +349,6 @@ (make-certificate contract name :address address :language language) (unless (contract-download-only-p contract) (make-certificate contract name :address address :language language :print t)) - (wait-for-certificates contract) (change-slot-values contract 'cert-issued t)) (defmethod contract-image-tiles ((contract contract)) Modified: trunk/projects/bos/m2/packages.lisp =================================================================== --- trunk/projects/bos/m2/packages.lisp 2008-07-22 11:48:19 UTC (rev 3553) +++ trunk/projects/bos/m2/packages.lisp 2008-07-22 12:02:48 UTC (rev 3554) @@ -161,6 +161,7 @@ #:contract-set-download-only-p #:contract-price #:contract-issue-cert + #:contract-certificates-generated-p #:contract-worldpay-trans-id #:contract-pdf-pathname #:contract-pdf-url Modified: trunk/projects/bos/web/contract-handlers.lisp =================================================================== --- trunk/projects/bos/web/contract-handlers.lisp 2008-07-22 11:48:19 UTC (rev 3553) +++ trunk/projects/bos/web/contract-handlers.lisp 2008-07-22 12:02:48 UTC (rev 3554) @@ -32,4 +32,5 @@ (:td (:princ-safe (contract-color contract)))) #+(or) (:tr (:td "cert issued?") - (:td (:princ-safe (if (contract-cert-issued contract) "yes" "no"))))))) \ No newline at end of file + (:td (:princ-safe (if (contract-cert-issued contract) "yes" "no"))))))) + Modified: trunk/projects/bos/web/kml-handlers.lisp =================================================================== --- trunk/projects/bos/web/kml-handlers.lisp 2008-07-22 11:48:19 UTC (rev 3553) +++ trunk/projects/bos/web/kml-handlers.lisp 2008-07-22 12:02:48 UTC (rev 3554) @@ -138,7 +138,7 @@ (hunchentoot:handle-if-modified-since timestamp) (setf (hunchentoot:header-out :last-modified) (hunchentoot:rfc-1123-date timestamp)) - (with-xml-response (:content-type #+nil "text/xml" "application/vnd.google-earth.kml+xml; charset=utf-8" + (with-xml-response (:content-type "application/vnd.google-earth.kml+xml; charset=utf-8" :root-element "kml") (with-query-params ((lang "en")) (with-element "Document" Modified: trunk/projects/bos/web/webserver.lisp =================================================================== --- trunk/projects/bos/web/webserver.lisp 2008-07-22 11:48:19 UTC (rev 3553) +++ trunk/projects/bos/web/webserver.lisp 2008-07-22 12:02:48 UTC (rev 3554) @@ -122,7 +122,17 @@ (defmethod handle-object ((handler certificate-handler) contract) (unless contract (setf contract (find-if #'contract-pdf-pathname (sponsor-contracts (bknr.web:bknr-session-user))))) - (redirect (format nil "/certificates/~D.pdf" (store-object-id contract)))) + (if (contract-certificates-generated-p contract) + (redirect (format nil "/certificates/~D.pdf" (store-object-id contract))) + (with-http-response (:content-type "text/html; charset=UTF-8") + (with-http-body () + (html + (:html + (:head + (:title "Waiting for certificate generation...") + ((:meta :http-equiv "Refresh" :content (format nil "3; ~A" (hunchentoot:script-name*))))) + (:body + "Please wait, certificate is being generated"))))))) (defclass statistics-handler (editor-only-handler prefix-handler) ())

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/payment-website/templates/
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3553 Author: ksprotte URL: http://bknr.net/trac/changeset/3553 updated links to new satmap.xml in templates U trunk/projects/bos/payment-website/templates/da/idea.xml U trunk/projects/bos/payment-website/templates/da/toplevel.xml U trunk/projects/bos/payment-website/templates/da/toplevel_main.xml U trunk/projects/bos/payment-website/templates/de/idea.xml U trunk/projects/bos/payment-website/templates/de/toplevel.xml U trunk/projects/bos/payment-website/templates/de/toplevel_main.xml U trunk/projects/bos/payment-website/templates/de/toplevel_news.xml U trunk/projects/bos/payment-website/templates/en/idea.xml U trunk/projects/bos/payment-website/templates/en/toplevel.xml U trunk/projects/bos/payment-website/templates/en/toplevel_main.xml Modified: trunk/projects/bos/payment-website/templates/da/idea.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/idea.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/da/idea.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -32,7 +32,7 @@ Satellit fotos her på internettet gør det muligt at observere programmets fremgang. <br></br><br></br> I løbet af de sidste årtier er den engang så artsrige regnskov i - <a href="javascript:window_infosys()" class="titlegreen"> + <a href="/da/satmap" class="titlegreen"> Samboja Lestari blevet nådesløst fældet og nedbrændt. </a> Næringsopslugende elefantgræs tog over, og hvad der blev tilbage var en økologisk ødemark. I dag er det dog allerede tydeligt, at dette ikke behøver fortsætte - siden 2001 har BOS skabt ny regnskov. Modified: trunk/projects/bos/payment-website/templates/da/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/da/toplevel.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -48,7 +48,7 @@ </div> <div>l</div> <div> - <a href="javascript:window_infosys()" class="menue" title="Move to satellite map."> + <a href="/da/satmap" class="menue" title="Move to satellite map."> satellitkort </a> </div> Modified: trunk/projects/bos/payment-website/templates/da/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/toplevel_main.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/da/toplevel_main.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -44,7 +44,7 @@ </div> <div>l</div> <div> - <a href="javascript:window_infosys()" class="menue" title="Move to satellite map."> + <a href="/da/satmap" class="menue" title="Move to satellite map."> satellitkort </a> </div> @@ -122,7 +122,7 @@ <td></td> <td colspan="2"> <img src="/images/pfeil_link_on.gif" width="10" height="9" border="0" alt=""></img> - <a href="javascript:window_infosys()" class="content_black"> + <a href="/da/satmap" class="content_black"> Det handler om m².<br></br><br></br> </a> </td> @@ -130,7 +130,7 @@ </tr> <tr> <td colspan="3" height="88"> - <a href="javascript:window_infosys()"> + <a href="/da/satmap"> <img src="/images/trans.gif" width="149" height="108" border="0" alt=""></img> </a> </td> Modified: trunk/projects/bos/payment-website/templates/de/idea.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/idea.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/de/idea.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -39,7 +39,7 @@ im Internet beobachten. <br /><br /> Der ehemals artenreiche Regenwald von - <a href="javascript:window_infosys()" class="titlegreen"> + <a href="/de/satmap" class="titlegreen"> Samboja Lestari </a> wurde in den letzten Jahrzehnten rücksichtslos gerodet und abgebrannt. Nährstoffzehrendes Alang-Alang-Gras breitete Modified: trunk/projects/bos/payment-website/templates/de/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/de/toplevel.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -54,7 +54,7 @@ </div> <div>l</div> <div> - <a href="javascript:window_infosys()" class="menue" + <a href="/de/satmap" class="menue" title="Satellitenkarte"> Satellitenkarte </a> Modified: trunk/projects/bos/payment-website/templates/de/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel_main.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/de/toplevel_main.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -54,7 +54,7 @@ </div> <div>l</div> <div> - <a href="javascript:window_infosys()" class="menue" + <a href="/de/satmap" class="menue" title="Satellitenkarte"> Satellitenkarte </a> @@ -135,7 +135,7 @@ <td></td> <td colspan="2"> <img src="/images/pfeil_link_on.gif" width="10" height="9" border="0" alt="" /> - <a href="javascript:window_infosys()" + <a href="/de/satmap" class="content_black"> Es dreht sich um m². </a> @@ -144,7 +144,7 @@ </tr> <tr> <td colspan="3" height="88"> - <a href="javascript:window_infosys()"> + <a href="/de/satmap"> <img src="/images/trans.gif" width="149" height="108" border="0" alt="" /> </a> </td> Modified: trunk/projects/bos/payment-website/templates/de/toplevel_news.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/toplevel_news.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/de/toplevel_news.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -51,7 +51,7 @@ </div> <div>l</div> <div> - <a href="javascript:window_infosys()" class="menue" + <a href="/de/satmap" class="menue" title="Satellitenkarte"> Satellitenkarte </a> @@ -132,7 +132,7 @@ <td></td> <td colspan="2"> <img src="/images/pfeil_link_on.gif" width="10" height="9" border="0" alt="" /> - <a href="javascript:window_infosys()" + <a href="/de/satmap" class="content_black"> Es dreht sich um m². </a> @@ -141,7 +141,7 @@ </tr> <tr> <td colspan="3" height="88"> - <a href="javascript:window_infosys()"> + <a href="/de/satmap"> <img src="/images/trans.gif" width="149" height="108" border="0" alt="" /> </a> </td> Modified: trunk/projects/bos/payment-website/templates/en/idea.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/idea.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/en/idea.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -39,7 +39,7 @@ Satellite pictures here on the internet make it possible to observe the progress of this concept. <br /><br /> During the last decades the once species-rich rainforest of - <a href="javascript:window_infosys()" class="titlegreen"> + <a href="/en/satmap" class="titlegreen"> Samboja Lestari </a> was cleared and burnt down relentlessly. Modified: trunk/projects/bos/payment-website/templates/en/toplevel.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/toplevel.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/en/toplevel.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -56,7 +56,7 @@ </div> <div>l</div> <div> - <a href="javascript:window_infosys()" class="menue" + <a href="/en/satmap" class="menue" title="Move to satellite map."> satellite map </a> Modified: trunk/projects/bos/payment-website/templates/en/toplevel_main.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/toplevel_main.xml 2008-07-22 11:39:17 UTC (rev 3552) +++ trunk/projects/bos/payment-website/templates/en/toplevel_main.xml 2008-07-22 11:48:19 UTC (rev 3553) @@ -52,7 +52,7 @@ </div> <div>l</div> <div> - <a href="javascript:window_infosys()" class="menue" + <a href="/en/satmap" class="menue" title="Move to satellite map."> satellite map </a> @@ -133,7 +133,7 @@ <td></td> <td colspan="2"> <img src="/images/pfeil_link_on.gif" width="10" height="9" border="0" alt="" /> - <a href="javascript:window_infosys()" + <a href="/en/satmap" class="content_black"> It's all about m².<br /><br /> </a> @@ -142,7 +142,7 @@ </tr> <tr> <td colspan="3" height="88"> - <a href="javascript:window_infosys()"> + <a href="/en/satmap"> <img src="/images/trans.gif" width="149" height="108" border="0" alt="" /> </a> </td>

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/payment-website/templates/
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3552 Author: ksprotte URL: http://bknr.net/trac/changeset/3552 added satmap.xml to templates A trunk/projects/bos/payment-website/templates/da/satmap.xml A trunk/projects/bos/payment-website/templates/de/satmap.xml A trunk/projects/bos/payment-website/templates/en/satmap.xml Added: trunk/projects/bos/payment-website/templates/da/satmap.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/satmap.xml (rev 0) +++ trunk/projects/bos/payment-website/templates/da/satmap.xml 2008-07-22 11:39:17 UTC (rev 3552) @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<bknr:toplevel + template="toplevel_main" + title="REGENWALD für SAMBOJA LESTARI" + xmlns="http://www.w3.org/1999/xhtml" + xmlns:bknr="http://bknr.net" + xmlns:bos="http://headcraft.de/bos" + > + <bos:set-cachable/> + <div id="content_main"> + <div id="textbox_content_bigger"> + <table border="0" cellpadding="0" cellspacing="0"> + + <tr> + <td colspan="2"> + <span class="headline"> + Satellitenkarte + </span> + </td> + <td align="center" valign="top"> + <img src="../images/pfeil_back.gif" width="10" height="9" alt="" /> + <a href="javascript:history.back()" class="titlegray"> + zurück + </a> + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Verschaffen Sie sich einen Überblick auf unserer + <a shape="rect" title="Satellitenkarte" class="titlegreen" href="javascript:window_infosys()"> + Satellitenkarte</a>. + </td> + </tr> +  + <tr> + <td height="12"> + </td> + </tr> +  + <tr> + <td colspan="3"> + <span class="headline"> + Besuchen Sie Samboja Lestari in Google Earth + </span> + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Wenn die <a href='http://earth.google.de/' target='_blank' shape='rect' class='titlegreen'>Google Earth Software</a> + auf Ihrem Computer installiert ist, können Sie sich das Projektgebiet mit einer Auswahl verschiedener + Satelliten Bilder (aus dem Zeitraum 2000 - 2007) und vielen weiteren Informationen anschauen. + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Über diesen Link wird sich direkt Ihre Google Earth Applikation öffnen: + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + <img alt="" height="9" width="10" src="/images/pfeil_link_on.gif"/> + <a shape="rect" class="more" href="/static/kml-root-de.kml"> + zu Google Earth + </a> + </td> + </tr> + </table> + </div> + </div> +</bknr:toplevel> Added: trunk/projects/bos/payment-website/templates/de/satmap.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/satmap.xml (rev 0) +++ trunk/projects/bos/payment-website/templates/de/satmap.xml 2008-07-22 11:39:17 UTC (rev 3552) @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<bknr:toplevel + template="toplevel_main" + title="REGENWALD für SAMBOJA LESTARI" + xmlns="http://www.w3.org/1999/xhtml" + xmlns:bknr="http://bknr.net" + xmlns:bos="http://headcraft.de/bos" + > + <bos:set-cachable/> + <div id="content_main"> + <div id="textbox_content_bigger"> + <table border="0" cellpadding="0" cellspacing="0"> + + <tr> + <td colspan="2"> + <span class="headline"> + Satellitenkarte + </span> + </td> + <td align="center" valign="top"> + <img src="../images/pfeil_back.gif" width="10" height="9" alt="" /> + <a href="javascript:history.back()" class="titlegray"> + zurück + </a> + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Verschaffen Sie sich einen Überblick auf unserer + <a shape="rect" title="Satellitenkarte" class="titlegreen" href="javascript:window_infosys()"> + Satellitenkarte</a>. + </td> + </tr> +  + <tr> + <td height="12"> + </td> + </tr> +  + <tr> + <td colspan="3"> + <span class="headline"> + Besuchen Sie Samboja Lestari in Google Earth + </span> + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Wenn die <a href='http://earth.google.de/' target='_blank' shape='rect' class='titlegreen'>Google Earth Software</a> + auf Ihrem Computer installiert ist, können Sie sich das Projektgebiet mit einer Auswahl verschiedener + Satelliten Bilder (aus dem Zeitraum 2000 - 2007) und vielen weiteren Informationen anschauen. + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Über diesen Link wird sich direkt Ihre Google Earth Applikation öffnen: + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + <img alt="" height="9" width="10" src="/images/pfeil_link_on.gif"/> + <a shape="rect" class="more" href="/static/kml-root-de.kml"> + zu Google Earth + </a> + </td> + </tr> + </table> + </div> + </div> +</bknr:toplevel> Added: trunk/projects/bos/payment-website/templates/en/satmap.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/satmap.xml (rev 0) +++ trunk/projects/bos/payment-website/templates/en/satmap.xml 2008-07-22 11:39:17 UTC (rev 3552) @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<bknr:toplevel + template="toplevel_main" + title="REGENWALD für SAMBOJA LESTARI" + xmlns="http://www.w3.org/1999/xhtml" + xmlns:bknr="http://bknr.net" + xmlns:bos="http://headcraft.de/bos" + > + <bos:set-cachable/> + <div id="content_main"> + <div id="textbox_content_bigger"> + <table border="0" cellpadding="0" cellspacing="0"> + + <tr> + <td colspan="2"> + <span class="headline"> + Satellitenkarte + </span> + </td> + <td align="center" valign="top"> + <img src="../images/pfeil_back.gif" width="10" height="9" alt="" /> + <a href="javascript:history.back()" class="titlegray"> + zurück + </a> + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Verschaffen Sie sich einen Überblick auf unserer + <a shape="rect" title="Satellitenkarte" class="titlegreen" href="javascript:window_infosys()"> + Satellitenkarte</a>. + </td> + </tr> +  + <tr> + <td height="12"> + </td> + </tr> +  + <tr> + <td colspan="3"> + <span class="headline"> + Besuchen Sie Samboja Lestari in Google Earth + </span> + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Wenn die <a href='http://earth.google.de/' target='_blank' shape='rect' class='titlegreen'>Google Earth Software</a> + auf Ihrem Computer installiert ist, können Sie sich das Projektgebiet mit einer Auswahl verschiedener + Satelliten Bilder (aus dem Zeitraum 2000 - 2007) und vielen weiteren Informationen anschauen. + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + Über diesen Link wird sich direkt Ihre Google Earth Applikation öffnen: + </td> + </tr> + <tr> + <td height="6"> + </td> + </tr> + <tr> + <td colspan="3"> + <img alt="" height="9" width="10" src="/images/pfeil_link_on.gif"/> + <a shape="rect" class="more" href="/static/kml-root-de.kml"> + zu Google Earth + </a> + </td> + </tr> + </table> + </div> + </div> +</bknr:toplevel>

1 0

[bknr-cvs] ksprotte changed trunk/projects/bos/web/contract-tree.lisp
by BKNR Commits 22 Jul '08

22 Jul '08

Revision: 3551 Author: ksprotte URL: http://bknr.net/trac/changeset/3551 contract-tree: removed annoying warning message that showed up, when contract-tree images were not yet rendered U trunk/projects/bos/web/contract-tree.lisp Modified: trunk/projects/bos/web/contract-tree.lisp =================================================================== --- trunk/projects/bos/web/contract-tree.lisp 2008-07-22 10:51:32 UTC (rev 3550) +++ trunk/projects/bos/web/contract-tree.lisp 2008-07-22 11:07:19 UTC (rev 3551) @@ -23,12 +23,10 @@ (first store-images) ;; We will just return NIL, if we cannot find one. ;; If there are too many, we will return the newest one and delete the rest. - (progn - (warn "~D store-images for ~S" (length store-images) node) - (let ((store-images-newest-first - (sort (copy-list store-images) #'> :key #'blob-timestamp))) - (mapc #'delete-object (rest store-images-newest-first)) - (first store-images-newest-first)))))) + (let ((store-images-newest-first + (sort (copy-list store-images) #'> :key #'blob-timestamp))) + (mapc #'delete-object (rest store-images-newest-first)) + (first store-images-newest-first))))) (defmethod initialize-instance :after ((node contract-node) &key args) (declare (ignore args))

1 0