bknr-cvs

bknr-cvs@common-lisp.net

1964 discussions

[bknr-cvs] hans changed trunk/projects/bos/web/sponsor-handlers.lisp
by BKNR Commits 24 Oct '08

24 Oct '08

Revision: 4016 Author: hans URL: http://bknr.net/trac/changeset/4016 Send instruction email for manually created sponsors. U trunk/projects/bos/web/sponsor-handlers.lisp Modified: trunk/projects/bos/web/sponsor-handlers.lisp =================================================================== --- trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-24 12:54:11 UTC (rev 4015) +++ trunk/projects/bos/web/sponsor-handlers.lisp 2008-10-24 13:32:33 UTC (rev 4016) @@ -117,6 +117,7 @@ :download-only (not want-print)))) (contract-issue-cert contract name :address address :language language) (send-to-postmaster #'mail-backoffice-sponsor-data contract numsqm country email name address language (all-request-params)) + (mail-instructions-to-sponsor contract email) (redirect (format nil "/edit-sponsor/~D" (store-object-id sponsor)))))) (defun contract-checkbox-name (contract)

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/ge/
by BKNR Commits 24 Oct '08

24 Oct '08

Revision: 4015 Author: hans URL: http://bknr.net/trac/changeset/4015 Remove directory which will not be kept in svn D trunk/projects/bos/payment-website/ge/

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/templates/de/bestellung.xml
by BKNR Commits 23 Oct '08

23 Oct '08

Revision: 4014 Author: hans URL: http://bknr.net/trac/changeset/4014 Verbesserte dynamische "verschenken"-Option U trunk/projects/bos/payment-website/templates/de/bestellung.xml Modified: trunk/projects/bos/payment-website/templates/de/bestellung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/bestellung.xml 2008-10-23 13:53:56 UTC (rev 4013) +++ trunk/projects/bos/payment-website/templates/de/bestellung.xml 2008-10-23 14:01:32 UTC (rev 4014) @@ -75,29 +75,35 @@ <tr> <td colspan="3" height="5"> </td> </tr> + <script type="text/javascript"> + function verschenken(state) { + document.bestellformular.gift.disabled = !state; + document.bestellformular.gift.checked = false; + } + </script> <tr> <td colspan="3"> <input type="radio" name="numsqm" value="1" - onclick="document.bestellformular.numsqm1.value = ''; document.getElementById('verschenken-info').style.visibility = 'hidden'" /> + onclick="document.bestellformular.numsqm1.value = ''; verschenken(false)" /> 1 m² Regenwald [3 Euro], <br /> <input type="radio" name="numsqm" value="5" - onclick="document.bestellformular.numsqm1.value = ''; document.getElementById('verschenken-info').style.visibility = 'hidden'" /> + onclick="document.bestellformular.numsqm1.value = ''; verschenken(false)" /> 5 m² Regenwald [15 Euro], <br /> <input type="radio" name="numsqm" value="10" checked="checked" - onclick="document.bestellformular.numsqm1.value = ''; document.getElementById('verschenken-info').style.visibility = 'hidden'" /> + onclick="document.bestellformular.numsqm1.value = ''; verschenken(false)" /> 10 m² Regenwald [30 Euro], <br /> <input type="radio" name="numsqm" value="30" - onclick="document.bestellformular.numsqm1.value = ''; document.getElementById('verschenken-info').style.visibility = 'visible'" /> + onclick="document.bestellformular.numsqm1.value = ''; verschenken(true)" /> 30 m² Regenwald [90 Euro] <br /> - <input type="radio" name="numsqm" value="" onclick="document.bestellformular.numsqm1.value = ''; document.getElementById('verschenken-info').style.visibility = 'hidden'"/> + <input type="radio" name="numsqm" value="" onclick="document.bestellformular.numsqm1.value = ''; verschenken(false)"/> oder <input type="text" name="numsqm1" size="5" value="" - onfocus="document.bestellformular.numsqm[4].click(); document.getElementById('verschenken-info').style.visibility = 'hidden'" - onkeyup="document.getElementById('verschenken-info').style.visibility = (document.bestellformular.numsqm1.value >= 30) ? 'visible' : 'hidden';"/> + onfocus="document.bestellformular.numsqm[4].click(); verschenken(false)" + onkeyup="verschenken(document.bestellformular.numsqm1.value >= 30)"/> Quadratmeter [zu je 3 Euro]. <br /> </td> @@ -106,9 +112,9 @@ <td colspan="3" height="8"> </td> </tr> - <tr id="verschenken-info" style="visibility: hidden"> + <tr> <td colspan="3"> - <input type="checkbox" name="gift" value="1" /> + <input type="checkbox" name="gift" value="1" disabled="1"/> Ich möchte die m² symbolisch verschenken. <img src="/images/pfeil_link_on.gif" width="10" height="9" alt="" /> <a href="#" onclick="window_extra('verschenken')" class="more">

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/templates/de/bestellung.xml
by BKNR Commits 23 Oct '08

23 Oct '08

Revision: 4013 Author: hans URL: http://bknr.net/trac/changeset/4013 Dynamische "Verschenken"-Option U trunk/projects/bos/payment-website/templates/de/bestellung.xml Modified: trunk/projects/bos/payment-website/templates/de/bestellung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/bestellung.xml 2008-10-23 10:47:47 UTC (rev 4012) +++ trunk/projects/bos/payment-website/templates/de/bestellung.xml 2008-10-23 13:53:56 UTC (rev 4013) @@ -78,25 +78,26 @@ <tr> <td colspan="3"> <input type="radio" name="numsqm" value="1" - onclick="document.bestellformular.numsqm1.value = '';" /> + onclick="document.bestellformular.numsqm1.value = ''; document.getElementById('verschenken-info').style.visibility = 'hidden'" /> 1 m² Regenwald [3 Euro], <br /> <input type="radio" name="numsqm" value="5" - onclick="document.bestellformular.numsqm1.value = '';" /> + onclick="document.bestellformular.numsqm1.value = ''; document.getElementById('verschenken-info').style.visibility = 'hidden'" /> 5 m² Regenwald [15 Euro], <br /> <input type="radio" name="numsqm" value="10" checked="checked" - onclick="document.bestellformular.numsqm1.value = '';" /> + onclick="document.bestellformular.numsqm1.value = ''; document.getElementById('verschenken-info').style.visibility = 'hidden'" /> 10 m² Regenwald [30 Euro], <br /> <input type="radio" name="numsqm" value="30" - onclick="document.bestellformular.numsqm1.value = '';" /> + onclick="document.bestellformular.numsqm1.value = ''; document.getElementById('verschenken-info').style.visibility = 'visible'" /> 30 m² Regenwald [90 Euro] <br /> - <input type="radio" name="numsqm" value=""/> + <input type="radio" name="numsqm" value="" onclick="document.bestellformular.numsqm1.value = ''; document.getElementById('verschenken-info').style.visibility = 'hidden'"/> oder <input type="text" name="numsqm1" size="5" value="" - onfocus="document.bestellformular.numsqm[4].click()"/> + onfocus="document.bestellformular.numsqm[4].click(); document.getElementById('verschenken-info').style.visibility = 'hidden'" + onkeyup="document.getElementById('verschenken-info').style.visibility = (document.bestellformular.numsqm1.value >= 30) ? 'visible' : 'hidden';"/> Quadratmeter [zu je 3 Euro]. <br /> </td> @@ -105,7 +106,7 @@ <td colspan="3" height="8"> </td> </tr> - <tr> + <tr id="verschenken-info" style="visibility: hidden"> <td colspan="3"> <input type="checkbox" name="gift" value="1" /> Ich möchte die m² symbolisch verschenken.

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/
by BKNR Commits 23 Oct '08

23 Oct '08

Revision: 4012 Author: hans URL: http://bknr.net/trac/changeset/4012 Weitere Aenderungen im Zusammenhang mit der Preisaenderung fuer Print-Urkunden. U trunk/projects/bos/payment-website/static/bos.js U trunk/projects/bos/payment-website/static/bos_da.js U trunk/projects/bos/payment-website/static/bos_en.js U trunk/projects/bos/payment-website/templates/de/idea.xml U trunk/projects/bos/payment-website/templates/de/idea_subtitle1.xml U trunk/projects/bos/payment-website/templates/de/idea_subtitle2.xml U trunk/projects/bos/payment-website/templates/de/ueberweisung.xml U trunk/projects/bos/payment-website/templates/de/verschenken.xml Modified: trunk/projects/bos/payment-website/static/bos.js =================================================================== --- trunk/projects/bos/payment-website/static/bos.js 2008-10-23 07:12:21 UTC (rev 4011) +++ trunk/projects/bos/payment-website/static/bos.js 2008-10-23 10:47:47 UTC (rev 4012) @@ -123,9 +123,9 @@ && (document.bestellformular.numsqm[0].checked || document.bestellformular.numsqm[1].checked || (document.bestellformular.numsqm[4].checked - && (document.bestellformular.numsqm1.value < 10)))) { + && (document.bestellformular.numsqm1.value < 30)))) { - alert("Das Verschenken von Quadratmetern ist erst ab einer Summe von 30 Euro möglich"); + alert("Das Verschenken von Quadratmetern ist erst ab einer Summe von 90 Euro möglich"); return false; } @@ -272,6 +272,8 @@ { if (document.getElementById('numsqm').value >= 30) { document.getElementById('mail-cert').style.visibility = 'inherit'; - document.getElementById('urkunde-info').style.visibility = 'inherit'; + document.getElementById('urkunde-print-info').style.display = 'inline'; + } else { + document.getElementById('urkunde-download-info').style.display = 'inline'; } } Modified: trunk/projects/bos/payment-website/static/bos_da.js =================================================================== --- trunk/projects/bos/payment-website/static/bos_da.js 2008-10-23 07:12:21 UTC (rev 4011) +++ trunk/projects/bos/payment-website/static/bos_da.js 2008-10-23 10:47:47 UTC (rev 4012) @@ -61,9 +61,9 @@ && (document.bestellformular.numsqm[0].checked || document.bestellformular.numsqm[1].checked || (document.bestellformular.numsqm[4].checked - && (document.bestellformular.numsqm1.value < 10)))) { + && (document.bestellformular.numsqm1.value < 30)))) { - alert("Das Verschenken von Quadratmetern ist erst ab einer Summe von 30 Euro möglich"); + alert("Das Verschenken von Quadratmetern ist erst ab einer Summe von 90 Euro möglich"); return false; } Modified: trunk/projects/bos/payment-website/static/bos_en.js =================================================================== --- trunk/projects/bos/payment-website/static/bos_en.js 2008-10-23 07:12:21 UTC (rev 4011) +++ trunk/projects/bos/payment-website/static/bos_en.js 2008-10-23 10:47:47 UTC (rev 4012) @@ -61,9 +61,9 @@ && (document.bestellformular.numsqm[0].checked || document.bestellformular.numsqm[1].checked || (document.bestellformular.numsqm[4].checked - && (document.bestellformular.numsqm1.value < 10)))) { + && (document.bestellformular.numsqm1.value < 30)))) { - alert("Das Verschenken von Quadratmetern ist erst ab einer Summe von 30 Euro möglich"); + alert("Das Verschenken von Quadratmetern ist erst ab einer Summe von 90 Euro möglich"); return false; } Modified: trunk/projects/bos/payment-website/templates/de/idea.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/idea.xml 2008-10-23 07:12:21 UTC (rev 4011) +++ trunk/projects/bos/payment-website/templates/de/idea.xml 2008-10-23 10:47:47 UTC (rev 4012) @@ -13,18 +13,13 @@ <div id="textbox_content"> <table border="0" cellpadding="0" cellspacing="0"> <tr> - <td colspan="2"> + <td colspan="3"> <span class="headline"> Samboja Lestari - kreative Aufforstung. <br /> Eine Zufluchtstätte für Borneo </span> </td> - <td align="center"><img src="/images/pfeil_back.gif" width="10" height="9" alt="" /> - <a href="#" onclick="history.back()" class="titlegray"> - zurück - </a> - </td> </tr> <tr><td height="6"> </td></tr> <tr> Modified: trunk/projects/bos/payment-website/templates/de/idea_subtitle1.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/idea_subtitle1.xml 2008-10-23 07:12:21 UTC (rev 4011) +++ trunk/projects/bos/payment-website/templates/de/idea_subtitle1.xml 2008-10-23 10:47:47 UTC (rev 4012) @@ -14,16 +14,11 @@ <div id="textbox_content_bigger"> <table border="0" cellpadding="0" cellspacing="0"> <tr> - <td colspan="2"> + <td colspan="3"> <span class="headline"> Landwirtschaft, Aufforstung und Schutz <br /> - eine gute Kombination </span> </td> - <td align="center"><img src="/images/pfeil_back.gif" width="10" height="9" alt="" /> - <a href="#" onclick="history.back()" class="titlegray"> - zurück - </a> - </td> </tr> <tr> <td height="6" width="150"><img src="/images/trans.gif" width="160" height="6" alt="" /> </td> @@ -76,4 +71,4 @@ </table> </div> </div> -</bknr:toplevel> \ No newline at end of file +</bknr:toplevel> Modified: trunk/projects/bos/payment-website/templates/de/idea_subtitle2.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/idea_subtitle2.xml 2008-10-23 07:12:21 UTC (rev 4011) +++ trunk/projects/bos/payment-website/templates/de/idea_subtitle2.xml 2008-10-23 10:47:47 UTC (rev 4012) @@ -13,13 +13,7 @@ <div id="textbox_content_bigger"> <table border="0" cellpadding="0" cellspacing="0"> <tr> - <td colspan="2"><span class="headline">Ein m², der es in sich hat <br /></span></td> - <td align="center"> - <img src="/images/pfeil_back.gif" width="10" height="9" alt="" /> - <a href="#" onclick="history.back()" class="titlegray"> - zurück - </a> - </td> + <td colspan="3"><span class="headline">Ein m², der es in sich hat <br /></span></td> </tr> <tr><td height="16"> </td> </tr> Modified: trunk/projects/bos/payment-website/templates/de/ueberweisung.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/ueberweisung.xml 2008-10-23 07:12:21 UTC (rev 4011) +++ trunk/projects/bos/payment-website/templates/de/ueberweisung.xml 2008-10-23 10:47:47 UTC (rev 4012) @@ -134,13 +134,18 @@ erfolgter Überweisung melden wir uns schriftlich und per E-Mail. <br /><br /> - <span id="urkunde-info" style="visibility: hidden"> <strong>[Urkunde]</strong> - <br /> - Sie können Ihre Regenwaldurkunde in jedem Fall als PDF von unserem System herunterladen, auch - wenn Sie es nicht per Post zugeschickt bekommen möchten. - <br /><br /> + <br /> + <span id="urkunde-print-info" style="display: none"> + Ihre persönliche Urkunde können Sie sich jederzeit bei + schafft-lebenswald.de als PDF herunterladen, auch wenn Sie + diese nicht per Post zugeschickt bekommen wollen. </span> + <span id="urkunde-download-info" style="display: none"> + Ihre persönliche Urkunde können Sie sich jederzeit bei + schafft-lebenswald.de als PDF herunterladen. + </span> + <br /><br /> <strong>[Dieses Formular]</strong> <br /> Bitte senden Sie dieses Formular per E-Mail direkt an uns. Sie können es auch Modified: trunk/projects/bos/payment-website/templates/de/verschenken.xml =================================================================== --- trunk/projects/bos/payment-website/templates/de/verschenken.xml 2008-10-23 07:12:21 UTC (rev 4011) +++ trunk/projects/bos/payment-website/templates/de/verschenken.xml 2008-10-23 10:47:47 UTC (rev 4012) @@ -33,7 +33,7 @@ nach Namen und Versandadresse der zu Beschenkenden Person gefragt. </p> <p> -Der Geschenkservice ist aus administrativen Gründen leider nur bei Online-Spenden ab 30 Euro möglich. +Der Geschenkservice ist aus administrativen Gründen leider nur bei Online-Spenden ab 90 Euro möglich. </p> </p> </bknr:toplevel>

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/
by BKNR Commits 23 Oct '08

23 Oct '08

Revision: 4011 Author: hans URL: http://bknr.net/trac/changeset/4011 Fixes to frontend Javascript handling (opening windows). Display information on printed certificate only when applicable. U trunk/projects/bos/payment-website/static/bos.js U trunk/projects/bos/payment-website/templates/da/bestellung.xml U trunk/projects/bos/payment-website/templates/da/headline2.xml U trunk/projects/bos/payment-website/templates/da/headline3.xml U trunk/projects/bos/payment-website/templates/da/idea.xml U trunk/projects/bos/payment-website/templates/da/idea_subtitle1.xml U trunk/projects/bos/payment-website/templates/da/idea_subtitle2.xml U trunk/projects/bos/payment-website/templates/da/index.xml U trunk/projects/bos/payment-website/templates/da/mail-transfer.xml U trunk/projects/bos/payment-website/templates/da/news.xml U trunk/projects/bos/payment-website/templates/da/profil_setup.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/satmap.xml U trunk/projects/bos/payment-website/templates/da/sponsor_canceled.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/ueberweisung.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/da/versand_quittung.xml U trunk/projects/bos/payment-website/templates/de/bestellung.xml U trunk/projects/bos/payment-website/templates/de/headline2.xml U trunk/projects/bos/payment-website/templates/de/headline3.xml U trunk/projects/bos/payment-website/templates/de/idea.xml U trunk/projects/bos/payment-website/templates/de/idea_subtitle1.xml U trunk/projects/bos/payment-website/templates/de/idea_subtitle2.xml U trunk/projects/bos/payment-website/templates/de/index.xml U trunk/projects/bos/payment-website/templates/de/mail-transfer.xml U trunk/projects/bos/payment-website/templates/de/news.xml U trunk/projects/bos/payment-website/templates/de/print_ueberweisung.xml U trunk/projects/bos/payment-website/templates/de/profil_setup.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/satmap.xml U trunk/projects/bos/payment-website/templates/de/sponsor_canceled.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/ueberweisung.xml U trunk/projects/bos/payment-website/templates/de/versand_geschenk.xml U trunk/projects/bos/payment-website/templates/de/versand_info.xml U trunk/projects/bos/payment-website/templates/de/versand_quittung.xml U trunk/projects/bos/payment-website/templates/en/bestellung.xml U trunk/projects/bos/payment-website/templates/en/headline2.xml U trunk/projects/bos/payment-website/templates/en/headline3.xml U trunk/projects/bos/payment-website/templates/en/idea.xml U trunk/projects/bos/payment-website/templates/en/idea_subtitle1.xml U trunk/projects/bos/payment-website/templates/en/idea_subtitle2.xml U trunk/projects/bos/payment-website/templates/en/index.xml U trunk/projects/bos/payment-website/templates/en/mail-transfer.xml U trunk/projects/bos/payment-website/templates/en/news.xml U trunk/projects/bos/payment-website/templates/en/profil_setup.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/satmap.xml U trunk/projects/bos/payment-website/templates/en/sponsor_canceled.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/payment-website/templates/en/versand_quittung.xml Change set too large, please see URL above

1 0

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

22 Oct '08

Revision: 4010 Author: hans URL: http://bknr.net/trac/changeset/4010 Limit fuer Print-Urkunde auf 90 Euro erhoeht. U trunk/projects/bos/m2/bos.m2.asd U trunk/projects/bos/m2/config.lisp U trunk/projects/bos/payment-website/static/bos.js U trunk/projects/bos/payment-website/templates/de/bestellung.xml U trunk/projects/bos/payment-website/templates/de/ueberweisung.xml Change set too large, please see URL above

1 0

[bknr-cvs] hans changed trunk/projects/bos/cert-daemon/cert-daemon.sh
by BKNR Commits 20 Oct '08

20 Oct '08

Revision: 4009 Author: hans URL: http://bknr.net/trac/changeset/4009 flatten is not a variable, but a pdftk command U trunk/projects/bos/cert-daemon/cert-daemon.sh Modified: trunk/projects/bos/cert-daemon/cert-daemon.sh =================================================================== --- trunk/projects/bos/cert-daemon/cert-daemon.sh 2008-10-20 21:26:09 UTC (rev 4008) +++ trunk/projects/bos/cert-daemon/cert-daemon.sh 2008-10-20 21:29:03 UTC (rev 4009) @@ -18,11 +18,11 @@ download_pdf_file=download-spool/$contract.pdf if [ $language = de -a -f $print_fdf_file ]; then - pdftk $print_m2s_pdf_file fill_form $print_fdf_file output $print_pdf_file $flatten + pdftk $print_m2s_pdf_file fill_form $print_fdf_file output $print_pdf_file flatten echo generated $print_pdf_file fi - pdftk $download_m2s_pdf_file fill_form $download_fdf_file output $download_pdf_file $flatten + pdftk $download_m2s_pdf_file fill_form $download_fdf_file output $download_pdf_file flatten echo generated $download_pdf_file rm -f $print_m2s_pdf_file $print_fdf_file $download_m2s_pdf_file $download_fdf_file trap "" EXIT

1 0

[bknr-cvs] hans changed trunk/projects/bos/cert-daemon/cert-daemon.sh
by BKNR Commits 20 Oct '08

20 Oct '08

Revision: 4008 Author: hans URL: http://bknr.net/trac/changeset/4008 Remove input files after certs have been generated. U trunk/projects/bos/cert-daemon/cert-daemon.sh Modified: trunk/projects/bos/cert-daemon/cert-daemon.sh =================================================================== --- trunk/projects/bos/cert-daemon/cert-daemon.sh 2008-10-20 21:04:54 UTC (rev 4007) +++ trunk/projects/bos/cert-daemon/cert-daemon.sh 2008-10-20 21:26:09 UTC (rev 4008) @@ -24,7 +24,7 @@ pdftk $download_m2s_pdf_file fill_form $download_fdf_file output $download_pdf_file $flatten echo generated $download_pdf_file - echo rm -f $print_m2s_pdf_file $print_fdf_file $download_m2s_pdf_file $download_fdf_file + rm -f $print_m2s_pdf_file $print_fdf_file $download_m2s_pdf_file $download_fdf_file trap "" EXIT }

1 0

[bknr-cvs] hans changed trunk/
by BKNR Commits 20 Oct '08

20 Oct '08

Revision: 4007 Author: hans URL: http://bknr.net/trac/changeset/4007 Certificate generation fixes U trunk/projects/bos/cert-daemon/cert-daemon.sh U trunk/projects/bos/m2/m2-pdf.lisp U trunk/projects/bos/m2/m2.lisp U trunk/projects/bos/m2/make-certificate.lisp U trunk/thirdparty/cl-pdf/pdf-parser.lisp U trunk/thirdparty/cl-pdf/pdf.lisp Modified: trunk/projects/bos/cert-daemon/cert-daemon.sh =================================================================== --- trunk/projects/bos/cert-daemon/cert-daemon.sh 2008-10-18 12:18:08 UTC (rev 4006) +++ trunk/projects/bos/cert-daemon/cert-daemon.sh 2008-10-20 21:04:54 UTC (rev 4007) @@ -10,32 +10,21 @@ echo "generating certs for contract $contract, language $language" print_fdf_file=mail-spool/$contract-$language.fdf + print_m2s_pdf_file=mail-spool/$contract-m2s.pdf print_pdf_file=mail-spool/$contract.pdf + + download_m2s_pdf_file=download-spool/$contract-m2s.pdf download_fdf_file=download-spool/$contract-$language.fdf download_pdf_file=download-spool/$contract.pdf - m2s_pdf_file=download-spool/$contract-m2s.pdf - - tmp1_file=/tmp/gen-cert-$$-1.pdf - tmp2_file=/tmp/gen-cert-$$-2.pdf - tmp3_file=/tmp/gen-cert-$$-3.pdf - tmp4_file=/tmp/gen-cert-$$-4.pdf - - trap "rm -f $tmp1_file $tmp2_file $tmp3_file $tmp4_file" EXIT - if [ $language = de -a -f $print_fdf_file ]; then - pdftk urkunde-print-$language.pdf fill_form $print_fdf_file output $tmp1_file flatten - pdftk $tmp1_file cat 1 output $tmp2_file - pdftk $tmp1_file cat 2 output $tmp3_file - pdftk $m2s_pdf_file background $tmp3_file output $tmp4_file - pdftk $tmp2_file $tmp4_file output $print_pdf_file + pdftk $print_m2s_pdf_file fill_form $print_fdf_file output $print_pdf_file $flatten echo generated $print_pdf_file fi - pdftk urkunde-download-$language.pdf fill_form $download_fdf_file output $tmp1_file - pdftk $m2s_pdf_file background $tmp1_file output $download_pdf_file + pdftk $download_m2s_pdf_file fill_form $download_fdf_file output $download_pdf_file $flatten echo generated $download_pdf_file - rm -f $tmp1_file $tmp2_file $tmp3_file $tmp4_file $print_fdf_file $download_fdf_file + echo rm -f $print_m2s_pdf_file $print_fdf_file $download_m2s_pdf_file $download_fdf_file trap "" EXIT } Modified: trunk/projects/bos/m2/m2-pdf.lisp =================================================================== --- trunk/projects/bos/m2/m2-pdf.lisp 2008-10-18 12:18:08 UTC (rev 4006) +++ trunk/projects/bos/m2/m2-pdf.lisp 2008-10-20 21:04:54 UTC (rev 4007) @@ -8,68 +8,74 @@ (pdf:draw-left-text x y part font 8 300) (incf y 10)))) -(defun make-m2-pdf (contract &key print) - (pdf:with-document () - (pdf:with-page () - (pdf:in-text-mode - (destructuring-bind (bb-x bb-y bb-width bb-height) (contract-bounding-box contract) - (let* ((m2s (sort (copy-list (contract-m2s contract)) - (lambda (a b) - (if (= (m2-y a) (m2-y b)) - (- (m2-x a) (m2-x b)) - (- (m2-y b) (m2-y b)))))) - (first-m2 (first m2s)) - (last-m2 (first (last m2s))) - (scale (/ 80 (max bb-width bb-height)))) +(defun make-m2-pdf (contract &key print template) + (flet ((render-m2s () + (pdf:in-text-mode + (destructuring-bind (bb-x bb-y bb-width bb-height) (contract-bounding-box contract) + (let* ((m2s (sort (copy-list (contract-m2s contract)) + (lambda (a b) + (if (= (m2-y a) (m2-y b)) + (- (m2-x a) (m2-x b)) + (- (m2-y b) (m2-y b)))))) + (first-m2 (first m2s)) + (last-m2 (first (last m2s))) + (scale (/ 80 (max bb-width bb-height)))) - (draw-coordinate 110 160 (m2-lon-lat first-m2)) + (draw-coordinate 110 160 (m2-lon-lat first-m2)) - (unless (eq first-m2 last-m2) - (draw-coordinate 190 40 (m2-lon-lat last-m2))) + (unless (eq first-m2 last-m2) + (draw-coordinate 190 40 (m2-lon-lat last-m2))) - (pdf:translate (+ 65.0 (if (>= bb-width bb-height) 0 - (* 0.5 (abs (- bb-width bb-height)) scale))) - (+ 65.0 (if (>= bb-height bb-width) 0 - (* 0.5 (abs (- bb-width bb-height)) scale)))) + (pdf:translate (+ 65.0 (if (>= bb-width bb-height) 0 + (* 0.5 (abs (- bb-width bb-height)) scale))) + (+ 65.0 (if (>= bb-height bb-width) 0 + (* 0.5 (abs (- bb-width bb-height)) scale)))) - (pdf:scale scale scale) + (pdf:scale scale scale) - (pdf:set-line-width 0.05) - (pdf:set-gray-stroke 0.6) - (pdf:move-to 0 0) - (pdf:line-to 0 bb-height) - (pdf:line-to bb-width bb-height) - (pdf:line-to bb-width 0) - (pdf:close-and-stroke) - (pdf:stroke) + (pdf:set-line-width 0.05) + (pdf:set-gray-stroke 0.6) + (pdf:move-to 0 0) + (pdf:line-to 0 bb-height) + (pdf:line-to bb-width bb-height) + (pdf:line-to bb-width 0) + (pdf:close-and-stroke) + (pdf:stroke) - (pdf:set-line-width 0.1) - (pdf:set-gray-stroke 0) - (pdf:set-gray-fill 0.6) - (pdf:set-line-join 2) + (pdf:set-line-width 0.1) + (pdf:set-gray-stroke 0) + (pdf:set-gray-fill 0.6) + (pdf:set-line-join 2) - (dolist (m2 (contract-m2s contract)) - (let ((x (- (m2-x m2) bb-x)) - (y (- (m2-y m2) bb-y))) - (pdf:move-to x y) - (pdf:line-to x (1+ y)) - (pdf:line-to (1+ x) (1+ y)) - (pdf:line-to (1+ x) y) - (pdf:line-to x y) - (pdf:close-fill-and-stroke))))))) - - (with-open-file (f (contract-m2-pdf-pathname contract :print print) - :direction :output - :if-exists :supersede - :external-format :iso-8859-1) - ;; cl-pdf does not really handle non-ascii characters in a very - ;; usable manner. In order to avoid having to deal with - ;; embedding fonts and encoding, just work around the issue: - (princ (remove (code-char 194) - (with-output-to-string (s) - (let ((pdf:*compress-streams* nil)) - (pdf:write-document s)))) - f)) + (dolist (m2 (contract-m2s contract)) + (let ((x (- (m2-x m2) bb-x)) + (y (- (m2-y m2) bb-y))) + (pdf:move-to x y) + (pdf:line-to x (1+ y)) + (pdf:line-to (1+ x) (1+ y)) + (pdf:line-to (1+ x) y) + (pdf:line-to x y) + (pdf:close-fill-and-stroke))))))) + (save-pdf () + (pdf:write-document (contract-m2-pdf-pathname contract :print print)))) + (if template + (if print + (pdf:with-existing-document (template) + (pdf:with-existing-page (0) + (pdf:insert-original-page-content)) + (pdf:with-existing-page (1) + (pdf:insert-original-page-content) + (render-m2s)) + (save-pdf)) + (pdf:with-existing-document (template) + (pdf:with-existing-page (0) + (pdf:insert-original-page-content) + (render-m2s)) + (save-pdf))) + (pdf:with-document () + (pdf:with-page () + (render-m2s)) + (save-pdf))) t)) #+(or) Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2008-10-18 12:18:08 UTC (rev 4006) +++ trunk/projects/bos/m2/m2.lisp 2008-10-20 21:04:54 UTC (rev 4007) @@ -371,7 +371,8 @@ (warn "re-issuing cert for ~A" contract)) (contract-delete-certificate-files contract) (make-certificate contract name :address address :language language) - (unless (contract-download-only-p contract) + (when (and (equal language "de") + (not (contract-download-only-p contract))) (make-certificate contract name :address address :language language :print t)) (change-slot-values contract 'cert-issued t)) Modified: trunk/projects/bos/m2/make-certificate.lisp =================================================================== --- trunk/projects/bos/m2/make-certificate.lisp 2008-10-18 12:18:08 UTC (rev 4006) +++ trunk/projects/bos/m2/make-certificate.lisp 2008-10-20 21:04:54 UTC (rev 4007) @@ -33,7 +33,13 @@ verschickt und entsprechend eine andere Vorlage ausgewählt als für den Download der Urkunde" (let ((sponsor (contract-sponsor contract))) - (make-m2-pdf contract :print print) + (make-m2-pdf contract + :print print + :template (make-pathname :name (format nil "urkunde-~A-~A" + (if print "print" "download") + language) + :type "pdf" + :defaults *pdf-base-directory*)) (make-fdf-file (contract-fdf-pathname contract :language language :print print) Modified: trunk/thirdparty/cl-pdf/pdf-parser.lisp =================================================================== --- trunk/thirdparty/cl-pdf/pdf-parser.lisp 2008-10-18 12:18:08 UTC (rev 4006) +++ trunk/thirdparty/cl-pdf/pdf-parser.lisp 2008-10-20 21:04:54 UTC (rev 4007) @@ -493,7 +493,10 @@ (defmacro with-existing-document ((file &key (creator "") author title subject keywords) &body body) `(let* ((*document* (read-pdf-file ,file)) (*root-page* (root-page *document*)) - (*page-number* 0)) + (*outlines-stack* (list (outline-root *document*))) + (*page* nil) + (*page-number* 0) + (*name-counter* 100)) (add-doc-info *document* :creator ,creator :author ,author :title ,title :subject ,subject :keywords ,keywords) ,@body)) Modified: trunk/thirdparty/cl-pdf/pdf.lisp =================================================================== --- trunk/thirdparty/cl-pdf/pdf.lisp 2008-10-18 12:18:08 UTC (rev 4006) +++ trunk/thirdparty/cl-pdf/pdf.lisp 2008-10-20 21:04:54 UTC (rev 4007) @@ -595,7 +595,6 @@ (*outlines-stack* (list (outline-root *document*))) (*page* nil) (*page-number* 0) - (*name-counter* 100) (*max-number-of-pages* ,max-number-of-pages)) (setf *root-page* (root-page *document*)) (catch 'max-number-of-pages-reached

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

bknr-cvs