From bknr at bknr.net Fri Mar 3 17:50:47 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Fri, 3 Mar 2006 12:50:47 -0500 (EST) Subject: [bknr-cvs] r1885 - in branches/xml-class-rework/projects: . mah-jongg mah-jongg/src mah-jongg/website Message-ID: <20060303175047.A8A7638009@common-lisp.net> Author: hhubner Date: 2006-03-03 12:50:47 -0500 (Fri, 03 Mar 2006) New Revision: 1885 Added: branches/xml-class-rework/projects/mah-jongg/ branches/xml-class-rework/projects/mah-jongg/src/ branches/xml-class-rework/projects/mah-jongg/src/game.lisp branches/xml-class-rework/projects/mah-jongg/src/load.lisp branches/xml-class-rework/projects/mah-jongg/src/mah-jongg.asd branches/xml-class-rework/projects/mah-jongg/src/package.lisp branches/xml-class-rework/projects/mah-jongg/src/test.lisp branches/xml-class-rework/projects/mah-jongg/website/ branches/xml-class-rework/projects/mah-jongg/website/bamboo.jpg branches/xml-class-rework/projects/mah-jongg/website/east.jpg branches/xml-class-rework/projects/mah-jongg/website/game.css branches/xml-class-rework/projects/mah-jongg/website/game.js branches/xml-class-rework/projects/mah-jongg/website/game.xml branches/xml-class-rework/projects/mah-jongg/website/game.xsl branches/xml-class-rework/projects/mah-jongg/website/north.jpg branches/xml-class-rework/projects/mah-jongg/website/south.jpg branches/xml-class-rework/projects/mah-jongg/website/undohtml.css branches/xml-class-rework/projects/mah-jongg/website/west.jpg Log: First version of the Mah-Jongg calculation server. Property changes on: branches/xml-class-rework/projects/mah-jongg ___________________________________________________________________ Name: svn:ignore + datastore Added: branches/xml-class-rework/projects/mah-jongg/src/game.lisp =================================================================== --- branches/xml-class-rework/projects/mah-jongg/src/game.lisp 2006-03-03 15:36:26 UTC (rev 1884) +++ branches/xml-class-rework/projects/mah-jongg/src/game.lisp 2006-03-03 17:50:47 UTC (rev 1885) @@ -0,0 +1,139 @@ +(in-package :mah-jongg) + +(defvar *round* nil) + +(deftransaction clear-round () + (setf *round* nil)) + +(defclass player () + ((name :reader name :initarg :name) + (wind :accessor wind :initarg :wind) + (score :accessor score :initarg :score :initform 0))) + +(defmethod print-object ((player player) stream) + (print-unreadable-object (player stream :type t) + (format stream "~S (~A) SCORE: ~A" (name player) (wind player) (score player)))) + +(defun make-player (name wind) + (make-instance 'player :name name :wind wind)) + +(defun wind->player (wind) + (find wind (players *round*) :key #'wind)) + +(defun next-wind (player) + (cadr (member (wind player) '(:east :south :west :north :east)))) + +(defun east-p (player) + (eq :east (wind player))) + +(defun balance (player-1 score-1 player-2 &optional (score-2 0)) + (let ((sum (* (if (east-p player-1) 2 1) (- score-1 score-2)))) + (incf (score player-1) sum) + (decf (score player-2) sum))) + +(defclass round () + ((players :reader players :initarg :players :documentation "List of players") + (games :accessor games :initform nil) + (east-win-count :accessor east-win-count :initform 0))) + +(defun find-player (name) + (or (find name (players *round*) :key #'name :test #'string-equal) + (error "can't find player named ~S" name))) + +(deftransaction make-round (east north west south) + (setf *round* (make-instance 'round + :players (list (make-player east :east) + (make-player north :north) + (make-player west :west) + (make-player south :south))))) + +(defun rotate-winds () + (dolist (player (players *round*)) + (setf (wind player) (next-wind player)))) + +(defclass game () + ((winner :reader winner :initarg :winner) + (east :reader east :initarg :east) + (results :reader results :initarg :results :documentation "List (( ) (...))"))) + +(defmethod print-object ((game game) stream) + (print-unreadable-object (game stream :type t) + (format stream "WINNER: ~S" (name (winner game))))) + +(deftransaction make-game (winner results) + (let* ((all-results (mapcar #'(lambda (name-score) (list (find-player (car name-score)) (cadr name-score))) results)) + (winner (find-player winner)) + (east (find-if #'east-p (players *round*))) + (winner-result (find winner all-results :key #'car)) + (other-results (remove winner all-results :key #'car))) + (dolist (loser (mapcar #'car other-results)) + (balance winner (cadr winner-result) loser)) + (apply #'balance (append (nth 0 other-results) (nth 1 other-results))) + (apply #'balance (append (nth 1 other-results) (nth 2 other-results))) + (apply #'balance (append (nth 0 other-results) (nth 2 other-results))) + (when (east-p winner) + (incf (east-win-count *round*))) + (when (or (not (east-p winner)) + (eql 4 (east-win-count *round*))) + (rotate-winds) + (setf (east-win-count *round*) 0)) + (car (push (make-instance 'game + :winner winner + :east east + :results all-results) + (games *round*))))) + +(defun round-as-xml () + (with-element "round" + (dolist (player (players *round*)) + (with-slots (name wind score) player + (with-element "player" + (attribute "name" name) + (attribute "wind" (string-downcase wind)) + (attribute "score" score)))) + (dolist (game (reverse (games *round*))) + (with-slots (winner east results) game + (with-element "game" + (dolist (player (players *round*)) + (with-element "score" + (attribute "name" (name player)) + (when (eq player winner) + (attribute "winner" "1")) + (when (eq player east) + (attribute "east" "1")) + (text (princ-to-string (cadr (find player results :key #'car))))))))))) + +(defun request-param (req name) + (assoc name (request-query req) :test #'equal)) + +(defun handle-game (req ent) + (when (eq :post (request-method req)) + (with-query-params (req action east north west south winner) + (ecase (make-keyword-from-string action) + (:make-round + (make-round east north west south)) + (:make-game + (make-game (name (wind->player (make-keyword-from-string winner))) + (mapcar #'(lambda (wind) (list (name (wind->player wind)) + (parse-integer (query-param req (symbol-name wind))))) + '(:east :north :west :south)))) + (:clear-round + (clear-round))))) + (with-http-response (req ent :content-type "text/xml") + (with-http-body (req ent) + (with-xml-output (cxml:make-character-stream-sink *html-stream*) + (sax:processing-instruction cxml::*sink* (runes:string-rod "xml-stylesheet") (runes:string-rod "type=\"text/xsl\" href=\"game.xsl\"")) + (if *round* + (round-as-xml) + (with-element "no-round")))))) + +(defun start-server (&key (port 8080)) + + (unpublish :all t) + (close-store) + + (make-instance 'store + :directory "../datastore/") + (publish :path "/game" :function 'handle-game) + (publish-directory :prefix "/" :destination "../website/") + (start :port port)) \ No newline at end of file Added: branches/xml-class-rework/projects/mah-jongg/src/load.lisp =================================================================== --- branches/xml-class-rework/projects/mah-jongg/src/load.lisp 2006-03-03 15:36:26 UTC (rev 1884) +++ branches/xml-class-rework/projects/mah-jongg/src/load.lisp 2006-03-03 17:50:47 UTC (rev 1885) @@ -0,0 +1,10 @@ +(push :cl-gd-gif *features*) + +(asdf:oos 'asdf:load-op :mah-jongg) +(asdf:oos 'asdf:load-op :swank) + +(swank::create-swank-server 4005 :spawn #'swank::simple-announce-function t) + +(mah-jongg::start-server) + +(mp::startup-idle-and-top-level-loops) Added: branches/xml-class-rework/projects/mah-jongg/src/mah-jongg.asd =================================================================== --- branches/xml-class-rework/projects/mah-jongg/src/mah-jongg.asd 2006-03-03 15:36:26 UTC (rev 1884) +++ branches/xml-class-rework/projects/mah-jongg/src/mah-jongg.asd 2006-03-03 17:50:47 UTC (rev 1885) @@ -0,0 +1,22 @@ +;;;; -*- Mode: LISP -*- + +(in-package :cl-user) + +(defpackage :mah-jongg.system + (:use :cl :asdf)) + +(in-package :mah-jongg.system) + +(defsystem :mah-jongg + :name "Mah Jongg" + :author "Hans Huebner " + :version "0" + :maintainer "Hans Huebner " + :licence "BSD" + :description "Mah Jongg game calculator" + :long-description "" + + :depends-on (:cxml :bknr :bknr-datastore :aserve) + + :components ((:file "package") + (:file "game" :depends-on ("package")))) Added: branches/xml-class-rework/projects/mah-jongg/src/package.lisp =================================================================== --- branches/xml-class-rework/projects/mah-jongg/src/package.lisp 2006-03-03 15:36:26 UTC (rev 1884) +++ branches/xml-class-rework/projects/mah-jongg/src/package.lisp 2006-03-03 17:50:47 UTC (rev 1885) @@ -0,0 +1,12 @@ +(in-package :cl-user) + +(defpackage :mah-jongg + (:use :cl + :cl-user + :cxml + :bknr.utils + :bknr.web + :bknr.datastore + :net.aserve + :net.html.generator) + (:export)) \ No newline at end of file Added: branches/xml-class-rework/projects/mah-jongg/src/test.lisp =================================================================== --- branches/xml-class-rework/projects/mah-jongg/src/test.lisp 2006-03-03 15:36:26 UTC (rev 1884) +++ branches/xml-class-rework/projects/mah-jongg/src/test.lisp 2006-03-03 17:50:47 UTC (rev 1885) @@ -0,0 +1,11 @@ +(in-package :mah-jongg) + +(clear-round) + +(make-round "hans" "julia" "starbug" "lisa") + +(make-game "hans" '((hans 1000) (julia 10) (starbug 20) (lisa 200))) + +(make-game "starbug" '((hans 10) (julia 100) (starbug 200) (lisa 200))) + +(players *round*) \ No newline at end of file Added: branches/xml-class-rework/projects/mah-jongg/website/bamboo.jpg =================================================================== (Binary files differ) Property changes on: branches/xml-class-rework/projects/mah-jongg/website/bamboo.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/xml-class-rework/projects/mah-jongg/website/east.jpg =================================================================== (Binary files differ) Property changes on: branches/xml-class-rework/projects/mah-jongg/website/east.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/xml-class-rework/projects/mah-jongg/website/game.css =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.css 2006-03-03 15:36:26 UTC (rev 1884) +++ branches/xml-class-rework/projects/mah-jongg/website/game.css 2006-03-03 17:50:47 UTC (rev 1885) @@ -0,0 +1,67 @@ +body { + font-family: sans-serif; + background-image: url(bamboo.jpg); + height: 1200px; +} + +* { + font-size: 30px; +} + +th { + width: 120px; +} + +td, th { + background-color: #fff; +} + +td.winner { + background-color: #ccc; +} + +td { + text-align: right; +} + +tr.sum { + padding-top: 4px; +} + +td.sum { + border-style: dashed; + border-width: 4px; +} + +td img { + float: left; + margin-left: 4px; + margin-top: 4px; +} + +table { + margin: 20px; +} + +table#game-list { + position: absolute; + right: 0px; + top: 0px; +} + +table#current-game { + position: fixed; + left: 0px; + bottom: 0px; +} + +.score-input { + width: 40px; + text-align: right; +} + +#end-round-button { + position: fixed; + right: 20px; + bottom: 20px; +} \ No newline at end of file Added: branches/xml-class-rework/projects/mah-jongg/website/game.js =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.js 2006-03-03 15:36:26 UTC (rev 1884) +++ branches/xml-class-rework/projects/mah-jongg/website/game.js 2006-03-03 17:50:47 UTC (rev 1885) @@ -0,0 +1,45 @@ +// -*- Java -*- + +var winds = [ 'east', 'north', 'west', 'south' ]; + +function $(name) +{ + return document.getElementById(name); +} + +function init_new_round_form() +{ + $('east').focus(); +} + +function check_new_round_form() +{ + for (i in winds) { + if ($(winds[i]).value.match(/^\s*$/)) { + $(winds[i]).focus(); + return false; + } + } + + return true; +} + +var check_new_game_inputs_interval; + +function check_new_game_inputs() +{ + if (!check_new_game_inputs_interval) { + check_new_game_inputs_interval = setInterval("check_new_game_inputs()", 300); + } + + for (i in winds) { + if ($(winds[i]).value.match(/^\s*$/)) { + $('make_game_button').disabled = 'disabled'; + return false; + } + } + + $('make_game_button').disabled = undefined; + + return true; +} Added: branches/xml-class-rework/projects/mah-jongg/website/game.xml =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.xml 2006-03-03 15:36:26 UTC (rev 1884) +++ branches/xml-class-rework/projects/mah-jongg/website/game.xml 2006-03-03 17:50:47 UTC (rev 1885) @@ -0,0 +1,2 @@ + + \ No newline at end of file Added: branches/xml-class-rework/projects/mah-jongg/website/game.xsl =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-03 15:36:26 UTC (rev 1884) +++ branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-03 17:50:47 UTC (rev 1885) @@ -0,0 +1,151 @@ + + + + + + + + Mah-Jongg + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ +
+
+ + + + + + + + + + + + + + + + + +
+
+ + + + + + + +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + winner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Added: branches/xml-class-rework/projects/mah-jongg/website/north.jpg =================================================================== (Binary files differ) Property changes on: branches/xml-class-rework/projects/mah-jongg/website/north.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/xml-class-rework/projects/mah-jongg/website/south.jpg =================================================================== (Binary files differ) Property changes on: branches/xml-class-rework/projects/mah-jongg/website/south.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/xml-class-rework/projects/mah-jongg/website/undohtml.css =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/undohtml.css 2006-03-03 15:36:26 UTC (rev 1884) +++ branches/xml-class-rework/projects/mah-jongg/website/undohtml.css 2006-03-03 17:50:47 UTC (rev 1885) @@ -0,0 +1,30 @@ +/* undohtml.css */ + +/* (CC) 2004 Tantek Celik. Some Rights Reserved. */ + +/* http://creativecommons.org/ licenses/by/2.0 */ +/* This style sheet is licensed under a Creative Commons License. */ +/* Purpose: undo some of the default styling of common (X)HTML browsers */ +/* link underlines tend to make hypertext less readable, + because underlines obscure the shapes of the lower + halves of words */ +:link,:visited { text-decoration:none } + +/* no list-markers by default, since lists are used more + often for semantics */ +ul,ol { list-style:none } + +/* avoid browser default inconsistent heading font-sizes */ +h1,h2,h3,h4,h5,h6 { font-size:1em; } + +/* remove the inconsistent (among browsers) default ul,ol + padding or margin */ +/* the default spacing on headings does not match nor align + with normal interline spacing at all, so let's get rid of it. */ +/* zero out the spacing around pre, form, body, html, p, + blockquote as well */ +/* form elements are oddly inconsistent, + and not quite CSS emulatable. */ +/* nonetheless strip their margin and padding as well */ +ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,body,html,p, blockquote,fieldset,input { margin:0; padding:0 } + Added: branches/xml-class-rework/projects/mah-jongg/website/west.jpg =================================================================== (Binary files differ) Property changes on: branches/xml-class-rework/projects/mah-jongg/website/west.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream From bknr at bknr.net Fri Mar 3 20:56:27 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Fri, 3 Mar 2006 15:56:27 -0500 (EST) Subject: [bknr-cvs] r1886 - branches/xml-class-rework/projects/mah-jongg/website Message-ID: <20060303205627.D007345005@common-lisp.net> Author: hhubner Date: 2006-03-03 15:56:27 -0500 (Fri, 03 Mar 2006) New Revision: 1886 Modified: branches/xml-class-rework/projects/mah-jongg/website/game.css branches/xml-class-rework/projects/mah-jongg/website/game.js branches/xml-class-rework/projects/mah-jongg/website/game.xsl Log: User interface now basically works. Modified: branches/xml-class-rework/projects/mah-jongg/website/game.css =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.css 2006-03-03 17:50:47 UTC (rev 1885) +++ branches/xml-class-rework/projects/mah-jongg/website/game.css 2006-03-03 20:56:27 UTC (rev 1886) @@ -56,7 +56,7 @@ } .score-input { - width: 40px; + width: 70px; text-align: right; } Modified: branches/xml-class-rework/projects/mah-jongg/website/game.js =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.js 2006-03-03 17:50:47 UTC (rev 1885) +++ branches/xml-class-rework/projects/mah-jongg/website/game.js 2006-03-03 20:56:27 UTC (rev 1886) @@ -25,21 +25,39 @@ } var check_new_game_inputs_interval; +var winner_clicked = false; +function set_winner_clicked() +{ + winner_clicked = true; + check_new_game_inputs(); +} + function check_new_game_inputs() { if (!check_new_game_inputs_interval) { check_new_game_inputs_interval = setInterval("check_new_game_inputs()", 300); } + var is_valid = winner_clicked; + for (i in winds) { - if ($(winds[i]).value.match(/^\s*$/)) { - $('make_game_button').disabled = 'disabled'; - return false; + try { + var value = parseInt($(winds[i] + '-score').value) * (1 << parseInt($(winds[i] + '-doubles').value)); + $(winds[i]).value = isNaN(value) ? '' : Math.min(value, 3000); } + catch (e) { + // Ignore errors + } } - $('make_game_button').disabled = undefined; + for (i in winds) { + if (!$(winds[i]).value.match(/^[1-9]/)) { + is_valid = false; + } + } + + $('make_game_button').disabled = is_valid ? undefined : 'disabled'; return true; } Modified: branches/xml-class-rework/projects/mah-jongg/website/game.xsl =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-03 17:50:47 UTC (rev 1885) +++ branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-03 20:56:27 UTC (rev 1886) @@ -125,19 +125,19 @@ - + - + - + - + From bknr at bknr.net Fri Mar 3 22:31:33 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Fri, 3 Mar 2006 17:31:33 -0500 (EST) Subject: [bknr-cvs] r1887 - branches/xml-class-rework/projects/mah-jongg/website Message-ID: <20060303223133.54DEC1703B@common-lisp.net> Author: hhubner Date: 2006-03-03 17:31:33 -0500 (Fri, 03 Mar 2006) New Revision: 1887 Modified: branches/xml-class-rework/projects/mah-jongg/website/game.js branches/xml-class-rework/projects/mah-jongg/website/game.xsl Log: Small UI enhancements. Modified: branches/xml-class-rework/projects/mah-jongg/website/game.js =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.js 2006-03-03 20:56:27 UTC (rev 1886) +++ branches/xml-class-rework/projects/mah-jongg/website/game.js 2006-03-03 22:31:33 UTC (rev 1887) @@ -7,24 +7,29 @@ return document.getElementById(name); } +var interval; + function init_new_round_form() { + interval = setInterval("check_new_round_form()", 300); $('east').focus(); } function check_new_round_form() { + var is_valid = true; + for (i in winds) { if ($(winds[i]).value.match(/^\s*$/)) { - $(winds[i]).focus(); - return false; + is_valid = false; } } - return true; + $('make_round_button').disabled = is_valid ? undefined : 'disabled'; + + return is_valid; } -var check_new_game_inputs_interval; var winner_clicked = false; function set_winner_clicked() @@ -35,8 +40,8 @@ function check_new_game_inputs() { - if (!check_new_game_inputs_interval) { - check_new_game_inputs_interval = setInterval("check_new_game_inputs()", 300); + if (!interval) { + interval = setInterval("check_new_game_inputs()", 300); } var is_valid = winner_clicked; Modified: branches/xml-class-rework/projects/mah-jongg/website/game.xsl =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-03 20:56:27 UTC (rev 1886) +++ branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-03 22:31:33 UTC (rev 1887) @@ -26,7 +26,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -50,12 +50,12 @@ - + - + From bknr at bknr.net Sun Mar 5 14:02:01 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 5 Mar 2006 09:02:01 -0500 (EST) Subject: [bknr-cvs] r1888 - in branches/xml-class-rework/projects/lisp-ecoop: src website/static website/templates Message-ID: <20060305140201.60D262A011@common-lisp.net> Author: hhubner Date: 2006-03-05 09:02:00 -0500 (Sun, 05 Mar 2006) New Revision: 1888 Added: branches/xml-class-rework/projects/lisp-ecoop/website/static/document-utils.css branches/xml-class-rework/projects/lisp-ecoop/website/static/document-utils.js branches/xml-class-rework/projects/lisp-ecoop/website/templates/upload.xml Modified: branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp branches/xml-class-rework/projects/lisp-ecoop/src/lisp-ecoop.asd branches/xml-class-rework/projects/lisp-ecoop/src/packages.lisp branches/xml-class-rework/projects/lisp-ecoop/src/participant.lisp branches/xml-class-rework/projects/lisp-ecoop/src/tags.lisp branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js branches/xml-class-rework/projects/lisp-ecoop/website/static/styles.css branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-profile.xml branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-submission.xml branches/xml-class-rework/projects/lisp-ecoop/website/templates/submission.xml branches/xml-class-rework/projects/lisp-ecoop/website/templates/toplevel.xml Log: Numerous changes to support the new data model with multiple documents per submission. Modified: branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp 2006-03-03 22:31:33 UTC (rev 1887) +++ branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp 2006-03-05 14:02:00 UTC (rev 1888) @@ -2,6 +2,9 @@ (enable-interpol-syntax) +(defun format-object-id (format object &rest args) + (apply #'format nil format (store-object-id object) args)) + (defmacro with-lisp-ecoop-page ((req title) &body body) `(with-bknr-page (,req :title ,title) , at body)) @@ -25,7 +28,7 @@ (with-query-params (req login full-name email text) (when (find-user login) (error "user ~A already exists" login)) - (make-participant login :full-name full-name :email email :text text :submission-pathname (request-uploaded-file req "submission")) + (make-participant login :full-name full-name :email email :text text :document-pathname (request-uploaded-file req "document")) (with-lisp-ecoop-page (req "Pariticpant created") "The participant has been created in the database and a welcome mail has been sent."))) @@ -54,15 +57,50 @@ (defclass pdf-handler (object-handler) () - (:default-initargs :class 'submission)) + (:default-initargs :class 'document)) -(defmethod handle-object ((handler pdf-handler) (submission submission) req) - (let ((pdf (file-contents (blob-pathname submission)))) +(defmethod handle-object ((handler pdf-handler) (document document) req) + (let ((pdf (file-contents (blob-pathname document)))) (with-http-response (req *ent* :content-type "application/pdf") (setf (request-reply-content-length req) (length pdf)) (with-http-body (req *ent* :external-format '(unsigned-byte 8)) (write-sequence pdf net.aserve::*html-stream*))))) + +(defclass upload-document-handler (object-handler) + () + (:default-initargs :class 'submission)) + +(defmethod handle-object ((handler upload-document-handler) object req) + (error "Missing object ID")) + +(defmethod handle-object ((handler upload-document-handler) (submission submission) req) + (unless (submission-edit-permitted-p submission) + (error "can't edit this submission")) + (ecase (request-method req) + (:post + (when (request-uploaded-file req "document") + (with-query-params (req info) + (format t "; new document - info ~S~%" info) + (let ((file-name (request-uploaded-file req "document"))) + (with-open-file (pdf file-name) + (if (cl-ppcre:scan "^%PDF-" (read-line pdf)) + (let ((document (make-object 'document :info info :submission submission))) + (blob-from-file document file-name) + (redirect (format-object-id "/upload/~A?success=1" submission) req)) + (redirect (format-object-id "/upload/~A?failure=~A" submission (uriencode-string "Uploaded file does not appear to be a PDF file")) req))))))) + (:get + (redirect (format-object-id "/upload/~A" submission) req)))) + +(defclass delete-document-handler (object-handler) + () + (:default-initargs :class 'document)) + +(defmethod handle-object ((handler delete-document-handler) (document document) req) + (unless (submission-edit-permitted-p (document-submission document)) + (error "can't edit this submission")) + (delete-object document)) + (defclass admin-handler (admin-only-handler page-handler) ()) @@ -74,5 +112,7 @@ ("/add-participant" add-participant-handler) ("/edit-participant" edit-participant-handler) ("/pdf" pdf-handler) + ("/upload-document" upload-document-handler) + ("/delete-document" delete-document-handler) ("/admin" admin-handler)) Modified: branches/xml-class-rework/projects/lisp-ecoop/src/lisp-ecoop.asd =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/lisp-ecoop.asd 2006-03-03 22:31:33 UTC (rev 1887) +++ branches/xml-class-rework/projects/lisp-ecoop/src/lisp-ecoop.asd 2006-03-05 14:02:00 UTC (rev 1888) @@ -8,12 +8,12 @@ (in-package :lisp-ecoop.system) (defsystem :lisp-ecoop - :name "worldpay test" + :name "LISP ECOOP Website" :author "Hans Huebner " :version "0" :maintainer "Hans Huebner " :licence "BSD" - :description "BKNR Test Web Server" + :description "Website for the LISP ECOOP Workshops" :long-description "" :depends-on (:bknr-modules :cxml :klammerscript) Modified: branches/xml-class-rework/projects/lisp-ecoop/src/packages.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/packages.lisp 2006-03-03 22:31:33 UTC (rev 1887) +++ branches/xml-class-rework/projects/lisp-ecoop/src/packages.lisp 2006-03-05 14:02:00 UTC (rev 1888) @@ -58,6 +58,10 @@ #:submission-remove-submitter #:submission-timeslot #:submission-documents + #:submission-edit-permitted-p + + #:document + #:document-info #:timeslot)) (defpackage :lisp-ecoop.tags Modified: branches/xml-class-rework/projects/lisp-ecoop/src/participant.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/participant.lisp 2006-03-03 22:31:33 UTC (rev 1887) +++ branches/xml-class-rework/projects/lisp-ecoop/src/participant.lisp 2006-03-05 14:02:00 UTC (rev 1888) @@ -3,9 +3,19 @@ (enable-interpol-syntax) (define-lisp-ecoop-class document (blob) - ((info :update :documentation "Short information for the document (e.g. 'Slides' or 'Draft Paper')")) - (:default-initargs :type "application/pdf")) + ((info :update :documentation "Short information for the document (e.g. 'Slides' or 'Draft Paper')") + (submission :read :documentation "Submission that this document belongs to")) + (:default-initargs :type "application/pdf" :submission (error ":submission argument missing while creating document"))) +(defmethod initialize-persistent-instance :after ((document document)) + (with-slots (submission) document + (push document (submission-documents submission)))) + +(defmethod destroy-object :before ((document document)) + (with-slots (submission) document + (with-slots (documents) submission + (setf documents (remove document documents))))) + (define-lisp-ecoop-class submission () ((title :update :documentation "Title of the submission" :initform nil :attribute t) (abstract :update :documentation "Abstract or short description" :initform nil :element t) @@ -13,6 +23,13 @@ (timeslot :update :documentation "Timeslot scheduled for this submission" :initform nil :attribute t) (documents :update :documentation "List of documents attached to this submission" :initform nil :element t))) +(defmethod destroy-object :before ((submission submission)) + (dolist (participant (submission-submitters submission)) + (with-slots (submissions) participant + (setf submissions (remove submission submissions)))) + (mapc #'destroy-object (submission-documents submission)) + (setf (submission-documents submission) nil)) + (defmethod destroy-object :before ((timeslot timeslot)) (when (subtypep (type-of (timeslot-content timeslot)) 'submission) (setf (submission-timeslot (timeslot-content timeslot)) nil))) @@ -20,6 +37,10 @@ (defmethod submission-type ((submission submission)) "Generic submission") +(defun submission-edit-permitted-p (submission) + (or (admin-p (bknr-request-user *req*)) + (find (bknr-request-user *req*) (submission-submitters submission)))) + (defmethod submission-add-submitter ((submission submission) submitter) (pushnew submitter (submission-submitters submission)) (pushnew submission (participant-submissions submitter))) @@ -131,17 +152,19 @@ (user-login participant) password))) -(defun make-participant (login &key full-name email text submission-pathname) +(defun make-participant (login &key full-name email text document-pathname) (let* ((initial-password (generate-random-password)) (participant (make-user login :full-name full-name :email email :password initial-password :class 'participant))) (when text (with-transaction ("set participant text") (setf (participant-text participant) text))) - (when submission-pathname - (let ((submission (make-object 'submission))) - (blob-from-file submission submission-pathname) + (when document-pathname + (let* ((submission (make-object 'submission)) + (document (make-object 'document :info "Initial paper"))) + (blob-from-file document document-pathname) (with-transaction ("set participant submission") + (push document (submission-documents submission)) (setf (participant-submissions participant) (list submission))))) (send-welcome-mail participant initial-password) participant)) Modified: branches/xml-class-rework/projects/lisp-ecoop/src/tags.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/tags.lisp 2006-03-03 22:31:33 UTC (rev 1887) +++ branches/xml-class-rework/projects/lisp-ecoop/src/tags.lisp 2006-03-05 14:02:00 UTC (rev 1888) @@ -53,18 +53,19 @@ (delete-object participant) (html (:h2 "Participant has been deleted")) (return-from profile-editor)))) - (when (request-uploaded-file *req* "submission") - (with-query-params (*req* type title abstract) + (when (request-uploaded-file *req* "document") + (with-query-params (*req* type title abstract info) (format t "; new submission - title ~S abstract ~S~%" title abstract) - (let ((file-name (request-uploaded-file *req* "submission"))) + (let ((file-name (request-uploaded-file *req* "document"))) (with-open-file (pdf file-name) (if (cl-ppcre:scan "^%PDF-" (read-line pdf)) - (let ((submission (make-object (if (equal type "breakout-group-proposal") - 'breakout-group-proposal - 'paper) - :submitters (list participant) :title title :abstract abstract))) - (blob-from-file submission file-name) - (with-transaction ("adding pariticipant submission") + (let* ((submission (make-object (if (equal type "breakout-group-proposal") + 'breakout-group-proposal + 'paper) + :submitters (list participant) :title title :abstract abstract)) + (document (make-object 'document :info info :submission submission))) + (blob-from-file document file-name) + (with-transaction ("adding participant submission") (push submission (participant-submissions participant)))) (html ((:script :language "JavaScript") "alert('Invalid file format of uploaded, only PDF files are accepted')"))))))) (when (request-uploaded-file *req* "picture") @@ -91,24 +92,17 @@ (let ((*participant* participant)) (mapc #'emit-template-node children)))) -(defun submission-info (submission) - (if submission - (dolist (document (submission-documents submission)) - (with-open-file (submission-file (blob-pathname document)) - (format nil "(~D bytes, uploaded ~A)" - (file-length submission-file) - (format-date-time (file-write-date submission-file))))) - "[no submission uploaded]")) +(defun document-file-info (document) + (with-open-file (document-file (blob-pathname document)) + (format nil "(~A, uploaded ~A)" + (scale-bytes (file-length document-file)) + (format-date-time (file-write-date document-file))))) (defvar *submission*) (defun submission-from-request () (find-store-object (parse-integer (get-template-var :*path-arg*)))) -(defun submission-edit-permitted-p (submission) - (or (admin-p (bknr-request-user *req*)) - (find (bknr-request-user *req*) (submission-submitters submission)))) - (define-bknr-tag submission-editor (&key children) (let ((submission (submission-from-request))) (unless submission @@ -123,13 +117,15 @@ (delete-object submission) (html (:h2 "The submission has been deleted")) (return-from submission-editor)))) - (when (request-uploaded-file *req* "file") - (let ((file-name (request-uploaded-file *req* "file"))) + (when (request-uploaded-file *req* "document") + (let ((file-name (request-uploaded-file *req* "document"))) (with-open-file (pdf file-name) (cond ((cl-ppcre:scan "^%PDF-" (read-line pdf)) (html (:h2 "New document has been saved")) - (blob-from-file submission file-name)) + (with-query-params (*req* info) + (let ((document (make-object 'document :info info :submission submission))) + (blob-from-file document file-name)))) (t (html ((:script :language "JavaScript") "alert('Invalid file format of uploaded, only PDF files are accepted')"))))))) (with-query-params (*req* title abstract remove-submitter-id add-submitter-id) @@ -181,12 +177,18 @@ (:princ-safe (user-full-name participant)))))))))))))) (define-bknr-tag submission-uploader () - (html (:princ-safe (submission-info *submission*)) :br - ((:button :type "button" :value "show" :onclick (format-object-id "document.location.href = '/submission/~A';" *submission*)) - "show") - :br - "Choose PDF file and press 'upload'" :br - ((:input :type "file" :name "file")) ((:button :type "submit" :name "action" :value "upload") "upload"))) + (html + (:table + (:tbody + (dolist (document (submission-documents *submission*)) + (html + (:tr + (:td (:princ-safe (document-info document))) + (:td (:princ-safe (document-file-info document))) + (:td ((:button :type "button" :value "show" :onclick (format-object-id "document.location.href = '/pdf/~A';" document)) "show") + ((:button :type "button" :value "delete" + :onclick (format-object-id "return delete_document(~A, \"~A\");" document (document-info document))) "delete")))))))) + (html ((:button :type "button" :value "show" :onclick "return open_document_upload_window()") "upload"))) (define-bknr-tag submission-submitters-chooser () (let ((submitters (submission-submitters *submission*))) @@ -254,7 +256,6 @@ (dolist (submission (participant-submissions *participant*)) (html ((:a :href (format-object-id "/submission/~A" submission)) (:princ-safe (submission-title submission))) " (" (:princ-safe (submission-type submission)) ")" - :br (:princ-safe (submission-info submission)) :br)) (html "[no submission]"))) @@ -340,6 +341,14 @@ (html " " ((:a :href (format-object-id "/edit-submission/~A" submission)) "[Edit]"))))))) +(define-bknr-tag submission-document-links (&key (submission (object-from-request))) + (html + (:h2 "Documents") + (:ul + (dolist (document (submission-documents submission)) + (html (:li ((:a :href (format-object-id "/pdf/~A" document) :target "_new") + (:princ-safe (document-info document)) " " (:princ-safe (document-file-info document))))))))) + (define-bknr-tag load-argument-object (&key children) (let* ((object (object-from-request))) (object-to-template-vars object) Modified: branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp 2006-03-03 22:31:33 UTC (rev 1887) +++ branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp 2006-03-05 14:02:00 UTC (rev 1888) @@ -28,7 +28,8 @@ :destination ,(unix-namestring (merge-pathnames #p"static/" *website-directory*)))) :modules '(user images stats mailinglist mailinglist-registration participants schedule) - :admin-navigation '(("user" . "/user/") + :admin-navigation '(("add participant" . "/add-participant") + ("user" . "/user/") ("stats" . "/stats") ("post mailinglists" . "/post-mailinglist") ("logout" . "/logout")) Added: branches/xml-class-rework/projects/lisp-ecoop/website/static/document-utils.css =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/static/document-utils.css 2006-03-03 22:31:33 UTC (rev 1887) +++ branches/xml-class-rework/projects/lisp-ecoop/website/static/document-utils.css 2006-03-05 14:02:00 UTC (rev 1888) @@ -0,0 +1,21 @@ +body { + font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; + background-color: #ffffff; +} + +h1 { + font-size: 14pt; + font-weight: bold; +} + +div.page { + position: absolute; + visibility: hidden; + top: 20px; + left: 20px; +} + +label { + width: 200px; + float: left; +} \ No newline at end of file Added: branches/xml-class-rework/projects/lisp-ecoop/website/static/document-utils.js =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/static/document-utils.js 2006-03-03 22:31:33 UTC (rev 1887) +++ branches/xml-class-rework/projects/lisp-ecoop/website/static/document-utils.js 2006-03-05 14:02:00 UTC (rev 1888) @@ -0,0 +1,47 @@ +// -*- Java -*- Script + +function $(name) +{ + return document.getElementById(name); +} + +function init() +{ + var url = document.location.href; + + // alert('init: ' + url); + + if (url.match("failure=")) { + var message = url.replace(/.*failure=(.*)/, "$1"); + $('error-message').innerHTML = decodeURI(message); + $('failed').style.visibility = 'visible'; + } else if (url.match("success=1")) { + $('success').style.visibility = 'visible'; + window.opener.location.reload(); + setTimeout("window.close()", 1000); + } else { + $('form').style.visibility = 'visible'; + } +} + +function begin_upload() +{ + if ($('info_input').value.match(/^\s*$/)) { + $('info_input').style.backgroundColor = '#f33'; + $('info_input').focus(); + return false; + } + + $('form').style.visibility = 'hidden'; + $('progress').style.visibility = 'visible'; + + var action = document.location.href; + action = action.replace(/upload/, "upload-document"); + + // alert(action); + + $('upload_document_form').action = action; + + return true; +} + Modified: branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js 2006-03-03 22:31:33 UTC (rev 1887) +++ branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js 2006-03-05 14:02:00 UTC (rev 1888) @@ -1,5 +1,33 @@ // -*- Java -*- +var POPUP_WINDOW_PARAMS = 'width=500,height=300,status=no,toolbar=no,menubar=no,resizable=yes,scrollbars=yes'; + +function http_request(url) +{ + var client; + + if (window.XMLHttpRequest) { + client = new XMLHttpRequest(); + } else { + client = new ActiveXObject("Microsoft.XMLHTTP"); + } + + client.open("GET", url, false); + + try { + if (window.XMLHttpRequest) { + client.send(null); + } else { + client.send(); + } + } + catch (e) { + debug('error sending request: ', e); + } + + return client.responseXML; +} + /* cms support */ function check(button, checkboxname, b) { @@ -24,7 +52,44 @@ /* adding/removing submitters */ function submitters_window(url) { - var submitters_window = open(url, "changesubmitters", "width=200,height=400,status=no,toolbar=no,menubar=no,resizable=yes,scrollbars=yes"); + var submitters_window = open(url, "changesubmitters", POPUP_WINDOW_PARAMS); submitters_window.focus(); return false; } + +/* Check upload parameters */ + +function check_document_upload() +{ + var info_input = document.getElementById('document-info-input'); + if (info_input.value == "") { + alert("Missing document info"); + info_input.focus(); + return false; + } + + return true; +} + +// Open document upload window + +function open_document_upload_window() { + var object_id = parseInt(window.location.href.replace(/.*\/(\d+)/, "$1")); + open('/upload-document/' + object_id, 'upload', POPUP_WINDOW_PARAMS); + return false; +} + +// Delete a document + +function delete_document(id, info) { + if (!confirm('Delete document "' + info + '" ?')) { + return false; + } + + http_request('/delete-document/' + id); + + window.location.reload(); + + return true; +} + Modified: branches/xml-class-rework/projects/lisp-ecoop/website/static/styles.css =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/static/styles.css 2006-03-03 22:31:33 UTC (rev 1887) +++ branches/xml-class-rework/projects/lisp-ecoop/website/static/styles.css 2006-03-05 14:02:00 UTC (rev 1888) @@ -165,8 +165,8 @@ } div#body div#content { - position: absolute; - left: 180px; + position: absolute; + left: 180px; } body h1 { @@ -242,4 +242,5 @@ pre { font-family: Times, serif; -} \ No newline at end of file +} + Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-profile.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-profile.xml 2006-03-03 22:31:33 UTC (rev 1887) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-profile.xml 2006-03-05 14:02:00 UTC (rev 1888) @@ -62,28 +62,6 @@ - New Submission - - Type: - - - - - - Title: - - - - Abstract: - - - - PDF: - - Action @@ -96,11 +74,6 @@

Please contact Hans H?bner for -inquiries relating to the workshop web site. We are interested in -developing the website into a LISP-based system to coordinate -distributed development activities and related real-life meetings -using an incremental development process. See the Website technology blurb for a -description of the technology used by this web site. +inquiries relating to the workshop web site.

Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-submission.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-submission.xml 2006-03-03 22:31:33 UTC (rev 1887) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/edit-submission.xml 2006-03-05 14:02:00 UTC (rev 1888) @@ -26,7 +26,7 @@ - Document (PDF) + Documents (PDF) Action Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/submission.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/submission.xml 2006-03-03 22:31:33 UTC (rev 1887) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/submission.xml 2006-03-05 14:02:00 UTC (rev 1888) @@ -8,6 +8,6 @@

$(title)

$(abstract)
- [Show PDF] + Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/toplevel.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/toplevel.xml 2006-03-03 22:31:33 UTC (rev 1887) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/toplevel.xml 2006-03-05 14:02:00 UTC (rev 1888) @@ -36,6 +36,7 @@
+
Added: branches/xml-class-rework/projects/lisp-ecoop/website/templates/upload.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/upload.xml 2006-03-03 22:31:33 UTC (rev 1887) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/upload.xml 2006-03-05 14:02:00 UTC (rev 1888) @@ -0,0 +1,43 @@ + + + + + Upload document + + + + +
+

Upload a document

+

+ Your document needs to be in PDF format. Every document has an attached short + information text which describes the nature of the content. Suggested texts + include "Draft Paper", "Final Paper", "Slides". +

+
+
+
+
+
+ +
+

+ Cancel +

+
+
+ Upload in progress, please wait +
+
+ Done uploading +
+
+

+ Upload failed: +

+ Dang! +
+ + From bknr at bknr.net Sun Mar 5 14:04:26 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 5 Mar 2006 09:04:26 -0500 (EST) Subject: [bknr-cvs] r1889 - in branches/xml-class-rework/bknr/src: data utils web Message-ID: <20060305140426.A099D2A010@common-lisp.net> Author: hhubner Date: 2006-03-05 09:04:26 -0500 (Sun, 05 Mar 2006) New Revision: 1889 Modified: branches/xml-class-rework/bknr/src/data/object.lisp branches/xml-class-rework/bknr/src/utils/package.lisp branches/xml-class-rework/bknr/src/utils/utils.lisp branches/xml-class-rework/bknr/src/web/authorizer.lisp Log: Attempt to handle uploads which are over the size limit better (not finished) Add scale-bytes function to pretty-print a file's size. Change delete-object so that it can be called within transaction code. Modified: branches/xml-class-rework/bknr/src/data/object.lisp =================================================================== --- branches/xml-class-rework/bknr/src/data/object.lisp 2006-03-05 14:02:00 UTC (rev 1888) +++ branches/xml-class-rework/bknr/src/data/object.lisp 2006-03-05 14:04:26 UTC (rev 1889) @@ -560,17 +560,21 @@ (destroy-object (store-object-with-id id))) (defun delete-object (object) - (execute (make-instance 'transaction :function-symbol 'tx-delete-object - :timestamp (get-universal-time) - :args (list (store-object-id object))))) + (if (in-transaction-p) + (destroy-object object) + (execute (make-instance 'transaction :function-symbol 'tx-delete-object + :timestamp (get-universal-time) + :args (list (store-object-id object)))))) (defun tx-delete-objects (&rest object-ids) (mapc #'(lambda (id) (destroy-object (store-object-with-id id))) object-ids)) (defun delete-objects (&rest objects) - (execute (make-instance 'transaction :function-symbol 'tx-delete-objects - :timestamp (get-universal-time) - :args (mapcar #'store-object-id objects)))) + (if (in-transaction-p) + (mapc #'destroy-object objects) + (execute (make-instance 'transaction :function-symbol 'tx-delete-objects + :timestamp (get-universal-time) + :args (mapcar #'store-object-id objects))))) (deftransaction change-slot-values (object &rest slots-and-values) (when object Modified: branches/xml-class-rework/bknr/src/utils/package.lisp =================================================================== --- branches/xml-class-rework/bknr/src/utils/package.lisp 2006-03-05 14:02:00 UTC (rev 1888) +++ branches/xml-class-rework/bknr/src/utils/package.lisp 2006-03-05 14:04:26 UTC (rev 1889) @@ -14,6 +14,9 @@ #+(not allegro) (:shadowing-import-from :acl-compat.mp process-kill process-wait) (:export #:define-bknr-class + + ;; byte size formatting + #:scale-bytes ;; date format #:format-date-time Modified: branches/xml-class-rework/bknr/src/utils/utils.lisp =================================================================== --- branches/xml-class-rework/bknr/src/utils/utils.lisp 2006-03-05 14:02:00 UTC (rev 1888) +++ branches/xml-class-rework/bknr/src/utils/utils.lisp 2006-03-05 14:04:26 UTC (rev 1889) @@ -536,3 +536,17 @@ (apply #'append subclasses (mapcar #'collect-subclasses subclasses))))) (mapcar #'class-name (remove-duplicates (collect-subclasses (if (symbolp class) (find-class class) class)))))) + +(defun scale-bytes (byte-count) + (cond + ((> byte-count (* 1024 1024 1024 1024)) + (format nil "~3,1F TB" (/ byte-count (* 1024 1024 1024 1024)))) + ((> byte-count (* 1024 1024 1024)) + (format nil "~3,1F GB" (/ byte-count (* 1024 1024 1024)))) + ((> byte-count (* 1024 1024)) + (format nil "~3,1F MB" (/ byte-count (* 1024 1024)))) + ((> byte-count 1024) + (format nil "~3,1F KB" (/ byte-count 1024))) + (t + (format nil "~A" byte-count)))) + \ No newline at end of file Modified: branches/xml-class-rework/bknr/src/web/authorizer.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/authorizer.lisp 2006-03-05 14:02:00 UTC (rev 1888) +++ branches/xml-class-rework/bknr/src/web/authorizer.lisp 2006-03-05 14:04:26 UTC (rev 1889) @@ -71,17 +71,26 @@ (defmethod authorize ((authorizer bknr-authorizer) (req http-request) ent) - ;; first check session cookie or bknr-sessionid parameter. the - ;; session cookie is set in the with-bknr-http-response macro to - ;; follow aserve's documented protocol for setting cookies - (let ((session (or (session-from-request-parameters authorizer req) - (session-from-request req) - (make-anonymous-session req)))) - (when session - (bknr-session-touch session) - (change-class req 'bknr-request :session session) - (return-from authorize t))) + (format t "; trying to authorize request~%") + ;; Catch any errors that occur during request body processing + (handler-case + ;; first check session cookie or bknr-sessionid parameter. the + ;; session cookie is set in the with-bknr-http-response macro to + ;; follow aserve's documented protocol for setting cookies + (let ((session (or (session-from-request-parameters authorizer req) + (session-from-request req) + (make-anonymous-session req)))) + (when session + (bknr-session-touch session) + (change-class req 'bknr-request :session session) + (format t "; request authorized~%") + (return-from authorize t))) + (error (e) + (format t "; Caught error ~A during request processing~%" e) + (http-error req *response-bad-request* (princ-to-string e)))) + + (format t "; request NOT authorized~%") ;; unauthorized, come up with 401 response to the web browser (redirect "/login" req) :deny) From bknr at bknr.net Mon Mar 6 20:01:56 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Mon, 6 Mar 2006 15:01:56 -0500 (EST) Subject: [bknr-cvs] r1890 - in trunk: modules projects/quickhoney projects/quickhoney/src thirdparty/cl-gd Message-ID: <20060306200156.01F0841001@common-lisp.net> Author: hhubner Date: 2006-03-06 15:01:56 -0500 (Mon, 06 Mar 2006) New Revision: 1890 Added: trunk/projects/quickhoney/src/screenrc trunk/projects/quickhoney/src/start-quickhoney-screen.sh Modified: trunk/modules/bknr-modules.asd trunk/modules/packages.lisp trunk/projects/quickhoney/ trunk/thirdparty/cl-gd/Makefile Log: deployment changes for quickhoney Modified: trunk/modules/bknr-modules.asd =================================================================== --- trunk/modules/bknr-modules.asd 2006-03-05 14:04:26 UTC (rev 1889) +++ trunk/modules/bknr-modules.asd 2006-03-06 20:01:56 UTC (rev 1890) @@ -30,7 +30,7 @@ :klammerscript #+(not allegro) :acl-compat - :bknr-id3) + #+nil :bknr-id3) :components ((:file "packages") Modified: trunk/modules/packages.lisp =================================================================== --- trunk/modules/packages.lisp 2006-03-05 14:04:26 UTC (rev 1889) +++ trunk/modules/packages.lisp 2006-03-06 20:01:56 UTC (rev 1890) @@ -6,7 +6,7 @@ :cl-interpol :net.aserve :puri - :bknr.id3 + #+(or) :bknr.id3 :bknr.rss :bknr.utils :bknr.web Property changes on: trunk/projects/quickhoney ___________________________________________________________________ Name: svn:ignore + datastore Added: trunk/projects/quickhoney/src/screenrc =================================================================== --- trunk/projects/quickhoney/src/screenrc 2006-03-05 14:04:26 UTC (rev 1889) +++ trunk/projects/quickhoney/src/screenrc 2006-03-06 20:01:56 UTC (rev 1890) @@ -0,0 +1 @@ +screen -t lisp lisp -core cmucl.core -load load.lisp Added: trunk/projects/quickhoney/src/start-quickhoney-screen.sh =================================================================== --- trunk/projects/quickhoney/src/start-quickhoney-screen.sh 2006-03-05 14:04:26 UTC (rev 1889) +++ trunk/projects/quickhoney/src/start-quickhoney-screen.sh 2006-03-06 20:01:56 UTC (rev 1890) @@ -0,0 +1,13 @@ +#!/bin/sh + + +TERM=xterm +SHELL=/bin/tcsh +HOME=/home/hans +PATH=/home/hans/bin:/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin + +export TERM SHELL HOME PATH +dir=$HOME/bknr-svn/projects/quickhoney/src + +cd $dir +sudo -u hans screen -m -d -c $dir/screenrc Property changes on: trunk/projects/quickhoney/src/start-quickhoney-screen.sh ___________________________________________________________________ Name: svn:executable + * Modified: trunk/thirdparty/cl-gd/Makefile =================================================================== --- trunk/thirdparty/cl-gd/Makefile 2006-03-05 14:04:26 UTC (rev 1889) +++ trunk/thirdparty/cl-gd/Makefile 2006-03-06 20:01:56 UTC (rev 1890) @@ -1,8 +1,8 @@ # this should work for FreeBSD and most Linux distros cl-gd-glue.so: - gcc -I/usr/local/include -fPIC -c cl-gd-glue.c - ld -shared -lgd -lz -lpng -ljpeg -lfreetype -liconv -lm -lc cl-gd-glue.o -o cl-gd-glue.so -L/usr/local/lib + gcc -fPIC -c cl-gd-glue.c + ld -shared -lgd -lz -lpng -ljpeg -lfreetype -lm -lc cl-gd-glue.o -o cl-gd-glue.so -L/usr/local/lib rm cl-gd-glue.o # this should work for Mac OS X From bknr at bknr.net Mon Mar 6 21:55:14 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Mon, 6 Mar 2006 16:55:14 -0500 (EST) Subject: [bknr-cvs] r1891 - branches/xml-class-rework/projects/mah-jongg/website Message-ID: <20060306215514.CD62533006@common-lisp.net> Author: hhubner Date: 2006-03-06 16:55:14 -0500 (Mon, 06 Mar 2006) New Revision: 1891 Modified: branches/xml-class-rework/projects/mah-jongg/website/game.js Log: Make scoring no points possible. Modified: branches/xml-class-rework/projects/mah-jongg/website/game.js =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.js 2006-03-06 20:01:56 UTC (rev 1890) +++ branches/xml-class-rework/projects/mah-jongg/website/game.js 2006-03-06 21:55:14 UTC (rev 1891) @@ -57,7 +57,7 @@ } for (i in winds) { - if (!$(winds[i]).value.match(/^[1-9]/)) { + if (!$(winds[i]).value.match(/^[0-9]/)) { is_valid = false; } } From bknr at bknr.net Tue Mar 7 05:58:43 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 7 Mar 2006 00:58:43 -0500 (EST) Subject: [bknr-cvs] r1892 - branches/xml-class-rework/bknr/src/data Message-ID: <20060307055843.62FBE4C000@common-lisp.net> Author: hhubner Date: 2006-03-07 00:58:42 -0500 (Tue, 07 Mar 2006) New Revision: 1892 Modified: branches/xml-class-rework/bknr/src/data/txn.lisp Log: When restoring a store with :until, truncate the log file at the :until position. :until can now be used to implement a roll-forward based undo facility. Modified: branches/xml-class-rework/bknr/src/data/txn.lisp =================================================================== --- branches/xml-class-rework/bknr/src/data/txn.lisp 2006-03-06 21:55:14 UTC (rev 1891) +++ branches/xml-class-rework/bknr/src/data/txn.lisp 2006-03-07 05:58:42 UTC (rev 1892) @@ -462,39 +462,46 @@ (defvar *show-transactions* nil) +(defun truncate-log (pathname position) + (let ((backup (make-pathname :type "backup" :defaults pathname))) + (format t "~&; creating log file backup: ~A~%" backup) + (with-open-file (s pathname + :element-type '(unsigned-byte 8) + :direction :input) + (with-open-file (r backup + :element-type '(unsigned-byte 8) + :direction :output) + (copy-stream s r)))) + (format t "~&; truncating transaction log at position ~D.~%" position) + #+cmu + (unix:unix-truncate (ext:unix-namestring pathname) position) + #+sbcl + (sb-posix:truncate (namestring pathname) position)) + (defun load-transaction-log (pathname &key until) - (let (length p) + (let (length position) (restart-case (with-open-file (s pathname :element-type '(unsigned-byte 8) :direction :input) (setf length (file-length s)) (loop - (setf p (file-position s)) - (unless (< p length) + (setf position (file-position s)) + (unless (< position length) (return)) (let ((txn (decode s))) - (when (or (not until) - (<= (transaction-timestamp txn) until)) - (when *show-transactions* - (format t "~&;;; txn @~D: ~A~%" p txn)) - (execute-unlogged txn))))) + (cond + ((and until + (> (transaction-timestamp txn) until)) + (truncate-log pathname position) + (return-from load-transaction-log)) + (t + (when *show-transactions* + (format t "~&;;; ~A txn @~D: ~A~%" (transaction-timestamp txn) position txn)) + (execute-unlogged txn)))))) (discard () :report "Discard rest of transaction log." - (let ((backup (make-pathname :type "backup" :defaults pathname))) - (format t "~&; creating log file backup: ~A~%" backup) - (with-open-file (s pathname - :element-type '(unsigned-byte 8) - :direction :input) - (with-open-file (r backup - :element-type '(unsigned-byte 8) - :direction :output) - (copy-stream s r)))) - (format t "~&; truncating transaction log at position ~D.~%" p) - #+cmu - (unix:unix-truncate (ext:unix-namestring pathname) p) - #+sbcl - (sb-posix:truncate (namestring pathname) p))))) + (truncate-log pathname position))))) (defgeneric restore-subsystem (store subsystem &key until)) From bknr at bknr.net Tue Mar 7 06:01:12 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 7 Mar 2006 01:01:12 -0500 (EST) Subject: [bknr-cvs] r1893 - in branches/xml-class-rework/projects/mah-jongg: src website Message-ID: <20060307060112.A238D4D008@common-lisp.net> Author: hhubner Date: 2006-03-07 01:01:12 -0500 (Tue, 07 Mar 2006) New Revision: 1893 Modified: branches/xml-class-rework/projects/mah-jongg/src/game.lisp branches/xml-class-rework/projects/mah-jongg/website/game.css branches/xml-class-rework/projects/mah-jongg/website/game.xsl Log: Add Button to undo last game entered. Modified: branches/xml-class-rework/projects/mah-jongg/src/game.lisp =================================================================== --- branches/xml-class-rework/projects/mah-jongg/src/game.lisp 2006-03-07 05:58:42 UTC (rev 1892) +++ branches/xml-class-rework/projects/mah-jongg/src/game.lisp 2006-03-07 06:01:12 UTC (rev 1893) @@ -54,13 +54,14 @@ (defclass game () ((winner :reader winner :initarg :winner) (east :reader east :initarg :east) + (undo-timestamp :reader undo-timestamp :initarg :undo-timestamp) (results :reader results :initarg :results :documentation "List (( ) (...))"))) (defmethod print-object ((game game) stream) (print-unreadable-object (game stream :type t) (format stream "WINNER: ~S" (name (winner game))))) -(deftransaction make-game (winner results) +(deftransaction make-game (undo-timestamp winner results) (let* ((all-results (mapcar #'(lambda (name-score) (list (find-player (car name-score)) (cadr name-score))) results)) (winner (find-player winner)) (east (find-if #'east-p (players *round*))) @@ -78,6 +79,7 @@ (rotate-winds) (setf (east-win-count *round*) 0)) (car (push (make-instance 'game + :undo-timestamp undo-timestamp :winner winner :east east :results all-results) @@ -85,6 +87,8 @@ (defun round-as-xml () (with-element "round" + (when (games *round*) + (attribute "undo-timestamp" (undo-timestamp (first (games *round*))))) (dolist (player (players *round*)) (with-slots (name wind score) player (with-element "player" @@ -92,7 +96,7 @@ (attribute "wind" (string-downcase wind)) (attribute "score" score)))) (dolist (game (reverse (games *round*))) - (with-slots (winner east results) game + (with-slots (winner east results undo-timestamp) game (with-element "game" (dolist (player (players *round*)) (with-element "score" @@ -108,12 +112,15 @@ (defun handle-game (req ent) (when (eq :post (request-method req)) - (with-query-params (req action east north west south winner) + (with-query-params (req action undo-timestamp east north west south winner) (ecase (make-keyword-from-string action) + (:undo + (restore (parse-integer undo-timestamp))) (:make-round (make-round east north west south)) (:make-game - (make-game (name (wind->player (make-keyword-from-string winner))) + (make-game (1- (get-universal-time)) + (name (wind->player (make-keyword-from-string winner))) (mapcar #'(lambda (wind) (list (name (wind->player wind)) (parse-integer (query-param req (symbol-name wind))))) '(:east :north :west :south)))) Modified: branches/xml-class-rework/projects/mah-jongg/website/game.css =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.css 2006-03-07 05:58:42 UTC (rev 1892) +++ branches/xml-class-rework/projects/mah-jongg/website/game.css 2006-03-07 06:01:12 UTC (rev 1893) @@ -60,7 +60,7 @@ text-align: right; } -#end-round-button { +#control-buttons { position: fixed; right: 20px; bottom: 20px; Modified: branches/xml-class-rework/projects/mah-jongg/website/game.xsl =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-07 05:58:42 UTC (rev 1892) +++ branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-07 06:01:12 UTC (rev 1893) @@ -90,7 +90,13 @@ - +
+ + + + + +
From bknr at bknr.net Tue Mar 7 06:09:22 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 7 Mar 2006 01:09:22 -0500 (EST) Subject: [bknr-cvs] r1894 - branches/xml-class-rework/projects/mah-jongg/website Message-ID: <20060307060922.7D42C4E003@common-lisp.net> Author: hhubner Date: 2006-03-07 01:09:21 -0500 (Tue, 07 Mar 2006) New Revision: 1894 Modified: branches/xml-class-rework/projects/mah-jongg/website/game.xsl Log: Confirm "Undo Last Game" and "End Round" buttons. Modified: branches/xml-class-rework/projects/mah-jongg/website/game.xsl =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-07 06:01:12 UTC (rev 1893) +++ branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-07 06:09:21 UTC (rev 1894) @@ -93,9 +93,9 @@
- + - +
From bknr at bknr.net Tue Mar 7 06:49:08 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 7 Mar 2006 01:49:08 -0500 (EST) Subject: [bknr-cvs] r1896 - branches/xml-class-rework/bknr/src/web Message-ID: <20060307064908.C0AB454060@common-lisp.net> Author: hhubner Date: 2006-03-07 01:49:08 -0500 (Tue, 07 Mar 2006) New Revision: 1896 Modified: branches/xml-class-rework/bknr/src/web/authorizer.lisp Log: Remove debug output. Modified: branches/xml-class-rework/bknr/src/web/authorizer.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/authorizer.lisp 2006-03-07 06:45:29 UTC (rev 1895) +++ branches/xml-class-rework/bknr/src/web/authorizer.lisp 2006-03-07 06:49:08 UTC (rev 1896) @@ -72,7 +72,6 @@ (req http-request) ent) - (format t "; trying to authorize request~%") ;; Catch any errors that occur during request body processing (handler-case ;; first check session cookie or bknr-sessionid parameter. the @@ -84,7 +83,6 @@ (when session (bknr-session-touch session) (change-class req 'bknr-request :session session) - (format t "; request authorized~%") (return-from authorize t))) (error (e) (format t "; Caught error ~A during request processing~%" e) From bknr at bknr.net Tue Mar 7 18:55:49 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 7 Mar 2006 13:55:49 -0500 (EST) Subject: [bknr-cvs] r1898 - trunk/projects/quickhoney/src Message-ID: <20060307185549.727744006@common-lisp.net> Author: hhubner Date: 2006-03-07 13:55:49 -0500 (Tue, 07 Mar 2006) New Revision: 1898 Modified: trunk/projects/quickhoney/src/load.lisp Log: Start swank Modified: trunk/projects/quickhoney/src/load.lisp =================================================================== --- trunk/projects/quickhoney/src/load.lisp 2006-03-07 06:54:18 UTC (rev 1897) +++ trunk/projects/quickhoney/src/load.lisp 2006-03-07 18:55:49 UTC (rev 1898) @@ -1,5 +1,8 @@ (push :cl-gd-gif *features*) (asdf:oos 'asdf:load-op :quickhoney) +(asdf:oos 'asdf:load-op :swank) +(swank::create-swank-server 4008 :spawn #'swank::simple-announce-function t) + (mp::startup-idle-and-top-level-loops) From bknr at bknr.net Tue Mar 7 18:58:28 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 7 Mar 2006 13:58:28 -0500 (EST) Subject: [bknr-cvs] r1899 - trunk/projects/quickhoney/website/static Message-ID: <20060307185828.522C9708A@common-lisp.net> Author: hhubner Date: 2006-03-07 13:58:28 -0500 (Tue, 07 Mar 2006) New Revision: 1899 Modified: trunk/projects/quickhoney/website/static/javascript.js Log: Change city -> t-shirt Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 18:55:49 UTC (rev 1898) +++ trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 18:58:28 UTC (rev 1899) @@ -6,7 +6,7 @@ directory_button['pixel'] = ['birdview', 'parts', 'icons', 'editorial', 'animation', 'smallworld']; directory_button['vector'] = ['portraits', 'celebrities', 'blackwhite', 'icons', 'editorial', 'nudes']; -directory_button['photo'] = ['browseall', 'city', 'landscape', 'shopping', 'food', 'special']; +directory_button['photo'] = ['browseall', 't-shirt', 'landscape', 'shopping', 'food', 'special']; /* safari global variable - used to trigger some compatibility hacks */ From bknr at bknr.net Tue Mar 7 19:31:04 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 7 Mar 2006 14:31:04 -0500 (EST) Subject: [bknr-cvs] r1900 - trunk/projects/quickhoney/website/templates Message-ID: <20060307193104.05929200A@common-lisp.net> Author: hhubner Date: 2006-03-07 14:31:04 -0500 (Tue, 07 Mar 2006) New Revision: 1900 Modified: trunk/projects/quickhoney/website/templates/index.bknr Log: Contact image changed. Change copyright notice to show 2006. Modified: trunk/projects/quickhoney/website/templates/index.bknr =================================================================== --- trunk/projects/quickhoney/website/templates/index.bknr 2006-03-07 18:58:28 UTC (rev 1899) +++ trunk/projects/quickhoney/website/templates/index.bknr 2006-03-07 19:31:04 UTC (rev 1900) @@ -117,7 +117,7 @@ Peter Stemmler: 646.270.5562
Nana Rausch: 646.270.5592

- +

QuickHoney - New York
536 Sixth Avenue, 2nd&3rd Floor
@@ -127,7 +127,7 @@

- ?1998-2005 QuickHoney Nana Rausch & Peter Stemmler. No part of + ?1998-2006 QuickHoney Nana Rausch & Peter Stemmler. No part of this website may be reproduced in any manner without permission. Programming by H?bner/Odendahl headcraft From bknr at bknr.net Tue Mar 7 19:33:03 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 7 Mar 2006 14:33:03 -0500 (EST) Subject: [bknr-cvs] r1901 - trunk/projects/quickhoney/website/templates Message-ID: <20060307193303.E7C294006@common-lisp.net> Author: hhubner Date: 2006-03-07 14:33:03 -0500 (Tue, 07 Mar 2006) New Revision: 1901 Modified: trunk/projects/quickhoney/website/templates/index.bknr Log: Changed wrong image before. Modified: trunk/projects/quickhoney/website/templates/index.bknr =================================================================== --- trunk/projects/quickhoney/website/templates/index.bknr 2006-03-07 19:31:04 UTC (rev 1900) +++ trunk/projects/quickhoney/website/templates/index.bknr 2006-03-07 19:33:03 UTC (rev 1901) @@ -105,7 +105,7 @@
- +

@@ -117,7 +117,7 @@ Peter Stemmler: 646.270.5562
Nana Rausch: 646.270.5592

- +

QuickHoney - New York
536 Sixth Avenue, 2nd&3rd Floor
From bknr at bknr.net Tue Mar 7 19:42:40 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 7 Mar 2006 14:42:40 -0500 (EST) Subject: [bknr-cvs] r1902 - trunk/projects/quickhoney/website/static Message-ID: <20060307194240.3BDA317031@common-lisp.net> Author: hhubner Date: 2006-03-07 14:42:39 -0500 (Tue, 07 Mar 2006) New Revision: 1902 Modified: trunk/projects/quickhoney/website/static/javascript.js Log: Recover "nice_jobs" and some other changes that got lost somewhere. Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 19:33:03 UTC (rev 1901) +++ trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 19:42:39 UTC (rev 1902) @@ -527,17 +527,17 @@ document.getElementById("path").innerHTML = path_links.join(" / "); } -/* home image - called from homeimage.onload */ +/* home image */ function home_loaded(image) { debug('home_loaded - image is ' + image + ' width: ' + image.width); - image.style.left = (36 + (648 - image.width) / 2) + 'px'; - image.style.top = (114 + (648 - image.height) / 2) + 'px'; - reveal_image(image); + document.getElementById("homeimage").style.left = (36 + (648 - image.width) / 2) + 'px'; + document.getElementById("homeimage").style.top = (114 + (648 - image.height) / 2) + 'px'; + if (logged_in) { var current_home_image = image.src.substring(image.src.indexOf('/image/') + 7); if (current_home_image != 'trans') { @@ -744,7 +744,7 @@ thumbnail_html += '' + '' + ''; } @@ -876,6 +876,17 @@ detail_window.focus(); } +/* nice_jobs() is a special form of a subdirectory which does not have a parent directory */ + +function nice_jobs() { + + document.getElementById("clients").style.visibility = 'hidden'; + + current_directory = 'clients'; + current_image = null; + subdirectory('nicejobs'); +} + /* Used from image-detail to load the current image */ function load_image() { @@ -953,7 +964,7 @@ document.getElementById("debugger").style.visibility = 'visible'; document.getElementById("debugger").style.left = '730px'; document.getElementById("debugger").style.width = '400px'; - document.getElementById("debugger").style.height = '640px'; + document.getElementById("debugger").style.heigth = '640px'; } else { document.getElementById("debugger").style.left = "1px"; document.getElementById("debugger").style.right = "1px"; From bknr at bknr.net Tue Mar 7 19:43:24 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 7 Mar 2006 14:43:24 -0500 (EST) Subject: [bknr-cvs] r1903 - trunk/projects/quickhoney/src Message-ID: <20060307194324.9E26E19010@common-lisp.net> Author: hhubner Date: 2006-03-07 14:43:24 -0500 (Tue, 07 Mar 2006) New Revision: 1903 Modified: trunk/projects/quickhoney/src/webserver.lisp Log: Add "stats" module Modified: trunk/projects/quickhoney/src/webserver.lisp =================================================================== --- trunk/projects/quickhoney/src/webserver.lisp 2006-03-07 19:42:39 UTC (rev 1902) +++ trunk/projects/quickhoney/src/webserver.lisp 2006-03-07 19:43:24 UTC (rev 1903) @@ -33,7 +33,7 @@ ("/favicon.ico" file-handler :destination ,(unix-namestring (merge-pathnames #p"static/favicon.ico" *website-directory*)) :content-type "application/x-icon")) - :modules '(user images) + :modules '(user images stats) :admin-navigation '(("user" . "/user/") ("images" . "/edit-images") ("import" . "/import") From bknr at bknr.net Tue Mar 7 19:44:34 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 7 Mar 2006 14:44:34 -0500 (EST) Subject: [bknr-cvs] r1904 - trunk/projects/quickhoney/src Message-ID: <20060307194434.6E1611C002@common-lisp.net> Author: hhubner Date: 2006-03-07 14:44:34 -0500 (Tue, 07 Mar 2006) New Revision: 1904 Added: trunk/projects/quickhoney/src/mods.lisp Log: Several manual modifications as ordererd by quickhoney. Added: trunk/projects/quickhoney/src/mods.lisp =================================================================== --- trunk/projects/quickhoney/src/mods.lisp 2006-03-07 19:43:24 UTC (rev 1903) +++ trunk/projects/quickhoney/src/mods.lisp 2006-03-07 19:44:34 UTC (rev 1904) @@ -0,0 +1,17 @@ +(in-package :quickhoney) + +(setq *images* (get-keywords-intersection-store-images '(:city))) + +(with-transaction (:korrektur) + (dolist (image *images*) + (setf (store-image-keywords image) (remove :city (store-image-keywords image))) + (pushnew :landscape (store-image-keywords image)))) + +(import-image "/home/hans/type-t-shirt.png" :keywords '(:type) :keywords-from-dir nil) + +(with-transaction (:korrektur) + (dolist (image (remove-if-not #'(lambda (image) (scan "shirt" (store-image-name image))) (class-instances 'quickhoney-image))) + (setf (store-image-keywords image) (remove :special (store-image-keywords image))) + (push :t-shirt (store-image-keywords image)))) + +(import-image "/home/hans/contact-peter-nana.png" :keywords '(:type) :keywords-from-dir nil) \ No newline at end of file From bknr at bknr.net Tue Mar 7 19:46:37 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 7 Mar 2006 14:46:37 -0500 (EST) Subject: [bknr-cvs] r1905 - trunk/projects/quickhoney/website/static Message-ID: <20060307194637.555651D005@common-lisp.net> Author: hhubner Date: 2006-03-07 14:46:37 -0500 (Tue, 07 Mar 2006) New Revision: 1905 Modified: trunk/projects/quickhoney/website/static/javascript.js Log: Re-add thumbnail borders. Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 19:44:34 UTC (rev 1904) +++ trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 19:46:37 UTC (rev 1905) @@ -743,7 +743,7 @@ var image = row[image_index]; thumbnail_html += '' - + '' + ''; From bknr at bknr.net Tue Mar 7 19:47:59 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 7 Mar 2006 14:47:59 -0500 (EST) Subject: [bknr-cvs] r1906 - trunk/projects/quickhoney/website/static Message-ID: <20060307194759.0707521003@common-lisp.net> Author: hhubner Date: 2006-03-07 14:47:58 -0500 (Tue, 07 Mar 2006) New Revision: 1906 Modified: trunk/projects/quickhoney/website/static/javascript.js Log: Correct correction Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 19:46:37 UTC (rev 1905) +++ trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 19:47:58 UTC (rev 1906) @@ -743,8 +743,8 @@ var image = row[image_index]; thumbnail_html += '' - + '' + ''; } From bknr at bknr.net Tue Mar 7 20:03:27 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 7 Mar 2006 15:03:27 -0500 (EST) Subject: [bknr-cvs] r1907 - in trunk/projects/quickhoney/website: static templates Message-ID: <20060307200327.3FC64690D9@common-lisp.net> Author: hhubner Date: 2006-03-07 15:03:26 -0500 (Tue, 07 Mar 2006) New Revision: 1907 Modified: trunk/projects/quickhoney/website/static/styles.css trunk/projects/quickhoney/website/templates/frontpage.bknr Log: More changes that were lost. Modified: trunk/projects/quickhoney/website/static/styles.css =================================================================== --- trunk/projects/quickhoney/website/static/styles.css 2006-03-07 19:47:58 UTC (rev 1906) +++ trunk/projects/quickhoney/website/static/styles.css 2006-03-07 20:03:26 UTC (rev 1907) @@ -5,6 +5,11 @@ background-color: #ffffff; } +#hidden-vcard { + visibility: hidden; + height: 0px; +} + /* cms styles */ h1 { Modified: trunk/projects/quickhoney/website/templates/frontpage.bknr =================================================================== --- trunk/projects/quickhoney/website/templates/frontpage.bknr 2006-03-07 19:47:58 UTC (rev 1906) +++ trunk/projects/quickhoney/website/templates/frontpage.bknr 2006-03-07 20:03:26 UTC (rev 1907) @@ -10,10 +10,16 @@ - QuickHoney + QuickHoney - Nana Rausch + Peter Stemmler +

+

QuickHoney Illustrations


+

Peter Stemmler

Phone: 646.270.5562
+

Nana Rausch

Phone 646.270.5592
+ Studio for Illustration, New York, Portfolio, Email
+
From bknr at bknr.net Wed Mar 8 06:49:37 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Wed, 8 Mar 2006 01:49:37 -0500 (EST) Subject: [bknr-cvs] r1908 - in branches/xml-class-rework/projects/lisp-ecoop: src website/static website/templates Message-ID: <20060308064937.DFB197020E@common-lisp.net> Author: hhubner Date: 2006-03-08 01:49:37 -0500 (Wed, 08 Mar 2006) New Revision: 1908 Added: branches/xml-class-rework/projects/lisp-ecoop/website/templates/create-submission.xml Modified: branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js branches/xml-class-rework/projects/lisp-ecoop/website/templates/upload.xml branches/xml-class-rework/projects/lisp-ecoop/website/templates/user-error.xml Log: First version for Pascal to test. Modified: branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp 2006-03-07 20:03:26 UTC (rev 1907) +++ branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp 2006-03-08 06:49:37 UTC (rev 1908) @@ -14,14 +14,21 @@ (defmethod handle-form ((handler add-participant-handler) (action (eql nil)) req) (with-lisp-ecoop-page (req "Create new participant") - ((:form :method "post" :enctype "multipart/form-data") + ((:form :method "post" :enctype "multipart/form-data" :onsubmit "return check_participant_form(this);") ((:table :border "1") (:tr (:th "Login") (:td (text-field "login" :size 15))) (:tr (:th "Full Name") (:td (text-field "full-name" :size 25))) (:tr (:th "Email") - (:td (text-field "email" :size 25)))) + (:td (text-field "email" :size 25))) + (:tr (:th "Submission") + (:td ((:select :name "submission" :id "submission-selector" :size "1") + (dolist (submission (sort (copy-list (class-instances 'submission)) + #'string-lessp :key #'submission-title)) + (html ((:option :value (store-object-id submission)) + (:princ-safe (submission-title submission)))))) + ((:input :type "submit" :onclick "return create_submission_window();" :value "new"))))) (submit-button "create" "create")))) (defmethod handle-form ((handler add-participant-handler) (action (eql :create)) req) @@ -37,7 +44,7 @@ (:default-initargs :class 'participant :query-function #'find-user)) (defmethod handle-object-form ((handler edit-participant-handler) (action (eql nil)) (participant participant) req) - (with-lisp-ecoop-page (req #?"Edit participant ((user-login participant))") + (with-lisp-ecoop-page (req #?"Edit participant $((user-login participant))") ((:form :method "post" :enctype "multipart/form-data") ((:table :border "1") (:tr (:th "Login") @@ -66,7 +73,22 @@ (with-http-body (req *ent* :external-format '(unsigned-byte 8)) (write-sequence pdf net.aserve::*html-stream*))))) +(defclass make-submission-handler (admin-only-handler page-handler) + ()) +(defmethod handle ((handler make-submission-handler) req) + (with-query-params (req title abstract) + (let ((submission (make-object 'submission :title title :abstract abstract))) + (with-lisp-ecoop-page (req #?"Submission created") + (html ((:script :type "text/javascript") + (:princ-safe #?" +if (window.opener) { + opener.add_submission($((store-object-id submission)), '$(title)'); + window.close(); +} else { + window.location.href = 'edit-submission/$((store-object-id submission))'; +}"))))))) + (defclass upload-document-handler (object-handler) () (:default-initargs :class 'submission)) @@ -111,6 +133,7 @@ (define-bknr-webserver-module participants ("/add-participant" add-participant-handler) ("/edit-participant" edit-participant-handler) + ("/make-submission" make-submission-handler) ("/pdf" pdf-handler) ("/upload-document" upload-document-handler) ("/delete-document" delete-document-handler) Modified: branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp 2006-03-07 20:03:26 UTC (rev 1907) +++ branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp 2006-03-08 06:49:37 UTC (rev 1908) @@ -17,13 +17,12 @@ (make-instance 'website :name "LISP ECOOP CMS" :base-href base-href + :template-base-directory (namestring (merge-pathnames #p"templates/" *website-directory*)) + :template-command-packages '((:lisp-ecoop . :lisp-ecoop.tags) + (:bknr . :bknr.web) + (:menu . :bknr.site-menu)) :handler-definitions `(("/" redirect-handler :to "home") - ("/" template-handler - :destination ,(namestring (merge-pathnames #p"templates/" *website-directory*)) - :command-packages ((:lisp-ecoop . :lisp-ecoop.tags) - (:bknr . :bknr.web) - (:menu . :bknr.site-menu))) ("/static" directory-handler :destination ,(unix-namestring (merge-pathnames #p"static/" *website-directory*)))) :modules '(user images stats mailinglist mailinglist-registration participants schedule) Modified: branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js 2006-03-07 20:03:26 UTC (rev 1907) +++ branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js 2006-03-08 06:49:37 UTC (rev 1908) @@ -1,6 +1,6 @@ // -*- Java -*- -var POPUP_WINDOW_PARAMS = 'width=500,height=300,status=no,toolbar=no,menubar=no,resizable=yes,scrollbars=yes'; +var POPUP_WINDOW_PARAMS = 'width=700,height=450,status=no,toolbar=no,menubar=no,resizable=yes,scrollbars=yes'; function http_request(url) { @@ -93,3 +93,50 @@ return true; } +// Create Participant form check + +function check_form_fields(form) +{ + var input_complete = true; + var first_missing; + for (var i = 1; i < arguments.length; i++) { + var field = form[arguments[i]]; + if (field.value.match(/^\S+$/)) { + field.style.background = '#fff'; + } else { + input_complete = false; + field.style.background = '#faa'; + if (!first_missing) { + first_missing = field; + } + } + } + + if (!input_complete) { + first_missing.focus(); + } + + return input_complete; +} + +function check_participant_form(form) { + return check_form_fields(form, 'login', 'full-name', 'email'); +} + +// Make a new submission + +function create_submission_window() { + window.add_submission = function(id, title) { + var submission_selector = document.getElementById('submission-selector'); + submission_selector.innerHTML = '' + submission_selector.innerHTML; + submission_selector.selectedIndex = 0; + } + + open('/create-submission', 'createsubmission', POPUP_WINDOW_PARAMS); + + return false; +} + +function check_create_submission_form(form) { + return check_form_fields(form, 'title'); +} Added: branches/xml-class-rework/projects/lisp-ecoop/website/templates/create-submission.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/create-submission.xml 2006-03-07 20:03:26 UTC (rev 1907) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/create-submission.xml 2006-03-08 06:49:37 UTC (rev 1908) @@ -0,0 +1,43 @@ + + + + + Create submission + + + + + +
+

Create a Submission

+

+ Using this form, a new submission may be created. +

+
+
+
+
+
+ + +

+ Cancel +

+
+
+ Creating submission... +
+
+ Submission created. +
+
+

+ Cannot create submission: +

+ Dang! +
+ + Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/upload.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/upload.xml 2006-03-07 20:03:26 UTC (rev 1907) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/upload.xml 2006-03-08 06:49:37 UTC (rev 1908) @@ -28,10 +28,10 @@

- Upload in progress, please wait + Upload in progress, please wait....
- Done uploading + Done uploading.

Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/user-error.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/user-error.xml 2006-03-07 20:03:26 UTC (rev 1907) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/user-error.xml 2006-03-08 06:49:37 UTC (rev 1908) @@ -7,8 +7,16 @@ xmlns:lisp-ecoop="http://lisp-ecoop06.bknr.net" xmlns:menu="http://bknr.net/menu" > -Your request could not be processed because an error occured: + + Error + + + +

+ Your request could not be processed because an error occured: + 

 $(error-message)
+ \ No newline at end of file From bknr at bknr.net Wed Mar 8 06:51:01 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Wed, 8 Mar 2006 01:51:01 -0500 (EST) Subject: [bknr-cvs] r1909 - branches/xml-class-rework/bknr/src/web Message-ID: <20060308065101.48115720A1@common-lisp.net> Author: hhubner Date: 2006-03-08 01:51:00 -0500 (Wed, 08 Mar 2006) New Revision: 1909 Modified: branches/xml-class-rework/bknr/src/web/handlers.lisp branches/xml-class-rework/bknr/src/web/templates.lisp branches/xml-class-rework/bknr/src/web/web-macros.lisp branches/xml-class-rework/bknr/src/web/web-utils.lisp Log: Improve error message generation. Now the template based error page is used all over. The website class is getting more and more messed up, though. Modified: branches/xml-class-rework/bknr/src/web/handlers.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/handlers.lisp 2006-03-08 06:49:37 UTC (rev 1908) +++ branches/xml-class-rework/bknr/src/web/handlers.lisp 2006-03-08 06:51:00 UTC (rev 1909) @@ -47,6 +47,12 @@ :accessor website-login-logo-url) (import-spool-directory :initarg :import-spool-directory :accessor website-import-spool-directory) + (template-base-directory :initarg :template-base-directory + :reader website-template-base-directory) + (template-command-packages :initarg :template-command-packages + :reader website-template-command-packages) + (template-handler :initform nil + :reader website-template-handler) (show-page-function :initarg :show-page-function :accessor website-show-page-function) (show-error-page-function :initarg :show-error-page-function @@ -63,6 +69,8 @@ :login-logo-url "/image/bknr-logo" :site-logo-url "/image/bknr-logo" :import-spool-directory #p"/home/bknr/spool/" + :template-base-directory nil + :template-command-packages nil :show-page-function #'show-page :show-error-page-function #'show-error-page)) @@ -124,7 +132,14 @@ (mapcar #'(lambda (module-name) (or (gethash (symbol-name module-name) *website-modules*) (warn "bknr module ~A not known" module-name))) (website-modules website))))) - + (when (website-template-base-directory website) + (setf (slot-value website 'template-handler) (make-instance 'template-handler + :name "/" + :site website + :destination (website-template-base-directory website) + :command-packages (website-template-command-packages website))) + (push (website-template-handler website) + (website-handlers website))) (mapc #'(lambda (handler) (publish-handler website handler)) (website-handlers website))) @@ -209,15 +224,7 @@ (redirect-uri (request-uri req))) (redirect "/login" req)) (handler-bind ((error #'(lambda (e) - (with-bknr-page (req :title "error processing your request" - :response *response-internal-server-error*) - (if (or (admin-p *user*) - *bknr-debug*) - (html (:pre (:princ-safe e) - #+cmu - ((:font :size "-3") - (debug:backtrace 30 *html-stream*)))) - (html "error processing your request"))) + (funcall (website-show-error-page-function *website*) e) (do-error-log-request req e) (error e)))) (handle handler req))) Modified: branches/xml-class-rework/bknr/src/web/templates.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/templates.lisp 2006-03-08 06:49:37 UTC (rev 1908) +++ branches/xml-class-rework/bknr/src/web/templates.lisp 2006-03-08 06:51:00 UTC (rev 1909) @@ -310,7 +310,7 @@ (length (page-handler-prefix handler))) :env (initial-template-environment handler req) :request req))) - ;; ... und wenn keine Fehler entdeckt wurden, rauschreiben + ;; ... und wenn keine Fehler entdeckt wurden, rausschreiben (if body (with-bknr-http-response (req :content-type "text/html; charset=UTF-8" Modified: branches/xml-class-rework/bknr/src/web/web-macros.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/web-macros.lisp 2006-03-08 06:49:37 UTC (rev 1908) +++ branches/xml-class-rework/bknr/src/web/web-macros.lisp 2006-03-08 06:51:00 UTC (rev 1909) @@ -94,16 +94,18 @@ (session-info))))) (defun show-error-page (error) - (html - (princ "" *html-stream*) - (princ #\Newline *html-stream*) - (:html - (:head - (header :title "Error processing your request")) - ((:body :class "cms") - (:h1 "Error processing your request") - (:p "While processing your request, an error occured:") - (:pre (:princ-safe error)))))) + (if (website-template-handler *website*) + (send-error-response (website-template-handler *website*) *req* (princ-to-string error)) + (html + (princ "" *html-stream*) + (princ #\Newline *html-stream*) + (:html + (:head + (header :title "Error processing your request")) + ((:body :class "cms") + (:h1 "Error processing your request") + (:p "While processing your request, an error occured:") + (:pre (:princ-safe error))))))) (defun show-page-with-error-handlers (fn req &key response title (show-page (website-show-page-function *website*)) Modified: branches/xml-class-rework/bknr/src/web/web-utils.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/web-utils.lisp 2006-03-08 06:49:37 UTC (rev 1908) +++ branches/xml-class-rework/bknr/src/web/web-utils.lisp 2006-03-08 06:51:00 UTC (rev 1909) @@ -65,17 +65,30 @@ (loop for name-value in (form-urlencoded-to-query (get-request-body request)) do (push name-value (getf (request-reply-plist request) 'bknr-parsed-parameters)))) -(defun get-parameters-from-body (request) +(defun parse-request-body (request &key uploads) + (let ((content-type (header-slot-value request :content-type))) + (cond + ((null content-type) + nil) + ((scan #?r"^(?i)application/x-www-form-urlencoded" content-type) + (get-urlencoded-form-data request)) + ((and uploads (scan #?r"^(?i)multipart/form-data" content-type)) + (get-multipart-form-data request))))) + +(defgeneric get-parameters-from-body (request) + (:documentation "Generic function to read in the parameters of a +request. This is a generic function because unauthorized request +bodies must not be completely read as that is done in the request +authorization phase. In this phase, processing must be fast and may +not return errors due to exceeded upload file size limits.")) + +(defmethod get-parameters-from-body ((request http-request)) + (parse-request-body request :uploads nil)) + +(defmethod get-parameters-from-body ((request bknr-request)) (unless (getf (request-reply-plist request) 'body-parsed) (setf (getf (request-reply-plist request) 'bknr-parsed-parameters) nil) - (let ((content-type (header-slot-value request :content-type))) - (cond - ((null content-type) - nil) - ((scan #?r"^(?i)application/x-www-form-urlencoded" content-type) - (get-urlencoded-form-data request)) - ((scan #?r"^(?i)multipart/form-data" content-type) - (get-multipart-form-data request)))) + (parse-request-body request :uploads t) (setf (getf (request-reply-plist request) 'body-parsed) t))) (defun request-uploaded-files (request) From bknr at bknr.net Fri Mar 10 14:53:13 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Fri, 10 Mar 2006 09:53:13 -0500 (EST) Subject: [bknr-cvs] r1910 - in branches/xml-class-rework/bknr/src: . sysclasses web Message-ID: <20060310145313.C2502671A0@common-lisp.net> Author: hhubner Date: 2006-03-10 09:53:13 -0500 (Fri, 10 Mar 2006) New Revision: 1910 Modified: branches/xml-class-rework/bknr/src/packages.lisp branches/xml-class-rework/bknr/src/sysclasses/user.lisp branches/xml-class-rework/bknr/src/web/authorizer.lisp branches/xml-class-rework/bknr/src/web/event-log.lisp branches/xml-class-rework/bknr/src/web/handlers.lisp branches/xml-class-rework/bknr/src/web/menu.lisp branches/xml-class-rework/bknr/src/web/user-handlers.lisp branches/xml-class-rework/bknr/src/web/web-macros.lisp branches/xml-class-rework/bknr/src/web/web-visitor.lisp Log: Numerous smaller changes to make running a bknr based site under a non-root path possible. This is not finished and I basically gave up the idea. Modified: branches/xml-class-rework/bknr/src/packages.lisp =================================================================== --- branches/xml-class-rework/bknr/src/packages.lisp 2006-03-08 06:51:00 UTC (rev 1909) +++ branches/xml-class-rework/bknr/src/packages.lisp 2006-03-10 14:53:13 UTC (rev 1910) @@ -280,6 +280,7 @@ #:website-url #:website-session-info #:website-base-href + #:website-make-path #:host #:publish-site #:publish-handler Modified: branches/xml-class-rework/bknr/src/sysclasses/user.lisp =================================================================== --- branches/xml-class-rework/bknr/src/sysclasses/user.lisp 2006-03-08 06:51:00 UTC (rev 1909) +++ branches/xml-class-rework/bknr/src/sysclasses/user.lisp 2006-03-10 14:53:13 UTC (rev 1910) @@ -155,9 +155,12 @@ (deftransaction set-user-crypted-password (user crypted-password) (setf (user-password user) crypted-password)) -(defun set-user-password (user password) +(defmethod set-user-password ((user user) password) (set-user-crypted-password user (crypt-md5 password (make-salt)))) +(defmethod set-user-password ((user string) password) + (set-user-crypted-password (find-user user) (crypt-md5 password (make-salt)))) + ;;; owned objects (define-persistent-class owned-object (store-object) Modified: branches/xml-class-rework/bknr/src/web/authorizer.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/authorizer.lisp 2006-03-08 06:51:00 UTC (rev 1909) +++ branches/xml-class-rework/bknr/src/web/authorizer.lisp 2006-03-10 14:53:13 UTC (rev 1910) @@ -90,5 +90,5 @@ (format t "; request NOT authorized~%") ;; unauthorized, come up with 401 response to the web browser - (redirect "/login" req) + (redirect (website-make-path *website* "login") req) :deny) Modified: branches/xml-class-rework/bknr/src/web/event-log.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/event-log.lisp 2006-03-08 06:51:00 UTC (rev 1909) +++ branches/xml-class-rework/bknr/src/web/event-log.lisp 2006-03-10 14:53:13 UTC (rev 1910) @@ -50,7 +50,7 @@ `(html ((:td :class "lognavi") ((:input :type "checkbox" :name "show-class" :value ,class-name ,@(if checked '(:checked "checked")))) - (cmslink (format nil "/event-log?show-only-class=~a" ,class-name) + (cmslink (format nil "event-log?show-only-class=~a" ,class-name) (:princ-safe (regex-replace ,class-name "-event$" "")))))) (defun serve-event-log-request (req) @@ -107,7 +107,7 @@ "count: " (html-text-input print-count 3) " hours: " (html-text-input print-hours 3) " " ((:input :type "submit" :name "filter" :value "filter")) - " " (cmslink ("/event-class-documentation" :target "documentation") " documentation "))) + " " (cmslink ("event-class-documentation" :target "documentation") " documentation "))) #+(or) (:tr ((:td :class "lognavi") "message: " ((:input :type "text" :size "80" :name "message"))))) ;; Query the database. Modified: branches/xml-class-rework/bknr/src/web/handlers.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/handlers.lisp 2006-03-08 06:51:00 UTC (rev 1909) +++ branches/xml-class-rework/bknr/src/web/handlers.lisp 2006-03-10 14:53:13 UTC (rev 1910) @@ -85,6 +85,9 @@ (dolist (handler (website-handlers website)) (format t "~A => ~A~%" (uri-path (page-handler-url handler)) handler))) +(defmethod website-make-path ((website website) relative-path) + (format nil "~A~A" (website-base-href website) relative-path)) + (defgeneric publish-handler (website handler)) (defgeneric publish-site (website)) @@ -222,7 +225,7 @@ (progn (setf (session-variable :login-redirect-uri) (redirect-uri (request-uri req))) - (redirect "/login" req)) + (redirect (website-make-path *website* "login") req)) (handler-bind ((error #'(lambda (e) (funcall (website-show-error-page-function *website*) e) (do-error-log-request req e) Modified: branches/xml-class-rework/bknr/src/web/menu.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/menu.lisp 2006-03-08 06:51:00 UTC (rev 1909) +++ branches/xml-class-rework/bknr/src/web/menu.lisp 2006-03-10 14:53:13 UTC (rev 1910) @@ -39,7 +39,7 @@ (defun in-subtree (url subtree-url) (search subtree-url url)) -(define-bknr-tag site-menu (&key config menu-name container-class active-class inactive-class) +(define-bknr-tag site-menu (&key config menu-name title container-class active-class inactive-class) (declare (ignore menu-name)) (let* ((menu (bknr.impex:parse-xml-file #+cmu (ext:unix-namestring (merge-pathnames config *default-pathname-defaults*)) @@ -47,6 +47,8 @@ *menu-def-classes*))) (html ((:div :class container-class) + (when title + (html ((:div :class "title") (:princ-safe title)))) (dolist (item (menu-items menu)) (let ((item-is-active (in-subtree (puri:uri-path (net.aserve:request-uri *req*)) (item-url item)))) (with-slots (url title active-image inactive-image) item Modified: branches/xml-class-rework/bknr/src/web/user-handlers.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/user-handlers.lisp 2006-03-08 06:51:00 UTC (rev 1909) +++ branches/xml-class-rework/bknr/src/web/user-handlers.lisp 2006-03-10 14:53:13 UTC (rev 1910) @@ -20,73 +20,20 @@ (:princ (format nil "edit ~a" (user-login user)))))) ;;; handlers -(defparameter *login-default-url* "/") - -(defclass login-handler (page-handler) - ((name :initform :login))) - -(defclass logout-handler (login-handler) - ((name :initform :logout))) - -(defmethod handle ((page-handler login-handler) req) - (with-query-params (req __username) - (let (login-failed-message) - (when (and __username - (equal __username (user-login (bknr-request-user req)))) - ;; request has successfully been authorized, redirect to asked uri - (let ((url (or (session-variable :login-redirect-uri) - *login-default-url*))) - (redirect url req) - (return-from handle))) - (when __username - (setf login-failed-message "invalid username or invalid password")) - (with-bknr-http-response (req) - (with-http-body (req *ent*) - (html - (:html - (:head - (loop for stylesheet in (bknr.web::website-style-sheet-urls *website*) - do (html ((:link :rel "stylesheet" :type "text/css" :href stylesheet)))) - ((:script :language "JavaScript") "function setFocus() { document.forms[0].elements[0].focus(); }") - (:title "please login to " (:princ-safe (website-name *website*)))) - ((:body :class "cms" :onload "setFocus();") - ((:div :align "center") - (bknr.images:banner :keyword :bknr) - ((:form :method "post") - (let* ((user-images (loop for user in (all-users) - for image = (random-elt (bknr.images:user-images user)) - when image - collect (list user image))) - (rows (group-by user-images 4))) - (when user-images - (html ((:table :class "login-images") - (dolist (row rows) - (html - (:tr (loop for (user image) in row - do (html - (:td - ((:a :href "#" - :onClick (format nil"javascript:document.forms[0].elements['__username'].value='~a'" (user-login user))) - ((:img :src (format nil "/image/~a/thumbnail,,120,120" - (store-object-id image))))))))))))))) - (when login-failed-message - (html (:p (:princ-safe login-failed-message)))) - (:table - (:tr ((:td :colspan "2") "please log in to " (:princ-safe (website-name *website*)))) - (:tr (:td "username") (:td ((:input :type "text" :name "__username" :size "20")))) - (:tr (:td "password") (:td ((:input :type "password" :name "__password" :size "20"))))) - ((:input :type "submit" :name "login" :value " login ")) - ((:input :type "button" :name "info" :value " info " :onclick "self.location.href='/info'")) - ((:input :type "button" :name "message" :value "message" :onclick "self.location.href='/message'")))))))))))) -(defmethod handle ((page-handler logout-handler) req) +(defclass logout-handler (page-handler) + ()) + +(defmethod handle ((handler logout-handler) req) (bknr.web::drop-session (bknr-request-session req)) - (with-query-params (req url) + (format t "url: ~A referer: ~A~%" (query-param req "url") (header-slot-value req :referer)) + (let ((url (or (query-param req "url") + (header-slot-value req :referer)))) (if url - (redirect url req) - (progn (with-bknr-page (req :title "logged out") - (html (:h2 "you are logged out"))) - (change-class req 'http-request))))) + (redirect url req) + (progn (with-bknr-page (req :title "logged out") + (html (:h2 "you are logged out"))) + (change-class req 'http-request))))) (defclass user-handler (edit-object-handler) ((require-user-flag :initform :admin))) @@ -179,5 +126,4 @@ (define-bknr-webserver-module user ("/user" user-handler) - ("/login" login-handler) ("/logout" logout-handler)) \ No newline at end of file Modified: branches/xml-class-rework/bknr/src/web/web-macros.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/web-macros.lisp 2006-03-08 06:51:00 UTC (rev 1909) +++ branches/xml-class-rework/bknr/src/web/web-macros.lisp 2006-03-10 14:53:13 UTC (rev 1910) @@ -152,5 +152,5 @@ (warn , at warning))) (defmacro cmslink (url &body body) - `(html ((:a :class "cmslink" :href ,url) + `(html ((:a :class "cmslink" :href (website-make-path *website* ,url)) , at body))) Modified: branches/xml-class-rework/bknr/src/web/web-visitor.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/web-visitor.lisp 2006-03-08 06:51:00 UTC (rev 1909) +++ branches/xml-class-rework/bknr/src/web/web-visitor.lisp 2006-03-10 14:53:13 UTC (rev 1910) @@ -35,7 +35,7 @@ (html-link (web-visitor-event-user event))) " from " (when (web-visitor-event-host event) - (cmslink (format nil "/host?host=~a" (host-ip-address (web-visitor-event-host event))) + (cmslink (format nil "host?host=~a" (host-ip-address (web-visitor-event-host event))) (:princ-safe (host-name (web-visitor-event-host event))))))) (defmethod as-xml ((event web-visitor-event)) From bknr at bknr.net Fri Mar 10 15:13:54 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Fri, 10 Mar 2006 10:13:54 -0500 (EST) Subject: [bknr-cvs] r1911 - in branches/xml-class-rework/projects/mah-jongg: src website Message-ID: <20060310151354.3AF3D671A3@common-lisp.net> Author: hhubner Date: 2006-03-10 10:13:53 -0500 (Fri, 10 Mar 2006) New Revision: 1911 Modified: branches/xml-class-rework/projects/mah-jongg/src/game.lisp branches/xml-class-rework/projects/mah-jongg/website/game.js branches/xml-class-rework/projects/mah-jongg/website/game.xsl Log: Change order of winds, first real-life test was successful. Modified: branches/xml-class-rework/projects/mah-jongg/src/game.lisp =================================================================== --- branches/xml-class-rework/projects/mah-jongg/src/game.lisp 2006-03-10 14:53:13 UTC (rev 1910) +++ branches/xml-class-rework/projects/mah-jongg/src/game.lisp 2006-03-10 15:13:53 UTC (rev 1911) @@ -21,7 +21,7 @@ (find wind (players *round*) :key #'wind)) (defun next-wind (player) - (cadr (member (wind player) '(:east :south :west :north :east)))) + (cadr (member (wind player) '(:east :north :west :south :east)))) (defun east-p (player) (eq :east (wind player))) @@ -40,12 +40,12 @@ (or (find name (players *round*) :key #'name :test #'string-equal) (error "can't find player named ~S" name))) -(deftransaction make-round (east north west south) +(deftransaction make-round (east south west north) (setf *round* (make-instance 'round :players (list (make-player east :east) - (make-player north :north) + (make-player south :south) (make-player west :west) - (make-player south :south))))) + (make-player north :north))))) (defun rotate-winds () (dolist (player (players *round*)) @@ -117,7 +117,7 @@ (:undo (restore (parse-integer undo-timestamp))) (:make-round - (make-round east north west south)) + (make-round east south west north)) (:make-game (make-game (1- (get-universal-time)) (name (wind->player (make-keyword-from-string winner))) Modified: branches/xml-class-rework/projects/mah-jongg/website/game.js =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.js 2006-03-10 14:53:13 UTC (rev 1910) +++ branches/xml-class-rework/projects/mah-jongg/website/game.js 2006-03-10 15:13:53 UTC (rev 1911) @@ -1,6 +1,6 @@ // -*- Java -*- -var winds = [ 'east', 'north', 'west', 'south' ]; +var winds = [ 'east', 'south', 'west', 'north' ]; function $(name) { Modified: branches/xml-class-rework/projects/mah-jongg/website/game.xsl =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-10 14:53:13 UTC (rev 1910) +++ branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-10 15:13:53 UTC (rev 1911) @@ -31,10 +31,10 @@
@@ -47,10 +47,10 @@ From bknr at bknr.net Fri Mar 10 15:22:39 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Fri, 10 Mar 2006 10:22:39 -0500 (EST) Subject: [bknr-cvs] r1912 - in branches/xml-class-rework/projects/lisp-ecoop: src website/static website/templates Message-ID: <20060310152239.665C7671A2@common-lisp.net> Author: hhubner Date: 2006-03-10 10:22:38 -0500 (Fri, 10 Mar 2006) New Revision: 1912 Modified: branches/xml-class-rework/projects/lisp-ecoop/src/config.lisp branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp branches/xml-class-rework/projects/lisp-ecoop/src/packages.lisp branches/xml-class-rework/projects/lisp-ecoop/src/participant.lisp branches/xml-class-rework/projects/lisp-ecoop/src/tags.lisp branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js branches/xml-class-rework/projects/lisp-ecoop/website/static/styles.css branches/xml-class-rework/projects/lisp-ecoop/website/templates/create-submission.xml branches/xml-class-rework/projects/lisp-ecoop/website/templates/toplevel.xml Log: Integrated administration functions into the template based site. Numerous smaller changes. Modified: branches/xml-class-rework/projects/lisp-ecoop/src/config.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/config.lisp 2006-03-10 15:13:53 UTC (rev 1911) +++ branches/xml-class-rework/projects/lisp-ecoop/src/config.lisp 2006-03-10 15:22:38 UTC (rev 1912) @@ -1,8 +1,12 @@ (in-package :lisp-ecoop.config) ;; URL f?r BASE HREFs -(defparameter *website-url* "http://lisp-ecoop.bknr.net") +(defparameter *base-path* "/") +(eval-when (:load-toplevel :execute) + (when (probe-file "site.lisp") + (load "site.lisp"))) + (defparameter *root-directory* #p"home:bknr-svn/projects/lisp-ecoop/") (defparameter *store-directory* (merge-pathnames #p"datastore/" *root-directory*)) Modified: branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp 2006-03-10 15:13:53 UTC (rev 1911) +++ branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp 2006-03-10 15:22:38 UTC (rev 1912) @@ -9,36 +9,6 @@ `(with-bknr-page (,req :title ,title) , at body)) -(defclass add-participant-handler (admin-only-handler form-handler) - ()) - -(defmethod handle-form ((handler add-participant-handler) (action (eql nil)) req) - (with-lisp-ecoop-page (req "Create new participant") - ((:form :method "post" :enctype "multipart/form-data" :onsubmit "return check_participant_form(this);") - ((:table :border "1") - (:tr (:th "Login") - (:td (text-field "login" :size 15))) - (:tr (:th "Full Name") - (:td (text-field "full-name" :size 25))) - (:tr (:th "Email") - (:td (text-field "email" :size 25))) - (:tr (:th "Submission") - (:td ((:select :name "submission" :id "submission-selector" :size "1") - (dolist (submission (sort (copy-list (class-instances 'submission)) - #'string-lessp :key #'submission-title)) - (html ((:option :value (store-object-id submission)) - (:princ-safe (submission-title submission)))))) - ((:input :type "submit" :onclick "return create_submission_window();" :value "new"))))) - (submit-button "create" "create")))) - -(defmethod handle-form ((handler add-participant-handler) (action (eql :create)) req) - (with-query-params (req login full-name email text) - (when (find-user login) - (error "user ~A already exists" login)) - (make-participant login :full-name full-name :email email :text text :document-pathname (request-uploaded-file req "document")) - (with-lisp-ecoop-page (req "Pariticpant created") - "The participant has been created in the database and a welcome mail has been sent."))) - (defclass edit-participant-handler (edit-object-handler) () (:default-initargs :class 'participant :query-function #'find-user)) @@ -77,8 +47,8 @@ ()) (defmethod handle ((handler make-submission-handler) req) - (with-query-params (req title abstract) - (let ((submission (make-object 'submission :title title :abstract abstract))) + (with-query-params (req type title abstract) + (let ((submission (make-object (if (string-equal type "paper") 'paper 'breakout-group-proposal) :title title :abstract abstract))) (with-lisp-ecoop-page (req #?"Submission created") (html ((:script :type "text/javascript") (:princ-safe #?" @@ -131,11 +101,8 @@ "Please choose an administrative task from the menu")) (define-bknr-webserver-module participants - ("/add-participant" add-participant-handler) - ("/edit-participant" edit-participant-handler) ("/make-submission" make-submission-handler) ("/pdf" pdf-handler) ("/upload-document" upload-document-handler) - ("/delete-document" delete-document-handler) - ("/admin" admin-handler)) + ("/delete-document" delete-document-handler)) Modified: branches/xml-class-rework/projects/lisp-ecoop/src/packages.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/packages.lisp 2006-03-10 15:13:53 UTC (rev 1911) +++ branches/xml-class-rework/projects/lisp-ecoop/src/packages.lisp 2006-03-10 15:22:38 UTC (rev 1912) @@ -3,7 +3,7 @@ (defpackage :lisp-ecoop.config (:use :cl :cl-user) - (:export #:*website-url* + (:export #:*base-path* #:*website-directory* #:*webserver-port* #:*store-directory* @@ -39,6 +39,7 @@ :xhtml-generator) (:shadowing-import-from :cl-interpol #:quote-meta-chars) (:export #:participant + #:make-participant #:all-participants #:participant-p #:participant-text Modified: branches/xml-class-rework/projects/lisp-ecoop/src/participant.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/participant.lisp 2006-03-10 15:13:53 UTC (rev 1911) +++ branches/xml-class-rework/projects/lisp-ecoop/src/participant.lisp 2006-03-10 15:22:38 UTC (rev 1912) @@ -82,6 +82,10 @@ (text :update :documentation "Self descriptionary text" :element t)) (:default-initargs :picture nil :submission nil :interests nil :text "")) +(defun curry (fun &rest args) + #'(lambda (&rest more) + (apply fun (append args more)))) + (defmethod initialize-persistent-instance :after ((participant participant)) (make-email-list)) @@ -127,7 +131,7 @@ Please direct your questions regarding the workshop to Hans H?bner, who can be reached by email as hans at huebner.org. -Have fun and see you in Glasgow!" +Have fun and see you on the workshop!" (user-login participant) initial-password))) @@ -145,26 +149,19 @@ Your new password is: ~A Please direct your questions regarding the workshop to Hans H?bner, who can -be reached by email as hans at huebner.org. - -Have fun and see you in Glasgow!" +be reached by email as hans at huebner.org." (user-login participant) (user-login participant) password))) -(defun make-participant (login &key full-name email text document-pathname) +(defun make-participant (login &key full-name email text submission) (let* ((initial-password (generate-random-password)) - (participant (make-user login :full-name full-name :email email :password initial-password - :class 'participant))) - (when text - (with-transaction ("set participant text") - (setf (participant-text participant) text))) - (when document-pathname - (let* ((submission (make-object 'submission)) - (document (make-object 'document :info "Initial paper"))) - (blob-from-file document document-pathname) - (with-transaction ("set participant submission") - (push document (submission-documents submission)) - (setf (participant-submissions participant) (list submission))))) + (participant (make-user login :full-name full-name :email email :password initial-password + :class 'participant))) + (with-transaction (:initialize-participant) + (when text + (setf (participant-text participant) text)) + (when submission + (submission-add-submitter submission participant))) (send-welcome-mail participant initial-password) participant)) Modified: branches/xml-class-rework/projects/lisp-ecoop/src/tags.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/tags.lisp 2006-03-10 15:13:53 UTC (rev 1911) +++ branches/xml-class-rework/projects/lisp-ecoop/src/tags.lisp 2006-03-10 15:22:38 UTC (rev 1912) @@ -30,7 +30,8 @@ (let ((participant (participant-from-request))) (unless (or (admin-p (bknr-request-user *req*)) (eq participant (bknr-request-user *req*))) - (error "can't edit this profile")) + (html (:h2 "can't edit this profile")) + (return-from profile-editor)) (when (eq :post (request-method *req*)) (with-query-params (*req* action) (format t ";; ACTION ~A~%" action) @@ -109,7 +110,8 @@ (html (:h2 "Invalid submission ID")) (return-from submission-editor)) (unless (submission-edit-permitted-p submission) - (error "can't edit this submission")) + (html (:h2 "can't edit this submission")) + (return-from submission-editor)) (when (eq :post (request-method *req*)) (with-query-params (*req* action) (case (make-keyword-from-string action) @@ -143,13 +145,36 @@ (let ((*submission* submission)) (mapc #'emit-template-node children)))) +(define-bknr-tag add-participant (&key children) + (unless (admin-p (bknr-request-user *req*)) + (html "You must be logged in as adminstrator to create new participants") + (return-from add-participant)) + (with-query-params (*req* action) + (when (eq :create (make-keyword-from-string action)) + (with-query-params (*req* login full-name email text submission) + (when (find-user login) + (error "user ~A already exists" login)) + (when submission + (setf submission (find-store-object (parse-integer submission)))) + (make-participant login :full-name full-name :email email :text text :submission submission) + (html + (:princ-safe #?"The participant $(login) has been created in the database and a welcome mail has been sent."))))) + (mapc #'emit-template-node children)) + +(define-bknr-tag submission-option-list () + (dolist (submission (sort (copy-list (class-instances 'submission)) + #'string-lessp :key #'submission-title)) + (html ((:option :value (store-object-id submission)) + (:princ-safe (submission-title submission)))))) + (define-bknr-tag submission-submitter-editor () (let ((submission (submission-from-request))) (unless submission (html (:h2 "Invalid submission ID")) (return-from submission-submitter-editor)) (unless (submission-edit-permitted-p submission) - (error "can't edit this submission")) + (html (:h2 "can't edit this submission")) + (return-from submission-submitter-editor)) (with-query-params (*req* add-submitter-id remove-submitter-id add-submitter remove-submitter) (let ((submitters (submission-submitters submission))) (cond @@ -263,22 +288,26 @@ (let ((user (bknr-request-user *req*))) (cond ((anonymous-p user) - (when (query-param *req* "__username") - (html ((:div :id "logfail") "Login failed"))) (html ((:form :method "post") - "Login" :br - ((:input :type "text" :name "__username")) - "Password" :br - ((:input :type "password" :name "__password")) - ((:button :type "submit" :name "action" :value "login") "login")))) + "Login" :br + ((:input :type "text" :name "__username")) + "Password" :br + ((:input :type "password" :name "__password")) + (when (query-param *req* "__username") + (html ((:div :id "logfail") "Login failed"))) + ((:button :type "submit" :name "action" :value "login") "login")))) (t - (html ((:form :method "post" :action "/logout") - ((:input :type "hidden" :name "url" :value (puri:uri-path (request-uri *req*)))) + (html ((:form :method "post" :action (website-make-path *website* "logout")) + ((:input :type "hidden" :name "url" :value (puri:uri-path (request-uri *req*)))) (:div "Logged in as " :br ((:a :href (format-object-id "/edit-profile/~A" user)) (:princ-safe (user-full-name user)))) (:div ((:button :type "submit" :name "action" :value "logout") "logout")))))))) +(define-bknr-tag admin-only (&key children) + (when (admin-p (bknr-request-user *req*)) + (mapc #'emit-template-node children))) + (defun parse-duration (string) (ignore-errors (destructuring-bind (hours minute) (mapcar #'parse-integer (coerce (nth-value 1 (scan-to-strings #?r"^(\d+):(\d\d)$" string)) 'list)) Modified: branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp 2006-03-10 15:13:53 UTC (rev 1911) +++ branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp 2006-03-10 15:22:38 UTC (rev 1912) @@ -8,7 +8,7 @@ (defun make-daily-statistics () (bknr.stats::make-yesterdays-stats :delete-events t :remove-referer-hosts '("lisp-ecoop.bknr.net"))) -(defun publish-lisp-ecoop (&key (port *webserver-port*) (listeners 20) (base-href "/")) +(defun publish-lisp-ecoop (&key (port *webserver-port*) (listeners 20) (base-href *base-path*)) (unless (bknr.cron:cron-job-with-name "daily webserver statistics") (bknr.cron:make-cron-job "daily webserver statistics" 'make-daily-statistics @@ -27,11 +27,7 @@ :destination ,(unix-namestring (merge-pathnames #p"static/" *website-directory*)))) :modules '(user images stats mailinglist mailinglist-registration participants schedule) - :admin-navigation '(("add participant" . "/add-participant") - ("user" . "/user/") - ("stats" . "/stats") - ("post mailinglists" . "/post-mailinglist") - ("logout" . "/logout")) + :admin-navigation nil :authorizer (make-instance 'bknr-authorizer) :style-sheet-urls (list (format nil "~Astatic/styles.css" base-href)) Modified: branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js 2006-03-10 15:13:53 UTC (rev 1911) +++ branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js 2006-03-10 15:22:38 UTC (rev 1912) @@ -101,7 +101,7 @@ var first_missing; for (var i = 1; i < arguments.length; i++) { var field = form[arguments[i]]; - if (field.value.match(/^\S+$/)) { + if (field.value.match(/\S+/)) { field.style.background = '#fff'; } else { input_complete = false; @@ -132,7 +132,7 @@ submission_selector.selectedIndex = 0; } - open('/create-submission', 'createsubmission', POPUP_WINDOW_PARAMS); + open('create-submission', 'createsubmission', POPUP_WINDOW_PARAMS); return false; } @@ -140,3 +140,18 @@ function check_create_submission_form(form) { return check_form_fields(form, 'title'); } + +// Make new participant + +function check_new_participant_form(form) +{ + var retval = check_form_fields(form, 'login', 'full-name', 'email'); + + if (retval && !form['email'].value.match(/^\S+@\S+\.\S+$/)) { + alert("invalid email address"); + form['email'].focus(); + return false; + } + + return retval; +} Modified: branches/xml-class-rework/projects/lisp-ecoop/website/static/styles.css =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/static/styles.css 2006-03-10 15:13:53 UTC (rev 1911) +++ branches/xml-class-rework/projects/lisp-ecoop/website/static/styles.css 2006-03-10 15:22:38 UTC (rev 1912) @@ -134,6 +134,12 @@ z-index: 2; } +div.site-menu div.title { + border: 0px; + border-bottom: 1px solid #000000; + background-color: #f0f0f0; +} + div.site-menu a { text-decoration: none; color: #0000ff; Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/create-submission.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/create-submission.xml 2006-03-10 15:13:53 UTC (rev 1911) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/create-submission.xml 2006-03-10 15:22:38 UTC (rev 1912) @@ -6,8 +6,8 @@ Create submission - - + +
@@ -16,7 +16,11 @@ Using this form, a new submission may be created.

+ action="make-submission" onsubmit="return check_create_submission_form(this);"> +

+ Paper + Breakout group proposal +




Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/toplevel.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/toplevel.xml 2006-03-10 15:13:53 UTC (rev 1911) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/toplevel.xml 2006-03-10 15:22:38 UTC (rev 1912) @@ -30,6 +30,14 @@ container-class="site-menu" active-class="site-menu-active" inactive-class="site-menu-inactive" /> + + +
From bknr at bknr.net Fri Mar 10 20:04:05 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Fri, 10 Mar 2006 15:04:05 -0500 (EST) Subject: [bknr-cvs] r1913 - branches/xml-class-rework/projects/lisp-ecoop/website/templates Message-ID: <20060310200405.DD24C4402B@common-lisp.net> Author: hhubner Date: 2006-03-10 15:04:05 -0500 (Fri, 10 Mar 2006) New Revision: 1913 Added: branches/xml-class-rework/projects/lisp-ecoop/website/templates/add-participant.xml branches/xml-class-rework/projects/lisp-ecoop/website/templates/admin-menu.xml branches/xml-class-rework/projects/lisp-ecoop/website/templates/login.xml Log: add new files Added: branches/xml-class-rework/projects/lisp-ecoop/website/templates/add-participant.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/add-participant.xml 2006-03-10 15:22:38 UTC (rev 1912) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/add-participant.xml 2006-03-10 20:04:05 UTC (rev 1913) @@ -0,0 +1,42 @@ + + + + +

Add Participant

+ + +

Using this form, new participants can be created.

+ + +
- + - +
- + - +
+ + + + + + + + + + + + + + + + + + + +
Login
Full Name
Email Address
Submission + + +
+ +
+ + + \ No newline at end of file Added: branches/xml-class-rework/projects/lisp-ecoop/website/templates/admin-menu.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/admin-menu.xml 2006-03-10 15:22:38 UTC (rev 1912) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/admin-menu.xml 2006-03-10 20:04:05 UTC (rev 1913) @@ -0,0 +1,5 @@ + + + + + Added: branches/xml-class-rework/projects/lisp-ecoop/website/templates/login.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/login.xml 2006-03-10 15:22:38 UTC (rev 1912) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/login.xml 2006-03-10 20:04:05 UTC (rev 1913) @@ -0,0 +1,27 @@ + + + + +

Login

+ +

Please log in to the website of the LISP ECOOP Workshop

+ +
+ + + + + + + + + + + + +
Username
Password
+ +
+
+ \ No newline at end of file From bknr at bknr.net Fri Mar 10 20:11:23 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Fri, 10 Mar 2006 15:11:23 -0500 (EST) Subject: [bknr-cvs] r1914 - branches/xml-class-rework/projects/lisp-ecoop/src Message-ID: <20060310201123.8D7874707A@common-lisp.net> Author: hhubner Date: 2006-03-10 15:11:23 -0500 (Fri, 10 Mar 2006) New Revision: 1914 Modified: branches/xml-class-rework/projects/lisp-ecoop/src/participant.lisp Log: Minor mail text changes. Modified: branches/xml-class-rework/projects/lisp-ecoop/src/participant.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/participant.lisp 2006-03-10 20:04:05 UTC (rev 1913) +++ branches/xml-class-rework/projects/lisp-ecoop/src/participant.lisp 2006-03-10 20:11:23 UTC (rev 1914) @@ -120,15 +120,15 @@ (defmethod send-welcome-mail ((participant participant) initial-password) (user-send-mail participant :subject "Your account on the LISP ECOOP workshop website has been created" :text (format nil -"Your participant account on the LISP ECOOP Workshop website has -been created. Please visit your personal profile page on -http://lisp-ecoop.bknr.net/edit-profile/ to change your password +"Your participant account on the LISP ECOOP Workshop website has +been created. Please visit your personal profile page on +http://lisp-ecoop.bknr.net/edit-profile/ to change your password andupdate your profile information. Your login name is: ~A Your initial password is: ~A -Please direct your questions regarding the workshop to Hans H?bner, who can +Please direct your questions regarding the workshop to Hans H?bner, who can be reached by email as hans at huebner.org. Have fun and see you on the workshop!" @@ -140,15 +140,15 @@ (user-send-mail participant :subject "Your password for the LISP ECOOP workshop website" :text (format nil -"Your password on the LISP ECOOP Workshop website has been reset. -Please visit your personal profile page on -http://lisp-ecoop.bknr.net/edit-profile/~A to change your password +"Your password on the LISP ECOOP Workshop website has been reset. +Please visit your personal profile page on +http://lisp-ecoop.bknr.net/edit-profile/~A to change your password and update your profile information. Your login name is: ~A Your new password is: ~A -Please direct your questions regarding the workshop to Hans H?bner, who can +Please direct your questions regarding the workshop to Hans H?bner, who can be reached by email as hans at huebner.org." (user-login participant) (user-login participant) From bknr at bknr.net Sun Mar 12 11:03:59 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 12 Mar 2006 06:03:59 -0500 (EST) Subject: [bknr-cvs] r1915 - in branches/xml-class-rework/projects/bos/payment-website/templates: . de Message-ID: <20060312110359.506726716B@common-lisp.net> Author: hhubner Date: 2006-03-12 06:03:55 -0500 (Sun, 12 Mar 2006) New Revision: 1915 Added: branches/xml-class-rework/projects/bos/payment-website/templates/baustelle.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/archive.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/bestellung.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/bos.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/buy-sqm.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/certificat.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/contact.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/disclaimer.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/generate-cert.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/headline2.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/headline3.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/idea.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/idea_subtitle1.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/idea_subtitle2.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/impressum.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/index.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/info-request.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-poidetail.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-poifoto.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-qmdetail.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-uebersicht.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/infosystem.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/mail-transfer.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/news.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/print_profil_setup.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/print_ueberweisung.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/print_versand_quittung.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/privacy.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/profil.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/profil_setup.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/quittung.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/ring-detail.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/save-initial-profile.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/sponsor_canceled.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_extra.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_main.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/ueberweisung.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_geschenk.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_info.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_quittung.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/verschenken.xml branches/xml-class-rework/projects/bos/payment-website/templates/user-error.xml Removed: branches/xml-class-rework/projects/bos/payment-website/templates/baustelle.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/archive.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/bestellung.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/bos.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/buy-sqm.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/certificat.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/contact.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/disclaimer.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/generate-cert.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/headline2.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/headline3.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/idea.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/idea_subtitle1.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/idea_subtitle2.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/impressum.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/index.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/info-request.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-poidetail.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-poifoto.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-qmdetail.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-uebersicht.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/infosystem.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/mail-transfer.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/news.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/print_profil_setup.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/print_ueberweisung.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/print_versand_quittung.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/privacy.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/profil.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/profil_setup.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/quittung.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/ring-detail.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/save-initial-profile.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/sponsor_canceled.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_extra.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_main.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/ueberweisung.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_geschenk.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_info.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_quittung.bknr branches/xml-class-rework/projects/bos/payment-website/templates/de/verschenken.bknr branches/xml-class-rework/projects/bos/payment-website/templates/user-error.bknr Log: change file extensions from bknr to xml Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/baustelle.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/baustelle.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/baustelle.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,61 +0,0 @@ - - - - - - - - - - REGENWALD für SAMBOJA LESTARI - - - - - - zur Startseite - - - - - - - -
- - -
-
-
- - - - - -
- - Hier entsteht die Website "create rainforest". - Bitte schauen Sie in ein paar Wochen wieder - vorbei! - -
-
-
-
-
- - Copied: branches/xml-class-rework/projects/bos/payment-website/templates/baustelle.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/baustelle.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/archive.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/archive.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/archive.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,15 +0,0 @@ - - - -

NEWS im ARCHIV

-

- -

- Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/archive.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/archive.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/bestellung.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/bestellung.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/bestellung.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,236 +0,0 @@ - - - - -
- -
-
- - - - - - - - - - - - - - - - -
- -
- - Regenwald schaffen -
f?r nur 3,- Euro pro m? - -

-
- Wir freuen uns ?ber Ihre Entscheidung, sich mit BOS f?r Natur und Mensch in Indonesien zu engagieren. -

- Mit Ihrer Unterst?tzung leisten Sie einen wichtigen Beitrag zur nachhaltigen Projektarbeit in Samboja Lestari - - - mehr... - -
-
- - - -
- - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - Ich bin dabei. Ich m?chte sehen wie Samboja Lestari gr?ner wird und schaffe... - -
- - 1 m? Regenwald [3 Euro], -
- - 5 m? Regenwald [15 Euro], -
- - 10 m? Regenwald [30 Euro], -
- - 30 m? Regenwald [90 Euro] -
- - oder - - Quadratmeter [zu je 3 Euro]. -
-
- - Ich m?chte die m? symbolisch verschenken. - - - Info - -
-
-
-
- Spenden sind steuerlich absetzbar!
-
-
- - Ich m?chte eine Spendenbescheinigung am Jahresende. -
-
-
-
- - Ihre Daten werden elektronisch ?ber unseren Partner WorldPay erfasst und bearbeitet. - Die Bestimmungen des Datenschutzgesetzes werden eingehalten. Daten werden nicht an Dritte - weitergegeben. - -
- - - Datenschutzinformation - -
- - Spenden Sie bequem online via Kreditkarte oder Lastschriftverfahren. - Sie verringern damit administrative Kosten f?r BOS. - - -
- - Ich habe die - - - Verzichtsklausel - gelesen und stimme ihr zu.

-
- - -
-
-
-
-
-
-


- [Regenwald-Urkunde] -
- Ab einer Spende von 30,- Euro senden wir Ihnen oder dem Beschenkten eine attraktive Regenwald-Urkunde zu. - Schon ab 1 m? erhalten Sie eine - - - Urkunde - - als pdf-Download im eigenen Sponsoren-Profil. -


- [Spendenquittung] -
- Bei Spenden ?ber 100,- Euro schicken wir Ihnen eine Spendenbescheinigung per Post zu. Bei Spenden - unter 100,- Euro gilt die Zahlungsbest?tigung per E-Mail. -

- [Vertrauensgarantie]
- Worldpay ist ein international anerkannter Onlinezahlungsanbieter. - Ihre Daten werden ?ber WorldPay verschl?sselt versendet und nach erfolgreicher Transaktion sofort gel?scht. -

-
-
-
- \ No newline at end of file Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/bestellung.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/bestellung.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/bos.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/bos.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/bos.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,97 +0,0 @@ - - - -
-
- - - - - - - - - - - -
BOS Foundation
- Die Borneo Orangutan Survival Foundation (BOS) ist die weltweit gr??te Organisation zur Rettung der vom Aussterben bedrohten - Orang-Utans. Ihr Lebensraum, der Regenwald mit seiner Artenvielfalt, wird in Zusammenarbeit mit der lokalen Bev?lkerung gesch?tzt. - BOS ist eine indonesische Nicht-Regierungs-Organisation, die im Jahr 1991 gegr?ndet wurde. -

- Die Aufgabenschwerpunkte von BOS in Indonesien sind: -

-
    -
  • - Konfiszierung illegal gehaltener Orang-Utans, Malaienb?ren und anderer Arten -
    • -
  • - Rehabilitation der Orang-Utans in Stationen -
    • -
  • - Auswilderung der Tiere in gesch?tzte Regenwaldgebiete -
    • -
  • - Rettung und Umsiedlung von gef?hrdeten Orang-Utans und anderen Arten -
    • -
  • - Aufforstung und Schutz von Regenwald -
    • -
  • - Schaffung von Alternativen f?r die lokale Bev?lkerung -
    • -
  • - Umweltbildung und Aufkl?rung der lokalen Bev?lkerung -
    • -
  • - ?berwachung von Schutzgebieten -
    • -
  • - Auswertung von Satellitenbildern -
    • -
  • - und vieles mehr. -
    • -
-
- Die Projekte von BOS werden aufgrund der sehr schwierigen wirtschaftlichen Lage in Indonesien haupts?chlich durch ausl?ndische Spendengelder finanziert. -
-
-
-
-
- - - - - - - - - - - - -
M?chten Sie gerne mehr ?ber die Projekte von BOS erfahren? -

- - - bos-deutschland.de - -
- - - savetheorangutan.info - -

-
Dort finden Sie auch Links zu unseren BOS- Schwesterorganisationen weltweit.
-
-
- Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/bos.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/bos.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/buy-sqm.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/buy-sqm.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/buy-sqm.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,8 +0,0 @@ - - - - Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/buy-sqm.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/buy-sqm.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/certificat.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/certificat.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/certificat.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,15 +0,0 @@ - - - -

So sieht Ihre Regenwald-Urkunde aus:

-
- -
- Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/certificat.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/certificat.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/contact.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/contact.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/contact.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,84 +0,0 @@ - - - -
-
- - - - - - - - - - - -
Kontakt - -
-
Wenn Sie Fragen haben, wenden Sie sich an uns!
- Wir freuen uns auf Ihre Anregungen und beantworten Ihre Fragen jederzeit gerne. -

- BOS Deutschland e.V.
- Sch?neberger Ufer 69
- D - 10785 Berlin -

- Telefon: +49.30.26 36 78 33
- Fax: +49.30.26 36 78 15

- E-Mail: - - - info at bos-deutschland.de - -





- Wir werden alle Anfragen baldm?glichst beantworten. Bitte haben Sie etwas Geduld. -
-
-
-
-
-
- - - - - - - - - - - - - - - - -
-
-
-
M?chten Sie gern mehr ?ber die Projekte von BOS erfahren? -

- - - bos-deutschland.de - -
- - - savetheorangutan.info - -

-
Dort finden Sie auch Links zu unseren BOS- Schwesterorganisationen weltweit. -
-
-
- Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/contact.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/contact.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/disclaimer.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/disclaimer.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/disclaimer.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,26 +0,0 @@ - - - -

- -

Verzichtserkl?rung

- -

-Jeder Sponsor eines oder mehrerer Quadratmeter wiederentstehenden -Regenwaldes im Aufforstungs- und Naturschutzprojekt Samboja Lestari / Borneo -/ Indonesien hat keinerlei Besitzanrechte oder sonstige Anspr?che auf das -entsprechende Land. Niemand wird berechtigt das Land weiter zu verkaufen. -Kein Sponsor geht Pflichten ein. Es handelt sich hierbei um eine rein -symbolische Handlung mit informativem Charakter. BOS garantiert, dass das -Land f?r ewig dem Nutzen des nachhaltigen Natur- und Tierschutzes reserviert -bleibt. -

-

- Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/disclaimer.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/disclaimer.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/generate-cert.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/generate-cert.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/generate-cert.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,6 +0,0 @@ - - Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/generate-cert.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/generate-cert.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/headline2.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/headline2.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/headline2.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,86 +0,0 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - Der Schl?ssel zum Erfolg - die lokale Bev?lkerung - - - - - zur?ck - -
- - -
- Der Naturschutz und die Bed?rfnisse der Bev?lkerung d?rfen sich nicht im Wege stehen. -

- Das Naturreservat Samboja Lestari bietet der lokalen Bev?lkerung ein gesichertes Einkommen, Gesundheit - und Bildung. Die Menschen werden in alle Phasen des Projektes mit einbezogen. Landwirtschaft, Baumschule, - Kompostproduktion, Aufforstung, Anpflanzung, Forschung und Aufbau der Infrastruktur bieten sichere Arbeitspl?tze. -
-
-
- "Auf diese Weise wird den Menschen eine Alternative geboten, und sie brauchen den Wald nicht mehr zu roden. So k?nnen - wir der Welt zeigen, dass Natur und Menschen zusammenleben k?nnen und einander nicht auszuschlie?en brauchen." -
- sagt Dr. Willie Smits, Vorsitzender von BOS Indonesien. -
-
-
-
-
-
- Die Sicherheit des Naturschutzreservates ist durch die Akzeptanz der indonesischen Bev?lkerung gew?hrleistet. - Der Erfolg des Projektes garantiert einen besseren Lebensstandard und umgekehrt. -
-
-
- Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/headline2.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/headline2.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/headline3.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/headline3.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/headline3.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,61 +0,0 @@ - - - - -
-
- - - - - - - - - - - - - - - - - - -
- - Orang-Utan, Malaienb?r und Nashornvogel - - - - - zur?ck - -
- Orang-Utans, auch Menschen des Waldes genannt, geh?ren zu den unmittelbar vom Aussterben bedrohten Menschenaffen. -

- Orang-Utans geh?ren nicht nur zu unseren nahen Verwandten im Tierreich, sie sind als Samenverbreiter auch unentbehrlich - f?r die Vielfalt des Regenwaldes - sie sind die so genannte Schirmspezies. Somit dient der Schutz dieser faszinierenden - Menschenaffen gleichzeitig auch dem Erhalt des Wald?kosystems. -

- Heute leben Orang-Utans nur noch auf Sumatra und Borneo. Massive Regenwaldzerst?rung und skrupelloser Tierhandel - k?nnten bald das Ende ihrer Art bedeuten. Auch die Malaienb?ren verlieren ihren Lebensraum. Das Naturreservat Samboja Lestari - bietet zahlreichen Tieren eine letzte Zuflucht - eine Chance zum ?berleben. Bereits heute leben Malaienb?ren dort in - einem abgegrenzten Areal und in wenigen Jahren k?nnen auch Orang-Utans ein Leben in Freiheit genie?en. -

- Seltene Arten wie z.B. Nashornvogel, Zwerghirsch und K?nigskobra k?nnen heute schon wieder in Samboja Lestari beobachtet werden. -
- - - -
-
-
- \ No newline at end of file Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/headline3.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/headline3.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/idea.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/idea.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/idea.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,122 +0,0 @@ - - - - -
-
- - - - - - - - - - - - - - - -
- - Samboja Lestari - kreative Aufforstung. -
- Eine Zufluchtst?tte f?r Borneo - - 		- - zur?ck - -
- BOS schafft durch ein einzigartiges Aufforstungskonzept die vielleicht letzte Zufluchtst?tte f?r Orang-Utans, - Malaienb?ren und andere bedrohte Arten in Borneo. Die Fortschritte k?nnen Sie anhand von Satellitenbildern hier - im Internet beobachten. -

- Der ehemals artenreiche Regenwald von - - Samboja Lestari - - wurde in den letzten Jahrzehnten r?cksichtslos gerodet und abgebrannt. N?hrstoffzehrendes Alang-Alang-Gras breitete - sich fl?chendeckend aus. Zur?ck blieb eine ?kologische W?ste. Doch schon heute kann man deutlich erkennen, dass - dies nicht so bleiben muss - denn BOS schafft seit 2001 neuen Regenwald. Das Gebiet von ?ber 17 Millionen m? wird - durch ein innovatives Aufforstungs- und Schutzkonzept wieder in nat?rlichen Lebensraum verwandelt. Im tropischen - Borneo wachsen Pflanzen um ein Vielfaches schneller als in Europa. Schon in wenigen Jahren k?nnen die ersten - Orang-Utans im neuen Regenwald ausgewildert werden und die Freiheit mit anderen Tieren teilen. In Samboja Lestari - ("ewiges Samboja") entsteht ein Naturschutzgebiet zum dauerhaften Nutzen f?r Menschen, Tiere und Pflanzen. -
-
-
-
-
- - - - - - - - - - - - - - -
- - Landwirtschaft, Aufforstung und Schutz - -
W?hrend der fr?hen Aufforstungs- phase bauen die indonesischen Landwirte gewinnbringende Agrarprodukte zwischen den - - - -
- neu gepflanzten B?umen an. Landwirtschaft und Aufforstung beeinflussen sich positiv... -
- ... - - mehr - -
- - - - - - - - - - - - - - -
- - Ein m?, der es in sich hat - -
- - - -
- Zur Finanzierung des Naturreservates hat BOS ein System zum symbolischen Landkauf entwickelt. -
- ... - - mehr - -
-
-
- \ No newline at end of file Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/idea.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/idea.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/idea_subtitle1.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/idea_subtitle1.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/idea_subtitle1.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,78 +0,0 @@ - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - Landwirtschaft, Aufforstung und Schutz
- eine gute Kombination - - 		- - zur?ck - -
-W?hrend der fr?hen Aufforstungsphase bauen die indonesischen Landwirte gewinnbringende Agrarprodukte zwischen den neu gepflanzten B?umen an. Landwirtschaft und Aufforstung beeinflussen sich positiv durch viele Faktoren. -

Agrarprodukte sch?tzen die jungen Tropenb?ume vor dem ?berwuchern mit Alang-Alang-Gras. B?ume verbessern die Boden- qualit?t und spenden Schatten. -

- Fr?chte wie Papaya und Ananas werden den Bauern garantiert von BOS abgekauft, regional vermarktet oder dienen der Eigenversorgung. Allein f?r die Versorgung der Orang-Utans in der nahe gelegenen Rehabilitationsstation Wanariset werden rund 1000 kg Fr?chte t?glich ben?tigt.
-
Das Schutz(ring)system - - -
- -Rund um das Naturreservat wird ein Ring aus Zuckerpalmplantagen angelegt. ?ber -650 Familien werden vom Zucker als Hauptprodukt profitieren. Der Ring -sch?tzt das Naturreservat vor den gef?rchteten Waldbr?nden als -Feuerbarriere.

Ein innerer Schutzring aus dicht wachsenden, -stacheligen Salakpalmen verhindert das Eindringen von Menschen in das -Schutzgebiet und das Ausbrechen von Orang-Utans. Die Fr?chte der -Salakpalme sind zudem wohlschmeckende Nahrung f?r Mensch und Tier. - -
-Ultraleichtflugzeuge und moderne Satellitentechnik unterst?tzen die st?ndige ?berwachung der BOS-Projekte aus Luft und Weltraum. Illegaler Holzeinschlag sowie Brandrodung k?nnen so auch in Samboja Lestari sehr viel effektiver verfolgt werden. -
-
-
- \ No newline at end of file Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/idea_subtitle1.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/idea_subtitle1.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/idea_subtitle2.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/idea_subtitle2.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/idea_subtitle2.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,75 +0,0 @@ - - - -
-
- - - - - - - - - - - - - - - - - - - - -
Ein m?, der es in sich hat
- - - zur?ck - -
- Zur Finanzierung des Naturreservates hat BOS ein System zum symbolischen Landkauf entwickelt. -

- - Schaffen Sie Regenwald f?r nur 3 Euro pro m?! - -

-
- Sie finanzieren den Landkauf, ?kologische Aufforstung, eine Baumschule, ?kologische Landwirtschaft, - Zuckerpalmplantagen, L?hne f?r indonesische Mitarbeiter, ?berwachung und Schutz des Gebietes, - Feuerbek?mpfung, Umweltbildung, Infrastruktur, Forschung und Arboretum, Orang-Utan-Inseln und das - Malaienb?rareal. - - -
-
- Leisten Sie einen Beitrag f?r eine bessere Zukunft und beobachten Sie den Projektverlauf von Samboja - Lestari im Internet. Jeder m?, den Sie symbolisch erwerben, wird Ihnen durch ein pers?nliches Profil - zugeordnet. ?ber ein Kennwort k?nnen Sie diese m? jederzeit leicht wieder finden. - Es k?nnen auch kurze Infotexte "auf" den jeweiligen m? hinterlassen werden, um sich mit anderen - Regenwaldsponsoren auszutauschen. Besucher dieser Internetseite d?rfen in alle m? und deren - pers?nliche Profile einblicken. -

- Beobachten Sie "Ihre" Fl?che aus unterschiedlichen Perspektiven bei der Entwicklung. BOS bietet Ihnen - einen transparenten Einblick u.a. ?ber Satellitenbilder und berichtet regelm??ig ?ber die - Fortschritte vor Ort. -

- Unterst?tzen Sie das Projekt und Sie erhalten eine Regenwald-Urkunde. Sie k?nnen m? auch an Ihre - Freunde, Verwandten und Bekannten verschenken. -

- Machen Sie mit und sehen Sie Regenwald wachsen! - -
-
-
-
- - Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/idea_subtitle2.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/idea_subtitle2.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/impressum.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/impressum.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/impressum.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,43 +0,0 @@ - - - -

Impressum

-

- www.create-rainforest.org ist eine Webseite von:

- - The Borneo Orangutan Survival Foundation (BOS) in Zusammenarbeit mit der - Schwesterorganisation BOS Deutschland e.V..

- - Postanschrift:

- BOS Deutschland e.V.

- Sch?neberger Ufer 69
- 10785 Berlin

- - Tel. +49 - (0)30 - 26 36 78 33
- Fax: +49 - (0)30 - 26 36 78 15

- - - - info at bos-deutschland.de - -
- - - www.bos-deutschland.de - -

- 1. Vorsitzender: Boris Thiemig
- 2. Vorsitzender: Dr. Dr. Klaus Ursus Schendel

- BOS Deutschland e.V. ist im Vereinsregister des Amtsgerichtes Kiel unter Nr. 502 VR 4228 eingetragen.

- Die Fotos auf der Webseite sind copyrightgesch?tzt und stehen f?r kommerzielle Zwecke nicht frei zur Verf?gung. - Wenn Sie Fotos von BOS nutzen m?chten, wenden Sie sich bitte an die oben genannte Kontaktadresse.

- Wenn Sie Fragen haben sollten, schreiben Sie eine E-Mail oder rufen Sie uns an.

-

- Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/impressum.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/impressum.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/index.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/index.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/index.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,120 +0,0 @@ - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - Samboja Lestari - kreative Aufforstung in Borneo.
- Eine Zufluchtst?tte f?r bedrohte Tierarten - -
- - - -
-BOS schafft durch ein einzigartiges Aufforstungskonzept die vielleicht -letzte Zufluchtst?tte f?r Orang-Utans, Malaienb?ren und andere -bedrohte Arten in Borneo. Die Fortschritte k?nnen Sie direkt hier im -Internet beobachten. -
- ... - - mehr - -
- - Der Schl?ssel zum Erfolg - die lokale Bev?lkerung - - - - Orang-Utan, Malaienb?r und Nashornvogel - -
- - - - - - - -
Naturschutz und Bed?rfnisse der Bev?lkerung d?rfen sich nicht im Wege stehen. -
- ... - - mehr - - 		Orang-Utans geh?ren zu den unmittelbar vom Aussterben bedrohten Menschenaffen. -
- ... - - mehr - -
-
-
-
- - -
-
- - Infos direkt nach Hause?
- Ihre E-Mail-Adresse: -

- - -
-
-
- Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/index.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/index.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/info-request.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/info-request.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/info-request.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,25 +0,0 @@ - - - - -

- - Vielen Dank f?r Ihr Interesse - -

- -

- Wir werden Ihnen gelegentlich Informationen ?ber BOS und das Projekt Samboja Lestari per Email zuschicken. -

-

- Bei Fragen wenden Sie sich bitte per Email an service at create-rainforest.org. -

- - \ No newline at end of file Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/info-request.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/info-request.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-poidetail.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-poidetail.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-poidetail.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,32 +0,0 @@ - - - -

Hilfe zur Satellitenkarte

-

-

Sie befinden sich in der Detail-Anzeige f?r einen interessanten Punkt (POI) auf dem Projektgel?nde - in Samboja Lestari. Links oben in der ?bersichtskarte bekommen Sie angezeigt, wo sich dieser POI - auf dem Gel?nde befindet.

-

Durch Klick auf einen der POI-Titel in der Liste links k?nnen Sie einen anderen POI anzeigen.

-

Oben rechts im Bild finden Sie sechs Detail-Fotos von diesem POI. Durch Klick auf die - Miniaturdarstellung k?nnen Sie das Foto vergr??ert anzeigen.

-

Am unteren des Fotos finden Sie bis zu drei Schaltfl?chen mit den Titeln Sat-Karte, - Luftbild und Panorama. Durch Klick auf eine der Schaltfl?chen k?nnen Sie - eine andere Ansicht des POI anzeigen.

-

- -

  • Sat-Karte Ausschnitt aus dem Satellitenfoto des Projektgel?ndes von 2002
    • -
  • Luftbild Luftbild des POI, aufgenommen im Herbst 2004 von einem Leichtflugzeug
    • -
  • Panorama Panorama-Foto des POI, aufgenommen im Herbst des Jahres 2004. Durch Klicken - und Ziehen im Panoramabild k?nnen Sie die Ansicht ver?ndern.
    • - -

    -

    Durch Klick auf die ?bersichtskarte links oben gelangen Sie wieder zur?ck zur POI-?bersicht.

    -

    -     Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-poidetail.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-poidetail.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-poifoto.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-poifoto.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-poifoto.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,21 +0,0 @@ - - - -

    Hilfe zur Satellitenkarte

    -

    -

    Sie befinden sich in der Detail-Anzeige f?r einen interessanten Punkt (POI) auf dem Projektgel?nde - in Samboja Lestari. Links oben in der ?bersichtskarte bekommen Sie angezeigt, wo sich dieser POI - auf dem Gel?nde befindet.

    -

    Das angezeigte Bild zeigt eine Ansicht des POI. Durch Klick auf eines der sechs rechts oben - angezeigten kleinen Bilder k?nnen Sie weitere Ansichten des POI sehen. Klicken Sie auf "Zur?ck", - um zur?ck zur Ansicht des Satellitenkarten-Ausschnitts des POI zu kommen.

    -

    Durch Klick auf die ?bersichtskarte links oben gelangen Sie wieder zur?ck zur POI-?bersicht.

    -

    -     Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-poifoto.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-poifoto.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-qmdetail.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-qmdetail.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-qmdetail.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,34 +0,0 @@ - - - -

    Hilfe zur Satellitenkarte

    -

    -

    Sie befinden sich in der Detailansicht f?r das Quadratmeter-Verkaufsgebiet. Hier k?nnen Sie sehen, wie viele - Quadratmeter schon verkauft wurden. Weiterhin k?nnen Sie die Profile der Sponsoren und die von ihnen dort hinterlegten - Mitteilungen sehen.

    -

    Wenn Sie angemeldet sind, werden Ihre "eigenen" Quadratmeter in der Satellitenkarte durch ein Icon () markiert. Die "verkauften" Quadratmeter werden in der Satellitenkarte farbig hervorgehoben. Durch Klick in die - Satellitenkarte in der Mitte des Bildschirms k?nnen Sie die "Quadratmeterlupe" verschieben. Der so angeklickte, rot umrahmte - Bereich wird rechts oben vergr??ert dargestellt. Durch Klick auf einen "verkauften" und farbig hervorgehobenen Quadratmeterbereich - in der vergr??erten Darstellung k?nnen Sie das zugeh?rige Sponsorenprofil aufrufen. Es wird unter dem Vergr??erungsbereich angezeigt - und kann "aufgezogen" werden, indem man die Maus hinein bewegt.

    -

    Unten rechts in der Satellitenkarte finden Sie das Ebenenauswahl-Men?, in dem sie einzelne Darstellungsebenen der Satellitenkarte - durch Klick auf den Namen der Ebene ein- und ausblenden k?nnen.

    -

    Folgende Ebenen stehen zur Verf?gung:

    -

    - -

  • Sat-Karte Die Satelliten-Karte stellt den Hintergrund der Karte dar
    • -
  • Verkaufsgebiete Gebiete mit zu verkaufenden Quadratmetern werden in grau dargestellt
    • -
  • Verkauft Verkaufte Quadratmeter werden unterschiedlich farbig dargestellt
    • - -

    -

    Durch Klick auf die ?bersichtskarte links oben gelangen Sie wieder zur?ck zur POI-?bersicht.

    -

    -     Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-qmdetail.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-qmdetail.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-uebersicht.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-uebersicht.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-uebersicht.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,75 +0,0 @@ - - - -

    Hilfe zur Satellitenkarte

    -

    -

    Sie befinden sich in unserem Satelliten-Informationssystem. - Hier k?nnen Sie sich selbst ein Bild ?ber das Projektgel?nde in Samboja Lestari machen, sowie nachsehen, wo - sich die von Ihnen gesponsorten Quadratmeter auf dem Gel?nde befinden.

    -

    - Auf der ?bersichtskarte sehen Sie verschiedene Icons, die Sie anklicken k?nnen und die sie zu weiteren Bildern - f?hren:

    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - Hier befindet sich eine Einrichtung von BOS. -
    - - - Dieses Icon markiert einen sehensw?rdigen Punkt auf dem Projektgel?nde. -
    - - - Verkaufsgebiet f?r Quadratmeter, hier k?nnen die Profile der - Quadratmetersponsoren einsehen. -
    - - - Hier sind "Ihre" Quadratmeter. Dieses Icon wird nur angezeigt, wenn - Sie sich angemeldet haben. -
    -     -

    ?ber die Liste unter "Points of Interest" links gelangen Sie direkt zum von Ihnen angeklickten - sehensw?rdigen Punkt.

    -

    Um aus einer der Unterebenen wieder zur ?bersicht zu gelangen, klicken Sie bitte auf die links - oben angezeigte ?bersichtskarte.

    -

    Falls Sie bereits Quadratmeter gesponsort haben, k?nnen Sie sich durch Eingabe Ihrer Sponsor-ID - und Ihres Kennworts oder Ihres Mastercodes in des Login-Feld links unten anmelden. Sie haben - dann Zugriff auf Ihr Sponsoren-Profil und k?nnen Ihren Sponsoren-Status sowie ggf. Ihre Regenwald-Urkunde - im PDF-Format abrufen.

    -

    Wir w?nschen Ihnen viel Spa? bei Ihrer virtuellen Entdeckungsreise nach Samboja Lestari!

    -

    -     Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-uebersicht.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/infosys-help-uebersicht.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/infosystem.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/infosystem.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/infosystem.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,23 +0,0 @@ - - - - - - - - - - REGENWALD f?r SAMBOJA LESTARI - Infosystem - - - -
    -
    -
    -

    Infosystem "rund um das Satellitenbild"

    -
    - - - Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/infosystem.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/infosystem.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/mail-transfer.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/mail-transfer.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/mail-transfer.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,83 +0,0 @@ - - - - -
    -
    -
    - - - - - - -
    - -
    -
    - - - -
    - - -
    -
    - - - - - - - - - - - - - - - - - - -
    - - Vielen Dank f?r Ihre Unterst?tzung - -
    - Bitte geben Sie unbedingt die ID $(contract-id) als Verwendungszweck - Ihrer ?berweisung an, damit wir Sie nach der Bearbeitung erreichen k?nnen! -
    - - - - - -
    BOS Deutschland e.V.
    Kontonummer:32 10 100
    Bank:Bank f?r Sozialwirtschaft
    BLZ:100 205 00
    -
    - Wir melden uns direkt nach Eingang Ihrer ?berweisung und - geben Ihnen die Informationen, die Sie ben?tigen, um Ihre Quadratmeter im Internet zu beobachten. -

    - - - Zur?ck zur Home Page - -
    -
    -
    -
    -     Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/mail-transfer.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/mail-transfer.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/news.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/news.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/news.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,18 +0,0 @@ - - - - -

    - - - NEWS im ARCHIV - -

    -     \ No newline at end of file Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/news.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/news.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/print_profil_setup.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/print_profil_setup.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/print_profil_setup.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,140 +0,0 @@ - - - -
    - - - - - - - - - - - - -
    - - Bitte ?berpr?fen Sie ggf. vor dem Drucken Ihre Druckereinstellungen. -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    Meine m? in Samboja Lestari - mein Sponsoren-Profil

    -
    -
    Ihre Sponsoren-Profil-Zugangsdaten: -
    - Ihre Sponsoren-ID: - - - $(sponsor-id) -
    - Ihr Kennwort: - - - $(sponsor-password_new) -
    -
    Momentan f?hren wir Ihr Profil unter folgendem angegebenem Namen: -
    -
    - Name: - - - $(name) -
    -
    -
    Ihre E-Mail-Adresse wird nicht ver?ffentlicht, sondern lediglich f?r interne Informationszwecke verwendet. -
    -
    - E-Mail-Adresse: - - - $(email) -
    -
    -
    - - -
    -     \ No newline at end of file Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/print_profil_setup.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/print_profil_setup.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/print_ueberweisung.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/print_ueberweisung.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/print_ueberweisung.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,129 +0,0 @@ - - - -
    - - - - - - - - - - - -
    Bitte ?berpr?fen Sie ggf. vor dem Drucken Ihre Druckereinstellungen.
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    Meine ?berweisung f?r das BOS-Projekt "Samboja Lestari"

    -
    - Ich ?berweise den Betrag von $(Betrag) Euro
    - auf das Spendenkonto "Samboja Lestari" von BOS Deutschland e.V.

    - Kontonummer:XXXXXXXXXXX
    - BLZ:XXXXXXXXXXX
    - Bank:XXXXXXXXXXXX

    - Verwendungszweck: $(Transaktionsnummer)
    - bitte unbedingt auf dem ?berweisungsformular angeben! -
    Vorname:$(vorname)
    Name:$(name)
    Stra?e/Nr.:$(strasse)
    PLZ/Ort $(plz) $(ort)
    E-Mail: $(email)
    Telefon: $(telefon)
    - - BOS garantiert: -
    - Ihre Daten werden lediglich f?r die Reservierung "Ihrer" m2 ben?tigt. -
    - Die Bestimmungen des Datenschutzgesetzes werden eingehalten. Diese Daten werden nicht an Dritte - weitergegeben. -     -
    - - - Datenschutzinfo - -
    - - -
    -     Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/print_ueberweisung.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/print_ueberweisung.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/print_versand_quittung.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/print_versand_quittung.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/print_versand_quittung.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,93 +0,0 @@ - - - -
    - - - - - - - - - - - - -
    Bitte ?berpr?fen Sie ggf. vor dem Drucken Ihre Druckereinstellungen.
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    Meine m? in Samboja Lestari

    -
    Die Regenwald-Urkunde wird auf folgenden Namen ausgestellt:
    Name:$(name)
    und wird an folgende Adresse versendet:
    Adresse: $(adresse)
    Mit dieser Zahlung wurde ein neues Sponsoren-Profil mit der folgenden Sponsoren-ID angelegt: -
    Ihre Sponsoren-ID:$(sponsor-id)
    - - -
    -     Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/print_versand_quittung.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/print_versand_quittung.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/privacy.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/privacy.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/privacy.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,67 +0,0 @@ - - - -

    Datenschutzgrunds?tze (Privacy Policy) von BOS Deutschland e.V.

    -

    -

    -Der Schutz Ihrer pers?nlichen Daten durch elektronische Verarbeitung -ist BOS Deutschland e.V. ein wichtiges Anliegen und streng -reglementiert. BOS Deutschland e.V. ist ein gemeinn?tzig anerkannter -Verein und unterliegt dem Bundesdatenschutzgesetz (BDSG). Eingetragen -in das Vereinsregister Amtsgericht Kiel, Nr. 502 VR 4228; -Freistellungsbescheid Finanzamt Kiel-Nord, GL 5105. -

    -

    -Was geschieht mit Ihren pers?nlichen Daten? -

    -

    -Wenn Sie sich dazu entschieden haben online zu spenden, m?ssen Sie -Ihre Kontoinformationen bekannt geben. Diese Informationen werden -ausschlie?lich von WorldPay verarbeitet. WorldPay ist ein -international anerkannter Onlinezahlungsanbieter. Ihre Daten werden -?ber WorldPay im sicheren SSL-Verfahren verschl?sselt versendet und -nach erfolgreicher Transaktion sofort wieder gel?scht. BOS -Deutschland e.V. hat keinen Zugriff auf Ihre Kontoinformationen. -

    -

    -Jedem Quadratmeter des Naturschutzprojektes, den Sie durch Ihre Spende -unterst?tzen, wird Ihr pers?nliches Profil angeh?ngt. Dieses Profil -besteht aus Namen, Landesherkunft, Anzahl der gesponsorten -Quadratmeter, Datum der Unterst?tzung und einem m?glichen, -pers?nlichen Gru?text. Alle Profilinformationen (ausschlie?lich -E-Mail-Adresse und Postadresse) sind f?r jeden Besucher unserer -Webseite einsehbar. Hierdurch soll eine gr??tm?gliche Transparenz und -Interaktion zwischen den Sponsoren gef?rdert -werden. Profilinformationen k?nnen von der betreffenden Person durch -Kennwortzugang jederzeit ge?ndert werden. Hier?ber ist es ist Ihnen auch -m?glich, anonym zu bleiben. -

    -

    -Um Ihnen Ihr pers?nliches Profil mit Sponsoren-ID und Kennwort -zusenden zu k?nnen, ben?tigen wir die Angabe Ihrer E-Mail-Adresse. -F?r die Versendung von Urkunden per Post ben?tigen wir eine -entsprechende Adresse und den Namen der Person, auf die die Urkunde -ausgestellt werden soll. F?r die Versendung von -Newslettern/Nachrichten k?nnen Sie uns Ihre E-Mail-Adresse -bekanntgeben. -

    -

    -Wir versichern, dass diese Daten nur zu Zwecken der Verwaltung und -Information von BOS Deutschland e.V. sowie im internationalen -BOS-Verbund verwendet werden. Sie k?nnen der Zusendung von -Informationen jederzeit widersprechen und das L?schen Ihrer Daten aus -dem System bewirken. Bitte geben Sie stets Ihre Sponsor-ID an! -

    -

    -Wenn Sie Fragen zu den Datenschutzgrunds?tzen von BOS Deutschland -e.V. haben, wenden Sie sich bitte an datenschutz at bos-deutschland.de. -

    -

    -     Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/privacy.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/privacy.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/profil.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/profil.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/profil.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,128 +0,0 @@ - - - - - Profil-Editor - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Sponsor-ID$(sponsor-id)Vom System zugewiesen
    Land$(country)Nicht ?nderbar
    NameF?r jeden sichtbar
    Neues KennwortBitte zwei mal eingeben
    Kennwort-Wiederholung
    Info-TextBeliebiger Informationstext, f?r jeden sichtbar
    QuadratmeterInsgesamt $(numsqm) Quadratmeter gekauft
    UTM-Koordinate: N$(sqm-x) E$(sqm-y)
    Aktionen - - Ihre Profildaten werden mit den eingegeben Werten aktualisiert
    - - Ihre pers?nlichen Profildaten werden gel?scht
    - - Alle durchgef?hrten ?nderungen werden verworfen.
    Urkunde als PDF ansehen / downloaden
    - - - Zur?ck - -
    -
    -     - - Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/profil.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/profil.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/profil_setup.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/profil_setup.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/profil_setup.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,172 +0,0 @@ - - - -
    - -
    -
    - - - - - - -
    - -
    -
    - - - -
    - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    Richten Sie jetzt Ihr Sponsoren-Profil ein: -
    - Ihre Sponsoren-ID: - - - $(sponsor-id) -
    - Kennwort: - - - -
    - Kennwort wiederholen: - - - -
    -
    - Momentan f?hren wir Ihr Profil unter unten angegebenem Namen. Sie k?nnen diesen an - dieser Stelle auch ?ndern bzw. angeben, dass Sie anonym bleiben m?chten. -
    -
    - Name: - - - -
    - anonym -
    -
    -
    - Ihre E-Mail-Adresse wird nicht ver?ffentlicht, sondern lediglich f?r - interne Informationszwecke verwendet. -
    -
    - E-Mail-Adresse: - - - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -

    - [Profil-Kennwort]
    - Geben Sie Ihr eigenes Kennwort an. Sollten Sie dieses vergessen, dann finden Sie ein so genanntes Master-Kennwort auf Ihrer - Zahlungsbest?tigung, die per E-Mail verschickt wurde.




    - [Profil-Einrichtung]
    - Legen Sie fest, unter welchem Namen "Ihr" m? angezeigt werden sollen. -












    -
    -
    -
    -     \ No newline at end of file Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/profil_setup.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/profil_setup.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/quittung.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/quittung.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/quittung.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,170 +0,0 @@ - - - - - - - - - - REGENWALD f?r SAMBOJA LESTARI - - - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - -
    - -
    Herzlichen Dank

    - f?r Ihre Unterst?tzung und das Vertrauen, das Sie BOS damit entgegen bringen. -

    - Die von Ihnen gesponserten m? sind in guten H?nden. -
    -
    - - - -
    - - -
    -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Ihre Zahlung war erfolgreich:
    - -
    Auf welchen Namen sollen wir Ihre Regenwald-Urkunde ausstellen?
    Name:
    - - Wir ?bernehmen den Namen, der in diesem Eingabefeld angegeben wird. - Bitte korrigieren Sie bei Bedarf die angezeigte Eingabe. - -
    - -
    -
    -     -
    -
    -
    -
    -

    - [Zahlungsbest?tigung] -
    - Diese Zahlungsbest?tigung von WorldPay ist bereits per E-Mail unterwegs zu Ihnen. Sollten Sie wider - Erwarten keine Nachricht erhalten, wenden Sie sich bitte an -
    - - - service at create-rainforest.org - -


    - - [Regenwald-Urkunde] -
    - Schon ab 1 m? erhalten Sie eine - - - Urkunde - - als pdf-Download in Ihrem eigenen Sponsoren-Profil. -






    -
    -
    -
    - - Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/quittung.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/quittung.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/ring-detail.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/ring-detail.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/ring-detail.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,28 +0,0 @@ - - - - - - - - Ringschema - - -
    -

    Ringschema

    - -
    - - - Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/ring-detail.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/ring-detail.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/save-initial-profile.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/save-initial-profile.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/save-initial-profile.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,8 +0,0 @@ - - - - Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/save-initial-profile.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/save-initial-profile.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/sponsor_canceled.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/sponsor_canceled.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/sponsor_canceled.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,109 +0,0 @@ - - - - - - - - - - REGENWALD f?r SAMBOJA LESTARI - - - - - - - -
    -
    -
    -
    - - - -
    - - -
    -
    - - - - -
    Sie haben die Zahlung abgebrochen
    -
    -
    -
    -
    -

    - [Zahlung abgebrochen] -
    -
    -
    - - Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/sponsor_canceled.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/sponsor_canceled.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,78 +0,0 @@ - - - - - - - - - $(title) - - - - - - - - - - - - - Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_extra.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_extra.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_extra.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,31 +0,0 @@ - - - - - - - - - - $(title) - - -
    -
    -
    - -
    - - - Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_extra.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_extra.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_main.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_main.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_main.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,168 +0,0 @@ - - - - - - - - - $(title) - - - - - - - -
    -
    - -
    - - - - - - - - - - - - - - - - - - - -
    -
    - - Schaffen Sie Regenwald! -

    -     		-
    - - - - Spenden Sie! - - -
    - - - -
    -
    -
    - - - - - - - - - - - - - - - - -
    - Satellitenkarte -
    - - - Es dreht sich um m?. - -
    - - - -
    -
    - - - -
    - - - -
    - - Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_main.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_main.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/ueberweisung.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/ueberweisung.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/ueberweisung.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,157 +0,0 @@ - - - -
    -
    -
    - - - - - - -
    - -
    -
    - - - -
    - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Ich m?chte meine Spende ?berweisen.
    -Ich habe mich dazu entschieden einen Betrag von $(amount) Euro auf das Spendenkonto "Samboja Lestari" von BOS Deutschland e.V. zu ?berweisen. - - - - -
    Kontonummer:32 10 100
    Bank:Bank f?r Sozialwirtschaft
    BLZ:100 205 00
    - Bitte unbedingt den Verwendungszweck "SL ID $(contract-id)" auf dem ?berweisungsformular angeben! -

    - Meine ?berweisung muss ich bei meiner Bank eigenst?ndig veranlassen! -
    Vorname:
    Name:
    Stra?e/Nr.:
    PLZ/Ort - - -
    E-Mail:
    Telefon:
    - -
    - -
    -
    -
    -
    -
    -
    - [Pers?nliche Daten] -
    -Wir reservieren gerne die von Ihnen gew?nschten m?. F?r die Zusendung -der entsprechenden Informationen (Regenwaldurkunde, Sponsorenprofil, -Geokoordinaten, Spendenbescheinigung) ben?tigen wir unbedingt die -Angabe Ihrer Daten. Nach erfolgter ?berweisung erhalten Sie diese -Informationen schriftlich oder per E-Mail von uns. -


    - [Dieses Formular] -
    - Bitte senden Sie dieses Formular per E-Mail direkt an uns. Sie k?nnen es auch - - - ausdrucken - - und per Fax oder Post an unsere - Kontaktadresse schicken: -

    - BOS Deutschland e.V. -
    - Sch?neberger Ufer 69 -
    - 10785 Berlin -

    - Fax: (030) 2636 7815 -
    -
    -
    -     Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/ueberweisung.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/ueberweisung.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_geschenk.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_geschenk.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_geschenk.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,184 +0,0 @@ - - - - - - - - - - REGENWALD f?r SAMBOJA LESTARI - - - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - -
    - -
    Herzlichen Dank
    f?r Ihre Unterst?tzung und das Vertrauen, das Sie BOS damit entgegen bringen.

    Die von Ihnen gesponserten m? sind in guten H?nden. -
    -
    - - - -
    - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Ihre Zahlung war erfolgreich:
    - -
    - Bitte geben Sie den Namen des Beschenkten f?r die Urkunde ein: -
    - Name: - - -
    - Bitte geben Sie die Versandadresse f?r die Regenwaldurkunde ein. -
    Versandadresse
    f?r die Urkunde:


    		 - - -
    - -
    -
    -
    -
    -     -
    -
    -

    - [Zahlungsbest?tigung]
    - Diese Zahlungsbest?tigung von WorldPay ist bereits per E-Mail unterwegs zu Ihnen. Sollten Sie wider Erwarten keine - Nachricht erhalten, wenden Sie sich bitte an -
    - - - service at create-rainforest.org - -








    - [Regenwald-Urkunde]
    - Sie oder der Beschenkte erhalten auf dem Postweg eine attraktive - - - Urkunde - - von uns. Sollte diese wider Erwarten nicht innerhalb der n?chsten zwei Wochen eingetroffen sein, wenden Sie sich bitte an -
    - - - service at create-rainforest.org - -





    -
    -
    -
    - - Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_geschenk.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_geschenk.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_info.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_info.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_info.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,187 +0,0 @@ - - - - - - - - - - REGENWALD f?r SAMBOJA LESTARI - - - - - - - -
    -
    -
    - - - - - - - - - - - - - - - - -
    - -
    Herzlichen Dank
    f?r Ihre Unterst?tzung und das Vertrauen, das Sie BOS damit entgegen bringen.

    Die von Ihnen gesponserten m? sind in guten H?nden. -
    -
    - - - -
    - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Ihre Zahlung war erfolgreich:
    - -
    - Ist das der Name, der auf der Regenwald-Urkunde als - Sponsor eingetragen werden soll? -
    - Name: - - -
    - Bitte ?berpr?fen bzw. korrigieren Sie die angegebene Adresse f?r den Versand - Ihrer Regenwald-Urkunde: -
    Versandadresse
    f?r die Urkunde:


    		 - - -
    - -
    -
    -
    -
    -     -
    -
    -

    - [Zahlungsbest?tigung]
    - Diese Zahlungsbest?tigung von WorldPay ist bereits per E-Mail unterwegs zu Ihnen. Sollten Sie wider Erwarten keine - Nachricht erhalten, wenden Sie sich bitte an -
    - - - service at create-rainforest.org - -








    - [Regenwald-Urkunde]
    - Sie oder der Beschenkte erhalten auf dem Postweg eine attraktive - - - Urkunde - - von uns. Sollte diese wider Erwarten nicht innerhalb der n?chsten zwei Wochen eingetroffen sein, wenden Sie sich bitte an -
    - - - service at create-rainforest.org - -





    -
    -
    -
    - - Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_info.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_info.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_quittung.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_quittung.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_quittung.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,149 +0,0 @@ - - - - -
    - -
    -
    - - - - - - -
    - -
    -
    - - - -
    - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - Wir werden Ihre Regenwald-Urkunde auf den folgenden Namen ausstellen und diese an - die unten angegebene Adresse versenden: -


    - Name f?r Regenwald-Urkunde: $(name) -

    - Versandadresse f?r Urkunde:
    -
    -$(address)
-$(postcode)
-$(country)
-
    -
    -
    - - ?berpr?fen Sie bitte die Richtigkeit der Angaben. - -
    -
    -
    -
    - Mit dieser Zahlung wurde ein neues Sponsoren-Profil mit der folgenden Sponsoren-ID angelegt: -
    - Ihre Sponsoren-ID: - - $(sponsor-id) -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -












    - [Sponsoren-ID]
    - Mit Hilfe des Sponsoren-Profils k?nnen Sie Ihre gesponserten m? jederzeit wieder finden. - Diese ID dient der einwandfreien Zuordnung der m?. - Besucher dieser Internetseite d?rfen in alle m? und deren pers?nliche Profile einblicken. - Wenn Sie anonym bleiben wollen, k?nnen Sie dieses in Ihrem Profil mit Kennwortzugang veranlassen. -





    -
    -
    -
    -     Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_quittung.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/versand_quittung.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/de/verschenken.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/verschenken.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/verschenken.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,39 +0,0 @@ - - - -

    - -

    Suchen Sie ein sinnvolles Geschenk?

    - -

    Verschenken Sie Quadratmeter wiederentstehenden Regenwaldes!

    - -

    -Der/Die Beschenkte erh?lt eine attraktive Urkunde und pers?nliche -Zugangscodes, um "seine/ihre" Quadratmeter in Borneo leicht orten zu -k?nnen. Zudem kann er/sie den Quadratmetern einen Gru?text anh?ngen, -der f?r jeden Besucher einsehbar ist. -

    -

    -Auch Sie erhalten die gleichen Zugangscodes und k?nnen z.B. einen -Geburtstagsgru? "auf" den verschenkten Quadratmetern -hinterlassen. -

    -

    -Setzen Sie das H?ckchen und fahren Sie wie gew?nscht fort. -

    -

    -Unmittelbar nach erfolgter Zahlung (wenige Sekunden sp?ter) werden Sie -nach Namen und Versandadresse der zu Beschenkenden Person gefragt. -

    -

    -Der Geschenkservice ist aus administrativen Gr?nden leider nur bei Online-Spenden ab 30 Euro m?glich. -

    -

    -     Copied: branches/xml-class-rework/projects/bos/payment-website/templates/de/verschenken.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/de/verschenken.bknr) Deleted: branches/xml-class-rework/projects/bos/payment-website/templates/user-error.bknr =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/user-error.bknr 2006-03-10 20:11:23 UTC (rev 1914) +++ branches/xml-class-rework/projects/bos/payment-website/templates/user-error.bknr 2006-03-12 11:03:55 UTC (rev 1915) @@ -1,14 +0,0 @@ - - - -Your request could not be processed because an error occured: -
    -$(error-message)
-
    - \ No newline at end of file Copied: branches/xml-class-rework/projects/bos/payment-website/templates/user-error.xml (from rev 1844, branches/xml-class-rework/projects/bos/payment-website/templates/user-error.bknr) From bknr at bknr.net Sun Mar 12 11:35:16 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 12 Mar 2006 06:35:16 -0500 (EST) Subject: [bknr-cvs] r1916 - in branches/xml-class-rework/projects/bos/payment-website: infosystem infosystem/de infosystem/en templates templates/de templates/en Message-ID: <20060312113516.2611B7A001@common-lisp.net> Author: hhubner Date: 2006-03-12 06:35:12 -0500 (Sun, 12 Mar 2006) New Revision: 1916 Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/ branches/xml-class-rework/projects/bos/payment-website/templates/en/archive.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/bestellung.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/bos.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/buy-sqm.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/certificat.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/contact.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/disclaimer.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/generate-cert.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/headline2.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/headline3.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/idea.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/idea_subtitle1.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/idea_subtitle2.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/impressum.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/index.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/info-request.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-poidetail.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-poifoto.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-qmdetail.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-uebersicht.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/infosystem.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/mail-transfer.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/news.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/print_profil_setup.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/print_versand_quittung.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/privacy.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/profil.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/profil_setup.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/quittung.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/ring-detail.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/save-initial-profile.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/sponsor_canceled.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/toplevel.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/toplevel_extra.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/toplevel_main.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/versand_geschenk.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/versand_info.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/versand_quittung.xml branches/xml-class-rework/projects/bos/payment-website/templates/en/verschenken.xml Modified: branches/xml-class-rework/projects/bos/payment-website/infosystem/de/satellitenkarte.htm branches/xml-class-rework/projects/bos/payment-website/infosystem/en/satellitenkarte.htm branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js branches/xml-class-rework/projects/bos/payment-website/templates/de/bestellung.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/impressum.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/index.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/quittung.xml branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_main.xml Log: Current version of english and german templates. Modified: branches/xml-class-rework/projects/bos/payment-website/infosystem/de/satellitenkarte.htm =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/infosystem/de/satellitenkarte.htm 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/infosystem/de/satellitenkarte.htm 2006-03-12 11:35:12 UTC (rev 1916) @@ -30,7 +30,6 @@ } --> - @@ -310,7 +309,7 @@
    Modified: branches/xml-class-rework/projects/bos/payment-website/infosystem/en/satellitenkarte.htm =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/infosystem/en/satellitenkarte.htm 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/infosystem/en/satellitenkarte.htm 2006-03-12 11:35:12 UTC (rev 1916) @@ -1,448 +1,447 @@ - - - - - - Satellite View - Samboja Lestari - - - - - - - - - - -
    - - - - - - - - - - - - -
    - - - -
    - - - - - - - -
    Overview
    - - - -
    -
    -
    -
    - - - - - - - -
    "Sale" State
    -
    -
    -
    -
    -
    - - - - - - - -
    Samboja Lestari is located on Borneo
    -
    -
    - - - - - - - -
    Samboja Lestari is located in Indonesia
    -
    -
    -
    - -
    -
    -
    - - -
    - - -
    Samboja Lestari - Overview
    -
    More than 17 million square meters for Eternity(?)
    -
    - - - Help - - - - Buy m?s - - - - Close - -
    -
    - -
    - -
    - - +? + + + + + Satellite View - Samboja Lestari + + + + + + + + + + + + + + + + + + + + + + +
    + + + +
    + + + + + + + +
    Overview
    + + + +
    +
    +
    +
    + + + + + + + +
    "Sale" State
    +
    +
    +
    +
    +
    + + + + + + + +
    Samboja Lestari is located on Borneo
    +
    +
    + + + + + + + +
    Samboja Lestari is located in Indonesia
    +
    +
    +
    + +
    +
    +
    + + +
    + + +
    Samboja Lestari - Overview
    +
    More than 17 million square metres for eternity.
    +
    + + + Help + + + + Buy m?s + + + + Close + +
    +
    + +
    + +
    + + \ No newline at end of file Modified: branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js 2006-03-12 11:35:12 UTC (rev 1916) @@ -336,7 +336,6 @@ // der Datensatz wird vorher auf Nullwerte gesetzt damit fals keine Daten in der URL enthalten sind der Quadratmeter als unverkauft angezeigt wird m2complete = false; - document.body.style.cursor = 'wait'; timer=0; n_profil = []; n_profil['name'] = msg("noch nicht verkauft"); @@ -398,14 +397,13 @@ } document.getElementById("qmInfoText").innerHTML = text; n_qm_erzeugen(); - document.body.style.cursor = 'auto'; } else { // wenn der Datensatz noch nicht komplett geladen ist wird der timer eroeht und die Funktion nochmal gestartet timer++; if (timer < 100) { setTimeout("n_qm_warten()", 100); } else { - document.getElementById("qmLaden").style."hidden"; schreibe_debugger("
    -> Nachbar-Quadratmeter konnten nicht geladen werden"); + document.getElementById("qmLaden").style.visibility = "hidden"; schreibe_debugger("
    -> Nachbar-Quadratmeter konnten nicht geladen werden"); } } return true; Modified: branches/xml-class-rework/projects/bos/payment-website/templates/de/bestellung.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/bestellung.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/bestellung.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -161,7 +161,7 @@ Die Bestimmungen des Datenschutzgesetzes werden eingehalten. Daten werden nicht an Dritte weitergegeben. -
    + Datenschutzinformation @@ -193,7 +193,7 @@ Verzichtsklausel - gelesen und stimme ihr zu.

    + gelesen und stimme ihr zu.
    Modified: branches/xml-class-rework/projects/bos/payment-website/templates/de/impressum.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/impressum.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/impressum.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -3,12 +3,12 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -

    Impressum

    +

    Imprint

    www.create-rainforest.org ist eine Webseite von:

    Modified: branches/xml-class-rework/projects/bos/payment-website/templates/de/index.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/index.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/index.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -42,6 +42,8 @@ mehr +
    +
    @@ -109,7 +111,7 @@

    - Infos direkt nach Hause?
    + Infos direkt nach Hause?

    Ihre E-Mail-Adresse:

    Modified: branches/xml-class-rework/projects/bos/payment-website/templates/de/quittung.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/quittung.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/quittung.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -14,7 +14,7 @@ - REGENWALD f?r SAMBOJA LESTARI + REGENWALD für SAMBOJA LESTARI @@ -113,7 +113,7 @@ - Wir ?bernehmen den Namen, der in diesem Eingabefeld angegeben wird. + Wir Äbernehmen den Namen, der in diesem Eingabefeld angegeben wird. Bitte korrigieren Sie bei Bedarf die angezeigte Eingabe. @@ -143,9 +143,9 @@


    - [Zahlungsbest?tigung] + [Zahlungsbestätigung]
    - Diese Zahlungsbest?tigung von WorldPay ist bereits per E-Mail unterwegs zu Ihnen. Sollten Sie wider + Diese Zahlungsbestätigung von WorldPay ist bereits per E-Mail unterwegs zu Ihnen. Sollten Sie wider Erwarten keine Nachricht erhalten, wenden Sie sich bitte an
    @@ -156,7 +156,7 @@ [Regenwald-Urkunde]
    - Schon ab 1 m? erhalten Sie eine + Schon ab 1 m² erhalten Sie eine Urkunde Modified: branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_main.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_main.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_main.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -142,7 +142,7 @@ - + Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/archive.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/archive.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/archive.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,15 @@ + + + +

    NEWS im ARCHIV

    +

    + +

    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/bestellung.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/bestellung.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/bestellung.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,197 @@ + + + + +
    + +
    +
    + + + + + + + + + + + + + + + + +
    + +
    + + Create rainforest +
    for only 3,- Euro per m? +     +

    +
    + We appreciate your decision to get involved in supporting the nature, the wildlife and the people of Indonesia. +

    + Your support is an important contribution towards ensuring sustainable project work in Samboja Lestari.
    + + + ... more + +
    +
    + + + +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + I am getting involved. I want to see how Samboja Lestari becomes green again and hereby create ... + +
    + + 1 m? rainforest [3 Euro], +
    + + 5 m? rainforest [15 Euro], +
    + + 10 m? rainforest [30 Euro], +
    + + 30 m? rainforest [90 Euro], +
    + + or + + m? [3 Euro each]. +
    +
    +
    +
    +
    + + Your data will be processed electronically by our partner WorldPay. + The provisions of the data protection law have been adhered to. Data will not be passed on to third parties. + +
    + + + privacy statement + +
    + + Donations can be effected comfortably online via credit card payment. + + +
    + + I have read + + the waiver clause + and I agree.
    +

    +
    + + +
    + +
    +
    +
    +
    +


    + [Rainforest certificate] +
    + Starting with 1 m? only you receive + + our rainforest certificate + as a pdf-download from your personal sponsor profile. +


    + [Donation receipt] +
    + BOS Germany is a tax free registered charity in Germany. Your ability to claim this donation for tax purposes outside of Germany, is dependent upon the laws of your country. +
    +Within your sponsor profile you will find a receipt as a pdf-download. + +

    + [Guarantee of trustworthiness]
    + WorldPay is an internationally renowned provider of online payment services. +Your date will be encoded by WorldPay and deleted immediately after the payment has been carried out succesfully. + +

    +
    +
    +
    +     \ No newline at end of file Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/bos.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/bos.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/bos.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,98 @@ + + + +
    +
    + + + + + + + + + + + +
    The BOS Foundation
    + The Borneo Orangutan Survival Foundation (BOS) is the largest organisation worldwide fighting + against the extinction of orangutans. Their habitat, the rainforest with its biological diversity, + is being protected in collaboration with the local people. + BOS is an Indonesian not-for-profit foundation, founded in 1991. +

    + The main aspects of BOS work in Indonesia are the following: +

    +
      +
    • + Confiscation of illegally kept orangutans, Malaysian bears and other species +
      • +
    • + Rehabilitation of orangutans in stations +
      • +
    • + Release of animals into protected rainforest areas +
      • +
    • + Rescue and relocation of endangered orangutans and other species +
      • +
    • + Forestation and protection of the rainforest +
      • +
    • + Creation of alternatives for the local people +
      • +
    • + Ecological education of the local people +
      • +
    • + Monitoring of protected areas +
      • +
    • + Analysis of satellite photos +
      • +
    • + and many more. +
      • +
    +
    + The projects run by BOS are mainly sponsored by foreign donors due to the difficult economic situation of Indonesia. +
    +
    +
    +
    +
    + + + + + + + + + + + + +
    Would you like to know more about projects run by BOS? +

    + + + savetheorangutan.info + +
    + + + bos-deutschland.de + +

    +
    On these webpages you will also find links to our BOS partner organisations worldwide.
    +
    +
    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/buy-sqm.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/buy-sqm.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/buy-sqm.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,8 @@ + + + + Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/certificat.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/certificat.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/certificat.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,15 @@ + + + +

    This is what your RAINFOREST CERTIFICATE will look like:

    +
    + +
    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/contact.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/contact.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/contact.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,84 @@ + + + +
    +
    + + + + + + + + + + + +
    Contact + +
    +
    Please contact us, if you have any questions.
    + We look forward to receiving your ideas and will answer your questions at any time. +

    + BOS Deutschland e.V.
    + Sch?neberger Ufer 69
    + D - 10785 Berlin +

    + Telefon: +49.30.26 36 78 33
    + Fax: +49.30.26 36 78 15

    + E-Mail: + + + info at bos-deutschland.de + +





    + We will answer all your inquiries as soon as possible. Please be patient. +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + +
    +
    +
    +
    Would you like to know more about projects run by BOS? +

    + + + savetheorangutan.info + +
    + + + bos-deutschland.de + +

    +
    On these webpages you will also find links to our BOS partner organisations worldwide. +
    +
    +
    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/disclaimer.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/disclaimer.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/disclaimer.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,24 @@ + + + +

    + +

    Disclaimer

    + +

    +Each sponsor of one or more square metres of renewable rainforest of the forestation +and nature protection project Samboja Lestari/Borneo/ Indonesia has no claims or other +rights to the respective land. No one is entitled to resell the land. Sponsors have no +duties whatsoever. This is a mere symbolic act of an informative nature. BOS guarantees +that the land will always be reserved for +the benefit of sustainable nature,- and wildlife protection. +

    +

    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/generate-cert.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/generate-cert.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/generate-cert.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,6 @@ + + Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/headline2.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/headline2.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/headline2.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,82 @@ + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + The key to success - the local population + + + + + back + +
    + + +
    + Nature conservation and the needs of the population must not be in conflict with each other. +

    + The nature reserve Samboja Lestari offers a safe income, health and education to the local population. The people will be included into all phases of the project. Agriculture, nursery, production of compost, reforestation and the creation of infrastructure provide safe workplaces. +
    +
    +
    + "This offers an alternative to the people, so that they don't have to clear the forest any more. Thus we can show the world, that nature and humans are able to coexist and don't have to exclude each other." +
    + says Dr. Willie Smits, chairman of BOS Indonesia. +
    +
    +
    +
    +
    +
    + The safety of the nature reserve is guaranteed by the acceptance through the Indonesian population. The success of the project guarantees a better standard of living and vice versa. +
    +
    +
    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/headline3.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/headline3.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/headline3.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,61 @@ + + + + +
    +
    + + + + + + + + + + + + + + + + + + +
    + + Orangutan, Sunbear and Rhinoceros bird + + + + + back + +
    + Orangutans, also called man of the forest, are highly endangered great apes. +

    + Orangutans are not only our closest relatives in the animal kingdom; they are also indispensable for the biological diversity + of the rainforest due to their role of seed distributors. They are the so called umbrella species. The protection of these fascinating + great apes serves at the same time to preserve the rainforest's eco system. +

    + Nowadays, orangutans live only on Sumatra and Borneo. Massive rainforest destruction and unscrupulous pet trade could + mean the end of their species. Malaysian bears are also in danger of losing their natural habitat. The nature reserve Samboja Lestari + represents the last refuge for several animals - a last chance for their survival. Malaysian bears are already living in the reserve, in + a specially set aside area. In a few years time also orang-utans will be able to live there in freedom. +

    + Rare species such as the Rhinoceros bird, the dwarf deer and the king cobra can already be observed in Samboja Lestari nowadays. +
    + + + +
    +
    +
    +     \ No newline at end of file Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/idea.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/idea.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/idea.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,115 @@ + + + + +
    +
    + + + + + + + + + + + + + + + +
    + + Samboja Lestari - Creative reforestation +
    + A sanctuary for Borneo +     +     		+ + back + +
    + By means of a unique reforestation concept BOS is creating a sanctuary for orang-utans, sunbears and other endangered species on Borneo -maybe the last one. +Satellite pictures here on the internet make it possible to observe the progress of this concept. +

    + During the last decades the once species-rich rainforest of + + Samboja Lestari + + was cleared and burnt down relentlessly. +Nutrient-consuming elephant grass took over completely. What remained was an ecological waste land. +Nowadays it is already visible that this doesn't have to stay - since 2001 BOS is creating new rainforest. An innovative concept of reforestation and protection is changing this area of over 16 mio sqm into a natural habitat again. In tropical Borneo plants grow much faster than in Europe. Already within a few years the first orang-utans can be released to share their freedom with other animals A nature reserve is being created for the permanent use of humans, animals and plants in Samboja Lestari ("eternal Samboja"). +
    +
    +
    +
    +
    + + + + + + + + + + + + + + +
    + + Agriculture, reforestation and protection + +
    During the early stage of reforestion Indonesian farmers plant profitable agricultural products among the newly planted trees. + + + +
    + ... + + more + +
    + + + + + + + + + + + + + + +
    + + A square metre with a certain knack + +
    + + + +
    + To finance the nature reserve, BOS has created a system of symbolical land-purchasing. +
    + ... + + more + +
    +
    +
    +     \ No newline at end of file Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/idea_subtitle1.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/idea_subtitle1.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/idea_subtitle1.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,74 @@ + + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + Agriculture, reforestation and protection +
    - a good combination +     +     		+ + back + +
    +During the early stage of reforestion Indonesian farmers plant profitable agricultural products among the newly planted trees. +

    +Agriculture and reforestation influence each other in many positive ways: agricultural products protect the young tropical trees from getting overgrown by elephant grass. Trees enrich the quality of the soil and provide shade. +

    +BOS guarantees to buy fruit like papaya and pineapples from the farmers, market them regionally or use them for self-supply. The supply of the orangutans in Wanariset rehabilitation center alone takes about 1000 kg of fruit daily. +
    +
    The Protection (circle) + + +
    + + A circle of sugar-palm plantations is being planted all around the nature reserve. Over 650 families will profit from the main product sugar. And - the circle forms a barrier against the much feared forest fires. +

    +A penetration of humans into the nature reserve, as well as the breakout of orangutans is prevented by an inner protection wall of thickly growing, prickly salac palms. Moreover, the fruit of these palms provides pleasant tasting food for humans and animals. +
    +Ultra-light aeroplanes and modern satellite technique support the permanent surveillance of the BOS projects. Thus, slash-and-burn and illegal logging can be fought much more effectively. +
    +
    +
    +     \ No newline at end of file Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/idea_subtitle2.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/idea_subtitle2.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/idea_subtitle2.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,66 @@ + + + +
    +
    + + + + + + + + + + + + + + + + + + + + +
    A square metre with a certain knack
    		+ + + back + +
    + To finance the nature reserve, BOS has created a system of symbolical land-purchasing. +

    + + For 3 Euros per m? you can help creating rainforest. + +

    +
    + You help financing the purchase of land, ecological reforestation, a nursery, ecological agriculture, sugar palm plantations, wages for Indonesian employees, surveillance and protection of the area, fire fighting, environmental education, infrastructure, research and arboretum, orangutan islands and sunbear areas. +

    +Contribute to a better future and observe the development of the Samboja Lestari project on the internet. +     		+ +
    +
    + Each square metre that you purchase symbolically will be assigned to you by a personal profile. Via a password you will be able to re-find your squaremeters easily at any time. It is also possible to place short informations on 'your' m? and thus communicate with other Samboja Lestari sponsors. +Visitors of this website will be able to gain insight into all m? and their personal profiles. +

    + Observe the development of 'your' area from different perspectives. BOS provides a transparent insight via satellite pictures, and gives regular reports about the progress in situ. +

    + Support the project and receive a rainforest document. You can also give squaremeters as a present to friends, relatives and other people you know. +

    + Participate and see rainforest grow! - And much more! +
    +
    +
    +
    + +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/impressum.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/impressum.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/impressum.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,44 @@ + + + +

    Imprint

    +

    + www.create-rainforest.org is a webpage by:

    + + The Borneo Orangutan Survival Foundation (BOS) in collaboration with + the partner organisation BOS Deutschland e.V..

    + + Postal address:

    + BOS Deutschland e.V.

    + Sch?neberger Ufer 69
    + 10785 Berlin

    + + Tel. +49 - (0)30 - 26 36 78 33
    + Fax: +49 - (0)30 - 26 36 78 15

    + + + + info at bos-deutschland.de + +
    + + + www.bos-deutschland.de + +

    + Chairman: Boris Thiemig
    + Vice chairman: Dr. Dr. Klaus Ursus Schendel

    + BOS Deutschland e.V. is registered under no. 24216 Nz. at the Amtsgericht Berlin-Charlottenburg (county court).

    + The images on the webpage are protected by copyright, and are not freely available for + commercial purposes. If you wish to make use of BOS images, + please contact us under the above mentioned contact details.

    + Please send us an e-mail or call us if you have any further questions.

    +

    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/index.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/index.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/index.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,115 @@ + + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + Samboja Lestari - creative reforestation
    +A sanctuary for Borneo +     +
    + + + +
    +By means of a unique reforestation concept BOS is creating a sanctuary for orang-utans, sunbears and other endangered species on Borneo -maybe the last one. Satellite pictures here on the internet make it possible to observe the progress of this concept. +
    + + ... more + +
    + + The Key to Success - the Local Population + + + + Orangutan, Sunbear and Rhinoceros bird + +
    + + + + + + + +
    Nature conservation and the needs of the population must not be in conflict with each other. +
    + + ... more + +     		Orangutans are in imminent danger of becoming extinct. +


    + + + ... more + +
    +
    +
    +
    + + +
    +
    + + Information directly to your home?
    + Your e-mail address: +

    + + +
    +
    +
    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/info-request.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/info-request.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/info-request.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,25 @@ + + + + +

    + + Many thanks for your interest. + +

    + +

    + We are pleased to send you informations by about BOS and our project in Samboja Lestari. +

    +

    + If you have questions please contact: service at create-rainforest.org. +

    +     +     \ No newline at end of file Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-poidetail.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-poidetail.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-poidetail.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,33 @@ + + + +

    Guide to the Satellite Map

    +

    +

    You are in the detail display for a point of interest (POI) in the project area Samboja Lestari. + On the top left in the overview map you can see where this POI is located. +

    +

    By clicking on one of the POI titles in the list you can choose another POI.

    +

    Above Right in the picture you find six detail photos of this POI. + By clicking on the miniature you can increase the chosen photo. +

    +

    At the lower edge of the photo are up to three buttons with the titles Sat map, + Luftbild and Panorama. + By clickng on one of the buttons you can choose a different view of the POI

    +

    + +

  • Sat-Karte Cutout from the satellite photo of the project area of 2002.
    • +
  • Aerial photograph Aerial photograph of the POI, taken up in the autumn 2004 of a light airplane.
    • +
  • Panorama Panorama photo of the POI, taken in the autumn 2004. + By clicking and dragging in the panorama picture you can change the view
    • + +

    +

    Click on the overview map on the top left to return to the POI overview.

    +

    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-poifoto.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-poifoto.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-poifoto.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,20 @@ + + + +

    Guide to the Satellite Map

    +

    +

    You are in the detail display for a point of interest (POI) in the project area Samboja Lestari. + On the top left in the overview map you can see where this POI is located.

    +

    The picture shows an image of the POI. Click on any of the six small images on the + top right-hand side to get further images of the POI. Click on "Back" to return to the satellite + map section of the POI.

    +

    Click on the overview map on the top left to return to the POI overview.

    +

    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-qmdetail.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-qmdetail.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-qmdetail.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,35 @@ + + + +

    Guide to the Satellite Map

    +

    +

    You are now in the map overview for the square metre sales area. + Here you can get an overview of how many square metres have already been sold. + In addition you can see the sponsors profiles and their posted messages.

    +

    If you are logged on with your password your "own" square metres will be marked with an icon ()on the satellite map. The "purchased" square metres will be highlighted in a different colour. + Click on the satellite map in the middle of the screen to move the "Square Metre Magnifier". + The red marked area will appear in an enlarged form in the upper right of the screen. Click on the "sold" + colour marked square metre areas in the enlarged image to find out more about the sponsors in their sponsor profile. + This is displayed under the enlarged area and is shown by moving the mouse over it.

    +

    On the bottom right of the satellite map you can get the area menu. Click on the individual + areas on the satellite map to + get the names of the individual areas.

    +

    The following areas can be viewed:

    +

    + +

  • Sat-Karte The satellite map is the background of the map
    • +
  • Areas for SaleAreas that can be purchased are shown in grey.
    • +
  • Sold Areas Areas that have been purchased are displayed in various colours
    • + +

    +

    Click on the overview map on the top left to return to the POI overview.

    +

    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-uebersicht.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-uebersicht.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/infosys-help-uebersicht.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,72 @@ + + + +

    About the satellite map

    +

    +

    You find yourself in our satellite information system. Here you can see for yourself + how the project area in Samboja Lestari looks like. + Furthermore, you can look up where the square metres you have sponsored are located.

    +

    + On the main map you see several icons you can click at, which will then lead you to further images:

    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + Here is one facility run by BOS. +
    + + + This icon marks a point of interest in the project area. +
    + + + Sales area for square metres. Here, profiles of square metre sponsors can be looked at. +
    + + + Here are 'your' square metres. This icon only comes up if you are registered. +
    +     +

    By clicking at the 'point of interest' list on the left, + you will get directly to the point of interest you wish to look at.

    +

    In order to get back to the main menu from one of the sublevels, + please click at the main map on the top left.

    +

    In case you already have sponsored square metres, you can register on the bottom left + by entering your sponsor-ID, password or mastercode into the login-area. You then have access + to your sponsor profile. You are able to recall your sponsor status; + and you have access to your rainforest-certificate as PDF document.

    +

    We wish you lots of fun on your virtual expedition to Samboja Lestari!

    +

    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/infosystem.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/infosystem.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/infosystem.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,23 @@ + + + + + + + + + + RAINFOREST for SAMBOJA LESTARI - Infosystem + + + +
    +
    +
    +

    Infosystem "satellite map"

    +
    + + + Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/mail-transfer.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/mail-transfer.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/mail-transfer.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,83 @@ + + + + +
    +
    +
    + + + + + + +
    + +
    +
    + + + +
    + + +
    +
    + + + + + + + + + + + + + + + + + + +
    + + Vielen Dank f?r Ihre Unterst?tzung + +
    + Bitte geben Sie unbedingt die ID $(contract-id) als Verwendungszweck + Ihrer ?berweisung an, damit wir Sie nach der Bearbeitung erreichen k?nnen! +
    + + + + + +
    BOS Deutschland e.V.
    Kontonummer:32 10 100
    Bank:Bank f?r Sozialwirtschaft
    BLZ:100 205 00
    +
    + Wir melden uns direkt nach Eingang Ihrer ?berweisung und + geben Ihnen die Informationen, die Sie ben?tigen, um Ihre Quadratmeter im Internet zu beobachten. +

    + + + Zur?ck zur Home Page + +
    +
    +
    +
    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/news.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/news.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/news.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,18 @@ + + + + +

    + + + NEWS in ARCHIVE + +

    +     \ No newline at end of file Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/print_profil_setup.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/print_profil_setup.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/print_profil_setup.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,140 @@ + + + +
    + + + + + + + + + + + + +
    + + Please check your printer setup before printing if necessary. +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    My m? in Samboja Lestari - my sponsor profile

    +
    +
    Your sponsor profile login data: +
    + Your sponsor ID: + + + $(sponsor-id) +
    + Your password: + + + $(sponsor-password_new) +
    +
    At this moment we manage your profile under the following name: +
    +
    + Name: + + + $(name) +
    +
    +
    Your e-mail address will not be published and is only used for internal purposes. +
    +
    + E-mail address: + + + $(email) +
    +
    +
    + + +
    +     \ No newline at end of file Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/print_versand_quittung.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/print_versand_quittung.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/print_versand_quittung.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,93 @@ + + + +
    + + + + + + + + + + + + +
    Bitte ?berpr?fen Sie ggf. vor dem Drucken Ihre Druckereinstellungen.
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    Meine m? in Samboja Lestari

    +
    Die Regenwald-Urkunde wird auf folgenden Namen ausgestellt:
    Name:$(name)
    und wird an folgende Adresse versendet:
    Adresse: $(adresse)
    Mit dieser Zahlung wurde ein neues Sponsoren-Profil mit der folgenden Sponsoren-ID angelegt: +
    Ihre Sponsoren-ID:$(sponsor-id)
    + + +
    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/privacy.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/privacy.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/privacy.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,57 @@ + + + +

    Privacy Policy of BOS Deutschland e.V.

    +

    +

    +The protection of your personal data via electronic processing is strictly regulated, +and is something BOS Deutschland e.V. takes very seriously.BOS Deutschland e.V. +is a renowned and not-for-profit foundation complying with the Bundesdatenschutzgesetz +(German Privacy Policy Law). BOS is registered under no. 502 VR 4228 at the Amtsgericht (county court) in Kiel; +exemption paper of the Finanzamt (tax office) in Kiel-Nord, no. GL5105. +

    +

    +What happens with your personal data? +

    +

    +Once you have decided to make a donation on-line, you are asked to disclose +your bank details. This information will exclusively be processed by WorldPay. +WorldPay is a renowned, international provider for on-line payment. +Your data will be send by WorldPay through a coded SSL-transaction, +and deleted immediately after the successful transaction. +BOS Deutschand e.V. has no access to your bank details whatsoever. +

    +

    +Each square metre of the ecological project you sponsor with your donation +is linked to your personal profile. This profile consists of your name, +country of origin, number of square metres you sponsor and the date of your donation. +A personalised greeting text is possible. All profile information (except your e-mail address and postal address) +is available to visitors of our webpage. Through this, transparency and interaction between sponsors is being promoted. Profile information can be altered by logging in with your password at all times. +By doing so, it is also possible to stay anonymous. +

    +

    +In order to send you your personal profile including your sponsor-ID and password, we need your e-mail address. +For sending certificates by mail we need your postal address, and the name of the person the certificate is +to be issued to. +In order to receive our newsletter/news we would need your e-mail address. +

    +

    +We assure you that this data will only be used for administrative and informative +purposes of BOS Deutschland e.V.,as well as for BOS associates international. +In case you do not wish to receive any more information from us, you are able to +delete your data from the system at any time. +For this purpose, please always give your sponsor ID! +

    +

    +In case you have further questions regarding the reglementation of privacy policy of BOS Deutschland e.V., +please send an e-mail to: datenschutz at bos-deutschland.de +

    +

    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/profil.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/profil.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/profil.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,128 @@ + + + + + Profile creation + + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Sponsor ID$(sponsor-id)will be created from our system
    Country$(country)can not be changed
    Name
    new passwordenter your personal password
    enter password againplease type in password twice
    your commentoptional text, not hidden
    square metresa total of $(numsqm) m? has been bought
    UTM-coordinate: N$(sqm-x) E$(sqm-y)
    action message + + Your personal profile data will be updated with the entered data.
    + + Your personal data will be hidden.
    + + All arranged changes have been discarded.
    show certificate/download as pdf
    + + + back + +
    +
    +     + + Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/profil_setup.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/profil_setup.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/profil_setup.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,168 @@ + + + +
    + +
    +
    + + + + + + +
    + +
    +
    + + + +
    + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    Create your sponsor profile now: +
    + Your sponsor ID: + + + $(sponsor-id) +
    + Password: + + + +
    + Repeat password: + + + +
    +
    + Currently we process your profile under the name below. You can change this name or stay anonymous. +
    +
    + Name: + + + +
    + anonymous +
    +
    +
    + Your e-mail address will not be published and is only used for internal infomation. +
    +
    + E-mail address: + + + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +

    + [Profile password]
    + Enter your personal password. In case you forgot it you can find a master password on your payment confirmation, that is sent to you by e-mail.




    + [Profile creation]
    + Define under wich name "your" m? will be indicated.












    +
    +
    +
    +     \ No newline at end of file Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/quittung.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/quittung.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/quittung.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,170 @@ + + + + + + + + + + RAINFOREST for SAMBOJA LESTARI + + + + + + + +
    +
    +
    + + + + + + + + + + + + + + + + +
    + +
    Thank you

    + for your support and for trusting in BOS. +

    + The square metre(s) you sponsor are in good hands. +
    +
    + + + +
    + + +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Your payment has been successful:
    + +
    What name will you have issued your Rainforest certificate in?
    Name:
    + + We accept the name entered in this field. Please correct the indicated name if necessary. + +
    + +
    +
    +     +
    +
    +
    +
    +

    + [Payment confirmation] +
    + This payment confirmation by WorldPay is already under way to your e-mail account. +In the unexpected case that you will not receive a message please contact + +
    + + + service at create-rainforest.org + +


    + + [Rainforest certificate] +
    + Starting with 1 square metre only you receive our + + + Rainforest certificate + + as a pdf-download from your personal sponsor profile. +






    +
    +
    +
    + + Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/ring-detail.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/ring-detail.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/ring-detail.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,28 @@ + + + + + + + + Scheme for the "ring" + + +
    +

    Scheme for the "ring"

    + +
    + + + Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/save-initial-profile.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/save-initial-profile.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/save-initial-profile.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,8 @@ + + + + Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/sponsor_canceled.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/sponsor_canceled.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/sponsor_canceled.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,109 @@ + + + + + + + + + + RAINFOREST for SAMBOJA LESTARI + + + + + + + +
    +
    +
    +
    + + + +
    + + +
    +
    + + + + +
    Your transaction has been cancelled.
    +
    +
    +
    +
    +

    + [payment interrupted] +
    +
    +
    + + Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/toplevel.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/toplevel.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/toplevel.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,80 @@ + + + + + + + + + + $(title) + + + + + + + + + + + + + Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/toplevel_extra.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/toplevel_extra.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/toplevel_extra.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,31 @@ + + + + + + + + + + $(title) + + +
    +
    +
    + +
    + + + Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/toplevel_main.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/toplevel_main.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/toplevel_main.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,168 @@ + + + + + + + + + $(title) + + + + + + + +
    +
    + +
    + + + + + + + + + + + + + + + + + + + +
    +
    + + Buy Rainforest! +


    +     		+
    + + + + Donate! +
    +     		+
    + + + +
    +
    +
    + + + + + + + + + + + + + + + + +
    + Satellite Map +
    + + + It's all about m?.

    +     +
    + + + +
    +
    + + + +
    + + + +
    + + Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/versand_geschenk.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/versand_geschenk.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/versand_geschenk.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,184 @@ + + + + + + + + + + REGENWALD f?r SAMBOJA LESTARI + + + + + + + +
    +
    +
    + + + + + + + + + + + + + + + + +
    + +
    Herzlichen Dank
    f?r Ihre Unterst?tzung und das Vertrauen, das Sie BOS damit entgegen bringen.

    Die von Ihnen gesponserten m? sind in guten H?nden. +
    +
    + + + +
    + + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Ihre Zahlung war erfolgreich:
    + +
    + Bitte geben Sie den Namen des Beschenkten f?r die Urkunde ein: +
    + Name: + + +
    + Bitte geben Sie die Versandadresse f?r die Regenwaldurkunde ein. +
    Versandadresse
    f?r die Urkunde:


    		 + + +
    + +
    +
    +
    +
    +     +
    +
    +

    + [Zahlungsbest?tigung]
    + Diese Zahlungsbest?tigung von WorldPay ist bereits per E-Mail unterwegs zu Ihnen. Sollten Sie wider Erwarten keine + Nachricht erhalten, wenden Sie sich bitte an +
    + + + service at create-rainforest.org + +








    + [Regenwald-Urkunde]
    + Sie oder der Beschenkte erhalten auf dem Postweg eine attraktive + + + Urkunde + + von uns. Sollte diese wider Erwarten nicht innerhalb der n?chsten zwei Wochen eingetroffen sein, wenden Sie sich bitte an +
    + + + service at create-rainforest.org + +





    +
    +
    +
    + + Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/versand_info.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/versand_info.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/versand_info.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,185 @@ + + + + + + + + + + RAINFOREST for SAMBOJA LESTARI + + + + + + + +
    +
    +
    + + + + + + + + + + + + + + + + +
    + +
    Thank you
    for your support and for trusting in BOS.

    The m? you sponsor are in good hands.
    +
    + + + +
    + + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Your payment has been successful:
    + +
    + Under which name would you like to have your rainforest certificate? [We accept the name entered in this field.] +
    + Name on the Rainforest certificate: + + +
    + Please correct the indicated address if necessary for printing into your rainforest certificate: +
    + Address
    for your Rainforest certificate::


    		 + + +
    + +
    +
    +
    +
    +     +
    +
    +

    + [Payment confirmation]
    + This payment confirmation by WorldPay is already under way to your e-mail account. +In the unexpected case that you will not receive a message please contact +
    + + + service at create-rainforest.org + +








    + [Rainforest certificate]
    + Starting with 1 m? only you receive + + + a Rainforest certificate + + from your personal sponsor profile as a pdf-download. If you have any problems or questions please contact +
    + + + service at create-rainforest.org + +





    +
    +
    +
    + + Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/versand_quittung.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/versand_quittung.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/versand_quittung.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,148 @@ + + + + +
    + +
    +
    + + + + + + +
    + +
    +
    + + + +
    + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + We will issue the Rainforest Certificate in the following name at the following address: +


    + Name on the Rainforest Certificate: $(name) +

    + Address for the certificate:
    +
    +$(address)
+$(postcode)
+$(country)
+
    +
    +
    + + Please check that the details given are accurate. + +
    +
    +
    +
    + This payment has created a new sponsor profile with the following sponsor ID: +
    + Your sponsor ID: + + $(sponsor-id) +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +












    + [Sponsor ID]
    + You can check your sponsored m? + at any time using your sponsor ID. The ID enables you to easily locate your m?. + Visitors of this website can look at all m? and their personal profiles. + If you wish to remain anonymous you can restrict access by the use of a password. +





    +
    +
    +
    +     Added: branches/xml-class-rework/projects/bos/payment-website/templates/en/verschenken.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/verschenken.xml 2006-03-12 11:03:55 UTC (rev 1915) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/verschenken.xml 2006-03-12 11:35:12 UTC (rev 1916) @@ -0,0 +1,39 @@ + + + +

    + +

    Suchen Sie ein sinnvolles Geschenk?

    + +

    Verschenken Sie Quadratmeter wiederentstehenden Regenwaldes!

    + +

    +Der/Die Beschenkte erh?lt eine attraktive Urkunde und pers?nliche +Zugangscodes, um "seine/ihre" Quadratmeter in Borneo leicht orten zu +k?nnen. Zudem kann er/sie den Quadratmetern einen Gru?text anh?ngen, +der f?r jeden Besucher einsehbar ist. +

    +

    +Auch Sie erhalten die gleichen Zugangscodes und k?nnen z.B. einen +Geburtstagsgru? "auf" den verschenkten Quadratmetern +hinterlassen. +

    +

    +Setzen Sie das H?ckchen und fahren Sie wie gew?nscht fort. +

    +

    +Unmittelbar nach erfolgter Zahlung (wenige Sekunden sp?ter) werden Sie +nach Namen und Versandadresse der zu Beschenkenden Person gefragt. +

    +

    +Der Geschenkservice ist aus administrativen Gr?nden leider nur bei Online-Spenden ab 30 Euro m?glich. +

    +

    +     From bknr at bknr.net Sun Mar 12 11:36:13 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 12 Mar 2006 06:36:13 -0500 (EST) Subject: [bknr-cvs] r1917 - in branches/xml-class-rework/projects/bos/payment-website: images static Message-ID: <20060312113613.88F257A002@common-lisp.net> Author: hhubner Date: 2006-03-12 06:36:07 -0500 (Sun, 12 Mar 2006) New Revision: 1917 Added: branches/xml-class-rework/projects/bos/payment-website/images/certificate_en.jpg branches/xml-class-rework/projects/bos/payment-website/images/projekt_pic_en.jpg branches/xml-class-rework/projects/bos/payment-website/images/ring_detail_en.jpg branches/xml-class-rework/projects/bos/payment-website/images/ring_en.jpg branches/xml-class-rework/projects/bos/payment-website/static/bos_en.js branches/xml-class-rework/projects/bos/payment-website/static/profil_en.js Log: new files for the english version Added: branches/xml-class-rework/projects/bos/payment-website/images/certificate_en.jpg =================================================================== (Binary files differ) Property changes on: branches/xml-class-rework/projects/bos/payment-website/images/certificate_en.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/xml-class-rework/projects/bos/payment-website/images/projekt_pic_en.jpg =================================================================== (Binary files differ) Property changes on: branches/xml-class-rework/projects/bos/payment-website/images/projekt_pic_en.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/xml-class-rework/projects/bos/payment-website/images/ring_detail_en.jpg =================================================================== (Binary files differ) Property changes on: branches/xml-class-rework/projects/bos/payment-website/images/ring_detail_en.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/xml-class-rework/projects/bos/payment-website/images/ring_en.jpg =================================================================== (Binary files differ) Property changes on: branches/xml-class-rework/projects/bos/payment-website/images/ring_en.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/xml-class-rework/projects/bos/payment-website/static/bos_en.js =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/static/bos_en.js 2006-03-12 11:35:12 UTC (rev 1916) +++ branches/xml-class-rework/projects/bos/payment-website/static/bos_en.js 2006-03-12 11:36:07 UTC (rev 1917) @@ -0,0 +1,96 @@ + +// Formularcheck f?r Profilsetup + +function check_profil_setup() { + + if (document.form.password.value == "") { + alert('Please enter your personal password.'); + document.form.password.focus(); + return false; + } + + if (document.form.password.value != document.form.password1.value) { + alert('Please enter your personal password again.'); + document.form.password.focus(); + return false; + } + + window_infosys(); + + return true; +} + +function check_ueberweisung() { + +// alert("numsqm: " + + " numsqm1: " + ); + + if (!document.bestellformular.disclaimer_read.checked) { + alert("Please read the waiver clause and confirm your agreement with a click to the check box."); + return false; + } + + if (document.bestellformular.numsqm[0].checked + || (document.bestellformular.numsqm[4].checked + && (document.bestellformular.numsqm1.value < 5))) { + + alert("Aufgrund des hohen manuellen Bearbeitungsaufands sind ?berweisungen erst ab einer Summe von 15 Euro (5 Quadratmeter) m?glich"); + return false; + } + + if (document.bestellformular.gift.checked) { + alert("Den Geschenkservice k?nnen wir nur bei Online-?berweisungen anbieten"); + return false; + } +} + +function check_online() { + + if (!document.bestellformular.disclaimer_read.checked) { + alert("Please read the waiver clause and confirm your agreement with a click to the check box."); + return false; + } + + if (document.bestellformular.gift.checked + && (document.bestellformular.numsqm[0].checked + || document.bestellformular.numsqm[1].checked + || (document.bestellformular.numsqm[4].checked + && (document.bestellformular.numsqm1.value < 10)))) { + + alert("Das Verschenken von Quadratmetern ist erst ab einer Summe von 30 Euro m?glich"); + return false; + } + + return true; +} + +// Formularcheck f?r Versandinformationen + +function check_versand_info() { + + if ((document.formular.name.value == '') + || (document.formular.address.value == '')) { + alert("Please enter a name and address for your rainforest certificate."); + return false; + } + + return true; +} + +// Funktion zum Verschicken von Info-Mail-Requests + +function send_info_request() { + var address = document.form.email.value; + + if (!is_valid_email(address)) { + alert('The email address you entered "' + address + '" was not recogniced by our server. Please send your request to ' + + 'service at createrainforest.org'); + } else { + if (confirm('Would you like to receive informations about BOS and Samboja Lestari to "' + address + '"?')) { + document.form.email.value = ''; + open("info-request?email=" + escape(address), + "mailwin", "width=480,height=235,status=no,toolbar=no,menubar=no,resizable=yes,scrollbars=yes,left=100,top=100"); + } + } + + return false; +} Added: branches/xml-class-rework/projects/bos/payment-website/static/profil_en.js =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/static/profil_en.js 2006-03-12 11:35:12 UTC (rev 1916) +++ branches/xml-class-rework/projects/bos/payment-website/static/profil_en.js 2006-03-12 11:36:07 UTC (rev 1917) @@ -0,0 +1,46 @@ +// JavaScript Document + +function anonymizecheck () +{ + if (confirm('Delete your personal data?')) { + document.form.name.value = ''; + document.form.infotext.value = ''; + return true; + } + return false; +} + +function buycheck () +{ + if (!document.form.numsqm.value.match(/^\d+$/) + || (document.form.numsqm.value.match(/^0+/))) { + alert("Invalid number of square metres."); + document.form.numsqm.select(); + document.form.numsqm.focus(); + return false; + } + return true; +} + +function formcheck () +{ + if (document.form.password.value != document.form.password1.value) { + alert('The passwords you have entered do not correspond'); + document.form.password.select(); + document.form.password.focus(); + return false; + } + + alert('Your changes will be saved.'); + + return true; +} + +function window_urkunde (sponsorid) { + var url = "/certificate/"; + var certwin = open(url, "certwin", "width=480,height=620,status=no,toolbar=no,menubar=no,resizable=yes,scrollbars=no"); + certwin.focus(); + + return false +}; + From bknr at bknr.net Sun Mar 12 11:37:36 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 12 Mar 2006 06:37:36 -0500 (EST) Subject: [bknr-cvs] r1918 - branches/xml-class-rework/projects/bos/m2 Message-ID: <20060312113736.C704F111C8@common-lisp.net> Author: hhubner Date: 2006-03-12 06:37:36 -0500 (Sun, 12 Mar 2006) New Revision: 1918 Modified: branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp branches/xml-class-rework/projects/bos/m2/m2.lisp Log: Support multi lingual certificate versions. Modified: branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp =================================================================== --- branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp 2006-03-12 11:36:07 UTC (rev 1917) +++ branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp 2006-03-12 11:37:36 UTC (rev 1918) @@ -9,25 +9,31 @@ (error "Error executing ~A - Exit code ~D~%Error message: ~A" (format nil "\"~A~{ ~A~}\"" program program-args) (process-exit-code process) error-message))))) -(defun fill-form (fdf-pathname pdf-pathname) - (let ((output-pathname (merge-pathnames (make-pathname :type "pdf") fdf-pathname))) - (handler-case - (progn - (run-tool "recode" (list "utf-8..latin-1" (unix-namestring fdf-pathname))) - (run-tool "pdftk" (list (unix-namestring pdf-pathname) - "fill_form" (unix-namestring fdf-pathname) - "output" (namestring output-pathname) - "flatten")) - (delete-file fdf-pathname) - (format t "; generated ~A~%" output-pathname)) - (error (e) - (warn "While filling form ~A with ~A:~%~A" pdf-pathname fdf-pathname e))))) +(defun fill-form (fdf-pathname pdf-pathname output-pathname) + (handler-case + (progn + (run-tool "recode" (list "utf-8..latin-1" (unix-namestring fdf-pathname))) + (run-tool "pdftk" (list (unix-namestring pdf-pathname) + "fill_form" (unix-namestring fdf-pathname) + "output" (namestring output-pathname) + "flatten")) + (delete-file fdf-pathname) + (format t "; generated ~A~%" output-pathname)) + (error (e) + (warn "While filling form ~A with ~A:~%~A" pdf-pathname fdf-pathname e)))) -(defun fill-forms (directory pdf-pathname) +(defun fill-forms (directory template-pathname) (dolist (fdf-pathname (remove "fdf" (directory directory) :test (complement #'string-equal) :key #'pathname-type)) - (fill-form fdf-pathname pdf-pathname))) + (destructuring-bind (id &optional (country "en")) (split "-" (pathname-name fdf-pathname)) + (let ((language-specific-template-pathname (merge-pathnames (make-pathname :name (format nil "~A-~A" (pathname-name template-pathname) country)) + template-pathname)) + (output-pathname (merge-pathnames (make-pathname :name id :type "pdf") fdf-pathname))) + (fill-form fdf-pathname (if (probe-file language-specific-template-pathname) + language-specific-template-pathname + template-pathname) + output-pathname))))) (defun cert-daemon () (ensure-directories-exist *cert-mail-directory*) Modified: branches/xml-class-rework/projects/bos/m2/m2.lisp =================================================================== --- branches/xml-class-rework/projects/bos/m2/m2.lisp 2006-03-12 11:36:07 UTC (rev 1917) +++ branches/xml-class-rework/projects/bos/m2/m2.lisp 2006-03-12 11:37:36 UTC (rev 1918) @@ -230,7 +230,9 @@ (< (contract-price contract) *mail-amount*)) (defmethod contract-fdf-pathname ((contract contract)) - (merge-pathnames (make-pathname :name (format nil "~D" (store-object-id contract)) + (merge-pathnames (make-pathname :name (format nil "~D-~(~A~)" + (store-object-id contract) + (or (sponsor-country (contract-sponsor contract)) "en")) :type "fdf") (if (contract-download-only-p contract) *cert-download-directory* *cert-mail-directory*))) From bknr at bknr.net Sun Mar 12 11:49:22 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 12 Mar 2006 06:49:22 -0500 (EST) Subject: [bknr-cvs] r1919 - branches/xml-class-rework/projects/bos/worldpay-test Message-ID: <20060312114922.D106021002@common-lisp.net> Author: hhubner Date: 2006-03-12 06:49:22 -0500 (Sun, 12 Mar 2006) New Revision: 1919 Modified: branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp Log: wording change for worldpay interaction. Modified: branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-12 11:37:36 UTC (rev 1918) +++ branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-12 11:49:22 UTC (rev 1919) @@ -86,7 +86,9 @@ (store-object-id contract) price language - (encode-urlencoded (format nil "~a qm Regenwald in Samboja Lestari" numsqm)) + (encode-urlencoded (format nil "~a ~a in Samboja Lestari" + numsqm + (if (string-equal language "de") "qm Regenwald" "sqm rain forest"))) (store-object-id sponsor) (sponsor-master-code sponsor) (if donationcert-yearly "1" "0") From bknr at bknr.net Sun Mar 12 18:20:56 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 12 Mar 2006 13:20:56 -0500 (EST) Subject: [bknr-cvs] r1920 - branches/xml-class-rework/bknr/src/web Message-ID: <20060312182056.A626E1B010@common-lisp.net> Author: hhubner Date: 2006-03-12 13:20:56 -0500 (Sun, 12 Mar 2006) New Revision: 1920 Modified: branches/xml-class-rework/bknr/src/web/authorizer.lisp Log: Remove debug output. Modified: branches/xml-class-rework/bknr/src/web/authorizer.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/authorizer.lisp 2006-03-12 11:49:22 UTC (rev 1919) +++ branches/xml-class-rework/bknr/src/web/authorizer.lisp 2006-03-12 18:20:56 UTC (rev 1920) @@ -88,7 +88,6 @@ (format t "; Caught error ~A during request processing~%" e) (http-error req *response-bad-request* (princ-to-string e)))) - (format t "; request NOT authorized~%") ;; unauthorized, come up with 401 response to the web browser (redirect (website-make-path *website* "login") req) :deny) From bknr at bknr.net Sun Mar 12 18:23:55 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 12 Mar 2006 13:23:55 -0500 (EST) Subject: [bknr-cvs] r1921 - in branches/xml-class-rework/projects/bos: . m2 payment-website/templates worldpay-test Message-ID: <20060312182355.BE01E21002@common-lisp.net> Author: hhubner Date: 2006-03-12 13:23:55 -0500 (Sun, 12 Mar 2006) New Revision: 1921 Added: branches/xml-class-rework/projects/bos/Back Office Interface.doc branches/xml-class-rework/projects/bos/payment-website/templates/login.xml Modified: branches/xml-class-rework/projects/bos/ branches/xml-class-rework/projects/bos/m2/allocation.lisp branches/xml-class-rework/projects/bos/m2/m2.lisp branches/xml-class-rework/projects/bos/m2/make-certificate.lisp branches/xml-class-rework/projects/bos/worldpay-test/allocation-area-handlers.lisp branches/xml-class-rework/projects/bos/worldpay-test/cms-links.lisp branches/xml-class-rework/projects/bos/worldpay-test/news-handlers.lisp branches/xml-class-rework/projects/bos/worldpay-test/poi-handlers.lisp branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp branches/xml-class-rework/projects/bos/worldpay-test/web-utils.lisp branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp Log: Various changes for the multi-lingual version. Property changes on: branches/xml-class-rework/projects/bos ___________________________________________________________________ Name: svn:ignore + datastore web.rc m2.rc Added: branches/xml-class-rework/projects/bos/Back Office Interface.doc =================================================================== (Binary files differ) Property changes on: branches/xml-class-rework/projects/bos/Back Office Interface.doc ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: branches/xml-class-rework/projects/bos/m2/allocation.lisp =================================================================== --- branches/xml-class-rework/projects/bos/m2/allocation.lisp 2006-03-12 18:20:56 UTC (rev 1920) +++ branches/xml-class-rework/projects/bos/m2/allocation.lisp 2006-03-12 18:23:55 UTC (rev 1921) @@ -473,7 +473,6 @@ (right (+ left width)) (bottom (+ top height)) (vertices (allocation-area-vertices (stripe-area stripe)))) - (format t "right ~A bottom ~A~%" right bottom) (when (stripe-full-p stripe) ;; Gleich NIL liefern, und den Stripe beseitigen, damit wir ihn nicht ;; wieder antreffen in Zukunft. Modified: branches/xml-class-rework/projects/bos/m2/m2.lisp =================================================================== --- branches/xml-class-rework/projects/bos/m2/m2.lisp 2006-03-12 18:20:56 UTC (rev 1920) +++ branches/xml-class-rework/projects/bos/m2/m2.lisp 2006-03-12 18:23:55 UTC (rev 1921) @@ -179,10 +179,12 @@ (paidp :update) (m2s :read) (color :read) + (download-only :read) (cert-issued :read) (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 + :download-only nil :color (random-elt *claim-colors*) :cert-issued nil :expires (+ (get-universal-time) *manual-contract-expiry-time*))) @@ -227,12 +229,13 @@ (* (length (contract-m2s contract)) +price-per-m2+)) (defmethod contract-download-only-p ((contract contract)) - (< (contract-price contract) *mail-amount*)) + (or (contract-download-only contract) + (< (contract-price contract) *mail-amount*))) -(defmethod contract-fdf-pathname ((contract contract)) +(defmethod contract-fdf-pathname ((contract contract) language) (merge-pathnames (make-pathname :name (format nil "~D-~(~A~)" (store-object-id contract) - (or (sponsor-country (contract-sponsor contract)) "en")) + language) :type "fdf") (if (contract-download-only-p contract) *cert-download-directory* *cert-mail-directory*))) @@ -246,11 +249,11 @@ (defmethod contract-pdf-url ((contract contract)) (format nil "/~:[~;print-~]certificate/~A" (not (contract-download-only-p contract)) (store-object-id contract))) -(defmethod contract-issue-cert ((contract contract) name &optional address) +(defmethod contract-issue-cert ((contract contract) name &key address language) (if (contract-cert-issued contract) (warn "can't re-issue cert for ~A" contract) (progn - (make-certificate contract name :address address) + (make-certificate contract name :address address :language language) (unless (contract-download-only-p contract) (mail-certificate-to-office contract address)) (change-slot-values contract 'cert-issued t)))) Modified: branches/xml-class-rework/projects/bos/m2/make-certificate.lisp =================================================================== --- branches/xml-class-rework/projects/bos/m2/make-certificate.lisp 2006-03-12 18:20:56 UTC (rev 1920) +++ branches/xml-class-rework/projects/bos/m2/make-certificate.lisp 2006-03-12 18:23:55 UTC (rev 1921) @@ -27,13 +27,13 @@ ;; bzw. im Dateisystem f?r den Download durch den Spender abgelegt ;; werden. -(defun make-certificate (contract name &key (address "")) +(defun make-certificate (contract name &key (address "") (language "en")) "Erzeugen einer FDF-Datei f?r das Ausf?llen der Urkunde. Wenn das optionale address-Argument ?bergeben wird, wird die Urkunde per Post verschickt und entsprechend eine andere Vorlage ausgew?hlt als f?r den Download der Urkunde" (let ((sponsor (contract-sponsor contract))) - (make-fdf-file (contract-fdf-pathname contract) + (make-fdf-file (contract-fdf-pathname contract language) :datum (format-date-time (contract-date contract) :show-time nil) :name name :address address Added: branches/xml-class-rework/projects/bos/payment-website/templates/login.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/login.xml 2006-03-12 18:20:56 UTC (rev 1920) +++ branches/xml-class-rework/projects/bos/payment-website/templates/login.xml 2006-03-12 18:23:55 UTC (rev 1921) @@ -0,0 +1,29 @@ + + + + Please login in to the BOS CMS + + +

    Login

    + +

    Please log in to the BOS CMS

    + +
    + + + + + + + + + + + + +
    Username
    Password
    + +
    +
    + + \ No newline at end of file Modified: branches/xml-class-rework/projects/bos/worldpay-test/allocation-area-handlers.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/allocation-area-handlers.lisp 2006-03-12 18:20:56 UTC (rev 1920) +++ branches/xml-class-rework/projects/bos/worldpay-test/allocation-area-handlers.lisp 2006-03-12 18:23:55 UTC (rev 1921) @@ -19,13 +19,13 @@ (loop for allocation-area in (all-allocation-areas) do (html (:tr - (:td (cmslink (format nil "/allocation-area/~D" (store-object-id allocation-area)) + (:td (cmslink (format nil "allocation-area/~D" (store-object-id allocation-area)) (:princ-safe (store-object-id allocation-area)))) (:td (if (allocation-area-active-p allocation-area) (html "yes") (html "no"))) (:td (:princ-safe (allocation-area-total-m2s allocation-area))) (:td (:princ-safe (allocation-area-free-m2s allocation-area))) (:td (:princ-safe (round (allocation-area-percent-used allocation-area))) "%"))))) - (:p (cmslink "/create-allocation-area" "Create new allocation area"))))) + (:p (cmslink "create-allocation-area" "Create new allocation area"))))) (defmethod handle-object-form ((handler allocation-area-handler) action allocation-area req) (with-bos-cms-page (req :title "Allocation Area") @@ -197,12 +197,12 @@ (html (:p (:h2 "Polygon already imported") "The polygon " (:princ-safe vertices) " has already been " "imported as " - (cmslink (format nil "/allocation-area/~D" (store-object-id existing-area)) + (cmslink (format nil "allocation-area/~D" (store-object-id existing-area)) "allocation area " (:princ-safe (store-object-id existing-area))))) (let ((allocation-area (make-allocation-area vertices))) (html (:p (:h2 "Successfully imported polygon number " (:princ-safe i)) "The polygon " - (cmslink (format nil "/allocation-area/~D" (store-object-id allocation-area)) + (cmslink (format nil "allocation-area/~D" (store-object-id allocation-area)) (:princ-safe (store-object-id allocation-area))) " has been successfully imported"))))) (error (e) Modified: branches/xml-class-rework/projects/bos/worldpay-test/cms-links.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/cms-links.lisp 2006-03-12 18:20:56 UTC (rev 1920) +++ branches/xml-class-rework/projects/bos/worldpay-test/cms-links.lisp 2006-03-12 18:23:55 UTC (rev 1921) @@ -5,7 +5,7 @@ (defmethod html-edit-link ((sponsor sponsor)) (html - (cmslink (format nil "/edit-sponsor/~D" (store-object-id sponsor)) + (cmslink (format nil "edit-sponsor/~D" (store-object-id sponsor)) (:princ-safe (format nil "edit sponsor #~D" (store-object-id sponsor)))))) (defmethod html-link ((sponsor sponsor)) @@ -13,7 +13,7 @@ (defmethod html-link ((contract contract)) (html - (cmslink (format nil "/contract/~D" (store-object-id contract)) + (cmslink (format nil "contract/~D" (store-object-id contract)) (:princ-safe (format nil "contract #~D" (store-object-id contract)))))) (defmethod object-url ((poi poi)) Modified: branches/xml-class-rework/projects/bos/worldpay-test/news-handlers.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/news-handlers.lisp 2006-03-12 18:20:56 UTC (rev 1920) +++ branches/xml-class-rework/projects/bos/worldpay-test/news-handlers.lisp 2006-03-12 18:23:55 UTC (rev 1921) @@ -19,7 +19,7 @@ (:ul (dolist (news-item (all-news-items)) (let ((id (store-object-id news-item))) - (html (:li (cmslink #?"/edit-news/$(id)" + (html (:li (cmslink #?"edit-news/$(id)" (:princ-safe (format-date-time (news-item-time news-item))) " - " (:princ-safe (or (news-item-title news-item language) "[no title in this language]"))))))))) Modified: branches/xml-class-rework/projects/bos/worldpay-test/poi-handlers.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/poi-handlers.lisp 2006-03-12 18:20:56 UTC (rev 1920) +++ branches/xml-class-rework/projects/bos/worldpay-test/poi-handlers.lisp 2006-03-12 18:23:55 UTC (rev 1921) @@ -93,12 +93,12 @@ (:td (cond ((poi-area poi) (html (:princ-safe (format nil "~D/~D " (first (poi-area poi)) (second (poi-area poi))))) - (cmslink (format nil "/map-browser/~A/~A?chosen-url=~A" + (cmslink (format nil "map-browser/~A/~A?chosen-url=~A" (first (poi-area poi)) (second (poi-area poi)) (uriencode-string (format nil "~A?action=save&" (uri-path (request-uri req))))) "[relocate]")) (t - (cmslink (format nil "/map-browser/?chosen-url=~A" + (cmslink (format nil "map-browser/?chosen-url=~A" (uriencode-string (format nil "~A?action=save&" (uri-path (request-uri req))))) "[choose]"))))) (:tr (:td "icon") @@ -127,7 +127,7 @@ (unless (eql 6 (length (poi-images poi))) (html :br - (cmslink (format nil "/edit-poi-image/?poi=~A" (store-object-id poi)) "[new]"))))) + (cmslink (format nil "edit-poi-image/?poi=~A" (store-object-id poi)) "[new]"))))) (:tr (:td "airal view") (:td (if (poi-airals poi) (html ((:a :href (format nil "/image/~D" (store-object-id (first (poi-airals poi)))) Modified: branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp 2006-03-12 18:20:56 UTC (rev 1920) +++ branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp 2006-03-12 18:23:55 UTC (rev 1921) @@ -37,7 +37,7 @@ (when (or count (or (ignore-errors (scan regex (user-full-name sponsor))) (ignore-errors (scan regex (user-email sponsor))))) - (html (:tr (:td (cmslink #?"/edit-sponsor/$((store-object-id sponsor))" (:princ-safe (store-object-id sponsor)))) + (html (:tr (:td (cmslink #?"edit-sponsor/$((store-object-id sponsor))" (:princ-safe (store-object-id sponsor)))) (:td (:princ-safe (format-date-time (contract-date (first (sponsor-contracts sponsor))) :show-time nil))) (:td (:princ-safe (or (user-email sponsor) ""))) (:td (:princ-safe (or (user-full-name sponsor) ""))))) @@ -63,11 +63,16 @@ (:tr (:td "Date (DD.MM.YYYY)") (:td (text-field "date" :size 10 :value (format-date-time (get-universal-time) :show-time nil)))) (:tr (:td "Number of square meters") - (:td (text-field "numsqm" :size 5)) - (:tr (:td "Country code (2 chars)") - (:td (text-field "country" :size 2 :value "DE")))) + (:td (text-field "numsqm" :size 5))) + (:tr (:td "Country code (2 chars)") + (:td (text-field "country" :size 2 :value "DE"))) (:tr (:td "Email-Address") (:td (text-field "email" :size 40))) + (:tr (:td "Language for certificate") + (:td ((:select :name "language") + (loop + for (language-symbol language-name) in (website-languages) + do (html ((:option :value language-symbol) (:princ-safe language-name))))))) (:tr (:td "Name for certificate") (:td (text-field "name" :size 20))) (:tr (:td "Postal address for certificate" @@ -78,10 +83,10 @@ (apply #'encode-universal-time 0 0 0 (mapcar #'parse-integer (split #?r"\." date-string)))) (defmethod handle-object-form ((handler edit-sponsor-handler) (action (eql :create)) (sponsor (eql nil)) req) - (with-query-params (req numsqm country email name postaladdress date) + (with-query-params (req numsqm country email name postaladdress date language) (let* ((sponsor (make-sponsor :email email :country country)) (contract (make-contract sponsor (parse-integer numsqm) :paidp t :date (date-to-universal date)))) - (contract-issue-cert contract name postaladdress) + (contract-issue-cert contract name :address postaladdress :language language) (redirect (format nil "/edit-sponsor/~D" (store-object-id sponsor)) req)))) (defun contract-checkbox-name (contract) @@ -121,7 +126,7 @@ (:td (:princ-safe (format-date-time (contract-date contract) :show-time nil))) (:td (:princ-safe (length (contract-m2s contract)))) (:td (:princ-safe (if (contract-paidp contract) "paid" "not paid"))) - (:td (cmslink (format nil "/cert-regen/~A" (store-object-id contract)) "Regenerate Certificate") + (:td (cmslink (format nil "cert-regen/~A" (store-object-id contract)) "Regenerate Certificate") (when (probe-file (contract-pdf-pathname contract)) (html :br (cmslink (contract-pdf-url contract) "Show Certificate")))))))) (:p (submit-button "save" "save") @@ -194,11 +199,11 @@ (html (:h2 "Completing square meter sale")) (sponsor-set-country (contract-sponsor contract) country) (contract-set-paidp contract t) - (contract-issue-cert contract name postaladdress) + (contract-issue-cert contract name :address postaladdress) (when email (html (:p "Sending instruction email to " (:princ-safe email))) (mail-instructions-to-sponsor contract email)))) - (:p (cmslink (format nil "/edit-sponsor/~D" (store-object-id (contract-sponsor contract))) + (:p (cmslink (format nil "edit-sponsor/~D" (store-object-id (contract-sponsor contract))) "click here") " to edit the sponsor's database entry")))) (defclass m2-javascript-handler (prefix-handler) @@ -266,25 +271,24 @@ ((:table) (:tr (:td "Name") (:td (text-field "name" :size 40))) - (if (contract-download-only-p contract) - (html - (:tr (:td (submit-button "make-download" "make-download")))) - (html + (:tr (:td "Language") + (:td ((:select :name "language") + (loop + for (language-symbol language-name) in (website-languages) + do (html ((:option :value language-symbol) (:princ-safe language-name))))))) + (unless (contract-download-only-p contract) + (html (:tr (:td "Address") - (:td (textarea-field "address"))) - (:tr (:td (submit-button "make-print" "make-print")))))))))) + (:td (textarea-field "address"))))) + (html + (:tr (:td (submit-button "regenerate" "regenerate"))))))))) (defun confirm-cert-regen (req) (with-bos-cms-page (req :title "Certificate generation request has been created") (html "Your certificate generation request has been created, please wait a few seconds before checking the PDF file"))) -(defmethod handle-object-form ((handler cert-regen-handler) (action (eql :make-print)) (contract contract) req) - (with-query-params (req name address) - (bos.m2::make-certificate contract name :address address)) - (confirm-cert-regen req)) - -(defmethod handle-object-form ((handler cert-regen-handler) (action (eql :make-download)) (contract contract) req) - (with-query-params (req name) - (bos.m2::make-certificate contract name)) +(defmethod handle-object-form ((handler cert-regen-handler) (action (eql :regenerate)) (contract contract) req) + (with-query-params (req name address language) + (bos.m2::make-certificate contract name :address address :language language)) (confirm-cert-regen req)) \ No newline at end of file Modified: branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-12 18:20:56 UTC (rev 1920) +++ branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-12 18:23:55 UTC (rev 1921) @@ -38,7 +38,7 @@ (define-bknr-tag generate-cert () (with-template-vars (gift email name address) (let ((contract (find-store-object (parse-integer (get-template-var :contract-id))))) - (contract-issue-cert contract name address) + (contract-issue-cert contract name :address address) (bknr.web::redirect-request :target (if gift "index" (format nil "profil_setup?name=~A&email=~A&sponsor-id=~A" (uriencode-string name) (uriencode-string email) Modified: branches/xml-class-rework/projects/bos/worldpay-test/web-utils.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/web-utils.lisp 2006-03-12 18:20:56 UTC (rev 1920) +++ branches/xml-class-rework/projects/bos/worldpay-test/web-utils.lisp 2006-03-12 18:23:55 UTC (rev 1921) @@ -16,7 +16,7 @@ (html "logged in as " (html-link (bknr-request-user *req*))) (html "not logged in")) " - current content language is " - (cmslink "/change-language" + (cmslink "change-language" (:princ-safe (current-website-language)) " (" (:princ-safe (language-name (current-website-language))) Modified: branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp 2006-03-12 18:20:56 UTC (rev 1920) +++ branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp 2006-03-12 18:23:55 UTC (rev 1921) @@ -179,8 +179,6 @@ (when website-url (setf *website-url* website-url)) - (setf bknr.web::*login-default-url* "/admin") - (make-instance 'bos-website :name "BOS Website" :handler-definitions `(("/edit-poi" edit-poi-handler) @@ -217,13 +215,13 @@ :command-packages ((:bos . :worldpay-test) (:bknr . :bknr.web)))) :modules '(user images stats) - :admin-navigation '(("user" . "/user/") - ("sponsor" . "/edit-sponsor/") - ("news" . "/edit-news/") - ("poi" . "/edit-poi/") - ("languages" . "/languages") - ("allocation area" . "/allocation-area/") - ("logout" . "/logout")) + :admin-navigation '(("user" . "user/") + ("sponsor" . "edit-sponsor/") + ("news" . "edit-news/") + ("poi" . "edit-poi/") + ("languages" . "languages") + ("allocation area" . "allocation-area/") + ("logout" . "logout")) :authorizer (make-instance 'bos-authorizer) :site-logo-url "/images/bos-logo.gif" :style-sheet-urls '("/static/cms.css") From bknr at bknr.net Sun Mar 12 20:07:25 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 12 Mar 2006 15:07:25 -0500 (EST) Subject: [bknr-cvs] r1922 - in branches/xml-class-rework/projects/bos: payment-website/templates worldpay-test Message-ID: <20060312200725.070E848158@common-lisp.net> Author: hhubner Date: 2006-03-12 15:07:24 -0500 (Sun, 12 Mar 2006) New Revision: 1922 Modified: branches/xml-class-rework/projects/bos/payment-website/templates/login.xml branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp Log: Make administrative login work properly again. Modified: branches/xml-class-rework/projects/bos/payment-website/templates/login.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/login.xml 2006-03-12 18:23:55 UTC (rev 1921) +++ branches/xml-class-rework/projects/bos/payment-website/templates/login.xml 2006-03-12 20:07:24 UTC (rev 1922) @@ -1,29 +1,33 @@ - - - Please login in to the BOS CMS - - -

    Login

    - -

    Please log in to the BOS CMS

    - -
    - - - - - - - - - - - - -
    Username
    Password
    - -
    -
    - + + + + Please login in to the BOS CMS + + + + + +

    Please log in to the BOS CMS

    + +
    + + + + + + + + + + + + +
    Username
    Password
    + +
    +
    + +     \ No newline at end of file Modified: branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-12 18:23:55 UTC (rev 1921) +++ branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-12 20:07:24 UTC (rev 1922) @@ -136,3 +136,8 @@ (format nil "~D" (apply #'+ (mapcar #'(lambda (contract) (length (contract-m2s contract))) (sponsor-contracts sponsor)))))) (mapc #'emit-template-node children)) + +(define-bknr-tag admin-login-page (&key children) + (if (admin-p (bknr-request-user (get-template-var :request))) + (html (:head ((:meta :http-equiv "refresh" :content "0; url=/admin")))) + (mapc #'emit-template-node children))) \ No newline at end of file From bknr at bknr.net Sun Mar 12 20:22:19 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 12 Mar 2006 15:22:19 -0500 (EST) Subject: [bknr-cvs] r1923 - in branches/xml-class-rework/projects/bos: m2 payment-website/templates/en worldpay-test Message-ID: <20060312202219.D8AA05000E@common-lisp.net> Author: hhubner Date: 2006-03-12 15:22:19 -0500 (Sun, 12 Mar 2006) New Revision: 1923 Modified: branches/xml-class-rework/projects/bos/m2/m2.lisp branches/xml-class-rework/projects/bos/payment-website/templates/en/bestellung.xml branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp Log: All non-german donors get a download version of their donor certificate, no hardcopy will be mailed. Modified: branches/xml-class-rework/projects/bos/m2/m2.lisp =================================================================== --- branches/xml-class-rework/projects/bos/m2/m2.lisp 2006-03-12 20:07:24 UTC (rev 1922) +++ branches/xml-class-rework/projects/bos/m2/m2.lisp 2006-03-12 20:22:19 UTC (rev 1923) @@ -269,7 +269,7 @@ (warn "Old tx-make-contract transaction used, contract dates may be wrong") (tx-do-make-contract sponsor m2-count :date date :paidp paidp :expires expires)) -(deftransaction do-make-contract (sponsor m2-count &key date paidp expires) +(deftransaction do-make-contract (sponsor m2-count &key date paidp expires download-only) (let ((m2s (find-free-m2s m2-count))) (if m2s (make-object 'contract @@ -277,14 +277,19 @@ :date date :paidp paidp :m2s m2s - :expires expires) + :expires expires + :download-only download-only) (warn "can't create contract, ~A square meters for ~A could not be allocated" m2-count sponsor)))) -(defun make-contract (sponsor m2-count &key (date (get-universal-time)) paidp (expires (+ (get-universal-time) *manual-contract-expiry-time*))) +(defun make-contract (sponsor m2-count + &key (date (get-universal-time)) + paidp + (expires (+ (get-universal-time) *manual-contract-expiry-time*)) + download-only) (unless (and (integerp m2-count) (plusp m2-count)) (error "number of square meters must be a positive integer")) - (let ((contract (do-make-contract sponsor m2-count :date date :paidp paidp :expires expires))) + (let ((contract (do-make-contract sponsor m2-count :date date :paidp paidp :expires expires :download-only download-only))) (unless contract (send-system-mail :subject "Contact creation failed - Allocation areas exhaused" :text (format nil "A contract for ~A square meters could not be created, presumably because no Modified: branches/xml-class-rework/projects/bos/payment-website/templates/en/bestellung.xml =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/templates/en/bestellung.xml 2006-03-12 20:07:24 UTC (rev 1922) +++ branches/xml-class-rework/projects/bos/payment-website/templates/en/bestellung.xml 2006-03-12 20:22:19 UTC (rev 1923) @@ -63,6 +63,7 @@
    +
    Modified: branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-12 20:07:24 UTC (rev 1922) +++ branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-12 20:22:19 UTC (rev 1923) @@ -55,7 +55,7 @@ (html ((:base "href" href))))) (define-bknr-tag buy-sqm (&key children) - (with-template-vars (numsqm numsqm1 action gift donationcert-yearly) + (with-template-vars (numsqm numsqm1 action gift donationcert-yearly download-only) (let* ((numsqm (parse-integer (or numsqm numsqm1))) ;; Wer ueber dieses Formular bestellt, ist ein neuer Sponsor, ;; also ein neues Sponsorenobjekt anlegen. Eine Profil-ID @@ -69,10 +69,12 @@ (scan #?r"rweisung" action))) (sponsor (make-sponsor)) (price (* numsqm 3)) - (contract (make-contract sponsor numsqm :expires (+ (if manual-transfer - bos.m2::*manual-contract-expiry-time* - bos.m2::*online-contract-expiry-time*) - (get-universal-time)))) + (contract (make-contract sponsor numsqm + :download-only download-only + :expires (+ (if manual-transfer + bos.m2::*manual-contract-expiry-time* + bos.m2::*online-contract-expiry-time*) + (get-universal-time)))) (language (session-variable :language))) (setf (get-template-var :worldpay-url) (if manual-transfer From bknr at bknr.net Sun Mar 12 20:36:25 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 12 Mar 2006 15:36:25 -0500 (EST) Subject: [bknr-cvs] r1924 - branches/xml-class-rework/projects/bos Message-ID: <20060312203625.69F545C12A@common-lisp.net> Author: hhubner Date: 2006-03-12 15:36:25 -0500 (Sun, 12 Mar 2006) New Revision: 1924 Modified: branches/xml-class-rework/projects/bos/screenrc-sample Log: update path Modified: branches/xml-class-rework/projects/bos/screenrc-sample =================================================================== --- branches/xml-class-rework/projects/bos/screenrc-sample 2006-03-12 20:22:19 UTC (rev 1923) +++ branches/xml-class-rework/projects/bos/screenrc-sample 2006-03-12 20:36:25 UTC (rev 1924) @@ -10,7 +10,7 @@ msgminwait 0 msgwait 0 -chdir /home/bknr/bos +chdir bknr-svn/projects/bos screen -t webserver lisp -core bos.core #logfile screen.log From bknr at bknr.net Sun Mar 12 21:13:40 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 12 Mar 2006 16:13:40 -0500 (EST) Subject: [bknr-cvs] r1925 - trunk/thirdparty/net.post-office Message-ID: <20060312211340.9C18F7A00F@common-lisp.net> Author: troussanov Date: 2006-03-12 16:13:40 -0500 (Sun, 12 Mar 2006) New Revision: 1925 Modified: trunk/thirdparty/net.post-office/packages.lisp Log: Use CL package instead of LISP Modified: trunk/thirdparty/net.post-office/packages.lisp =================================================================== --- trunk/thirdparty/net.post-office/packages.lisp 2006-03-12 20:36:25 UTC (rev 1924) +++ trunk/thirdparty/net.post-office/packages.lisp 2006-03-12 21:13:40 UTC (rev 1925) @@ -1,6 +1,6 @@ (defpackage :net.post-office - (:use #:lisp #+allegro #:excl #-allegro #:acl-compat.excl) + (:use #:cl #+allegro #:excl #-allegro #:acl-compat.excl) (:export ;; smtp #:send-letter From bknr at bknr.net Sun Mar 12 21:15:03 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 12 Mar 2006 16:15:03 -0500 (EST) Subject: [bknr-cvs] r1926 - trunk/projects/hello-web/src Message-ID: <20060312211503.5159116003@common-lisp.net> Author: troussanov Date: 2006-03-12 16:15:02 -0500 (Sun, 12 Mar 2006) New Revision: 1926 Modified: trunk/projects/hello-web/src/load.lisp trunk/projects/hello-web/src/packages.lisp trunk/projects/hello-web/src/webserver.lisp Log: Make hello-web wirking again with CMUL Modified: trunk/projects/hello-web/src/load.lisp =================================================================== --- trunk/projects/hello-web/src/load.lisp 2006-03-12 21:13:40 UTC (rev 1925) +++ trunk/projects/hello-web/src/load.lisp 2006-03-12 21:15:02 UTC (rev 1926) @@ -6,4 +6,5 @@ (swank::create-swank-server 4005 :spawn #'swank::simple-announce-function t) (hello-web::startup) +#-sbcl (mp::startup-idle-and-top-level-loops) Modified: trunk/projects/hello-web/src/packages.lisp =================================================================== --- trunk/projects/hello-web/src/packages.lisp 2006-03-12 21:13:40 UTC (rev 1925) +++ trunk/projects/hello-web/src/packages.lisp 2006-03-12 21:15:02 UTC (rev 1926) @@ -11,7 +11,10 @@ (defpackage :hello-web.tags (:use :cl :cl-user -; :ext + #-sbcl + :ext + #+sbcl + :sb-ext :bknr.web :xhtml-generator :hello-web.config) @@ -32,7 +35,10 @@ (defpackage :hello-web (:use :cl :cl-user -; :ext + #-sbcl + :ext + #+sbcl + :sb-ext :cl-interpol :cl-ppcre :bknr.utils Modified: trunk/projects/hello-web/src/webserver.lisp =================================================================== --- trunk/projects/hello-web/src/webserver.lisp 2006-03-12 21:13:40 UTC (rev 1925) +++ trunk/projects/hello-web/src/webserver.lisp 2006-03-12 21:15:02 UTC (rev 1926) @@ -24,7 +24,7 @@ (:bknr . :bknr.web) (:menu . :bknr.site-menu))) ("/static" directory-handler - :destination ,(#-sbcl unix-namestring #+sbcl sb-ext:native-namestring + :destination ,(#-sbcl unix-namestring #+sbcl native-namestring (merge-pathnames #p"static/" *website-directory*)) )) :modules '(images user) From bknr at bknr.net Sun Mar 12 21:20:06 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 12 Mar 2006 16:20:06 -0500 (EST) Subject: [bknr-cvs] r1927 - trunk/bknr/src/images Message-ID: <20060312212006.7C6781C00E@common-lisp.net> Author: troussanov Date: 2006-03-12 16:20:06 -0500 (Sun, 12 Mar 2006) New Revision: 1927 Modified: trunk/bknr/src/images/imageproc-handler.lisp Log: More SBCL port changes Modified: trunk/bknr/src/images/imageproc-handler.lisp =================================================================== --- trunk/bknr/src/images/imageproc-handler.lisp 2006-03-12 21:15:02 UTC (rev 1926) +++ trunk/bknr/src/images/imageproc-handler.lisp 2006-03-12 21:20:06 UTC (rev 1927) @@ -170,16 +170,10 @@ (let ((ims (header-slot-value req :if-modified-since)) (changed-time (blob-timestamp image))) (setf (net.aserve::last-modified *ent*) changed-time) - (setf (reply-header-slot-value req :last-modified) (#-allegro - universal-time-to-date - #+allegro - net.aserve::universal-time-to-date - changed-time)) + (setf (reply-header-slot-value req :last-modified) + (net.aserve::universal-time-to-date changed-time)) (if (and ims - (<= changed-time (#-allegro - date-to-universal-time - #+allegro - net.aserve::date-to-universal-time ims))) + (<= changed-time (net.aserve::date-to-universal-time ims))) (progn (setf (request-reply-code req) *response-not-modified*) (format t "; image ~A not changed~%" image) From bknr at bknr.net Mon Mar 13 09:42:48 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Mon, 13 Mar 2006 04:42:48 -0500 (EST) Subject: [bknr-cvs] r1928 - branches/xml-class-rework/projects/lisp-ecoop/website/templates Message-ID: <20060313094248.2BBA967168@common-lisp.net> Author: pcostanza Date: 2006-03-13 04:42:47 -0500 (Mon, 13 Mar 2006) New Revision: 1928 Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml Log: News: Nick Levine's keynote, best paper award Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-03-12 21:20:06 UTC (rev 1927) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-03-13 09:42:47 UTC (rev 1928) @@ -12,8 +12,15 @@ ALU

    -

    Supported by ALU

    +

    Supported by ALU and Ravenbrook

    +

    Important News

    +
      +
    • Nick Levine is going to give a keynote presentation.
      • +
    • The ALU has kindly sponsored a $500 prize fund for exceptional papers.
      • +
    +

    Please see the News section for more details.

    +

    Important Dates

    • Submission deadline: April 1, 2006
      • Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml 2006-03-12 21:20:06 UTC (rev 1927) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml 2006-03-13 09:42:47 UTC (rev 1928) @@ -5,10 +5,12 @@

      News

      -

      March 3, 2006

      +

      March 13, 2006

        -
      • The workshop is now officially supported by the ALU. Thanks a lot to the ALU!
        • +
      • Nick Levine will be giving a keynote presentation at the European Lisp Workshop. He has been a professional Lisp consultant for over two decades and is the organizer of the upcoming International Lisp Conference 2007 in Cambridge / UK. We are grateful to Ravenbrook Limited for sponsoring the keynote presentation.
        • +
        +
      • The Association of Lisp Users has kindly sponsored a $500 prize fund for exceptional papers, selected from the submissions to this year's European Lisp Workshop. Both the ALU and the ELW organizers are looking forward to your submissions.

      February 23, 2006

      From bknr at bknr.net Mon Mar 13 09:44:13 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Mon, 13 Mar 2006 04:44:13 -0500 (EST) Subject: [bknr-cvs] r1929 - branches/xml-class-rework/projects/lisp-ecoop/website/templates Message-ID: <20060313094413.5095C67169@common-lisp.net> Author: pcostanza Date: 2006-03-13 04:44:13 -0500 (Mon, 13 Mar 2006) New Revision: 1929 Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml Log: Corrected the news link in the homepage. Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-03-13 09:42:47 UTC (rev 1928) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-03-13 09:44:13 UTC (rev 1929) @@ -19,7 +19,7 @@
    • Nick Levine is going to give a keynote presentation.
    • The ALU has kindly sponsored a $500 prize fund for exceptional papers.
    -

    Please see the News section for more details.

    +

    Please see the News section for more details.

    Important Dates

      From bknr at bknr.net Mon Mar 13 11:02:36 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Mon, 13 Mar 2006 06:02:36 -0500 (EST) Subject: [bknr-cvs] r1930 - branches/xml-class-rework/projects/lisp-ecoop/website/templates Message-ID: <20060313110236.07B302E17F@common-lisp.net> Author: pcostanza Date: 2006-03-13 06:02:35 -0500 (Mon, 13 Mar 2006) New Revision: 1930 Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml Log: Minor improvements. Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml 2006-03-13 09:44:13 UTC (rev 1929) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml 2006-03-13 11:02:35 UTC (rev 1930) @@ -8,9 +8,9 @@

      March 13, 2006

        -
      • Nick Levine will be giving a keynote presentation at the European Lisp Workshop. He has been a professional Lisp consultant for over two decades and is the organizer of the upcoming International Lisp Conference 2007 in Cambridge / UK. We are grateful to Ravenbrook Limited for sponsoring the keynote presentation.
        • +
      • Nick Levine will be giving a keynote presentation at the European Lisp Workshop. He has been a professional Lisp consultant for over two decades and is the organizer of the upcoming International Lisp Conference 2007 in Cambridge, UK. We are grateful to Ravenbrook Limited for sponsoring the keynote presentation.

        • -
      • The Association of Lisp Users has kindly sponsored a $500 prize fund for exceptional papers, selected from the submissions to this year's European Lisp Workshop. Both the ALU and the ELW organizers are looking forward to your submissions.
        • +
      • The Association of Lisp Users has kindly sponsored a $500 prize fund for exceptional papers submitted to this year's European Lisp Workshop. Both the ALU and the workshop organizers are looking forward to your submissions.

      February 23, 2006

      From bknr at bknr.net Thu Mar 16 18:06:09 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Thu, 16 Mar 2006 13:06:09 -0500 (EST) Subject: [bknr-cvs] r1931 - branches/xml-class-rework/projects/bos/worldpay-test Message-ID: <20060316180609.996EA29006@common-lisp.net> Author: hhubner Date: 2006-03-16 13:06:09 -0500 (Thu, 16 Mar 2006) New Revision: 1931 Modified: branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp Log: pass language parameter down to cert generator. Modified: branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp 2006-03-13 11:02:35 UTC (rev 1930) +++ branches/xml-class-rework/projects/bos/worldpay-test/sponsor-handlers.lisp 2006-03-16 18:06:09 UTC (rev 1931) @@ -182,6 +182,11 @@ (:td (:princ-safe (format-date-time (contract-date contract))))) (:tr (:td "Country code (2 chars)") (:td (text-field "country" :size 2 :value "DE"))) + (:tr (:td "Language") + (:td ((:select :name "language") + (loop + for (language-symbol language-name) in (website-languages) + do (html ((:option :value language-symbol) (:princ-safe language-name))))))) (:tr (:td "Name for certificate") (:td (text-field "name" :size 50))) (:tr (:td "Email-Address") @@ -191,7 +196,7 @@ (:tr (:td (submit-button "process" "process" :formcheck "javascript:return check_complete_sale()")))))))))) (defmethod handle-object-form ((handler complete-transfer-handler) (action (eql :process)) contract req) - (with-query-params (req email name postaladdress country) + (with-query-params (req email name postaladdress country language) (with-bos-cms-page (req :title "Square meter sale completion") (if (contract-paidp contract) (html (:h2 "This sale has already been completed")) @@ -199,7 +204,7 @@ (html (:h2 "Completing square meter sale")) (sponsor-set-country (contract-sponsor contract) country) (contract-set-paidp contract t) - (contract-issue-cert contract name :address postaladdress) + (contract-issue-cert contract name :address postaladdress :language language) (when email (html (:p "Sending instruction email to " (:princ-safe email))) (mail-instructions-to-sponsor contract email)))) Modified: branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-13 11:02:35 UTC (rev 1930) +++ branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-16 18:06:09 UTC (rev 1931) @@ -36,9 +36,9 @@ (mapc #'emit-template-node children)) (define-bknr-tag generate-cert () - (with-template-vars (gift email name address) + (with-template-vars (gift email name address language) (let ((contract (find-store-object (parse-integer (get-template-var :contract-id))))) - (contract-issue-cert contract name :address address) + (contract-issue-cert contract name :address address :language language) (bknr.web::redirect-request :target (if gift "index" (format nil "profil_setup?name=~A&email=~A&sponsor-id=~A" (uriencode-string name) (uriencode-string email) From bknr at bknr.net Thu Mar 16 18:21:21 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Thu, 16 Mar 2006 13:21:21 -0500 (EST) Subject: [bknr-cvs] r1932 - branches/xml-class-rework/projects/bos/payment-website/infosystem/en Message-ID: <20060316182121.7079E4F008@common-lisp.net> Author: hhubner Date: 2006-03-16 13:21:20 -0500 (Thu, 16 Mar 2006) New Revision: 1932 Modified: branches/xml-class-rework/projects/bos/payment-website/infosystem/en/satellitenkarte.htm Log: Fix broken logout link Modified: branches/xml-class-rework/projects/bos/payment-website/infosystem/en/satellitenkarte.htm =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/infosystem/en/satellitenkarte.htm 2006-03-16 18:06:09 UTC (rev 1931) +++ branches/xml-class-rework/projects/bos/payment-website/infosystem/en/satellitenkarte.htm 2006-03-16 18:21:20 UTC (rev 1932) @@ -120,7 +120,7 @@
    - + From bknr at bknr.net Thu Mar 16 18:31:23 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Thu, 16 Mar 2006 13:31:23 -0500 (EST) Subject: [bknr-cvs] r1933 - branches/xml-class-rework/projects/bos/worldpay-test Message-ID: <20060316183123.62FB752001@common-lisp.net> Author: hhubner Date: 2006-03-16 13:31:23 -0500 (Thu, 16 Mar 2006) New Revision: 1933 Modified: branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp Log: Use "lang" parameter as passed in by worldpay Modified: branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-16 18:21:20 UTC (rev 1932) +++ branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-16 18:31:23 UTC (rev 1933) @@ -36,9 +36,10 @@ (mapc #'emit-template-node children)) (define-bknr-tag generate-cert () - (with-template-vars (gift email name address language) + (with-template-vars (gift email name address lang) + (format t "generate-cert: param 'lang': ~A template-var :language: ~A template-var :lang: ~A~%" lang (get-template-var :language) (get-template-var :lang)) (let ((contract (find-store-object (parse-integer (get-template-var :contract-id))))) - (contract-issue-cert contract name :address address :language language) + (contract-issue-cert contract name :address address :language lang) (bknr.web::redirect-request :target (if gift "index" (format nil "profil_setup?name=~A&email=~A&sponsor-id=~A" (uriencode-string name) (uriencode-string email) From bknr at bknr.net Fri Mar 17 15:59:17 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Fri, 17 Mar 2006 10:59:17 -0500 (EST) Subject: [bknr-cvs] r1934 - branches/xml-class-rework/projects/bos/worldpay-test Message-ID: <20060317155917.3DBC63000E@common-lisp.net> Author: hhubner Date: 2006-03-17 10:59:16 -0500 (Fri, 17 Mar 2006) New Revision: 1934 Modified: branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp Log: Repair language marks for certificates. Repair logout button in satellite application. Modified: branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-16 18:31:23 UTC (rev 1933) +++ branches/xml-class-rework/projects/bos/worldpay-test/tags.lisp 2006-03-17 15:59:16 UTC (rev 1934) @@ -36,10 +36,9 @@ (mapc #'emit-template-node children)) (define-bknr-tag generate-cert () - (with-template-vars (gift email name address lang) - (format t "generate-cert: param 'lang': ~A template-var :language: ~A template-var :lang: ~A~%" lang (get-template-var :language) (get-template-var :lang)) + (with-template-vars (gift email name address) (let ((contract (find-store-object (parse-integer (get-template-var :contract-id))))) - (contract-issue-cert contract name :address address :language lang) + (contract-issue-cert contract name :address address :language (session-variable :language)) (bknr.web::redirect-request :target (if gift "index" (format nil "profil_setup?name=~A&email=~A&sponsor-id=~A" (uriencode-string name) (uriencode-string email) Modified: branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp =================================================================== --- branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp 2006-03-16 18:31:23 UTC (rev 1933) +++ branches/xml-class-rework/projects/bos/worldpay-test/worldpay-test.lisp 2006-03-17 15:59:16 UTC (rev 1934) @@ -108,8 +108,8 @@ (with-query-params (req logout) (when logout (bknr.web::drop-session (bknr-request-session req)))) - (redirect "/infosystem/satellitenkarte.htm" - req)) + (let ((language (session-variable :language))) + (redirect #?"/infosystem/$(language)/satellitenkarte.htm" req))) (defclass certificate-handler (object-handler) () From bknr at bknr.net Fri Mar 17 18:41:27 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Fri, 17 Mar 2006 13:41:27 -0500 (EST) Subject: [bknr-cvs] r1935 - branches/xml-class-rework/projects/bos/m2 Message-ID: <20060317184127.8B7E6400D@common-lisp.net> Author: hhubner Date: 2006-03-17 13:41:27 -0500 (Fri, 17 Mar 2006) New Revision: 1935 Modified: branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp Log: Make certificate generation more robus Modified: branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp =================================================================== --- branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp 2006-03-17 15:59:16 UTC (rev 1934) +++ branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp 2006-03-17 18:41:27 UTC (rev 1935) @@ -12,11 +12,13 @@ (defun fill-form (fdf-pathname pdf-pathname output-pathname) (handler-case (progn - (run-tool "recode" (list "utf-8..latin-1" (unix-namestring fdf-pathname))) - (run-tool "pdftk" (list (unix-namestring pdf-pathname) - "fill_form" (unix-namestring fdf-pathname) - "output" (namestring output-pathname) - "flatten")) + (ignore-errors (run-tool "recode" (list "utf-8..latin-1" (unix-namestring fdf-pathname)))) + (if (unix-namestring pdf-pathname) + (run-tool "pdftk" (list (unix-namestring pdf-pathname) + "fill_form" (unix-namestring fdf-pathname) + "output" (namestring output-pathname) + "flatten")) + (warn "Warning, stray FDF file ~A deleted, no such contract exists" fdf-pathname)) (delete-file fdf-pathname) (format t "; generated ~A~%" output-pathname)) (error (e) @@ -35,11 +37,15 @@ template-pathname) output-pathname))))) +(defun generate-certs () + (fill-forms *cert-mail-directory* *cert-mail-template*) + (fill-forms *cert-download-directory* *cert-download-template*) + (fill-forms *receipt-mail-directory* *receipt-mail-template*) + (fill-forms *receipt-download-directory* *receipt-download-template*)) + (defun cert-daemon () (ensure-directories-exist *cert-mail-directory*) (ensure-directories-exist *cert-download-directory*) - (loop (fill-forms *cert-mail-directory* *cert-mail-template*) - (fill-forms *cert-download-directory* *cert-download-template*) - (fill-forms *receipt-mail-directory* *receipt-mail-template*) - (fill-forms *receipt-download-directory* *receipt-download-template*) - (sleep *cert-daemon-poll-seconds*))) \ No newline at end of file + (loop + (generate-certs) + (sleep *cert-daemon-poll-seconds*))) \ No newline at end of file From bknr at bknr.net Fri Mar 17 18:56:17 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Fri, 17 Mar 2006 13:56:17 -0500 (EST) Subject: [bknr-cvs] r1936 - branches/xml-class-rework/projects/bos/m2 Message-ID: <20060317185617.286A66811B@common-lisp.net> Author: hhubner Date: 2006-03-17 13:56:13 -0500 (Fri, 17 Mar 2006) New Revision: 1936 Modified: branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp Log: Generate proper messages for stray fdf files Modified: branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp =================================================================== --- branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp 2006-03-17 18:41:27 UTC (rev 1935) +++ branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp 2006-03-17 18:56:13 UTC (rev 1936) @@ -13,14 +13,16 @@ (handler-case (progn (ignore-errors (run-tool "recode" (list "utf-8..latin-1" (unix-namestring fdf-pathname)))) - (if (unix-namestring pdf-pathname) - (run-tool "pdftk" (list (unix-namestring pdf-pathname) - "fill_form" (unix-namestring fdf-pathname) - "output" (namestring output-pathname) - "flatten")) - (warn "Warning, stray FDF file ~A deleted, no such contract exists" fdf-pathname)) - (delete-file fdf-pathname) - (format t "; generated ~A~%" output-pathname)) + (cond + ((unix-namestring pdf-pathname) + (run-tool "pdftk" (list (unix-namestring pdf-pathname) + "fill_form" (unix-namestring fdf-pathname) + "output" (namestring output-pathname) + "flatten")) + (format t "; generated ~A~%" output-pathname)) + (t + (warn "Warning, stray FDF file ~A deleted, no such contract exists" fdf-pathname))) + (delete-file fdf-pathname)) (error (e) (warn "While filling form ~A with ~A:~%~A" pdf-pathname fdf-pathname e)))) From bknr at bknr.net Fri Mar 17 19:20:10 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Fri, 17 Mar 2006 14:20:10 -0500 (EST) Subject: [bknr-cvs] r1937 - branches/xml-class-rework/projects/mah-jongg/website Message-ID: <20060317192010.9479A1C001@common-lisp.net> Author: hhubner Date: 2006-03-17 14:20:10 -0500 (Fri, 17 Mar 2006) New Revision: 1937 Modified: branches/xml-class-rework/projects/mah-jongg/website/game.xsl Log: Select existing input when navigating to a 'doubles' field - as requested by Julia. Modified: branches/xml-class-rework/projects/mah-jongg/website/game.xsl =================================================================== --- branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-17 18:56:13 UTC (rev 1936) +++ branches/xml-class-rework/projects/mah-jongg/website/game.xsl 2006-03-17 19:20:10 UTC (rev 1937) @@ -140,7 +140,11 @@
    - + From bknr at bknr.net Fri Mar 17 19:20:47 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Fri, 17 Mar 2006 14:20:47 -0500 (EST) Subject: [bknr-cvs] r1938 - branches/xml-class-rework/projects/bos/m2 Message-ID: <20060317192047.2E3F81C002@common-lisp.net> Author: hhubner Date: 2006-03-17 14:20:46 -0500 (Fri, 17 Mar 2006) New Revision: 1938 Modified: branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp Log: Properly close pipes generated by the cert generator. Modified: branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp =================================================================== --- branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp 2006-03-17 19:20:10 UTC (rev 1937) +++ branches/xml-class-rework/projects/bos/m2/cert-daemon.lisp 2006-03-17 19:20:46 UTC (rev 1938) @@ -1,13 +1,15 @@ (in-package :bos.m2.cert-generator) (defun run-tool (program &optional program-args &rest args) - (let ((process (apply #'run-program program program-args :output :stream args))) + (let* ((process (apply #'run-program program program-args :output :stream args)) + (error-message (unless (zerop (process-exit-code process)) + (with-output-to-string (*standard-output*) + (with-open-stream (output-stream (process-output process)) + (princ (read-line output-stream))))))) + (process-close process) (unless (zerop (process-exit-code process)) - (let ((error-message (with-output-to-string (*standard-output*) - (with-open-stream (output-stream (process-output process)) - (princ (read-line output-stream)))))) - (error "Error executing ~A - Exit code ~D~%Error message: ~A" - (format nil "\"~A~{ ~A~}\"" program program-args) (process-exit-code process) error-message))))) + (error "Error executing ~A - Exit code ~D~%Error message: ~A" + (format nil "\"~A~{ ~A~}\"" program program-args) (process-exit-code process) error-message)))) (defun fill-form (fdf-pathname pdf-pathname output-pathname) (handler-case From bknr at bknr.net Sat Mar 18 13:58:44 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sat, 18 Mar 2006 08:58:44 -0500 (EST) Subject: [bknr-cvs] r1939 - branches/xml-class-rework/projects/lisp-ecoop/website/templates Message-ID: <20060318135844.825332108B@common-lisp.net> Author: pcostanza Date: 2006-03-18 08:58:44 -0500 (Sat, 18 Mar 2006) New Revision: 1939 Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml Log: Added information about the conference's registration fees. Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-03-17 19:20:46 UTC (rev 1938) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-03-18 13:58:44 UTC (rev 1939) @@ -18,6 +18,7 @@
    • Nick Levine is going to give a keynote presentation.
    • The ALU has kindly sponsored a $500 prize fund for exceptional papers.
      • +
    • Information about the conference's fee structure is now available. Participating in the workshop can be as cheap as 150 Euro for students and 250 Euro for regular participants, including coffe breaks, lunch and receptions for both workshop days.

    Please see the News section for more details.

    Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml 2006-03-17 19:20:46 UTC (rev 1938) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml 2006-03-18 13:58:44 UTC (rev 1939) @@ -5,6 +5,12 @@

    News

    +

    March 18, 2006

    + +
      +
    • Information about registration fees for ECOOP 2006 is now available. If you want to attend only the European Lisp Workshop (two days), this will cost 150 Euro for students and 250 Euro for regular participants. If you want to attend the whole conference, including the workshop, this will cost 300 Euro for students and 500 Euro for regular participants. During the workshop days, coffee breaks and lunches are included in those fees, as are receptions on both evenings that typically include food and drinks. Note that these fees are early registration fees valid only before May 23, 2006. See the conference's page about registration fees for more information.
      • +
    +

    March 13, 2006

      From bknr at bknr.net Mon Mar 20 20:33:22 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Mon, 20 Mar 2006 15:33:22 -0500 (EST) Subject: [bknr-cvs] r1940 - branches/xml-class-rework/bknr/src/web Message-ID: <20060320203322.7B4235903C@common-lisp.net> Author: hhubner Date: 2006-03-20 15:33:22 -0500 (Mon, 20 Mar 2006) New Revision: 1940 Modified: branches/xml-class-rework/bknr/src/web/handlers.lisp Log: Strip leading slashes in website-make-path Modified: branches/xml-class-rework/bknr/src/web/handlers.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/handlers.lisp 2006-03-18 13:58:44 UTC (rev 1939) +++ branches/xml-class-rework/bknr/src/web/handlers.lisp 2006-03-20 20:33:22 UTC (rev 1940) @@ -85,9 +85,14 @@ (dolist (handler (website-handlers website)) (format t "~A => ~A~%" (uri-path (page-handler-url handler)) handler))) -(defmethod website-make-path ((website website) relative-path) - (format nil "~A~A" (website-base-href website) relative-path)) +(defun relative (path) + (if (eq #\/ (aref path 0)) + (relative (subseq path 1)) + path)) +(defmethod website-make-path ((website website) path) + (format nil "~A~A" (website-base-href website) (relative path))) + (defgeneric publish-handler (website handler)) (defgeneric publish-site (website)) From bknr at bknr.net Tue Mar 21 06:42:44 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 21 Mar 2006 01:42:44 -0500 (EST) Subject: [bknr-cvs] r1941 - branches/xml-class-rework/projects/lisp-ecoop/website/templates Message-ID: <20060321064244.25B74200D@common-lisp.net> Author: hhubner Date: 2006-03-21 01:42:43 -0500 (Tue, 21 Mar 2006) New Revision: 1941 Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml Log: fix speling glitch Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-03-20 20:33:22 UTC (rev 1940) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-03-21 06:42:43 UTC (rev 1941) @@ -18,7 +18,7 @@
      • Nick Levine is going to give a keynote presentation.
      • The ALU has kindly sponsored a $500 prize fund for exceptional papers.
        • -
      • Information about the conference's fee structure is now available. Participating in the workshop can be as cheap as 150 Euro for students and 250 Euro for regular participants, including coffe breaks, lunch and receptions for both workshop days.
        • +
      • Information about the conference's fee structure is now available. Participating in the workshop can be as cheap as 150 Euro for students and 250 Euro for regular participants, including coffee breaks, lunch and receptions for both workshop days.

      Please see the News section for more details.

      From bknr at bknr.net Tue Mar 28 13:22:03 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Tue, 28 Mar 2006 08:22:03 -0500 (EST) Subject: [bknr-cvs] r1942 - branches/xml-class-rework/projects/lisp-ecoop/website/templates Message-ID: <20060328132203.6339B58318@common-lisp.net> Author: pcostanza Date: 2006-03-28 08:22:02 -0500 (Tue, 28 Mar 2006) New Revision: 1942 Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml Log: Extended the submission deadline. Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-03-21 06:42:43 UTC (rev 1941) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-03-28 13:22:02 UTC (rev 1942) @@ -16,6 +16,7 @@

      Important News

        +
      • We have extended the submission deadline to April 15.
      • Nick Levine is going to give a keynote presentation.
      • The ALU has kindly sponsored a $500 prize fund for exceptional papers.
      • Information about the conference's fee structure is now available. Participating in the workshop can be as cheap as 150 Euro for students and 250 Euro for regular participants, including coffee breaks, lunch and receptions for both workshop days.
        • @@ -24,8 +25,8 @@

        Important Dates

          -
        • Submission deadline: April 1, 2006
          • -
        • Notification of acceptance: May 1, 2006
          • +
        • Submission deadline: April 15, 2006
          • +
        • Notification of acceptance: May 12, 2006
        • ECOOP early registration deadline: May 23, 2006
        Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml 2006-03-21 06:42:43 UTC (rev 1941) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml 2006-03-28 13:22:02 UTC (rev 1942) @@ -5,6 +5,12 @@

        News

        +

        March 28, 2006

        + +
          +
        • We have extended the submission deadline to April 15. Notifications of acceptance will now be sent out by May 12.
          • +
        +

        March 18, 2006