Revision: 3812
Author: hans
URL: http://bknr.net/trac/changeset/3812
Reorganize source to match control flow.
U trunk/projects/bos/web/sponsor-handlers.lisp
Modified: trunk/projects/bos/web/sponsor-handlers.lisp
===================================================================
--- trunk/projects/bos/web/sponsor-handlers.lisp 2008-09-05 15:03:22 UTC (rev 3811)
+++ trunk/projects/bos/web/sponsor-handlers.lisp 2008-09-05 15:04:15 UTC (rev 3812)
@@ -330,16 +330,16 @@
(redirect #?"/cert-regen/$((store-object-id contract))?action=wait")
(defmethod handle-object-form ((handler cert-regen-handler) (action (eql :wait)) (contract contract))
- (if (and (contract-certificates-generated-p contract)
- (not (contract-tree-needs-update-p)))
+ (if (not (and (contract-certificates-generated-p contract)
+ (not (contract-tree-needs-update-p))))
+ (html (:html
+ (:head ((:meta :http-equiv "refresh"
+ :content #?"2; url=/cert-regen/$((store-object-id contract))?action=wait")))
+ (:body "waiting for certificate to be regenerated...")))
(with-bos-cms-page (:title "Certificate has been recreated")
(html "The certificates for the sponsor have been re-generated." :br)
(unless (contract-download-only-p contract)
(mail-print-pdf contract)
(html "The print certificate has been sent to the relevant BOS office address by email." :br))
(let ((sponsor (contract-sponsor contract)))
- (cmslink #?"edit-sponsor/$((store-object-id sponsor))" "return to sponsor")))
- (html (:html
- (:head ((:meta :http-equiv "refresh"
- :content #?"2; url=/cert-regen/$((store-object-id contract))?action=wait")))
- (:body "waiting for certificate to be regenerated...")))))
\ No newline at end of file
+ (cmslink #?"edit-sponsor/$((store-object-id sponsor))" "return to sponsor")))))
\ No newline at end of file
Revision: 3811
Author: hans
URL: http://bknr.net/trac/changeset/3811
Wait for certificate generation in CMS.
U trunk/projects/bos/web/sponsor-handlers.lisp
Modified: trunk/projects/bos/web/sponsor-handlers.lisp
===================================================================
--- trunk/projects/bos/web/sponsor-handlers.lisp 2008-09-05 14:23:27 UTC (rev 3810)
+++ trunk/projects/bos/web/sponsor-handlers.lisp 2008-09-05 15:03:22 UTC (rev 3811)
@@ -327,10 +327,19 @@
(defmethod handle-object-form ((handler cert-regen-handler) (action (eql :regenerate)) (contract contract))
(with-query-params (name address language)
(contract-issue-cert contract name :address address :language language))
- (with-bos-cms-page (:title "Certificate has been recreated")
- (html "The certificates for the sponsor have been re-generated." :br)
- (unless (contract-download-only-p contract)
- (mail-print-pdf contract)
- (html "The print certificate has been sent to the relevant BOS office address by email." :br))
- (let ((sponsor (contract-sponsor contract)))
- (cmslink #?"edit-sponsor/$((store-object-id sponsor))" "return to sponsor"))))
\ No newline at end of file
+ (redirect #?"/cert-regen/$((store-object-id contract))?action=wait")
+
+(defmethod handle-object-form ((handler cert-regen-handler) (action (eql :wait)) (contract contract))
+ (if (and (contract-certificates-generated-p contract)
+ (not (contract-tree-needs-update-p)))
+ (with-bos-cms-page (:title "Certificate has been recreated")
+ (html "The certificates for the sponsor have been re-generated." :br)
+ (unless (contract-download-only-p contract)
+ (mail-print-pdf contract)
+ (html "The print certificate has been sent to the relevant BOS office address by email." :br))
+ (let ((sponsor (contract-sponsor contract)))
+ (cmslink #?"edit-sponsor/$((store-object-id sponsor))" "return to sponsor")))
+ (html (:html
+ (:head ((:meta :http-equiv "refresh"
+ :content #?"2; url=/cert-regen/$((store-object-id contract))?action=wait")))
+ (:body "waiting for certificate to be regenerated...")))))
\ No newline at end of file
Revision: 3810
Author: hans
URL: http://bknr.net/trac/changeset/3810
add new files to slime
A trunk/thirdparty/slime/contrib/slime-clipboard.el
A trunk/thirdparty/slime/contrib/slime-fontifying-fu.el
A trunk/thirdparty/slime/contrib/slime-mdot-fu.el
A trunk/thirdparty/slime/contrib/slime-package-fu.el
A trunk/thirdparty/slime/contrib/swank-clipboard.lisp
A trunk/thirdparty/slime/contrib/swank-package-fu.lisp
Change set too large, please see URL above
Revision: 3809
Author: hans
URL: http://bknr.net/trac/changeset/3809
Update slime, hoping that it fixes SBCL problems.
U trunk/thirdparty/slime/CVS/Entries
U trunk/thirdparty/slime/ChangeLog
U trunk/thirdparty/slime/NEWS
U trunk/thirdparty/slime/contrib/CVS/Entries
U trunk/thirdparty/slime/contrib/ChangeLog
U trunk/thirdparty/slime/contrib/slime-asdf.el
U trunk/thirdparty/slime/contrib/slime-fancy.el
U trunk/thirdparty/slime/contrib/slime-fuzzy.el
U trunk/thirdparty/slime/contrib/slime-indentation.el
U trunk/thirdparty/slime/contrib/slime-presentations.el
U trunk/thirdparty/slime/contrib/slime-typeout-frame.el
U trunk/thirdparty/slime/contrib/swank-arglists.lisp
U trunk/thirdparty/slime/contrib/swank-listener-hooks.lisp
U trunk/thirdparty/slime/doc/CVS/Entries
U trunk/thirdparty/slime/metering.lisp
U trunk/thirdparty/slime/slime.el
U trunk/thirdparty/slime/swank-abcl.lisp
U trunk/thirdparty/slime/swank-allegro.lisp
U trunk/thirdparty/slime/swank-backend.lisp
U trunk/thirdparty/slime/swank-clisp.lisp
U trunk/thirdparty/slime/swank-cmucl.lisp
U trunk/thirdparty/slime/swank-ecl.lisp
U trunk/thirdparty/slime/swank-gray.lisp
U trunk/thirdparty/slime/swank-lispworks.lisp
U trunk/thirdparty/slime/swank-loader.lisp
U trunk/thirdparty/slime/swank-openmcl.lisp
U trunk/thirdparty/slime/swank-sbcl.lisp
U trunk/thirdparty/slime/swank-scl.lisp
U trunk/thirdparty/slime/swank.lisp
U trunk/thirdparty/slime/test.sh
Change set too large, please see URL above
Revision: 3808
Author: ksprotte
URL: http://bknr.net/trac/changeset/3808
updated satmap text in de and en (da displays en)
U trunk/projects/bos/payment-website/templates/da/satmap.xml
U trunk/projects/bos/payment-website/templates/de/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-09-05 13:14:20 UTC (rev 3807)
+++ trunk/projects/bos/payment-website/templates/da/satmap.xml 2008-09-05 13:37:11 UTC (rev 3808)
@@ -56,9 +56,12 @@
</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.
+ If the Google Earth Software
+ <a href='http://earth.google.de/' target='_blank' shape='rect' class='titlegreen'>http://earth.google.de/</a>
+ is installed on your computer, you can view the project area with
+ satellite images from 2002 and 2007 plus a lot of additional
+ information. For an optimal viewing experience, you can also use the
+ above link to upgrade your Google Earth installation if needed.
</td>
</tr>
<tr>
Modified: trunk/projects/bos/payment-website/templates/de/satmap.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/de/satmap.xml 2008-09-05 13:14:20 UTC (rev 3807)
+++ trunk/projects/bos/payment-website/templates/de/satmap.xml 2008-09-05 13:37:11 UTC (rev 3808)
@@ -56,9 +56,13 @@
</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.
+ Wenn die Google Earth Software
+ <a href='http://earth.google.de/' target='_blank' shape='rect' class='titlegreen'>http://earth.google.de/</a>
+ auf Ihrem Computer installiert ist, können Sie sich das
+ Projektgebiet mit Satelliten-Bildern aus dem Jahr 2002 und
+ 2007 sowie vielen weiteren Informationen anschauen. Für
+ eine optimale Darstellung, können Sie Google Earth über
+ den gleichen Link gegebenenfalls auch updaten.
</td>
</tr>
<tr>
Modified: trunk/projects/bos/payment-website/templates/en/satmap.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/en/satmap.xml 2008-09-05 13:14:20 UTC (rev 3807)
+++ trunk/projects/bos/payment-website/templates/en/satmap.xml 2008-09-05 13:37:11 UTC (rev 3808)
@@ -56,9 +56,12 @@
</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.
+ If the Google Earth Software
+ <a href='http://earth.google.de/' target='_blank' shape='rect' class='titlegreen'>http://earth.google.de/</a>
+ is installed on your computer, you can view the project area with
+ satellite images from 2002 and 2007 plus a lot of additional
+ information. For an optimal viewing experience, you can also use the
+ above link to upgrade your Google Earth installation if needed.
</td>
</tr>
<tr>
Revision: 3805
Author: ksprotte
URL: http://bknr.net/trac/changeset/3805
setf contract-download-only: ensure that we set it to either T or NIL
U trunk/projects/bos/m2/m2.lisp
Modified: trunk/projects/bos/m2/m2.lisp
===================================================================
--- trunk/projects/bos/m2/m2.lisp 2008-09-05 10:27:56 UTC (rev 3804)
+++ trunk/projects/bos/m2/m2.lisp 2008-09-05 11:12:38 UTC (rev 3805)
@@ -330,6 +330,10 @@
(deftransaction contract-set-download-only-p (contract newval)
(setf (contract-download-only contract) newval))
+(defmethod (setf contract-download-only) :around (newval (obj contract))
+ "Ensures that NEWVAL is either T or NIL."
+ (call-next-method (if newval t nil) obj))
+
(defmethod contract-fdf-pathname ((contract contract) &key language print)
(when (and print
(contract-download-only-p contract))