Author: ksprotte Date: Thu Jan 31 02:16:47 2008 New Revision: 2426 Modified: branches/bos/projects/bos/payment-website/templates/da/profil.xml branches/bos/projects/bos/payment-website/templates/de/profil.xml branches/bos/projects/bos/payment-website/templates/en/profil.xml branches/bos/projects/bos/web/tags.lisp Log: Einbau eines Google Earth Links auf die Profilseite #15 Modified: branches/bos/projects/bos/payment-website/templates/da/profil.xml ============================================================================== --- branches/bos/projects/bos/payment-website/templates/da/profil.xml (original) +++ branches/bos/projects/bos/payment-website/templates/da/profil.xml Thu Jan 31 02:16:47 2008 @@ -55,7 +55,8 @@ </tr> <tr> <td class="Label">kvardratmeter</td> - <td class="Input">til værdi af $(numsqm) m² er blevet opkøbt<br></br>UTM-kordinater: N$(sqm-x) E$(sqm-y)</td> + <td class="Input">til værdi af $(numsqm) m² er blevet opkøbt<br></br>UTM-kordinater: N$(sqm-x) E$(sqm-y) + <br /><a href="/contract-kml/$(contract-id)">Your square metres in Google Earth</a></td> <td class="Info"></td> </tr> <tr> Modified: branches/bos/projects/bos/payment-website/templates/de/profil.xml ============================================================================== --- branches/bos/projects/bos/payment-website/templates/de/profil.xml (original) +++ branches/bos/projects/bos/payment-website/templates/de/profil.xml Thu Jan 31 02:16:47 2008 @@ -60,7 +60,8 @@ </tr> <tr> <td class="Label">Quadratmeter</td> - <td class="Input">Insgesamt $(numsqm) Quadratmeter gekauft<br />UTM-Koordinate: N$(sqm-x) E$(sqm-y)</td> + <td class="Input">Insgesamt $(numsqm) Quadratmeter gekauft<br />UTM-Koordinate: N$(sqm-x) E$(sqm-y) + <br /><a href="/contract-kml/$(contract-id)">Ihre Quadratmeter in Google Earth</a></td> <td class="Info"></td> </tr> <tr> Modified: branches/bos/projects/bos/payment-website/templates/en/profil.xml ============================================================================== --- branches/bos/projects/bos/payment-website/templates/en/profil.xml (original) +++ branches/bos/projects/bos/payment-website/templates/en/profil.xml Thu Jan 31 02:16:47 2008 @@ -60,7 +60,8 @@ </tr> <tr> <td class="Label">square metres</td> - <td class="Input">a total of $(numsqm) m² has been bought<br />UTM-coordinate: N$(sqm-x) E$(sqm-y)</td> + <td class="Input">a total of $(numsqm) m² has been bought<br />UTM-coordinate: N$(sqm-x) E$(sqm-y) + <br /><a href="/contract-kml/$(contract-id)">Your square metres in Google Earth</a></td> <td class="Info"></td> </tr> <tr> Modified: branches/bos/projects/bos/web/tags.lisp ============================================================================== --- branches/bos/projects/bos/web/tags.lisp (original) +++ branches/bos/projects/bos/web/tags.lisp Thu Jan 31 02:16:47 2008 @@ -147,7 +147,8 @@ (mapc #'emit-template-node children)) (define-bknr-tag save-profile (&key children) - (let ((sponsor (bknr-request-user (get-template-var :request)))) + (let* ((sponsor (bknr-request-user (get-template-var :request))) + (contract (first (sponsor-contracts sponsor)))) (with-template-vars (email name password infotext anonymize) (when anonymize (change-slot-values sponsor @@ -163,11 +164,12 @@ (when infotext (change-slot-values sponsor 'info-text infotext))) (setf (get-template-var :sponsor-id) (format nil "~D" (store-object-id sponsor))) + (setf (get-template-var :contract-id) (format nil "~D" (store-object-id contract))) (setf (get-template-var :country) (sponsor-country sponsor)) (setf (get-template-var :infotext) (sponsor-info-text sponsor)) (setf (get-template-var :name) (user-full-name sponsor)) - (setf (get-template-var :sqm-x) (format nil "~,3f" (m2-utm-x (first (contract-m2s (first (sponsor-contracts sponsor))))))) - (setf (get-template-var :sqm-y) (format nil "~,3f" (m2-utm-y (first (contract-m2s (first (sponsor-contracts sponsor))))))) + (setf (get-template-var :sqm-x) (format nil "~,3f" (m2-utm-x (first (contract-m2s contract))))) + (setf (get-template-var :sqm-y) (format nil "~,3f" (m2-utm-y (first (contract-m2s contract))))) (setf (get-template-var :numsqm) (format nil "~D" (apply #'+ (mapcar #'(lambda (contract) (length (contract-m2s contract))) (sponsor-contracts sponsor))))))