[bknr-cvs] r2117 - in trunk/projects: bos/payment-website/templates/da bos/worldpay-test quickhoney/src
bknr at bknr.net
bknr at bknr.net
Mon Dec 18 19:16:01 UTC 2006
Author: hhubner
Date: 2006-12-18 14:15:59 -0500 (Mon, 18 Dec 2006)
New Revision: 2117
Added:
trunk/projects/bos/payment-website/templates/da/certificate.xml
Modified:
trunk/projects/bos/payment-website/templates/da/bestellung.xml
trunk/projects/bos/payment-website/templates/da/certificat.xml
trunk/projects/bos/payment-website/templates/da/profil_setup.xml
trunk/projects/bos/payment-website/templates/da/quittung.xml
trunk/projects/bos/payment-website/templates/da/versand_info.xml
trunk/projects/bos/payment-website/templates/da/versand_quittung.xml
trunk/projects/bos/worldpay-test/tags.lisp
trunk/projects/quickhoney/src/webserver.lisp
Log:
Current danish version and small last-minute fixes.
Modified: trunk/projects/bos/payment-website/templates/da/bestellung.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/da/bestellung.xml 2006-12-16 07:40:30 UTC (rev 2116)
+++ trunk/projects/bos/payment-website/templates/da/bestellung.xml 2006-12-18 19:15:59 UTC (rev 2117)
@@ -158,8 +158,8 @@
</tr>
<tr>
<td align="right" colspan="3">
- <input type="submit" class="form_big_bold" name="action" value="Doner online" onclick="return check_online();"></input>
- <input type="submit" class="form_big" name="action" value="Überweisen" onclick="return check_ueberweisung();"></input>
+ <input type="submit" class="form_big_bold" name="action" value="Doner online" onclick="return check_online();" />
+ <input type="submit" class="form_big" name="action" value="overføre" onclick="return check_ueberweisung();" />
</td>
</tr>
Modified: trunk/projects/bos/payment-website/templates/da/certificat.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/da/certificat.xml 2006-12-16 07:40:30 UTC (rev 2116)
+++ trunk/projects/bos/payment-website/templates/da/certificat.xml 2006-12-18 19:15:59 UTC (rev 2117)
@@ -3,6 +3,6 @@
<bknr:toplevel template="toplevel_extra" title="Regnskov i SAMBOJA LESTARI - Regnskovs Diplom" xmlns="http://www.w3.org/1999/xhtml" xmlns:bknr="http://bknr.net" xmlns:bos="http://headcraft.de/bos">
<h1 class="extra">Sådan vil dit Regnskovs Diplom se ud:</h1>
<center>
- <img src="/images/certificate_en.jpg" width="300" height="424" alt="" border="0"></img>
+ <img src="/images/certificate_da.jpg" width="300" height="417" alt="" border="0"></img>
</center>
</bknr:toplevel>
Added: trunk/projects/bos/payment-website/templates/da/certificate.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/da/certificate.xml 2006-12-16 07:40:30 UTC (rev 2116)
+++ trunk/projects/bos/payment-website/templates/da/certificate.xml 2006-12-18 19:15:59 UTC (rev 2117)
@@ -0,0 +1,8 @@
+<?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_extra" title="Regnskov i SAMBOJA LESTARI - Regnskovs Diplom" xmlns="http://www.w3.org/1999/xhtml" xmlns:bknr="http://bknr.net" xmlns:bos="http://headcraft.de/bos">
+ <h1 class="extra">Sådan vil dit Regnskovs Diplom se ud:</h1>
+ <center>
+ <img src="/images/certificate_en.jpg" width="300" height="424" alt="" border="0"></img>
+ </center>
+</bknr:toplevel>
Modified: trunk/projects/bos/payment-website/templates/da/profil_setup.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/da/profil_setup.xml 2006-12-16 07:40:30 UTC (rev 2116)
+++ trunk/projects/bos/payment-website/templates/da/profil_setup.xml 2006-12-18 19:15:59 UTC (rev 2117)
@@ -139,7 +139,7 @@
</tr>
<tr>
<td colspan="3" align="right">
- <input type="submit" class="form_big" name="Button" value="save and continue"></input>
+ <input type="submit" class="form_big" name="Button" value="gem og fortsæt" />
</td>
</tr>
</table>
Modified: trunk/projects/bos/payment-website/templates/da/quittung.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/da/quittung.xml 2006-12-16 07:40:30 UTC (rev 2116)
+++ trunk/projects/bos/payment-website/templates/da/quittung.xml 2006-12-18 19:15:59 UTC (rev 2117)
@@ -123,7 +123,7 @@
</tr>
<tr>
<td colspan="3" align="right">
- <input type="submit" class="form_big" name="Button" onclick="javascript:return confirm('Is the indicated name correct?');" value="save and fortsæt"></input>
+ <input type="submit" class="form_big" name="Button" onclick="javascript:return confirm('Er det nævnte navn korrekt?');" value="gem og fortsæt" />
</td>
</tr>
</table>
Modified: trunk/projects/bos/payment-website/templates/da/versand_info.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/da/versand_info.xml 2006-12-16 07:40:30 UTC (rev 2116)
+++ trunk/projects/bos/payment-website/templates/da/versand_info.xml 2006-12-18 19:15:59 UTC (rev 2117)
@@ -1,16 +1,10 @@
<?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">
-<html
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:bknr="http://bknr.net"
- xmlns:bos="http://headcraft.de/bos"
- suppress-xml-headers="1"
- >
+<!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)/da/versand_info" />
- <link rel="stylesheet" href="/static/toplevel_style.css" />
- <link rel="stylesheet" href="/static/content_style.css" />
+ <base href="$(website-url)/da/versand_info"></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"><!-- x -->
</script>
<!--<meta http-equiv="content-type" content="text/html; charset=UTF-8" />-->
@@ -22,7 +16,7 @@
<div id="header">
<div id="menue_banner">
- <img src="../images/header_ganzneu.gif" border="0" />
+ <img src="../images/header_ganzneu.gif" border="0"></img>
</div>
<div id="menue_header_left">
@@ -39,18 +33,18 @@
<tr>
<td></td>
<td colspan="2">
- <img src="/images/step3.gif" width="120" height="20" border="0" alt="" />
+ <img src="/images/step3.gif" width="120" height="20" border="0" alt=""></img>
</td>
</tr>
<tr><td colspan="4" height="40"></td></tr>
<tr>
<td> </td>
- <td colspan="2"><span class="link_titlered">Tak</span><br /><br /></td>
+ <td colspan="2"><span class="link_titlered">Tak</span><br></br><br></br></td>
<td> </td>
</tr>
<tr>
<td></td>
- <td colspan="2"> for din støtte og for din tilld til BOS. <br /><br />The m² du har sponseret er i gode hænder. </td>
+ <td colspan="2"> for din støtte og for din tilld til BOS. <br></br><br></br>The m² du har sponseret er i gode hænder. </td>
<td></td>
</tr>
</table>
@@ -71,20 +65,20 @@
<!-- container content_main -->
<bos:process-payment>
<div id="content_main">
- <div id="textbox_content_big" >
+ <div id="textbox_content_big">
<form name="formular" method="post" action="versand_quittung">
- <input type="hidden" name="sponsor-id" value="$(sponsor-id)" />
- <input type="hidden" name="master-code" value="$(master-code)" />
- <input type="hidden" name="contract-id" value="$(cartId)" />
- <input type="hidden" name="email" value="$(email)" />
- <input type="hidden" name="next-step-name" value="weiter" />
+ <input type="hidden" name="sponsor-id" value="$(sponsor-id)"></input>
+ <input type="hidden" name="master-code" value="$(master-code)"></input>
+ <input type="hidden" name="contract-id" value="$(cartId)"></input>
+ <input type="hidden" name="email" value="$(email)"></input>
+ <input type="hidden" name="next-step-name" value="videre"></input>
<table id="formTable" width="95%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td colspan="3"><span class="headline">Din betaling er modtaget:</span></td>
</tr>
<tr>
<td colspan="3" height="140">
- <bos:worldpay-receipt />
+ <bos:worldpay-receipt></bos:worldpay-receipt>
</td>
</tr>
<tr>
@@ -98,7 +92,7 @@
</tr>
<tr>
<td colspan="3">
- I hvilket navn skal vi udstede dit Regnskovs diplom? [Vi acceptere det intastede navn i dette felt. Vær venlig at ændre navnet om nødvendigt. ]
+ I hvilket navn skal vi udstede dit Regnskovs diplom? [Vi accepterer det indtastede navn i dette felt. Vær venlig at ændre navnet om nødvendigt. ]
</td>
</tr>
<tr>
@@ -107,7 +101,7 @@
</td>
<td></td>
<td>
- <input type="text" class="form_big" size="35" name="name" value="$(name)" />
+ <input type="text" class="form_big" size="35" name="name" value="$(name)"></input>
</td>
</tr>
<tr>
@@ -123,7 +117,7 @@
</tr>
<tr>
<td>
- Addressen til dit <br />regnskovs diplom:<br /><br /><br /></td>
+ Addressen til dit <br></br>regnskovs diplom:<br></br><br></br><br></br></td>
<td></td>
<td>
<!-- left-aligned in order to aid formatting -->
@@ -143,9 +137,7 @@
</tr>
<tr>
<td colspan="3" align="right">
- <input type="submit" class="form_big" name="Button"
- onclick="return check_versand_info();"
- value="save and continue" />
+ <input type="submit" class="form_big" name="Button" onclick="return check_versand_info();" value="gem og fortsæt"></input>
</td>
</tr>
</table>
@@ -155,28 +147,28 @@
</bos:process-payment>
<div id="content_right">
<div id="helpbox">
- <br /><br />
- [<strong>Betalings-bekræftigelse</strong>]<br />
+ <br></br><br></br>
+ [<strong>Betalings-bekræftigelse</strong>]<br></br>
Denne betalings-bekræftigelse fra WorldPay er allerede undervejs til din indbox. I den uventede situation at du ikke skulle modtage nogen besked, venligst kontakt:
- <br />
- <img src="/images/pfeil_link_on.gif" width="10" height="9" alt="" />
+ <br></br>
+ <img src="/images/pfeil_link_on.gif" width="10" height="9" alt=""></img>
<a href="mailto:service at create-rainforest.org" class="more">
service at create-rainforest.org
</a>
- <br /><br /><br /><br /><br /><br /><br /><br /><br />
- [<strong>Regnskovs diplom</strong>]<br />
+ <br></br><br></br><br></br><br></br><br></br><br></br><br></br><br></br><br></br>
+ [<strong>Regnskovs diplom</strong>]<br></br>
Med bare 1 sponseret kvardratmeter vil du modtage vores
- <img src="/images/pfeil_link_on.gif" width="10" height="9" alt="" />
+ <img src="/images/pfeil_link_on.gif" width="10" height="9" alt=""></img>
<a href="javascript:window_extra('certificat')" class="more">
Regnskovs diplom
</a>
som et pdf-download fra din personlige sponsor profil.
- <br />
- <img src="/images/pfeil_link_on.gif" width="10" height="9" alt="" />
+ <br></br>
+ <img src="/images/pfeil_link_on.gif" width="10" height="9" alt=""></img>
<a href="mailto:service at create-rainforest.org" class="more">
service at create-rainforest.org
</a>
- <br /><br /><br /><br /><br /><br />
+ <br></br><br></br><br></br><br></br><br></br><br></br>
</div>
</div>
</div>
Modified: trunk/projects/bos/payment-website/templates/da/versand_quittung.xml
===================================================================
--- trunk/projects/bos/payment-website/templates/da/versand_quittung.xml 2006-12-16 07:40:30 UTC (rev 2116)
+++ trunk/projects/bos/payment-website/templates/da/versand_quittung.xml 2006-12-18 19:15:59 UTC (rev 2117)
@@ -1,12 +1,6 @@
<?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
- title="REGNSKOV i SAMBOJA LESTARI"
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:bknr="http://bknr.net"
- xmlns:bos="http://headcraft.de/bos"
- >
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" >
+<bknr:toplevel title="REGNSKOV i SAMBOJA LESTARI" xmlns="http://www.w3.org/1999/xhtml" xmlns:bknr="http://bknr.net" xmlns:bos="http://headcraft.de/bos">
<!-- content 3teilig-->
<div id="content">
<!-- content left-->
@@ -16,7 +10,7 @@
<tr>
<td></td>
<td colspan="2">
- <img src="/images/step4.gif" width="120" height="20" border="0" alt="" />
+ <img src="/images/step4.gif" width="120" height="20" border="0" alt=""></img>
</td>
</tr>
<tr><td colspan="4" height="40"></td></tr>
@@ -37,24 +31,24 @@
</div>
<!-- container content_main -->
<div id="content_main">
- <div id="textbox_content_big" >
+ <div id="textbox_content_big">
<form method="post" action="generate-cert">
- <input type="hidden" name="sponsor-id" value="$(sponsor-id)" />
- <input type="hidden" name="__sponsorid" value="$(sponsor-id)" />
- <input type="hidden" name="__password" value="$(master-code)" />
- <input type="hidden" name="contract-id" value="$(contract-id)" />
- <input type="hidden" name="name" value="$(name)" />
- <input type="hidden" name="address" value="$(address)" />
- <input type="hidden" name="email" value="$(email)" />
- <input type="hidden" name="gift" value="$(gift)" />
+ <input type="hidden" name="sponsor-id" value="$(sponsor-id)"></input>
+ <input type="hidden" name="__sponsorid" value="$(sponsor-id)"></input>
+ <input type="hidden" name="__password" value="$(master-code)"></input>
+ <input type="hidden" name="contract-id" value="$(contract-id)"></input>
+ <input type="hidden" name="name" value="$(name)"></input>
+ <input type="hidden" name="address" value="$(address)"></input>
+ <input type="hidden" name="email" value="$(email)"></input>
+ <input type="hidden" name="gift" value="$(gift)"></input>
<table id="formTable" width="95%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td colspan="3">
Regnskovs diplomet vil blive udstedt i følgende navn og adresse:
- <br /><br /><br />
+ <br></br><br></br><br></br>
Navn på regnskovs diplomet: $(name)
- <br /><br />
- Adresse på diplomet: <br />
+ <br></br><br></br>
+ Adresse på diplomet: <br></br>
<pre>
$(address)
$(postcode)
@@ -122,11 +116,8 @@
</tr>
<tr>
<td colspan="3" align="right">
- <input class="form_big" type="button"
- value="tilbage"
- onclick="javascript:history.back()"
- id="back" name="back" />
- <input type="submit" class="form_big" name="Button" value="$(next-step-name)" />
+ <input class="form_big" type="button" value="tilbage" onclick="javascript:history.back()" id="back" name="back"></input>
+ <input type="submit" class="form_big" name="Button" value="$(next-step-name)"></input>
</td>
</tr>
</table>
@@ -135,9 +126,9 @@
</div>
<div id="content_right">
<div id="helpbox">
- <br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />
- [<strong>Sponsor ID</strong>]<br />
- Du kan til en hver tid cheke dine sponsorerede m² ved hjælp af dit sponsor ID. ID'et gør det muligt for dig nemt at lokaliserer dine m². Ligeledes kan besøgende på hjemmesiden se alle m² og de personlige profiler. Hvis du ønsker at forblive anonym kan du begrænse adgangen ved hjælp af et kodeord. <br /><br /><br /><br /><br /><br />
+ <br></br><br></br><br></br><br></br><br></br><br></br><br></br><br></br><br></br><br></br><br></br><br></br><br></br>
+ [<strong>Sponsor ID</strong>]<br></br>
+ Du kan til en hver tid cheke dine sponsorerede m² ved hjælp af dit sponsor ID. ID'et gør det muligt for dig nemt at lokalisere dine m². Ligeledes kan besøgende på hjemmesiden se alle m² og de personlige profiler. Hvis du ønsker at forblive anonym kan du begrænse adgangen ved hjælp af et kodeord. <br></br><br></br><br></br><br></br><br></br><br></br>
</div>
</div>
</div>
Modified: trunk/projects/bos/worldpay-test/tags.lisp
===================================================================
--- trunk/projects/bos/worldpay-test/tags.lisp 2006-12-16 07:40:30 UTC (rev 2116)
+++ trunk/projects/bos/worldpay-test/tags.lisp 2006-12-18 19:15:59 UTC (rev 2117)
@@ -69,9 +69,8 @@
;; eventuell noch mal prüfen und sicher stellen.
(manual-transfer (or (scan #?r"rweisen" action)
(scan #?r"rweisung" action)
- (scan #?r"overf" action)))
+ (scan #?r"verf" action)))
(sponsor (make-sponsor))
- (price (* numsqm 3))
(contract (make-contract sponsor numsqm
:download-only download-only
:expires (+ (if manual-transfer
@@ -79,30 +78,35 @@
bos.m2::*online-contract-expiry-time*)
(get-universal-time))))
(language (session-variable :language)))
- (setf (get-template-var :worldpay-url)
- (if manual-transfer
- (format nil "ueberweisung?contract-id=~A&amount=~A&numsqm=~A~@[&donationcert-yearly=1~]"
- (store-object-id contract)
- price
- numsqm
- donationcert-yearly)
- (format nil "https://select.worldpay.com/wcc/purchase?instId=~A&cartId=~A&amount=~A¤cy=EUR&lang=~A&desc=~A&MC_sponsorid=~A&MC_password=~A&MC_donationcert-yearly=~A&MC_gift=~A~@[~A~]"
- *worldpay-installation-id*
- (store-object-id contract)
- price
- language
- (encode-urlencoded (format nil "~A ~A Samboja Lestari"
- numsqm
- (case (make-keyword-from-string language)
- (:de "qm Regenwald in")
- (:da "sqm Regnskov i")
- (t "sqm rain forest in"))))
- (store-object-id sponsor)
- (sponsor-master-code sponsor)
- (if donationcert-yearly "1" "0")
- (if gift "1" "0")
- (when *worldpay-test-mode* "&testMode=100"))))))
- (mapc #'emit-template-node children))
+ (destructuring-bind (price currency)
+ (case (make-keyword-from-string language)
+ (:da (list (* numsqm 24) "DKK"))
+ (t (list (* numsqm 3) "EUR")))
+ (setf (get-template-var :worldpay-url)
+ (if manual-transfer
+ (format nil "ueberweisung?contract-id=~A&amount=~A&numsqm=~A~@[&donationcert-yearly=1~]"
+ (store-object-id contract)
+ price
+ numsqm
+ donationcert-yearly)
+ (format nil "https://select.worldpay.com/wcc/purchase?instId=~A&cartId=~A&amount=~A¤cy=~A&lang=~A&desc=~A&MC_sponsorid=~A&MC_password=~A&MC_donationcert-yearly=~A&MC_gift=~A~@[~A~]"
+ *worldpay-installation-id*
+ (store-object-id contract)
+ price
+ currency
+ language
+ (encode-urlencoded (format nil "~A ~A Samboja Lestari"
+ numsqm
+ (case (make-keyword-from-string language)
+ (:de "qm Regenwald in")
+ (:da "sqm Regnskov i")
+ (t "sqm rain forest in"))))
+ (store-object-id sponsor)
+ (sponsor-master-code sponsor)
+ (if donationcert-yearly "1" "0")
+ (if gift "1" "0")
+ (when *worldpay-test-mode* "&testMode=100"))))))
+ (mapc #'emit-template-node children)))
(define-bknr-tag mail-transfer ()
(with-query-params ((get-template-var :request)
Modified: trunk/projects/quickhoney/src/webserver.lisp
===================================================================
--- trunk/projects/quickhoney/src/webserver.lisp 2006-12-16 07:40:30 UTC (rev 2116)
+++ trunk/projects/quickhoney/src/webserver.lisp 2006-12-18 19:15:59 UTC (rev 2117)
@@ -23,6 +23,7 @@
("/upload-image" upload-image-handler)
("/upload-animation" upload-animation-handler)
("/upload-button" upload-button-handler)
+ ("/rss" rss-handler)
("/" redirect-handler
:to "/frontpage")
("/" template-handler
More information about the Bknr-cvs
mailing list