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

[bknr-cvs] r2082 - trunk/projects/bos/m2
by bknr＠bknr.net 20 Nov '06

20 Nov '06

Author: hhubner Date: 2006-11-20 15:55:39 -0500 (Mon, 20 Nov 2006) New Revision: 2082 Modified: trunk/projects/bos/m2/m2.lisp Log: Remove destroyed contracts from last-paid-contracts cache Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2006-11-20 15:19:07 UTC (rev 2081) +++ trunk/projects/bos/m2/m2.lisp 2006-11-20 20:55:39 UTC (rev 2082) @@ -337,7 +337,7 @@ #'> :key #'contract-date) (make-list +last-contracts-cache-size+)) 0 +last-contracts-cache-size+))) - *last-contracts-cache*) + (remove-if #'object-destroyed-p *last-contracts-cache*)) (defun add-contract-to-cache (contract) (last-paid-contracts) ; force cache initialization, should really be done by a eval-when

1 0

[bknr-cvs] r2081 - in trunk/projects/bos: . statistics web
by bknr＠bknr.net 20 Nov '06

20 Nov '06

Author: hhubner Date: 2006-11-20 10:19:07 -0500 (Mon, 20 Nov 2006) New Revision: 2081 Modified: trunk/projects/bos/build.lisp trunk/projects/bos/statistics/Makefile trunk/projects/bos/web/web.lisp Log: Make worldpay-test-mode work as option in web.rc Modified: trunk/projects/bos/build.lisp =================================================================== --- trunk/projects/bos/build.lisp 2006-11-19 17:00:46 UTC (rev 2080) +++ trunk/projects/bos/build.lisp 2006-11-20 15:19:07 UTC (rev 2081) @@ -10,8 +10,8 @@ (defun read-configuration (pathname) (with-open-file (s pathname) - (loop for form = (read s nil nil) - while form + (loop for form = (read s nil :end-of-file) + while (not (eq form :end-of-file)) collect form))) (defmacro define-toggle-switch (switch-name variable default) Modified: trunk/projects/bos/statistics/Makefile =================================================================== --- trunk/projects/bos/statistics/Makefile 2006-11-19 17:00:46 UTC (rev 2080) +++ trunk/projects/bos/statistics/Makefile 2006-11-20 15:19:07 UTC (rev 2081) @@ -1,5 +1,5 @@ -BASE_URL = http://192.168.254.132:8080/reports-xml +BASE_URL = http://217.13.200.204:8080/reports-xml YEAR = LOGIN = OUTPUT_DIR = ../payment-website/images/statistics @@ -23,4 +23,4 @@ .xsl.svg: xsltproc -o $*.xml $*.xsl '$(BASE_URL)/$*/$(YEAR)$(LOGIN)' xsltproc -o $(OUTPUT_DIR)/$*$(YEAR).svg buildSVGLineChart.xsl $*.xml - rm $*.xml \ No newline at end of file + rm $*.xml Modified: trunk/projects/bos/web/web.lisp =================================================================== --- trunk/projects/bos/web/web.lisp 2006-11-19 17:00:46 UTC (rev 2080) +++ trunk/projects/bos/web/web.lisp 2006-11-20 15:19:07 UTC (rev 2081) @@ -14,13 +14,15 @@ (defvar *vhosts*) (defvar *website-directory*) (defvar *website-url*) +(defvar *worldpay-test-mode*) -(defun init (&key (port 8080) (listeners 1) (vhosts '("localhost")) website-directory website-url) +(defun init (&key (port 8080) (listeners 1) (vhosts '("localhost")) website-directory website-url worldpay-test-mode) (setf *port* port) (setf *listeners* listeners) (setf *vhosts* vhosts) (setf *website-url* website-url) (setf *website-directory* website-directory) + (setf *worldpay-test-mode* worldpay-test-mode) (unless *website-directory* (error ":website-directory not specified")) (reinit)) @@ -30,7 +32,8 @@ (unpublish :all t) (worldpay-test::publish-worldpay-test :website-directory *website-directory* :vhosts *vhosts* - :website-url *website-url*) + :website-url *website-url* + :worldpay-test-mode *worldpay-test-mode*) (format t "~&; Starting aserve~@[ in debug mode~].~%" debug) (force-output) (setq *webserver*

1 0

[bknr-cvs] r2080 - in trunk/projects/bos: . payment-website/infosystem
by bknr＠bknr.net 19 Nov '06

19 Nov '06

Author: hhubner Date: 2006-11-19 12:00:46 -0500 (Sun, 19 Nov 2006) New Revision: 2080 Modified: trunk/projects/bos/build.sh trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css trunk/projects/bos/screenrc-sample Log: commit production system changes Modified: trunk/projects/bos/build.sh =================================================================== --- trunk/projects/bos/build.sh 2006-11-19 15:34:09 UTC (rev 2079) +++ trunk/projects/bos/build.sh 2006-11-19 17:00:46 UTC (rev 2080) @@ -1,5 +1,5 @@ #!/bin/sh -e set -x -(cd ../thirdparty/cl-gd && make) +(cd ../../thirdparty/cl-gd && make) lisp -core cmucl.core -noinit -load load.lisp -load build.lisp Modified: trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css =================================================================== --- trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css 2006-11-19 15:34:09 UTC (rev 2079) +++ trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css 2006-11-19 17:00:46 UTC (rev 2080) @@ -267,8 +267,3 @@ overflow: hidden; } -#Info3Text table { - padding: 0px; - border: 0px; - margin: 0px; -} Modified: trunk/projects/bos/screenrc-sample =================================================================== --- trunk/projects/bos/screenrc-sample 2006-11-19 15:34:09 UTC (rev 2079) +++ trunk/projects/bos/screenrc-sample 2006-11-19 17:00:46 UTC (rev 2080) @@ -10,12 +10,13 @@ msgminwait 0 msgwait 0 -chdir bknr-svn/projects/bos +chdir /home/bknr/bknr-svn/projects/bos screen -t webserver lisp -core bos.core #logfile screen.log #log on screen -t cert-daemon lisp -core bos.core -cert-daemon +screen -t wp-callback-redir perl tools/wp-callpack-redirect.pl msgminwait 1 msgwait 1

1 0

[bknr-cvs] r2079 - in trunk/projects/bos/payment-website/infosystem: . da de en
by bknr＠bknr.net 19 Nov '06

19 Nov '06

Author: hhubner Date: 2006-11-19 10:34:09 -0500 (Sun, 19 Nov 2006) New Revision: 2079 Modified: trunk/projects/bos/payment-website/infosystem/da/satellitenkarte.htm trunk/projects/bos/payment-website/infosystem/de/satellitenkarte.htm trunk/projects/bos/payment-website/infosystem/en/satellitenkarte.htm trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css Log: Fix "last sponsor" display for all languages Modified: trunk/projects/bos/payment-website/infosystem/da/satellitenkarte.htm =================================================================== --- trunk/projects/bos/payment-website/infosystem/da/satellitenkarte.htm 2006-11-18 07:01:08 UTC (rev 2078) +++ trunk/projects/bos/payment-website/infosystem/da/satellitenkarte.htm 2006-11-19 15:34:09 UTC (rev 2079) @@ -160,14 +160,14 @@ </table> </div> <div id="Uebersicht" style="position:absolute; width:1px; height:1px; z-index:4; left: 0px; top: 0px; visibility: visible;"> - <div id="Info3" style="position:absolute; width:178px; height:132px; z-index:3; top: 329px; left: 550px; visibility: inherit;" class="KarteRahmen"> + <div id="Info3" style="position:absolute; width:178px; height:142px; z-index:3; top: 329px; left: 550px; visibility: inherit;" class="KarteRahmen"> <table width="178" border="0" cellspacing="0" cellpadding="0"> <tr> <td class="InfoKopf">"Sale" State</td> </tr> <tr> - <td width="160"> - <div id="Info3Text" style="position:absolute; width:160px; height:105px; z-index:4; top: 25px;" class="InfoZelle"> + <td width="166"> + <div id="Info3Text" class="InfoZelle"> </div> </td> </tr> @@ -437,7 +437,7 @@ </div> <div id="Ueberschrift" style="position:absolute; width:290px; height:20px; z-index:5; left: 169px; top: 80px;">Samboja Lestari - Overview</div> <div id="Untertitel" style="position:absolute; width:350px; height:20px; z-index:5; left: 169px; top: 469px;" align="right">More than 17 million square metres for eternity.</div> - <div class="Links" style="position:absolute; width:178px; height:132px; z-index:3; top: 472px; left: 550px;"> + <div class="Links" style="position:absolute; width:178px; height:132px; z-index:3; top: 482px; left: 550px;"> <span style="padding-right:2px"> <img src="/images/pfeil_link_on.gif" border="0" /> <a class="FaehnchenLink" href="javascript:window_infosystem_hilfe();"> Help </a> Modified: trunk/projects/bos/payment-website/infosystem/de/satellitenkarte.htm =================================================================== --- trunk/projects/bos/payment-website/infosystem/de/satellitenkarte.htm 2006-11-18 07:01:08 UTC (rev 2078) +++ trunk/projects/bos/payment-website/infosystem/de/satellitenkarte.htm 2006-11-19 15:34:09 UTC (rev 2079) @@ -160,7 +160,7 @@ </table> </div> <div id="Uebersicht" style="position:absolute; width:1px; height:1px; z-index:4; left: 0px; top: 0px; visibility: visible;"> - <div id="Info3" style="position:absolute; width:178px; height:132px; z-index:3; top: 329px; left: 550px; visibility: inherit;" class="KarteRahmen"> + <div id="Info3" style="position:absolute; width:178px; height:142px; z-index:3; top: 329px; left: 550px; visibility: inherit;" class="KarteRahmen"> <table width="178" border="0" cellspacing="0" cellpadding="0"> <tr> <td class="InfoKopf">"Verkaufs"-Status</td> @@ -443,7 +443,7 @@ </div> <div id="Ueberschrift" style="position:absolute; width:290px; height:20px; z-index:5; left: 169px; top: 80px;">Samboja Lestari im Überblick</div> <div id="Untertitel" style="position:absolute; width:350px; height:20px; z-index:5; left: 169px; top: 469px;" align="right">Über 17 Millionen Quadratmeter für die Ewigkeit</div> - <div class="Links" style="position:absolute; width:178px; height:132px; z-index:3; top: 472px; left: 550px;"> + <div class="Links" style="position:absolute; width:178px; height:132px; z-index:3; top: 482px; left: 550px;"> <span style="padding-right:2px"> <img src="/images/pfeil_link_on.gif" border="0" /> <a class="FaehnchenLink" href="javascript:window_infosystem_hilfe();"> Hilfe </a> Modified: trunk/projects/bos/payment-website/infosystem/en/satellitenkarte.htm =================================================================== --- trunk/projects/bos/payment-website/infosystem/en/satellitenkarte.htm 2006-11-18 07:01:08 UTC (rev 2078) +++ trunk/projects/bos/payment-website/infosystem/en/satellitenkarte.htm 2006-11-19 15:34:09 UTC (rev 2079) @@ -160,14 +160,14 @@ </table> </div> <div id="Uebersicht" style="position:absolute; width:1px; height:1px; z-index:4; left: 0px; top: 0px; visibility: visible;"> - <div id="Info3" style="position:absolute; width:178px; height:132px; z-index:3; top: 329px; left: 550px; visibility: inherit;" class="KarteRahmen"> + <div id="Info3" style="position:absolute; width:178px; height:142px; z-index:3; top: 329px; left: 550px; visibility: inherit;" class="KarteRahmen"> <table width="178" border="0" cellspacing="0" cellpadding="0"> <tr> <td class="InfoKopf">"Sale" State</td> </tr> <tr> - <td width="160"> - <div id="Info3Text" style="position:absolute; width:160px; height:105px; z-index:4; top: 25px;" class="InfoZelle"> + <td width="166"> + <div id="Info3Text" class="InfoZelle"> </div> </td> </tr> @@ -437,7 +437,7 @@ </div> <div id="Ueberschrift" style="position:absolute; width:290px; height:20px; z-index:5; left: 169px; top: 80px;">Samboja Lestari - Overview</div> <div id="Untertitel" style="position:absolute; width:350px; height:20px; z-index:5; left: 169px; top: 469px;" align="right">More than 17 million square metres for eternity.</div> - <div class="Links" style="position:absolute; width:178px; height:132px; z-index:3; top: 472px; left: 550px;"> + <div class="Links" style="position:absolute; width:178px; height:132px; z-index:3; top: 482px; left: 550px;"> <span style="padding-right:2px"> <img src="/images/pfeil_link_on.gif" border="0" /> <a class="FaehnchenLink" href="javascript:window_infosystem_hilfe();"> Help </a> Modified: trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css =================================================================== --- trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css 2006-11-18 07:01:08 UTC (rev 2078) +++ trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css 2006-11-19 15:34:09 UTC (rev 2079) @@ -258,7 +258,7 @@ #Info3Text { position: absolute; width: 156px; - height: 115px; + height: 145px; z-index: 4; top: 16px; padding: 0px;

1 0

[bknr-cvs] r2078 - trunk/projects/bos/payment-website/infosystem
by bknr＠bknr.net 18 Nov '06

18 Nov '06

Author: hhubner Date: 2006-11-18 02:01:08 -0500 (Sat, 18 Nov 2006) New Revision: 2078 Modified: trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css Log: Do not wrap long names in "last sponsor" display. Modified: trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css =================================================================== --- trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css 2006-11-18 06:57:09 UTC (rev 2077) +++ trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css 2006-11-18 07:01:08 UTC (rev 2078) @@ -257,12 +257,13 @@ #Info3Text { position: absolute; - width: 166px; + width: 156px; height: 115px; z-index: 4; top: 16px; padding: 0px; padding-left: 10px; + white-space: nowrap; overflow: hidden; }

1 0

[bknr-cvs] r2077 - in trunk/projects/bos: payment-website/infosystem payment-website/infosystem/de worldpay-test
by bknr＠bknr.net 18 Nov '06

18 Nov '06

Author: hhubner Date: 2006-11-18 01:57:09 -0500 (Sat, 18 Nov 2006) New Revision: 2077 Modified: trunk/projects/bos/payment-website/infosystem/de/messages.js trunk/projects/bos/payment-website/infosystem/javascript.js trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css trunk/projects/bos/worldpay-test/poi-handlers.lisp Log: Only display last sponsor on satellite app main page. Modified: trunk/projects/bos/payment-website/infosystem/de/messages.js =================================================================== --- trunk/projects/bos/payment-website/infosystem/de/messages.js 2006-11-17 12:16:36 UTC (rev 2076) +++ trunk/projects/bos/payment-website/infosystem/de/messages.js 2006-11-18 06:57:09 UTC (rev 2077) @@ -1,7 +1,7 @@ document.messages = { - 'Anzahl Sponsoren': 'Sponsoren', - 'Anzahl verkaufte m²': 'm²', + 'Anzahl Sponsoren': 'Anzahl Sponsoren', + 'Anzahl verkaufte m²': 'Anzahl verkaufte m²', 'Das Laden des Panoramas dauert einen Moment und benötigt Java in Ihrem Browser.<br /><br />Klicken und Ziehen Sie mit der Maus, um sich im Panorama umzusehen!': 'Das Laden des Panoramas dauert einen Moment und benötigt Java in Ihrem Browser.<br /><br />Klicken und Ziehen Sie mit der Maus, um sich im Panorama umzusehen!', 'Diese Anwendung benötigt Cookies, um zu funktionieren. Bitte schalten Sie Cookies in Ihrem Browser ein.': 'Diese Anwendung benötigt Cookies, um zu funktionieren. Bitte schalten Sie Cookies in Ihrem Browser ein.', 'Dieser m² wurde bisher noch nicht verkauft': 'Dieser m² wurde bisher noch nicht verkauft', Modified: trunk/projects/bos/payment-website/infosystem/javascript.js =================================================================== --- trunk/projects/bos/payment-website/infosystem/javascript.js 2006-11-17 12:16:36 UTC (rev 2076) +++ trunk/projects/bos/payment-website/infosystem/javascript.js 2006-11-18 06:57:09 UTC (rev 2077) @@ -169,24 +169,20 @@ window.opener.focus(); } +var B = partial(createDOM, 'B'); + function last_sponsors(sponsors) { + var sponsor = sponsors[0]; + replaceChildNodes('Info3Text', - TABLE(null, - TBODY(null, - TR(null, - TH({ colspan: 3 }, - '' + anzahlSponsoren + ' ' + msg('Anzahl Sponsoren') + ', ' + anzahlVerkauft + " " + msg('Anzahl verkaufte m²'))), - TR(null, - TH(null, msg('Datum')), - TH(null, msg('m²')), - TH(null, msg('Name'))), - map(function(sponsor) { return TR(null, - TD(null, sponsor.date.getDate() + "." + sponsor.date.getMonth() + "."), - TD(null, sponsor.count), - TD(null, sponsor.name)) }, - sponsors) - ))); + msg('Anzahl Sponsoren'), BR(), + B(anzahlSponsoren), BR(), BR(), + msg('Anzahl verkaufte m²'), BR(), + B(anzahlVerkauft), BR(), BR(), + msg('Letzter Sponsor'), BR(), + B(sponsor.name, BR()), + '(' + sponsor.date.getDate() + "." + sponsor.date.getMonth() + "." + ' - ' + sponsor.country + ' - ' + sponsor.count + ' m²)'); } function poi_fertig(_poi, _anzahlSponsoren, _anzahlVerkauft) { Modified: trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css =================================================================== --- trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css 2006-11-17 12:16:36 UTC (rev 2076) +++ trunk/projects/bos/payment-website/infosystem/satellitenkarte_style.css 2006-11-18 06:57:09 UTC (rev 2077) @@ -262,7 +262,7 @@ z-index: 4; top: 16px; padding: 0px; - padding-left: 2px; + padding-left: 10px; overflow: hidden; } Modified: trunk/projects/bos/worldpay-test/poi-handlers.lisp =================================================================== --- trunk/projects/bos/worldpay-test/poi-handlers.lisp 2006-11-17 12:16:36 UTC (rev 2076) +++ trunk/projects/bos/worldpay-test/poi-handlers.lisp 2006-11-18 06:57:09 UTC (rev 2077) @@ -332,10 +332,11 @@ ()) (defun contract-js (contract) - (format nil "{ id: ~A, date: ~A, name: ~S, count: ~A }" + (format nil "{ id: ~A, date: ~A, name: ~S, country: ~S, count: ~A }" (store-object-id contract) (format-date-time (contract-date contract) :js-style t) (or (user-full-name (contract-sponsor contract)) "anonymous") + (sponsor-country (contract-sponsor contract)) (length (contract-m2s contract)))) (defmethod handle ((handler poi-javascript-handler) req)

1 0

[bknr-cvs] r2076 - in trunk/projects/bos/payment-website: infosystem templates/da
by bknr＠bknr.net 17 Nov '06

17 Nov '06

Author: hhubner Date: 2006-11-17 07:16:36 -0500 (Fri, 17 Nov 2006) New Revision: 2076 Added: trunk/projects/bos/payment-website/infosystem/da/ Removed: trunk/projects/bos/payment-website/infosystem/dk/ Modified: trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml trunk/projects/bos/payment-website/templates/da/versand_info.xml Log: Correct language code for danish version. Copied: trunk/projects/bos/payment-website/infosystem/da (from rev 2072, trunk/projects/bos/payment-website/infosystem/dk) Modified: trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml 2006-11-17 12:07:01 UTC (rev 2075) +++ trunk/projects/bos/payment-website/templates/da/sponsor_canceled.xml 2006-11-17 12:16:36 UTC (rev 2076) @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" > <html xmlns="http://www.w3.org/1999/xhtml" xmlns:bknr="http://bknr.net" xmlns:bos="http://headcraft.de/bos" suppress-xml-headers="1"> <head> - <base href="$(website-url)/en/sponsor_canceled"></base> + <base href="$(website-url)/da/sponsor_canceled"></base> <link rel="stylesheet" href="/static/toplevel_style.css"></link> <link rel="stylesheet" href="/static/content_style.css"></link> <script src="/static/bos.js" type="text/javascript"> Modified: trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml 2006-11-17 12:07:01 UTC (rev 2075) +++ trunk/projects/bos/payment-website/templates/da/versand_geschenk.xml 2006-11-17 12:16:36 UTC (rev 2076) @@ -8,7 +8,7 @@ suppress-xml-headers="1" > <head> - <base href="$(website-url)/de/versand_info" /> + <base href="$(website-url)/da/versand_info" /> <link rel="stylesheet" href="/static/toplevel_style.css" /> <link rel="stylesheet" href="/static/content_style.css" /> <script src="/static/bos.js" type="text/javascript"> Modified: trunk/projects/bos/payment-website/templates/da/versand_info.xml =================================================================== --- trunk/projects/bos/payment-website/templates/da/versand_info.xml 2006-11-17 12:07:01 UTC (rev 2075) +++ trunk/projects/bos/payment-website/templates/da/versand_info.xml 2006-11-17 12:16:36 UTC (rev 2076) @@ -8,7 +8,7 @@ suppress-xml-headers="1" > <head> - <base href="$(website-url)/en/versand_info" /> + <base href="$(website-url)/da/versand_info" /> <link rel="stylesheet" href="/static/toplevel_style.css" /> <link rel="stylesheet" href="/static/content_style.css" /> <script src="/static/bos.js" type="text/javascript">

1 0

[bknr-cvs] r2075 - in trunk/projects/bos/payment-website/templates: . da
by bknr＠bknr.net 17 Nov '06

17 Nov '06

Author: hhubner Date: 2006-11-17 07:07:01 -0500 (Fri, 17 Nov 2006) New Revision: 2075 Added: trunk/projects/bos/payment-website/templates/da/ Removed: trunk/projects/bos/payment-website/templates/dk/ Modified: trunk/projects/bos/payment-website/templates/da/quittung.xml Log: Use 'da' instead of 'dk' for danish language code. Correctly set base url of quittung to danish version. Copied: trunk/projects/bos/payment-website/templates/da (from rev 2072, trunk/projects/bos/payment-website/templates/dk) Modified: trunk/projects/bos/payment-website/templates/da/quittung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/dk/quittung.xml 2006-11-16 15:05:14 UTC (rev 2072) +++ trunk/projects/bos/payment-website/templates/da/quittung.xml 2006-11-17 12:07:01 UTC (rev 2075) @@ -2,7 +2,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" > <html xmlns="http://www.w3.org/1999/xhtml" xmlns:bknr="http://bknr.net" xmlns:bos="http://headcraft.de/bos" suppress-xml-headers="1"> <head> - <base href="$(website-url)/en/quittung"></base> + <base href="$(website-url)/da/quittung"></base> <link rel="stylesheet" href="/static/toplevel_style.css"></link> <link rel="stylesheet" href="/static/content_style.css"></link> <script src="/static/bos.js" type="text/javascript">

1 0

[bknr-cvs] r2074 - trunk/projects/bos/payment-website/static
by bknr＠bknr.net 17 Nov '06

17 Nov '06

Author: hhubner Date: 2006-11-17 06:42:09 -0500 (Fri, 17 Nov 2006) New Revision: 2074 Modified: trunk/projects/bos/payment-website/static/bos.js trunk/projects/bos/payment-website/static/bos_en.js Log: Fix form check for number of sqm to buy. Modified: trunk/projects/bos/payment-website/static/bos.js =================================================================== --- trunk/projects/bos/payment-website/static/bos.js 2006-11-17 11:31:08 UTC (rev 2073) +++ trunk/projects/bos/payment-website/static/bos.js 2006-11-17 11:42:09 UTC (rev 2074) @@ -106,7 +106,7 @@ return false; } - if (!document.bestellformular.numsqm1.value.match(/^\d+/)) { + if (document.bestellformular.numsqm[4].checked && !document.bestellformular.numsqm1.value.match(/^\d+/)) { alert('Bitte geben Sie die Anzahl der Quadratmeter ein, die Sie "kaufen" möchten!'); document.bestellformular.numsqm1.focus(); return false; Modified: trunk/projects/bos/payment-website/static/bos_en.js =================================================================== --- trunk/projects/bos/payment-website/static/bos_en.js 2006-11-17 11:31:08 UTC (rev 2073) +++ trunk/projects/bos/payment-website/static/bos_en.js 2006-11-17 11:42:09 UTC (rev 2074) @@ -51,7 +51,7 @@ return false; } - if (!document.bestellformular.numsqm1.value.match(/^\d+/)) { + if (document.bestellformular.numsqm[4].checked && !document.bestellformular.numsqm1.value.match(/^\d+/)) { alert('Please enter the number of square meters that you want to "buy"!'); document.bestellformular.numsqm1.focus(); return false;

1 0

[bknr-cvs] r2073 - trunk/projects/bos/m2
by bknr＠bknr.net 17 Nov '06

17 Nov '06

Author: hhubner Date: 2006-11-17 06:31:08 -0500 (Fri, 17 Nov 2006) New Revision: 2073 Modified: trunk/projects/bos/m2/m2.lisp Log: Provide default initarg for paidp Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2006-11-16 15:05:14 UTC (rev 2072) +++ trunk/projects/bos/m2/m2.lisp 2006-11-17 11:31:08 UTC (rev 2073) @@ -187,6 +187,7 @@ (expires :read :documentation "universal time which specifies the time the contract expires (is deleted) when it has not been paid for" :initform nil)) (:default-initargs :m2s nil + :paidp nil :download-only nil :color (random-elt *claim-colors*) :cert-issued nil

1 0