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

[bknr-cvs] r2159 - trunk/projects/bos/payment-website/images
by bknr＠bknr.net 26 Apr '07

26 Apr '07

Author: hhubner Date: 2007-04-26 08:36:57 -0400 (Thu, 26 Apr 2007) New Revision: 2159 Modified: trunk/projects/bos/payment-website/images/bos-logo.gif Log: corrected logo Modified: trunk/projects/bos/payment-website/images/bos-logo.gif =================================================================== (Binary files differ)

1 0

[bknr-cvs] r2158 - in trunk/projects/bos/payment-website/templates: da de en
by bknr＠bknr.net 26 Apr '07

26 Apr '07

Author: hhubner Date: 2007-04-26 08:36:06 -0400 (Thu, 26 Apr 2007) New Revision: 2158 Modified: trunk/projects/bos/payment-website/templates/da/impressum.xml trunk/projects/bos/payment-website/templates/da/print_profil_setup.xml trunk/projects/bos/payment-website/templates/da/print_versand_quittung.xml trunk/projects/bos/payment-website/templates/de/contact.xml trunk/projects/bos/payment-website/templates/de/impressum.xml trunk/projects/bos/payment-website/templates/de/print_profil_setup.xml trunk/projects/bos/payment-website/templates/de/print_ueberweisung.xml trunk/projects/bos/payment-website/templates/de/print_versand_quittung.xml trunk/projects/bos/payment-website/templates/de/ueberweisung.xml trunk/projects/bos/payment-website/templates/en/contact.xml trunk/projects/bos/payment-website/templates/en/impressum.xml trunk/projects/bos/payment-website/templates/en/print_profil_setup.xml trunk/projects/bos/payment-website/templates/en/print_versand_quittung.xml Log: BOS has moved their office, change contact info accordingly. Modified: trunk/projects/bos/payment-website/templates/da/impressum.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/impressum.xml 2007-04-23 05:08:16 UTC (rev 2157) +++ trunk/projects/bos/payment-website/templates/da/impressum.xml 2007-04-26 12:36:06 UTC (rev 2158) @@ -17,8 +17,8 @@ Postal address:<br /><br /> BOS Deutschland e.V.<br /><br /> - Schöneberger Ufer 69<br /> - 10785 Berlin<br /><br /> + Böckhstr. 39<br /> + 10967 Berlin<br /><br /> Tel. +49 - (0)30 - 26 36 78 33<br /> Fax: +49 - (0)30 - 26 36 78 15<br /><br /> Modified: trunk/projects/bos/payment-website/templates/da/print_profil_setup.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/print_profil_setup.xml 2007-04-23 05:08:16 UTC (rev 2157) +++ trunk/projects/bos/payment-website/templates/da/print_profil_setup.xml 2007-04-26 12:36:06 UTC (rev 2158) @@ -123,9 +123,9 @@ <div id="footer_print_bottom" align="center"> <div>phone: +49.30.26 36 78 33</div> <div>l</div> - <div>D-10785 Berlin </div> + <div>D-10967 Berlin </div> <div>l</div> - <div>Schöneberger Ufer 69</div> + <div>Böckhstr. 39</div> </div> </td> </tr> Modified: trunk/projects/bos/payment-website/templates/da/print_versand_quittung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/print_versand_quittung.xml 2007-04-23 05:08:16 UTC (rev 2157) +++ trunk/projects/bos/payment-website/templates/da/print_versand_quittung.xml 2007-04-26 12:36:06 UTC (rev 2158) @@ -83,9 +83,9 @@ <div id="footer_print_bottom" align="center"> <div>Telefon: +49.30.26 36 78 33</div> <div>l</div> - <div>D-10785 Berlin </div> + <div>D-10967 Berlin </div> <div>l</div> - <div>Schöneberger Ufer 69</div> + <div>Böckhstr. 39</div> </div> </td> </tr> Modified: trunk/projects/bos/payment-website/templates/de/contact.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/contact.xml 2007-04-23 05:08:16 UTC (rev 2157) +++ trunk/projects/bos/payment-website/templates/de/contact.xml 2007-04-26 12:36:06 UTC (rev 2158) @@ -26,8 +26,8 @@ Wir freuen uns auf Ihre Anregungen und beantworten Ihre Fragen jederzeit gerne. <br /><br /> BOS Deutschland e.V.<br /> - Schöneberger Ufer 69<br /> - D - 10785 Berlin + Böckhstr. 39<br /> + D - 10967 Berlin <br /><br /> Telefon: +49.30.26 36 78 33<br /> Fax: +49.30.26 36 78 15<br /><br /> Modified: trunk/projects/bos/payment-website/templates/de/impressum.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/impressum.xml 2007-04-23 05:08:16 UTC (rev 2157) +++ trunk/projects/bos/payment-website/templates/de/impressum.xml 2007-04-26 12:36:06 UTC (rev 2158) @@ -17,8 +17,8 @@ Postanschrift:<br /><br /> BOS Deutschland e.V.<br /><br /> - Schöneberger Ufer 69<br /> - 10785 Berlin<br /><br /> + Böckhstr. 39<br /> + 10967 Berlin<br /><br /> Tel. +49 - (0)30 - 26 36 78 33<br /> Fax: +49 - (0)30 - 26 36 78 15<br /><br /> Modified: trunk/projects/bos/payment-website/templates/de/print_profil_setup.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/print_profil_setup.xml 2007-04-23 05:08:16 UTC (rev 2157) +++ trunk/projects/bos/payment-website/templates/de/print_profil_setup.xml 2007-04-26 12:36:06 UTC (rev 2158) @@ -130,9 +130,9 @@ <div id="footer_print_bottom" align="center"> <div>Telefon: +49.30.26 36 78 33</div> <div>l</div> - <div>D-10785 Berlin </div> + <div>D-10967 Berlin </div> <div>l</div> - <div>Schöneberger Ufer 69</div> + <div>Böckhstr. 39</div> </div> </td> </tr> Modified: trunk/projects/bos/payment-website/templates/de/print_ueberweisung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/print_ueberweisung.xml 2007-04-23 05:08:16 UTC (rev 2157) +++ trunk/projects/bos/payment-website/templates/de/print_ueberweisung.xml 2007-04-26 12:36:06 UTC (rev 2158) @@ -119,9 +119,9 @@ <div id="footer_print_bottom" align="center"> <div>Telefon: +49.30.26 36 78 33</div> <div>l</div> - <div>D-10785 Berlin </div> + <div>D-10967 Berlin </div> <div>l</div> - <div>Schöneberger Ufer 69</div> + <div>Böckhstr. 39</div> </div> </td> </tr> Modified: trunk/projects/bos/payment-website/templates/de/print_versand_quittung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/print_versand_quittung.xml 2007-04-23 05:08:16 UTC (rev 2157) +++ trunk/projects/bos/payment-website/templates/de/print_versand_quittung.xml 2007-04-26 12:36:06 UTC (rev 2158) @@ -83,9 +83,9 @@ <div id="footer_print_bottom" align="center"> <div>Telefon: +49.30.26 36 78 33</div> <div>l</div> - <div>D-10785 Berlin </div> + <div>D-10967 Berlin </div> <div>l</div> - <div>Schöneberger Ufer 69</div> + <div>Böckhstr. 39</div> </div> </td> </tr> Modified: trunk/projects/bos/payment-website/templates/de/ueberweisung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/ueberweisung.xml 2007-04-23 05:08:16 UTC (rev 2157) +++ trunk/projects/bos/payment-website/templates/de/ueberweisung.xml 2007-04-26 12:36:06 UTC (rev 2158) @@ -136,9 +136,9 @@ <br /><br /> BOS Deutschland e.V. <br /> - Schöneberger Ufer 69 + Böckhstr. 39 <br /> - 10785 Berlin + 10967 Berlin <br /><br /> Fax: (030) 2636 7815 </div> Modified: trunk/projects/bos/payment-website/templates/en/contact.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/contact.xml 2007-04-23 05:08:16 UTC (rev 2157) +++ trunk/projects/bos/payment-website/templates/en/contact.xml 2007-04-26 12:36:06 UTC (rev 2158) @@ -26,8 +26,8 @@ We look forward to receiving your ideas and will answer your questions at any time. <br /><br /> BOS Deutschland e.V.<br /> - Schöneberger Ufer 69<br /> - D - 10785 Berlin + Böckhstr. 39<br /> + D - 10967 Berlin <br /><br /> Telefon: +49.30.26 36 78 33<br /> Fax: +49.30.26 36 78 15<br /><br /> Modified: trunk/projects/bos/payment-website/templates/en/impressum.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/impressum.xml 2007-04-23 05:08:16 UTC (rev 2157) +++ trunk/projects/bos/payment-website/templates/en/impressum.xml 2007-04-26 12:36:06 UTC (rev 2158) @@ -17,8 +17,8 @@ Postal address:<br /><br /> BOS Deutschland e.V.<br /><br /> - Schöneberger Ufer 69<br /> - 10785 Berlin<br /><br /> + Böckhstr. 39<br /> + 10967 Berlin<br /><br /> Tel. +49 - (0)30 - 26 36 78 33<br /> Fax: +49 - (0)30 - 26 36 78 15<br /><br /> Modified: trunk/projects/bos/payment-website/templates/en/print_profil_setup.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/print_profil_setup.xml 2007-04-23 05:08:16 UTC (rev 2157) +++ trunk/projects/bos/payment-website/templates/en/print_profil_setup.xml 2007-04-26 12:36:06 UTC (rev 2158) @@ -130,9 +130,9 @@ <div id="footer_print_bottom" align="center"> <div>phone: +49.30.26 36 78 33</div> <div>l</div> - <div>D-10785 Berlin </div> + <div>D-10967 Berlin </div> <div>l</div> - <div>Schöneberger Ufer 69</div> + <div>Böckhstr. 39</div> </div> </td> </tr> Modified: trunk/projects/bos/payment-website/templates/en/print_versand_quittung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/en/print_versand_quittung.xml 2007-04-23 05:08:16 UTC (rev 2157) +++ trunk/projects/bos/payment-website/templates/en/print_versand_quittung.xml 2007-04-26 12:36:06 UTC (rev 2158) @@ -83,9 +83,9 @@ <div id="footer_print_bottom" align="center"> <div>Telefon: +49.30.26 36 78 33</div> <div>l</div> - <div>D-10785 Berlin </div> + <div>D-10967 Berlin </div> <div>l</div> - <div>Schöneberger Ufer 69</div> + <div>Böckhstr. 39</div> </div> </td> </tr>

1 0

[bknr-cvs] r2157 - trunk/projects/bos/payment-website/templates/da
by bknr＠bknr.net 23 Apr '07

23 Apr '07

Author: hhubner Date: 2007-04-23 01:08:16 -0400 (Mon, 23 Apr 2007) New Revision: 2157 Modified: trunk/projects/bos/payment-website/templates/da/mail-transfer.xml Log: Correct danish version again. Modified: trunk/projects/bos/payment-website/templates/da/mail-transfer.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/mail-transfer.xml 2007-04-19 20:23:46 UTC (rev 2156) +++ trunk/projects/bos/payment-website/templates/da/mail-transfer.xml 2007-04-23 05:08:16 UTC (rev 2157) @@ -62,7 +62,6 @@ </table> </td> </tr> - <tr><td>Tilbage til hjemmesiden</td></tr> <tr><td height="6"></td></tr> <tr> <td colspan="3">

1 0

[bknr-cvs] r2156 - trunk/projects/bos/payment-website/templates/da
by bknr＠bknr.net 19 Apr '07

19 Apr '07

Author: hhubner Date: 2007-04-19 16:23:46 -0400 (Thu, 19 Apr 2007) New Revision: 2156 Modified: trunk/projects/bos/payment-website/templates/da/mail-transfer.xml Log: Add missing translation Modified: trunk/projects/bos/payment-website/templates/da/mail-transfer.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/mail-transfer.xml 2007-04-15 07:39:51 UTC (rev 2155) +++ trunk/projects/bos/payment-website/templates/da/mail-transfer.xml 2007-04-19 20:23:46 UTC (rev 2156) @@ -70,7 +70,7 @@ <br /><br /> <a href="index" class="more"> <img src="/images/pfeil_link_on.gif" width="10" height="9" border="0" alt="" /> - Home + hjem </a> </td> <td></td>

1 0

[bknr-cvs] r2155 - trunk/projects/bos/payment-website/templates/da
by bknr＠bknr.net 15 Apr '07

15 Apr '07

Author: hhubner Date: 2007-04-15 03:39:51 -0400 (Sun, 15 Apr 2007) New Revision: 2155 Modified: trunk/projects/bos/payment-website/templates/da/mail-transfer.xml trunk/projects/bos/payment-website/templates/da/ueberweisung.xml Log: Corrections in danish version. Modified: trunk/projects/bos/payment-website/templates/da/mail-transfer.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/mail-transfer.xml 2007-04-15 07:27:51 UTC (rev 2154) +++ trunk/projects/bos/payment-website/templates/da/mail-transfer.xml 2007-04-15 07:39:51 UTC (rev 2155) @@ -40,7 +40,7 @@ <tr> <td colspan="3"> <span class="headline"> - Vielen Dank für Ihre Unterstützung + Vi takker mange gange for din støtte </span> </td> <td></td> @@ -48,30 +48,29 @@ <tr><td height="6"></td></tr> <tr> <td colspan="3"> - <strong>Bitte geben Sie unbedingt die ID $(contract-id) als Verwendungszweck - Ihrer Überweisung an, damit wir Sie nach der Bearbeitung erreichen können!</strong> + <strong>Husk endelig at notere dit udstedte ID $(contract-id) på bankoverførslen; dette er den eneste måde, hvorpå vi kan identificere dine m2.</strong> </td> </tr> <tr><td height="6"></td></tr> <tr> <td colspan="3"> <table border="0"> - <tr><td colspan="2">BOS Deutschland e.V.</td></tr> - <tr><td>Kontonummer:</td><td>32 10 100</td></tr> - <tr><td>Bank:</td><td>Bank für Sozialwirtschaft</td></tr> - <tr><td>BLZ:</td><td>100 205 00</td></tr> + <tr><td colspan="2">BOS Danmark</td></tr> + <tr><td>Kontonummer:</td><td>0001718891</td></tr> + <tr><td>Bank:</td><td>Merkur Bank</td></tr> + <tr><td>Reg.Nr.:</td><td>8401</td></tr> </table> </td> </tr> + <tr><td>Tilbage til hjemmesiden</td></tr> <tr><td height="6"></td></tr> <tr> <td colspan="3"> - Wir melden uns direkt nach Eingang Ihrer Überweisung und - geben Ihnen die Informationen, die Sie benötigen, um Ihre Quadratmeter im Internet zu beobachten. +Lige så snart vi registrerer din overførsel, vil du modtage en mail eller et brev med de informationer, der er nødvendige for at du kan logge ind og se dine m2. <br /><br /> <a href="index" class="more"> <img src="/images/pfeil_link_on.gif" width="10" height="9" border="0" alt="" /> - Zurück zur Home Page + Home </a> </td> <td></td> Modified: trunk/projects/bos/payment-website/templates/da/ueberweisung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/ueberweisung.xml 2007-04-15 07:27:51 UTC (rev 2154) +++ trunk/projects/bos/payment-website/templates/da/ueberweisung.xml 2007-04-15 07:39:51 UTC (rev 2155) @@ -119,9 +119,7 @@ <div id="helpbox"> <strong>[Personlige oplysninger]</strong> <br /> -Vi reserverer gerne det ønskede antal mÂ². -Vi har brug for nogle personlige oplysninger for at kunne sende dig informationer om (regnskovsbevis, sponsorprofil, geografisk koordinater, bidragskvittering). -Når vi har modtaget bidraget, sender vi dig alle ovenfor nævnte informationer eller e-mail. +Vi reserverer gerne det ønskede antal m². Vi har brug for nogle personlige oplysninger for at kunne sende dig de nødvendige informationer (regnskovsbevis, sponsorprofil, geografiske koordinater, bidragskvittering). Når vi har modtaget bidraget, sender vi dig alle ovenfor nævnte informationer. <br /><br /><br /> <strong>[Denne formular]</strong> <br />

1 0

[bknr-cvs] r2154 - in trunk: bknr/src/images bknr/src/web projects/bos/payment-website/static
by bknr＠bknr.net 15 Apr '07

15 Apr '07

Author: hhubner Date: 2007-04-15 03:27:51 -0400 (Sun, 15 Apr 2007) New Revision: 2154 Modified: trunk/bknr/src/images/image.lisp trunk/bknr/src/web/web-macros.lisp trunk/projects/bos/payment-website/static/cms.css Log: Improve error message formatting Modified: trunk/bknr/src/images/image.lisp =================================================================== --- trunk/bknr/src/images/image.lisp 2007-04-15 07:27:22 UTC (rev 2153) +++ trunk/bknr/src/images/image.lisp 2007-04-15 07:27:51 UTC (rev 2154) @@ -70,7 +70,7 @@ (unless (scan #?r"\D" name) (error "invalid image name ~A, needs to contain at least one non-digit character" name)) (when (store-image-with-name name) - (error "can't make image with name ~A, an image with name already exists in the datastore" name)) + (error "can't make image with name ~A, an image with this name already exists in the datastore" name)) (let ((store-image (apply #'make-object class-name :name name Modified: trunk/bknr/src/web/web-macros.lisp =================================================================== --- trunk/bknr/src/web/web-macros.lisp 2007-04-15 07:27:22 UTC (rev 2153) +++ trunk/bknr/src/web/web-macros.lisp 2007-04-15 07:27:51 UTC (rev 2154) @@ -105,7 +105,8 @@ ((:body :class "cms") (:h1 "Error processing your request") (:p "While processing your request, an error occured:") - (:pre (:princ-safe error))))))) + ((:div :class "error") + (:princ-safe error))))))) (defun show-page-with-error-handlers (fn req &key response title) (unless response Modified: trunk/projects/bos/payment-website/static/cms.css =================================================================== --- trunk/projects/bos/payment-website/static/cms.css 2007-04-15 07:27:22 UTC (rev 2153) +++ trunk/projects/bos/payment-website/static/cms.css 2007-04-15 07:27:51 UTC (rev 2154) @@ -51,3 +51,8 @@ .footer { font-size: 70%; } + +.error { + color:#f00; + font-size: 110%; +} \ No newline at end of file

1 0

[bknr-cvs] r2153 - trunk/projects/hello-web/src
by bknr＠bknr.net 15 Apr '07

15 Apr '07

Author: hhubner Date: 2007-04-15 03:27:22 -0400 (Sun, 15 Apr 2007) New Revision: 2153 Modified: trunk/projects/hello-web/src/hello-web.asd Log: remove unneeded dependency Modified: trunk/projects/hello-web/src/hello-web.asd =================================================================== --- trunk/projects/hello-web/src/hello-web.asd 2007-04-15 07:12:54 UTC (rev 2152) +++ trunk/projects/hello-web/src/hello-web.asd 2007-04-15 07:27:22 UTC (rev 2153) @@ -20,7 +20,6 @@ :cl-ppcre :aserve :cxml - :mime :bknr-modules) :components ((:file "packages")

1 0

[bknr-cvs] r2152 - trunk/bknr/src/images
by bknr＠bknr.net 15 Apr '07

15 Apr '07

Author: hhubner Date: 2007-04-15 03:12:54 -0400 (Sun, 15 Apr 2007) New Revision: 2152 Modified: trunk/bknr/src/images/image.lisp Log: correct wording Modified: trunk/bknr/src/images/image.lisp =================================================================== --- trunk/bknr/src/images/image.lisp 2007-04-15 07:11:08 UTC (rev 2151) +++ trunk/bknr/src/images/image.lisp 2007-04-15 07:12:54 UTC (rev 2152) @@ -132,7 +132,7 @@ (unless (scan #?r"\D" name) (error "invalid image name ~A, needs to contain at least one non-digit character" name)) (when (store-image-with-name name) - (error "can't import image with name ~A, an image with name already exists in the datastore" name)) + (error "can't import image with name ~A, an image with this name already exists in the datastore" name)) (with-image-from-file (image pathname) ;; xxx not tx safe. hm. (let ((store-image (apply #'make-object

1 0

[bknr-cvs] r2151 - trunk/bknr/src/web
by bknr＠bknr.net 15 Apr '07

15 Apr '07

Author: hhubner Date: 2007-04-15 03:11:08 -0400 (Sun, 15 Apr 2007) New Revision: 2151 Modified: trunk/bknr/src/web/handlers.lisp Log: Remove call to not-yet-existent set-string-rod-fn Modified: trunk/bknr/src/web/handlers.lisp =================================================================== --- trunk/bknr/src/web/handlers.lisp 2007-04-15 07:08:04 UTC (rev 2150) +++ trunk/bknr/src/web/handlers.lisp 2007-04-15 07:11:08 UTC (rev 2151) @@ -463,7 +463,7 @@ (defgeneric object-list-handler-show-object-xml (handler object req)) (defmethod object-list-handler-show-object-xml ((handler xml-object-list-handler) object req) - (set-string-rod-fn #'cxml::utf8-string-to-rod) + #+(or) (set-string-rod-fn #'cxml::utf8-string-to-rod) (write-to-xml object)) (defmethod handle-object ((handler xml-object-list-handler) object req)

1 0

[bknr-cvs] r2150 - trunk/projects/bos/worldpay-test
by bknr＠bknr.net 15 Apr '07

15 Apr '07

Author: hhubner Date: 2007-04-15 03:08:04 -0400 (Sun, 15 Apr 2007) New Revision: 2150 Modified: trunk/projects/bos/worldpay-test/sponsor-handlers.lisp Log: Add contract creator information to manually created sponsors. Modified: trunk/projects/bos/worldpay-test/sponsor-handlers.lisp =================================================================== --- trunk/projects/bos/worldpay-test/sponsor-handlers.lisp 2007-04-15 07:07:16 UTC (rev 2149) +++ trunk/projects/bos/worldpay-test/sponsor-handlers.lisp 2007-04-15 07:08:04 UTC (rev 2150) @@ -93,7 +93,11 @@ (defmethod handle-object-form ((handler edit-sponsor-handler) (action (eql :create)) (sponsor (eql nil)) req) (with-query-params (req numsqm country email name address date language) (let* ((sponsor (make-sponsor :email email :country country)) - (contract (make-contract sponsor (parse-integer numsqm) :paidp t :date (date-to-universal date)))) + (contract (make-contract sponsor (parse-integer numsqm) + :paidp (format nil "~A: manually created by ~A" + (format-date-time (get-universal-time)) + (user-login (bknr-request-user req))) + :date (date-to-universal date)))) (contract-issue-cert contract name :address address :language language) (mail-backoffice-sponsor-data contract req) (redirect (format nil "/edit-sponsor/~D" (store-object-id sponsor)) req))))

1 0