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

[bknr-cvs] r1968 - in branches/xml-class-rework/bknr/src: . rss web
by bknr＠bknr.net 22 Jul '06

22 Jul '06

Author: hhubner Date: 2006-07-22 07:29:38 -0400 (Sat, 22 Jul 2006) New Revision: 1968 Added: branches/xml-class-rework/bknr/src/rss/test.lisp Modified: branches/xml-class-rework/bknr/src/bknr.asd branches/xml-class-rework/bknr/src/packages.lisp branches/xml-class-rework/bknr/src/rss/rss.lisp branches/xml-class-rework/bknr/src/web/handlers.lisp branches/xml-class-rework/bknr/src/web/web-utils.lisp Log: fix smaller upload problems rewrote rss module, still needs debugging to make it work with gmail Modified: branches/xml-class-rework/bknr/src/bknr.asd =================================================================== --- branches/xml-class-rework/bknr/src/bknr.asd 2006-07-16 17:49:02 UTC (rev 1967) +++ branches/xml-class-rework/bknr/src/bknr.asd 2006-07-22 11:29:38 UTC (rev 1968) @@ -34,6 +34,7 @@ :klammerscript :bknr-datastore :bknr-data-impex + :kmrcl #+(not allegro) :acl-compat) Modified: branches/xml-class-rework/bknr/src/packages.lisp =================================================================== --- branches/xml-class-rework/bknr/src/packages.lisp 2006-07-16 17:49:02 UTC (rev 1967) +++ branches/xml-class-rework/bknr/src/packages.lisp 2006-07-22 11:29:38 UTC (rev 1968) @@ -26,7 +26,7 @@ #:start-cron)) (defpackage :bknr.rss - (:use :cl :cl-user :cl-ppcre :bknr.utils :puri :cxml-xmls) + (:use :cl :cl-user :cl-ppcre :bknr.utils :puri :cxml-xmls :bknr.datastore :bknr.indices :cxml) (:export #:xml-escape #:*img-src-scanner* #:*a-href-scanner* @@ -37,14 +37,9 @@ #:rss-to-xml #:merge-feeds - ;; feed - #:rss-feed - #:rss-feed-channel - #:rss-feed-image - #:rss-feed-items - ;; channel #:rss-channel + #:rss-channel-cleanup #:rss-channel-about #:rss-channel-title #:rss-channel-link @@ -52,6 +47,7 @@ #:rss-channel-image #:rss-channel-textinput #:rss-channel-items + #:rss-channel-xml ;; image #:rss-image @@ -62,13 +58,16 @@ ;; item #:rss-item - #:rss-item-about + #:rss-item-channel #:rss-item-title #:rss-item-link - #:rss-item-desc - #:rss-item-creator - #:rss-item-date - #:rss-item-orig-feed + #:rss-item-description + #:rss-item-author + #:rss-item-category + #:rss-item-comments + #:rss-item-enclosure + #:rss-item-guid + #:rss-item-source ;; textinput #:rss-textinput @@ -251,6 +250,12 @@ #:navi-button #:with-bknr-http-response + #:upload + #:upload-name + #:upload-pathname + #:upload-size + #:upload-content-type + #:bknr-url-path ;; templates Modified: branches/xml-class-rework/bknr/src/rss/rss.lisp =================================================================== --- branches/xml-class-rework/bknr/src/rss/rss.lisp 2006-07-16 17:49:02 UTC (rev 1967) +++ branches/xml-class-rework/bknr/src/rss/rss.lisp 2006-07-22 11:29:38 UTC (rev 1968) @@ -1,168 +1,134 @@ (in-package :bknr.rss) -(defconstant +rdf-ns+ "http://www.w3.org/1999/02/22-rdf-syntax-ns#") -(defconstant +rss-ns+ "http://purl.org/rss/1.0/") -(defconstant +dc-ns+ "http://purl.org/dc/elements/1.1/") -(defconstant +content-ns+ "http://purl.org/rss/1.0/modules/content/") +;; RSS 2.0 Generation Package -(defgeneric rss-to-xml (rss-element)) +;; This package aids in the automatic generation of RSS channels. -(defun xml-escape (xml-string) - (apply #'concatenate 'string - (loop for c across xml-string - collect (case c - ((#\<) "<") - ((#\>) ">") - ((#\&) "&") - ((#\') "'") - ((#\") """) - (t (string c)))))) +;; Class rss-channel models one rss channel. Items are added to a +;; channel by deriving other persistent classes from the (mixin) class +;; rss-item. When an object of such a derived class is created, it is +;; automatically added to its RSS channel. Likewise, it is +;; automatically deleted from the channel when it is deleted. +;; The channel that an item is put into is defined by the generic +;; function rss-item-channel which needs to be specialized for each +;; item class. The default method of this generic function specifies +;; nil as channel, which results in the creation of a warning message +;; when an object of this class is created. -(defun rss10-content (content) - `(("description") NIL ,content)) +;; The rss-item-channel method may return the channel either as a +;; string or as a channel object. -(defun rss10-tzd (zone) - (if (> zone 0) - (format nil "+~2,'0D" zone) - (format nil "-~2,'0D" (- zone)))) +;; Subclasses of rss-item should provide methods for some of the +;; generic functions (rss-item-channel rss-item-title rss-item-link +;; rss-item-description rss-item-author rss-item-category +;; rss-item-comments rss-item-enclosure rss-item-guid +;; rss-item-source). These functions are called when the RSS file for +;; the channel is generated and provide the -(defun rss10-date (date) - (multiple-value-bind (second minute hour date month year day daylight zone) - (decode-universal-time date) - (declare (ignore day daylight)) - (format nil "~4,'0D-~2,'0D-~2,'0DT~2,'0D:~2,'0D:~2,'0D~a:00" - year month date hour minute second - (rss10-tzd zone)))) +;; One rss-item can only be in one channel. -(defclass rss-feed () - ((channel :initarg :channel :accessor rss-feed-channel :initform nil) - (image :initform nil :initarg :image :accessor rss-feed-image) - (items :initarg :items :accessor rss-feed-items :initform nil))) +;;; Paul Graham, On Lisp, p191 +(defmacro aif (test-form then-form &optional else-form) + `(let ((it ,test-form)) + (if it ,then-form ,else-form))) -(defmethod rss-feed-items-with-title ((feed rss-feed)) - (let ((feed-title (rss-channel-title (rss-feed-channel feed)))) - (mapcar #'(lambda (item) - (with-slots (title about link desc creator date) item - (make-instance 'rss-item - :title (format nil "~a - ~a" - feed-title title) - :about about - :orig-feed feed - :link link - :desc desc - :creator creator - :date date))) - (rss-feed-items feed)))) +(define-persistent-class rss-channel () + ((name :update + :index-type string-unique-index + :index-reader find-rss-channel) + (title :update) + (link :update) + (description :update) + (last-update :update :initform (get-universal-time)) + (max-item-age :update :initform (* 7 3600)) + (items :update :initform nil))) -(defun merge-feeds (title url desc feeds) - (let ((items (subseq (sort (apply #'append (mapcar #'rss-feed-items-with-title feeds)) - #'> :key #'rss-item-date) - 0 30))) - (make-instance 'rss-feed - :channel (make-instance 'rss-channel :title title - :link url - :desc desc - :items (mapcar #'rss-item-link items)) - :items items))) +(defun render-mandatory-element (channel element) + (with-element (string-downcase (symbol-name element)) + (text (aif (and (slot-boundp channel element) + (slot-value channel element)) + it + (format nil "(channel ~(~A~) not defined)" element))))) -(defmethod rss-to-xml ((feed rss-feed)) - (make-node :name "rdf:RDF" - :ns +rss-ns+ - :attrs `(("xmlns:rdf" ,+rdf-ns+) - ("xmlns:dc" ,+dc-ns+)) - :children (append (list (rss-to-xml (rss-feed-channel feed))) - (if (rss-feed-image feed) - (list (rss-to-xml (rss-feed-image feed))) - nil) - (mapcar #'rss-to-xml (rss-feed-items feed))))) +(defmethod rss-channel-xml ((channel rss-channel) stream) + (with-xml-output (make-character-stream-sink stream) + (with-element "rss" + (attribute "version" "2.0") + (with-element "channel" + (dolist (slot '(title description link)) + (render-mandatory-element channel slot)) + (dolist (item (rss-channel-items channel)) + (rss-item-xml item)))))) -(defclass rss-channel () - ((about :initarg :about :accessor rss-channel-about :initform nil) - (title :initarg :title :accessor rss-channel-title :initform nil) - (link :initarg :link :accessor rss-channel-link :initform nil) - (desc :initarg :desc :accessor rss-channel-desc :initform nil) - (image :initform nil :initarg :image :accessor rss-channel-image) - (textinput :initform nil :initarg :textinput :accessor rss-channel-textinput) - (items :initform nil :initarg :items :accessor rss-channel-items))) +(defmethod rss-channel-items ((channel rss-channel)) + "Return all non-expired items in channel." + (let ((expiry-time (- (get-universal-time) (rss-channel-max-item-age channel)))) + (remove-if (lambda (item) (< (rss-item-pub-date item) expiry-time)) (slot-value channel 'items)))) -(defmethod rss-to-xml ((chan rss-channel)) - `(("channel") - (("rdf:about" ,(or (rss-channel-about chan) "nothing"))) - ,@(remove nil - `((("title") NIL ,(rss-channel-title chan)) - (("link" ) NIL ,(rss-channel-link chan)) - ,(when (rss-channel-desc chan) - `(("description") NIL ,(rss-channel-desc chan))) - ,(when (rss-channel-image chan) - `(("image") - (("rdf:resource" ,(rss-image-url (rss-channel-image chan)))))) - ,(when (rss-channel-items chan) - `(("items") - NIL - ("rdf:Seq" NIL - ,@(mapcar #'(lambda (item) - `("rdf:li" (("rdf:resource" - ,(if (typep item 'rss-item) - (rss-item-link item) - item))))) - (rss-channel-items chan))))) - ,(when (rss-channel-textinput chan) - `(("textinput") - (("rdf:resource" . ,(rss-textinput-link - (rss-channel-textinput chan)))))))))) +(deftransaction rss-channel-cleanup (channel) + "Remove expired items from the items list. Can be used to reduce +the memory footprint of very high volume channels." + (setf (slot-value channel 'items) (rss-channel-items channel))) -(defclass rss-image () - ((about :initarg :about :accessor rss-image-about :initform nil) - (title :initarg :title :accessor rss-image-title :initform nil) - (url :initarg :url :accessor rss-image-url :initform nil) - (link :initarg :link :accessor rss-image-link :initform nil))) +;; Internal helper functions to find a channel -(defmethod rss-to-xml ((image rss-image)) - `(("image") - (("rdf:about" ,(or (rss-image-about image) "nothing"))) - (("title") NIL ,(rss-image-title image)) - (("link" ) NIL ,(rss-image-link image)) - (("url" ) NIL ,(rss-image-url image)))) +(defmethod remove-item ((channel rss-channel) (item rss-item)) + "Remove item from channel. May only be called within transaction context." + (setf (slot-value channel 'items) (remove item (rss-channel-items channel)))) -(defclass rss-item () - ((about :initarg :about :accessor rss-item-about :initform nil) - (title :initarg :title :accessor rss-item-title) - (link :initarg :link :accessor rss-item-link) - (desc :initform nil :initarg :desc :accessor rss-item-desc) - (creator :initarg :creator :accessor rss-item-creator :initform nil) - (date :initarg :date :accessor rss-item-date :initform 0) - (orig-feed :initarg :orig-feed :accessor rss-item-orig-feed :initform nil))) +(defmethod remove-item ((channel string) (item rss-item)) + (aif (find-rss-channel channel) + (remove-item it item))) -(defmethod rss-to-xml ((item rss-item)) - `(("item") - (("rdf:about" ,(or (rss-item-about item) "nothing"))) - ,@(remove - nil - `((("title") NIL ,(rss-item-title item)) - (("link" ) NIL ,(rss-item-link item)) - ,(when (rss-item-desc item) - (rss10-content (rss-item-desc item))) - ,(when (rss-item-creator item) - `("dc:creator" - NIL - ,(rss-item-creator item))) - ,(when (rss-item-date item) - `("dc:date" - NIL - ,(rss10-date (rss-item-date item)))))))) +(defmethod remove-item ((channel (eql nil)) (item rss-item)) + (warn "no RSS channel defined for item ~A" item)) -(defclass rss-textinput () - ((about :initarg :about :accessor rss-textinput-about :initform nil) - (title :initarg :title :accessor rss-textinput-title) - (desc :initarg :desc :accessor rss-textinput-desc) - (link :initarg :link :accessor rss-textinput-link) - (name :initarg :name :accessor rss-textinput-name))) +(defmethod add-item ((channel rss-channel) (item rss-item)) + "Add item to channel. May only be called within transaction context." + (setf (slot-value channel 'items) (cons item (rss-channel-items channel)))) -(defmethod rss-to-xml ((textinput rss-textinput)) - `(("textinput") - (("rdf:about" ,(or (rss-textinput-about textinput) "nothing"))) - (("title") NIL ,(rss-textinput-title textinput)) - (("link" ) NIL ,(rss-textinput-link textinput)) - (("name" ) NIL ,(rss-textinput-name textinput)) - (("description") NIL ,(rss-textinput-desc textinput)))) +(defmethod add-item ((channel string) (item rss-item)) + (aif (find-rss-channel channel) + (add-item it item) + (warn "can't find RSS channel ~A to add newly created item ~A to" channel item))) + +(defmethod add-item ((channel (eql nil)) (item rss-item)) + (warn "no RSS channel defined for item ~A" item)) + +;; Mixin for items + +(define-persistent-class rss-item () + ((pub-date :read))) + +(defmethod initialize-persistent-instance :after ((rss-item rss-item)) + (setf (slot-value rss-item 'pub-date) (get-universal-time)) + (add-item (rss-item-channel rss-item) rss-item)) + +(defmethod destroy-object :before ((rss-item rss-item)) + (remove-item (rss-item-channel rss-item) rss-item)) + +(defmethod rss-item-channel ((rss-item rss-item))) +(defmethod rss-item-title ((rss-item rss-item))) +(defmethod rss-item-link ((rss-item rss-item))) +(defmethod rss-item-description ((rss-item rss-item))) +(defmethod rss-item-author ((rss-item rss-item))) +(defmethod rss-item-category ((rss-item rss-item))) +(defmethod rss-item-comments ((rss-item rss-item))) +(defmethod rss-item-enclosure ((rss-item rss-item))) +(defmethod rss-item-guid ((rss-item rss-item))) +(defmethod rss-item-source ((rss-item rss-item))) + +(defun item-slot-element (item slot-name) + (let ((accessor (kmrcl:concat-symbol 'rss-item- slot-name))) + (aif (funcall accessor item) + (with-element (string-downcase (symbol-name slot-name)) + (text it))))) + +(defmethod rss-item-xml ((item rss-item)) + (with-element "item" + (dolist (slot '(title link description author category comments enclosure guid source)) + (item-slot-element item slot)) + (with-element "pubDate" + (text (format-date-time (rss-item-pub-date item) :mail-style t))))) + Added: branches/xml-class-rework/bknr/src/rss/test.lisp =================================================================== --- branches/xml-class-rework/bknr/src/rss/test.lisp 2006-07-16 17:49:02 UTC (rev 1967) +++ branches/xml-class-rework/bknr/src/rss/test.lisp 2006-07-22 11:29:38 UTC (rev 1968) @@ -0,0 +1,15 @@ +(make-package :bknr.rss.test) +(in-package :bknr.rss.test) +(use-package :bknr.rss) +(use-package :bknr.datastore) + +(define-persistent-class test-item (rss-item) + ()) + +(defmethod rss-item-channel ((item test-item)) + "blub") + +(defmethod rss-item-author ((item test-item)) + "Hans Hübner") + +(open-store "/tmp/datastore/") \ No newline at end of file Modified: branches/xml-class-rework/bknr/src/web/handlers.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/handlers.lisp 2006-07-16 17:49:02 UTC (rev 1967) +++ branches/xml-class-rework/bknr/src/web/handlers.lisp 2006-07-22 11:29:38 UTC (rev 1968) @@ -237,7 +237,7 @@ (error e)))) (handle handler req))) (handler-case - (mapcar #'delete-file (mapcar #'cdr (getf (request-reply-plist req) 'uploaded-files))) + (mapcar #'delete-file (mapcar #'cdr (request-uploaded-files req))) (error (e) (warn "error ~A ignored while deleting uploaded files" e))))) Modified: branches/xml-class-rework/bknr/src/web/web-utils.lisp =================================================================== --- branches/xml-class-rework/bknr/src/web/web-utils.lisp 2006-07-16 17:49:02 UTC (rev 1967) +++ branches/xml-class-rework/bknr/src/web/web-utils.lisp 2006-07-22 11:29:38 UTC (rev 1968) @@ -2,6 +2,8 @@ (enable-interpol-syntax) +(defstruct upload name pathname content-type) + (defgeneric object-url (obj)) (defgeneric edit-object-url (obj)) (defgeneric html-link (obj)) @@ -31,7 +33,6 @@ (loop (multiple-value-bind (kind part-name file-name content-type) (parse-multipart-header (get-multipart-header request)) - (declare (ignore content-type)) (case kind (:eof (return)) (:data (push (cons part-name (get-all-multipart-data request)) parameters)) @@ -53,7 +54,8 @@ :if-exists :error :element-type '(unsigned-byte 8)) (write-sequence contents temporary-file)) - (push (cons part-name uploaded-file-name) uploaded-files)))))) + (push (make-upload :name part-name :pathname uploaded-file-name + :content-type content-type) uploaded-files)))))) (t (get-all-multipart-data request :limit *upload-file-size-limit*))))) (when file-size-limit-reached @@ -91,10 +93,15 @@ (parse-request-body request :uploads t) (setf (getf (request-reply-plist request) 'body-parsed) t))) -(defun request-uploaded-files (request) - "Return a list of conses (NAME . PATHNAME) which contains files uploaded by the user" +(defun request-uploaded-files (request &key all-info) + "Return a list of conses (NAME . PATHNAME) which contains files uploaded by the user. +If :all-info is non-nil, the full upload file information is returned as a list" (get-parameters-from-body request) - (getf (request-reply-plist request) 'uploaded-files)) + (if all-info + (getf (request-reply-plist request) 'uploaded-files) + (mapcar (lambda (upload) (cons (upload-name upload) + (upload-pathname upload))) + (getf (request-reply-plist request) 'uploaded-files)))) (defun request-uploaded-file (request parameter-name) (cdr (find parameter-name (request-uploaded-files request) :test #'equal :key #'car)))

1 0

[bknr-cvs] r1967 - in branches/xml-class-rework/projects/bos: . payment-website/infosystem payment-website/static payment-website/templates/de
by bknr＠bknr.net 16 Jul '06

16 Jul '06

Author: hhubner Date: 2006-07-16 13:49:02 -0400 (Sun, 16 Jul 2006) New Revision: 1967 Modified: branches/xml-class-rework/projects/bos/make-base-lisp.lisp branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js branches/xml-class-rework/projects/bos/payment-website/static/bos.js branches/xml-class-rework/projects/bos/payment-website/static/content_style.css branches/xml-class-rework/projects/bos/payment-website/static/toplevel_style.css branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_main.xml Log: Login panel on home page added Modified: branches/xml-class-rework/projects/bos/make-base-lisp.lisp =================================================================== --- branches/xml-class-rework/projects/bos/make-base-lisp.lisp 2006-07-16 13:41:47 UTC (rev 1966) +++ branches/xml-class-rework/projects/bos/make-base-lisp.lisp 2006-07-16 17:49:02 UTC (rev 1967) @@ -1,8 +1,8 @@ ;; create base lisp image -(compile-file "../bknr/patches/patch-around-mop-cmucl19a.lisp") -(load "../bknr/patches/patch-around-mop-cmucl19a.x86f") -(load "../thirdparty/asdf/asdf.lisp") +(compile-file "../../bknr/patches/patch-around-mop-cmucl19a.lisp") +(load "../../bknr/patches/patch-around-mop-cmucl19a.x86f") +(load "../../thirdparty/asdf/asdf.lisp") (defun setup-registry () (format t "; setting up ASDF registry, please be patient...") @@ -11,12 +11,12 @@ (pushnew (make-pathname :directory (pathname-directory asd-pathname)) asdf:*central-registry* :test #'equal)) - (remove "asd" (directory #p"../**/") + (remove "asd" (directory #p"../../**/") :test (complement #'equal) :key #'pathname-type)) (format t " ~D directories found~%" (length asdf:*central-registry*))) (setup-registry) -(save-lisp "home:cmucl.core") +(save-lisp "cmucl.core") Modified: branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js 2006-07-16 13:41:47 UTC (rev 1966) +++ branches/xml-class-rework/projects/bos/payment-website/infosystem/javascript.js 2006-07-16 17:49:02 UTC (rev 1967) @@ -215,6 +215,14 @@ timer = 0; var user = document.form0.__sponsorid.value; var password = document.form0.__password.value; + + var current_url = '' + document.location; + + if (user == '' && current_url.match(/__sponsorid/)) { + user = current_url.replace(/.*__sponsorid=([^?]*).*/, "$1"); + password = current_url.replace(/.*__password=([^?]*).*/, "$1"); + } + var url = http_pfad + "/sponsor-login"; if (user != "") { url += "?__sponsorid=" + user + "&__password=" + password; Modified: branches/xml-class-rework/projects/bos/payment-website/static/bos.js =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/static/bos.js 2006-07-16 13:41:47 UTC (rev 1966) +++ branches/xml-class-rework/projects/bos/payment-website/static/bos.js 2006-07-16 17:49:02 UTC (rev 1967) @@ -1,4 +1,4 @@ - +// -*- Java -*- Script // *** extrafenster fuer impressum, kontakt etc. *** // function window_extra(target) { mywin=open(target,"detailwin","width=482,height=600,status=no,toolbar=no,menubar=no,resizable=yes,scrollbars=yes,left=100,top=100"); @@ -22,9 +22,18 @@ // *** extrafenster fuer satellitenkarte *** // function window_infosys() { var language = document.location.pathname.substr(1, 2); // XXX funktioniert nur mit 2-buchstaben-abkuerzungen von sprachen - mywin=open("/infosystem/" + language + "/satellitenkarte.htm", - "infowin", - "width=740,height=500,status=no,toolbar=no,menubar=no,resizable=no,scrollbars=no,left=250,top=50"); + var url = "/infosystem/" + language + "/satellitenkarte.htm"; + + var sponsorid_input = document.getElementById('sponsorid-input'); + var password_input = document.getElementById('password-input'); + + if (sponsorid_input && password_input) { + url += "?__sponsorid=" + sponsorid_input.value + "&__password=" + password_input.value; + } + + mywin=open(url, + "infowin", + "width=740,height=500,status=no,toolbar=no,menubar=no,resizable=no,scrollbars=no,left=250,top=50"); mywin.focus(); }; Modified: branches/xml-class-rework/projects/bos/payment-website/static/content_style.css =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/static/content_style.css 2006-07-16 13:41:47 UTC (rev 1966) +++ branches/xml-class-rework/projects/bos/payment-website/static/content_style.css 2006-07-16 17:49:02 UTC (rev 1967) @@ -15,7 +15,7 @@ width: 150px; max-width: 150px; padding-bottom: 0px; - margin : 58px 15px 10px 15px; + margin : 5px 15px 10px 15px; border-width: 1px; border-style: solid solid solid solid; border-color : Silver; @@ -33,7 +33,7 @@ width: 150px; height: 398px; max-width: 150px; - margin : 28px 15px 10px 15px; + margin : 5px 15px 10px 15px; visibility: visible; display: block; font : normal normal 0.7em Verdana, Geneva, Arial, Helvetica, sans-serif; @@ -50,9 +50,9 @@ width: 150px; max-width: 150px; height: 180px; - margin : 22px 15px 10px 15px; + margin : 0px 15px 10px 15px; border-width: 1px; - border-style: solid solid none solid; + border-style: solid solid solid solid; border-color : Silver; visibility: visible; display: block; @@ -65,6 +65,34 @@ background-position : bottom; } +/* Login-Formular auf der HP */ +#textbox_left_login { + position: relative; + background-color: white; + z-index: 20; + width: 150px; + max-width: 150px; + height: 85px; + margin : 0px 15px 0px 15px; + border-width: 1px; + border-style: solid solid solid solid; + border-color : Silver; + visibility: visible; + display: block; + font : normal normal 0.7em Verdana, Geneva, Arial, Helvetica, sans-serif; + color : #333333; + font-weight : normal; + text-decoration : none; +} + +.password-input { + width: 115px; +} + +.login-button { + top: 5px; +} + #textbox_right { position: relative; Modified: branches/xml-class-rework/projects/bos/payment-website/static/toplevel_style.css =================================================================== --- branches/xml-class-rework/projects/bos/payment-website/static/toplevel_style.css 2006-07-16 13:41:47 UTC (rev 1966) +++ branches/xml-class-rework/projects/bos/payment-website/static/toplevel_style.css 2006-07-16 17:49:02 UTC (rev 1967) @@ -351,7 +351,7 @@ #menue_footer { position: relative; z-index: 15; - margin-top: 20px; + margin-top: 5px; margin-left: 0px; width: 186px; height: 20px; 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-07-16 13:41:47 UTC (rev 1966) +++ branches/xml-class-rework/projects/bos/payment-website/templates/de/toplevel_main.xml 2006-07-16 17:49:02 UTC (rev 1967) @@ -148,6 +148,34 @@ </tr> </table> </div> + <div id="textbox_left_login"> + <form> + <table border="0" cellpadding="0" cellspacing="0"> + <tr><td colspan="4" height="6"></td></tr> + <tr> + <td width="6"> </td> + <td colspan="2"><strong>Sponsor-ID</strong></td> + <td width="6"></td> + </tr> + <tr> + <td width="6"> </td> + <td colspan="2"><input id="sponsorid-input" type="text" name="__sponsorid"/></td> + <td width="6"></td> + </tr> + <tr> + <td width="6"> </td> + <td colspan="2"><strong>Kennwort</strong></td> + <td width="6"></td> + </tr> + <tr> + <td width="6"> </td> + <td colspan="2"><input id="password-input" class="password-input" type="password" name="__password"/> + <img onclick="window_infosys()" class="login-button" src="/infosystem/bilder/submit.gif"/></td> + <td width="6"></td> + </tr> + </table> + </form> + </div>  <div id="menue_footer"> <a href="javascript:window_extra('privacy')" class="footer">

1 0

[bknr-cvs] r1966 - in branches/xml-class-rework/projects/quickhoney: src website/static website/templates
by bknr＠bknr.net 16 Jul '06

16 Jul '06

Author: hhubner Date: 2006-07-16 09:41:47 -0400 (Sun, 16 Jul 2006) New Revision: 1966 Modified: branches/xml-class-rework/projects/quickhoney/src/handlers.lisp branches/xml-class-rework/projects/quickhoney/website/static/javascript.js branches/xml-class-rework/projects/quickhoney/website/templates/index.xml Log: Make contact image user-replaceable. Modified: branches/xml-class-rework/projects/quickhoney/src/handlers.lisp =================================================================== --- branches/xml-class-rework/projects/quickhoney/src/handlers.lisp 2006-07-16 11:49:47 UTC (rev 1965) +++ branches/xml-class-rework/projects/quickhoney/src/handlers.lisp 2006-07-16 13:41:47 UTC (rev 1966) @@ -151,7 +151,7 @@ (handler-case (progn (unless uploaded-file - (error "no file uploaded in upload handler")) + (error "no file uploaded")) (cl-gd:with-image-from-file* (uploaded-file) (let* ((color-table (make-hash-table :test #'eql)) (width (cl-gd:image-width)) @@ -187,7 +187,7 @@ (:body (:h2 "Error during upload") (:p "Error during upload:") - (:pre (:princ-safe e)) + (:p (:princ-safe (apply #'format nil (simple-condition-format-control e) (simple-condition-format-arguments e)))) (:p ((:a :href "javascript:window.close()") "ok")))))))))))) (defclass upload-animation-handler (admin-only-handler page-handler) @@ -249,7 +249,7 @@ (not (equal "" subdirectory))) (error "no subcategory selected, upload not accepted")) (unless uploaded-file - (error "no file uploaded in upload handler")) + (error "no file uploaded")) (cl-gd:with-image-from-file* (uploaded-file) (unless (and (eql 208 (cl-gd:image-width)) (eql 208 (cl-gd:image-height))) @@ -278,5 +278,5 @@ (:body (:h2 "Error during upload") (:p "Error during upload:") - (:pre (:princ-safe e)) + (:p (:princ-safe (apply #'format nil (simple-condition-format-control e) (simple-condition-format-arguments e)))) (:p ((:a :href "javascript:window.close()") "ok")))))))))))) Modified: branches/xml-class-rework/projects/quickhoney/website/static/javascript.js =================================================================== --- branches/xml-class-rework/projects/quickhoney/website/static/javascript.js 2006-07-16 11:49:47 UTC (rev 1965) +++ branches/xml-class-rework/projects/quickhoney/website/static/javascript.js 2006-07-16 13:41:47 UTC (rev 1966) @@ -155,7 +155,7 @@ document.getElementById("image_detail").innerHTML = ''; if (current_directory == 'quickhoney') { load_button_images(); - setTimeout("if (current_directory == 'quickhoney') { show_cms_window('edit_quickhoney_form'); }", 2000); + setTimeout("if (current_directory == 'quickhoney') { show_cms_window('edit_quickhoney_form'); } else if (current_directory == 'contact') { show_cms_window('edit_contact_form'); }", 2000); } else { setTimeout("if (!current_image) { show_cms_window('upload_form'); }", 2000); do_query(); @@ -366,6 +366,12 @@ ['000000', 'ffffff', '9900ff'], function() { footer_hide(); + + if (button_images['contact/contact']) { + document.getElementById("contactimage").src = button_images['contact/contact']; + } + + current_directory = 'contact'; }); function preload_menu_images() { @@ -425,6 +431,8 @@ if (logged_in) { if (current_directory == "quickhoney") { show_cms_window("edit_quickhoney_form"); + } else if (current_directory == "contact") { + show_cms_window("edit_contact_form"); } else if (current_directory && current_subdirectory) { if (current_image) { show_cms_window('edit_form'); @@ -548,6 +556,22 @@ } } +/* contact image */ + +function contact_loaded(image) { + + debug('contact_loaded - image is ' + image + ' width: ' + image.width); + + reveal_image(image); + + if (logged_in) { + var current_contact_image = image.src.substring(image.src.indexOf('/image/') + 7); + if (current_contact_image != 'trans') { + document.getElementById("delete_contactimage_form_element").setAttribute("action", "/edit-image-js/" + current_contact_image); + } + } +} + /* directory - first level category */ var button_images = []; @@ -557,10 +581,13 @@ button_images = _button_images; if (current_directory == 'quickhoney' + || current_directory == 'contact' || (document.getElementById("homeimage").src.indexOf("trans") != -1)) { document.getElementById("homeimage").style.visibility = 'hidden'; document.getElementById("homeimage").src = button_images['home/home']; + + document.getElementById("contactimage").src = button_images['contact/contact']; } } @@ -570,7 +597,8 @@ + '/home/home' + '/pixel/' + directory_button['pixel'].join(',') + '/vector/' + directory_button['vector'].join(',') - + '/photo,000000/' + directory_button['photo'].join(',')); + + '/photo,000000/' + directory_button['photo'].join(',') + + '/contact/contact'); } function directory(directory_name) { Modified: branches/xml-class-rework/projects/quickhoney/website/templates/index.xml =================================================================== --- branches/xml-class-rework/projects/quickhoney/website/templates/index.xml 2006-07-16 11:49:47 UTC (rev 1965) +++ branches/xml-class-rework/projects/quickhoney/website/templates/index.xml 2006-07-16 13:41:47 UTC (rev 1966) @@ -105,7 +105,7 @@ <div id="contact"> <div id="contact-bigimage"> - <img src="/image/contact-peter-nana" /> + <img id="contactimage" src="/image/trans" onload="contact_loaded(this);"/> </div> <img class="contact" src="/image/type_contact_email" /> <p class="contact"> @@ -238,6 +238,23 @@ </form> </div> + <div id="edit_contact_form" class="cms_form"> + <div class="cms_title">Upload home image</div> + <form action="/upload-image/contact/button" method="post" + enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);"> + <p class="cms"> + <input type="file" name="image-file" /><br /> + </p> + <p class="cms"> + <input type="submit" name="action" value="upload" /> + </p> + </form> + <div class="cms_title">Delete this home image</div> + <form id="delete_contactimage_form_element" action="/edit-image-js" target="edit_iframe" method="post"> + <input type="submit" name="action" value="delete" onclick="return confirm('Really delete this contact image?');" /> + </form> + </div> + <div id="saving_edits_form" class="cms_form"> <div class="cms_title">Saving Edits</div> <p class="cms">

1 0

[bknr-cvs] r1965 - in branches/xml-class-rework/projects/quickhoney: src website/static
by bknr＠bknr.net 16 Jul '06

16 Jul '06

Author: hhubner Date: 2006-07-16 07:49:47 -0400 (Sun, 16 Jul 2006) New Revision: 1965 Modified: branches/xml-class-rework/projects/quickhoney/src/handlers.lisp branches/xml-class-rework/projects/quickhoney/website/static/javascript.js Log: Accept more animation types. Clear detail display so that running movies are stopped, this in particular stops any sound playing when navigating back to the menu. Modified: branches/xml-class-rework/projects/quickhoney/src/handlers.lisp =================================================================== --- branches/xml-class-rework/projects/quickhoney/src/handlers.lisp 2006-07-16 08:55:39 UTC (rev 1964) +++ branches/xml-class-rework/projects/quickhoney/src/handlers.lisp 2006-07-16 11:49:47 UTC (rev 1965) @@ -28,9 +28,10 @@ ()) (defmethod handle-object ((handler animation-handler) animation req) - (with-bknr-http-response (req :content-type "application/x-shockwave-flash") - (with-http-body (req *ent*) - (blob-to-stream (quickhoney-animation-image-animation animation) *html-stream*)))) + (let ((content-type (blob-type (quickhoney-animation-image-animation animation)))) + (with-bknr-http-response (req :content-type content-type) + (with-http-body (req *ent*) + (blob-to-stream (quickhoney-animation-image-animation animation) *html-stream*))))) (defclass image-query-js-handler (javascript-handler object-handler) ()) @@ -201,8 +202,8 @@ (progn (unless (and uploaded-image uploaded-animation) (error "files not uploaded")) - (unless (find (upload-content-type uploaded-animation) '("application/x-shockwave-flash") :test #'equal) - (error "Invalid content type, only Flash animations are accepted")) + (unless (find (upload-content-type uploaded-animation) '("application/x-shockwave-flash" "video/quicktime" "application/x-director") :test #'equal) + (error "Invalid content type ~A - Please upload a Flash, Shockwave or Quicktime file" (upload-content-type uploaded-animation))) (cl-gd:with-image-from-file* ((upload-pathname uploaded-image)) (let* ((animation-blob (make-blob-from-file (upload-pathname uploaded-animation) 'blob :type (upload-content-type uploaded-animation))) Modified: branches/xml-class-rework/projects/quickhoney/website/static/javascript.js =================================================================== --- branches/xml-class-rework/projects/quickhoney/website/static/javascript.js 2006-07-16 08:55:39 UTC (rev 1964) +++ branches/xml-class-rework/projects/quickhoney/website/static/javascript.js 2006-07-16 11:49:47 UTC (rev 1965) @@ -152,6 +152,7 @@ show_cms_window("image_deleted_form"); current_image = null; + document.getElementById("image_detail").innerHTML = ''; if (current_directory == 'quickhoney') { load_button_images(); setTimeout("if (current_directory == 'quickhoney') { show_cms_window('edit_quickhoney_form'); }", 2000); @@ -456,6 +457,7 @@ current_directory = pagename; current_subdirectory = null; current_image = null; + document.getElementById("image_detail").innerHTML = ''; // Update path display display_path(); @@ -580,6 +582,7 @@ current_directory = directory_name; current_subdirectory = false; current_image = false; + document.getElementById("image_detail").innerHTML = ''; footer_up(); @@ -621,6 +624,7 @@ footer_down(); current_image = false; + document.getElementById("image_detail").innerHTML = ''; query_imagedb(current_directory, subdirectory); @@ -884,6 +888,7 @@ current_directory = 'clients'; current_image = null; + document.getElementById("image_detail").innerHTML = ''; subdirectory('nicejobs'); }

1 0

[bknr-cvs] r1964 - branches/xml-class-rework/bknr/src/data
by bknr＠bknr.net 16 Jul '06

16 Jul '06

Author: hhubner Date: 2006-07-16 04:55:39 -0400 (Sun, 16 Jul 2006) New Revision: 1964 Modified: branches/xml-class-rework/bknr/src/data/blob.lisp Log: Correct wrong logic for automatic type determination Modified: branches/xml-class-rework/bknr/src/data/blob.lisp =================================================================== --- branches/xml-class-rework/bknr/src/data/blob.lisp 2006-07-16 08:54:30 UTC (rev 1963) +++ branches/xml-class-rework/bknr/src/data/blob.lisp 2006-07-16 08:55:39 UTC (rev 1964) @@ -146,7 +146,7 @@ (blob-from-stream blob in))) (defun make-blob-from-file (pathname &optional (class 'blob) &rest initargs) - (when (getf initargs :type) + (unless (getf initargs :type) (setf (getf initargs :type) (pathname-type pathname))) (let ((blob (apply #'make-object class initargs)))

1 0

[bknr-cvs] r1963 - in branches/xml-class-rework/projects/quickhoney: src website/static website/templates
by bknr＠bknr.net 16 Jul '06

16 Jul '06

Author: hhubner Date: 2006-07-16 04:54:30 -0400 (Sun, 16 Jul 2006) New Revision: 1963 Added: branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.xml branches/xml-class-rework/projects/quickhoney/website/templates/image-detail.xml branches/xml-class-rework/projects/quickhoney/website/templates/index.xml branches/xml-class-rework/projects/quickhoney/website/templates/user-error.xml Removed: branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.bknr branches/xml-class-rework/projects/quickhoney/website/templates/image-detail.bknr branches/xml-class-rework/projects/quickhoney/website/templates/index.bknr branches/xml-class-rework/projects/quickhoney/website/templates/user-error.bknr Modified: branches/xml-class-rework/projects/quickhoney/src/handlers.lisp branches/xml-class-rework/projects/quickhoney/src/image.lisp branches/xml-class-rework/projects/quickhoney/src/load.lisp branches/xml-class-rework/projects/quickhoney/src/webserver.lisp branches/xml-class-rework/projects/quickhoney/website/static/javascript.js branches/xml-class-rework/projects/quickhoney/website/static/styles.css Log: Convert to current development tree, support more animation types. Modified: branches/xml-class-rework/projects/quickhoney/src/handlers.lisp =================================================================== --- branches/xml-class-rework/projects/quickhoney/src/handlers.lisp 2006-07-12 09:06:31 UTC (rev 1962) +++ branches/xml-class-rework/projects/quickhoney/src/handlers.lisp 2006-07-16 08:54:30 UTC (rev 1963) @@ -194,15 +194,19 @@ (defmethod handle ((handler upload-animation-handler) req) (with-query-params (req client) - (let ((uploaded-image-file (cdr (find "image-file" (request-uploaded-files req) :test #'equal :key #'car))) - (uploaded-animation-file (cdr (find "animation-file" (request-uploaded-files req) :test #'equal :key #'car)))) + (let* ((uploaded-files (request-uploaded-files req :all-info t)) + (uploaded-image (find "image-file" uploaded-files :test #'equal :key #'upload-name)) + (uploaded-animation (find "animation-file" uploaded-files :test #'equal :key #'upload-name))) (handler-case (progn - (unless (and uploaded-image-file uploaded-animation-file) + (unless (and uploaded-image uploaded-animation) (error "files not uploaded")) - (cl-gd:with-image-from-file* (uploaded-image-file) - (let* ((animation-blob (make-blob-from-file uploaded-animation-file 'blob)) - (image (make-store-image :name (pathname-name uploaded-image-file) + (unless (find (upload-content-type uploaded-animation) '("application/x-shockwave-flash") :test #'equal) + (error "Invalid content type, only Flash animations are accepted")) + (cl-gd:with-image-from-file* ((upload-pathname uploaded-image)) + (let* ((animation-blob (make-blob-from-file (upload-pathname uploaded-animation) 'blob + :type (upload-content-type uploaded-animation))) + (image (make-store-image :name (pathname-name (upload-pathname uploaded-image)) :class-name 'quickhoney-animation-image :keywords (list :upload :pixel :animation) :initargs `(:client ,client :animation ,animation-blob)))) @@ -226,7 +230,7 @@ (:body (:h2 "Error during upload") (:p "Error during upload:") - (:pre (:princ-safe e)) + (:p (:princ-safe (apply #'format nil (simple-condition-format-control e) (simple-condition-format-arguments e)))) (:p ((:a :href "javascript:window.close()") "ok")))))))))))) (defclass upload-button-handler (admin-only-handler page-handler) Modified: branches/xml-class-rework/projects/quickhoney/src/image.lisp =================================================================== --- branches/xml-class-rework/projects/quickhoney/src/image.lisp 2006-07-12 09:06:31 UTC (rev 1962) +++ branches/xml-class-rework/projects/quickhoney/src/image.lisp 2006-07-16 08:54:30 UTC (rev 1963) @@ -21,4 +21,7 @@ (get-keywords-intersection-store-images '(:import)))) (define-persistent-class quickhoney-animation-image (quickhoney-image) - ((animation :update))) \ No newline at end of file + ((animation :update))) + +(defmethod destroy-object :before ((image quickhoney-animation-image)) + (delete-object (quickhoney-animation-image-animation image))) \ No newline at end of file Modified: branches/xml-class-rework/projects/quickhoney/src/load.lisp =================================================================== --- branches/xml-class-rework/projects/quickhoney/src/load.lisp 2006-07-12 09:06:31 UTC (rev 1962) +++ branches/xml-class-rework/projects/quickhoney/src/load.lisp 2006-07-16 08:54:30 UTC (rev 1963) @@ -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 4085 :spawn #'swank::simple-announce-function t) + (mp::startup-idle-and-top-level-loops) Modified: branches/xml-class-rework/projects/quickhoney/src/webserver.lisp =================================================================== --- branches/xml-class-rework/projects/quickhoney/src/webserver.lisp 2006-07-12 09:06:31 UTC (rev 1962) +++ branches/xml-class-rework/projects/quickhoney/src/webserver.lisp 2006-07-16 08:54:30 UTC (rev 1963) @@ -10,6 +10,7 @@ (unpublish :all t) + (setf bknr.web::*upload-file-size-limit* (* 30 1024 1024)) (make-instance 'website :name "Quickhoney CMS" :handler-definitions `(("/random-image" random-image-handler) Modified: branches/xml-class-rework/projects/quickhoney/website/static/javascript.js =================================================================== --- branches/xml-class-rework/projects/quickhoney/website/static/javascript.js 2006-07-12 09:06:31 UTC (rev 1962) +++ branches/xml-class-rework/projects/quickhoney/website/static/javascript.js 2006-07-16 08:54:30 UTC (rev 1963) @@ -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 */ @@ -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') { @@ -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"; Modified: branches/xml-class-rework/projects/quickhoney/website/static/styles.css =================================================================== --- branches/xml-class-rework/projects/quickhoney/website/static/styles.css 2006-07-12 09:06:31 UTC (rev 1962) +++ branches/xml-class-rework/projects/quickhoney/website/static/styles.css 2006-07-16 08:54:30 UTC (rev 1963) @@ -5,6 +5,11 @@ background-color: #ffffff; } +#hidden-vcard { + visibility: hidden; + height: 0px; +} + /* cms styles */ h1 { Deleted: branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.bknr =================================================================== --- branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.bknr 2006-07-12 09:06:31 UTC (rev 1962) +++ branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.bknr 2006-07-16 08:54:30 UTC (rev 1963) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html - xmlns="http://www.w3.org/1999/xhtml" - xmlns:bknr="http://bknr.net" - xmlns:quickhoney="http://quickhoney.com" - > - <head> - <link rel="stylesheet" href="/static/styles.css" /> - <script src="/static/javascript.js" type="text/javascript"> - </script> - <title>QuickHoney</title> - </head> - - <body id="quickhoney"> - - <table border="0" width="100%"> - <tr height="200"> - <td height="200" colspan="2"> - <img src="/image/trans" /> - </td> - </tr> - <tr> - <td align="center"> - <a href="#" onclick="frontpage()"> - <img border="0" src="/image/Startscreen" width="438" height="67" /> - </a> - </td> - </tr> - <tr> - <td align="center"> - <a href="#" onclick="frontpage()"> - <img border="0" src="/image/EnterSite" width="116" height="18" /> - <img border="0" src="/image/trans" width="70" height="1"/> - </a> - </td> - </tr> - <tr height="200"> - <td height="200"> - <img src="/image/trans" /> - </td> - </tr> - </table> - <br /> - <div align="center"> - Site requires Firefox, Safari or Internet Explorer and Javascript. - </div> - </body> -</html> Copied: branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.xml (from rev 1962, branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.bknr) =================================================================== --- branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.bknr 2006-07-12 09:06:31 UTC (rev 1962) +++ branches/xml-class-rework/projects/quickhoney/website/templates/frontpage.xml 2006-07-16 08:54:30 UTC (rev 1963) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html + xmlns="http://www.w3.org/1999/xhtml" + xmlns:bknr="http://bknr.net" + xmlns:quickhoney="http://quickhoney.com" + > + <head> + <link rel="stylesheet" href="/static/styles.css" /> + <script src="/static/javascript.js" type="text/javascript"> + </script> + <title>QuickHoney - Nana Rausch + Peter Stemmler</title> + </head> + + <body id="quickhoney"> + <div id="hidden-vcard"> + <h1>QuickHoney Illustrations</h1><br /> + <h1>Peter Stemmler</h1>Phone: 646.270.5562<br /> + <h1>Nana Rausch</h1>Phone 646.270.5592<br /> + Studio for Illustration, New York, Portfolio, Email<br /> + </div> + + <table border="0" width="100%"> + <tr height="200"> + <td height="200" colspan="2"> + <img src="/image/trans" /> + </td> + </tr> + <tr> + <td align="center"> + <a href="#" onclick="frontpage()"> + <img border="0" src="/image/Startscreen" width="438" height="67" /> + </a> + </td> + </tr> + <tr> + <td align="center"> + <a href="#" onclick="frontpage()"> + <img border="0" src="/image/EnterSite" width="116" height="18" /> + <img border="0" src="/image/trans" width="70" height="1"/> + </a> + </td> + </tr> + <tr height="200"> + <td height="200"> + <img src="/image/trans" /> + </td> + </tr> + </table> + <br /> + <div align="center"> + Site requires Firefox, Safari or Internet Explorer and Javascript. + </div> + </body> +</html> Deleted: branches/xml-class-rework/projects/quickhoney/website/templates/image-detail.bknr =================================================================== --- branches/xml-class-rework/projects/quickhoney/website/templates/image-detail.bknr 2006-07-12 09:06:31 UTC (rev 1962) +++ branches/xml-class-rework/projects/quickhoney/website/templates/image-detail.bknr 2006-07-16 08:54:30 UTC (rev 1963) @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html - xmlns="http://www.w3.org/1999/xhtml" - xmlns:bknr="http://bknr.net" - > - <head> - <link rel="stylesheet" href="/static/styles.css" /> - <script src="/static/javascript.js" type="text/javascript"> - </script> - <title>QuickHoney image</title> - </head> - <body id="imagedetail"> - <div id="logo"> - <a href="javascript:window.close()"> - <img src="/image/quickhoney" id="the_logo" name="logo" border="0" /> - </a> - </div> - - <div id="image"> - <a href="javascript:window.close()"> - <img src="/image/trans" id="the_image" name="image" border="0" /> - </a> - </div> - </body> - <script language="javascript"> - load_image(); - </script> -</html> \ No newline at end of file Copied: branches/xml-class-rework/projects/quickhoney/website/templates/image-detail.xml (from rev 1962, branches/xml-class-rework/projects/quickhoney/website/templates/image-detail.bknr) Deleted: branches/xml-class-rework/projects/quickhoney/website/templates/index.bknr =================================================================== --- branches/xml-class-rework/projects/quickhoney/website/templates/index.bknr 2006-07-12 09:06:31 UTC (rev 1962) +++ branches/xml-class-rework/projects/quickhoney/website/templates/index.bknr 2006-07-16 08:54:30 UTC (rev 1963) @@ -1,321 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html - xmlns="http://www.w3.org/1999/xhtml" - xmlns:bknr="http://bknr.net" - xmlns:quickhoney="http://quickhoney.com" - > - <head> - <link rel="stylesheet" href="/static/styles.css" /> - <script src="/static/javascript.js" type="text/javascript"> - </script> - <title>QuickHoney</title> - </head> - - <body id="quickhoney"> - - <a onclick="show_page('quickhoney')" href="#"> - <img alt="quickhoney" class="menu" id="m_quickhoney" src="/image/quickhoney" /> - </a> - <a onclick="show_page('pixel')" href="#"> - <img alt="pixel" class="menu" id="m_pixel" src="/image/pixel" /> - </a> - <a onclick="show_page('vector')" href="#"> - <img alt="vector" class="menu" id="m_vector" src="/image/vector" /> - </a> - <a onclick="show_page('photo')" href="#"> - <img alt="photo" class="menu" id="m_photo" src="/image/photo" /> - </a> - <a onclick="show_page('clients')" href="#"> - <img alt="clients" class="menu" id="m_clients" src="/image/clients" /> - </a> - <a onclick="show_page('contact')" href="#"> - <img alt="contact" class="menu" id="m_contact" src="/image/contact" /> - </a> - - <p id="path" class="text"> </p> - <p id="version" class="text"><quickhoney:version-and-last-change /></p> - - <div id="elements"> - <div id="quickhoney"> - <img alt="quickhoney" class="inherited_image" id="homeimage" src="/image/trans" onload="home_loaded(this);" /> - </div> - - <div id="directory"> - <a href="#"> - <img alt="button" class="button" id="button0" onload="reveal_image(this);" src="/image/trans" /> - </a> - <a href="#"> - <img alt="button" class="button" id="button1" onload="reveal_image(this);" src="/image/trans" /> - </a> - <a href="#"> - <img alt="button" class="button" id="button2" onload="reveal_image(this);" src="/image/trans" /> - </a> - <a href="#"> - <img alt="button" class="button" id="button3" onload="reveal_image(this);" src="/image/trans" /> - </a> - <a href="#"> - <img alt="button" class="button" id="button4" onload="reveal_image(this);" src="/image/trans" /> - </a> - <a href="#"> - <img alt="button" class="button" id="button5" onload="reveal_image(this);" src="/image/trans" /> - </a> - </div> - - <div id="results"> - <p id="page_navbar" class="text"> - </p> - - <p id="result_page_count" class="text"> - </p> - - <div id="thumbnails"> - </div> - </div> - - <div id="browse"> - <span id="image_navbar" class="text"> - </span> - <span id="full_click" class="text"> - </span> - - <span id="results_navbar" class="text"> - <span id="back_to_results"><a onclick="back_to_results()" href="#">back to results</a></span> - <span id="result_image_count">  - </span> - </span> - - <div id="image_detail"> - </div> - - <div id="metadata" class="text"> - (not available) - </div> - </div> - - <div id="clients"> - <a href="#" onclick="return nice_jobs();"> - <img id="jobs-banner" src="/random-image/button/jobs" border="0" /> - </a> - <img id="clients-type" src="/image/type-niceclients" /> - <p id="client_names"> - </p> - </div> - - <div id="contact"> - <div id="contact-bigimage"> - <img src="/image/contact_nanapeter" /> - </div> - <img class="contact" src="/image/type_contact_email" /> - <p class="contact"> - Peter Stemmler: <a href="mailto:p@quickhoney.com">p(a)quickhoney.com</a><br /> - Nana Rausch: <a href="mailto:n@quickhoney.com">n(a)quickhoney.com</a> - </p> - <img class="contact" src="/image/type_contact_phone" /> - <p class="contact"> - Peter Stemmler: 646.270.5562<br /> - Nana Rausch: 646.270.5592 - </p> - <img class="contact" src="/image/type_contact_address" /> - <p class="contact"> - QuickHoney - New York<br /> - 536 Sixth Avenue, 2nd&3rd Floor<br /> - New York, NY 10011<br /> - USA <br /> - </p> - </div> - - <div id="footer" class="text"> - ©1998-2005 QuickHoney Nana Rausch & Peter Stemmler. No part of - this website may be reproduced in any manner without permission. - Programming by Hübner/Odendahl <a href="http://headcraft.de/" target="_new"> - headcraft</a> - </div> - </div> - -  - - <div id="cms"> - <div id="upload_form" class="cms_form"> - <form id="upload_form_element" action="/upload-image" method="post" - enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);"> - <div class="cms_title">Upload new image</div> - <p class="cms"> - Category: <b><span id="upload_category"> </span></b><br /><br /> - <input type="file" name="image-file" /><br /> - </p> - <p class="cms"> - Client:<br /> - <input type="text" id="upload_client" name="upload_client" value="" /><br /> - <div id="upload_client_select"> - </div> - </p> - <p class="cms"> - <input type="submit" name="upload" value="upload" /> - </p> - </form> - </div> - - <div id="pixel_button_upload_form" class="cms_form"> - <form action="/upload-button" method="post" - enctype="multipart/form-data" target="upload_result" onsubmit="do_button_upload(this.target);"> - <input type="hidden" name="directory" value="pixel" /> - <div class="cms_title">Upload new button</div> - <p class="cms"> - Category: - <select name="subdirectory" size="1"> - <option selected="selected"></option> - <option>birdview</option> - <option>parts</option> - <option>icons</option> - <option>editorial</option> - <option>animation</option> - <option>smallworld</option> - </select> - <br /><br /> - <input type="file" name="image-file" /><br /> - </p> - <p class="cms"> - <input type="submit" name="upload" value="upload" /> - </p> - </form> - </div> - - <div id="upload_animation_form" class="cms_form"> - <form id="upload_form_element" action="/upload-animation" method="post" - enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);"> - <div class="cms_title">Upload new animatoin</div> - <p class="cms"> - Image:<br /> - <input type="file" name="image-file" /><br /> - Animation (Flash File):<br /> - <input type="file" name="animation-file" /><br /> - </p> - <p class="cms"> - Client:<br /> - <input type="text" id="upload_client" name="upload_client" value="" /><br /> - <div id="upload_animation_client_select"> - </div> - </p> - <p class="cms"> - <input type="submit" name="upload" value="upload" /> - </p> - </form> - </div> - - <div id="edit_form" class="cms_form"> - <form id="edit_form_element" action="/edit-image-js" target="edit_iframe" method="post" - onsubmit="return do_edit();"> - <div class="cms_title">Edit image</div> - <p class="cms"> - Client:<br /> - <input type="text" id="edit_client" name="client" value="" /><br /> - <div id="edit_client_select"> - </div> - </p> - <p class="cms"> - <input type="submit" name="action" value="edit" /> - <input type="submit" name="action" value="delete" onclick="return confirm('Really delete this image?');" /> - </p> - </form> - </div> - - <div id="edit_quickhoney_form" class="cms_form"> - <div class="cms_title">Upload home image</div> - <form action="/upload-image/home/button" method="post" - enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);"> - <p class="cms"> - <input type="file" name="image-file" /><br /> - </p> - <p class="cms"> - <input type="submit" name="action" value="upload" /> - </p> - </form> - <div class="cms_title">Delete this home image</div> - <form id="delete_homeimage_form_element" action="/edit-image-js" target="edit_iframe" method="post"> - <input type="submit" name="action" value="delete" onclick="return confirm('Really delete this home image?');" /> - </form> - </div> - - <div id="saving_edits_form" class="cms_form"> - <div class="cms_title">Saving Edits</div> - <p class="cms"> - Your request is being processed. - </p> - </div> - - <div id="image_edited_form" class="cms_form"> - <div class="cms_title">Edits saved</div> - <p class="cms"> - Your image edits have been saved. - </p> - </div> - - <div id="image_deleted_form" class="cms_form"> - <div class="cms_title">Image deleted</div> - <p class="cms"> - The image has been deleted. - </p> - </div> - - <div id="login_form" class="cms_form"> - <form method="post" name="login_form" onsubmit="return send_login();"> - <b>Login</b> <br /> - Username<br /> - <input type="text" name="username" /><br /> - Password<br /> - <input type="password" name="password" /><br /><br /> - <a href="#" onclick="send_login();" class="cmslink">login</a> - <input class="invisibleSubmit" type="submit" /> - </form> - </div> - - <div id="login_failure" class="cms_form"> - <b>Login failed</b> <br /> - Please check your user name and password. - </div> - - <div id="login_status" class="cms_form"> - <p>You are logged in as <b id="username"> </b></p> - <p><a href="#" onclick="send_logout();" class="cmslink">logout</a></p> - </div> - - </div> - - <div id="debugger" class="debugger"> - <b>Debugger</b> <br /> <br /> - <a id="clear_debug_window" href="#" onclick="clear_debug_window()" class="debugger">clear debug window</a><br /> <br /> - <p id="debugger_text" class="debugger"> - </p> - </div> - - <p id="cue"> - query database - </p> - - <div id="query_frame" class="hidden_iframe"> - <iframe src="about:blank" height="0" width="0" name="query_iframe"> </iframe> - </div> - - <div id="buttonload_frame" class="hidden_iframe"> - <iframe src="about:blank" height="0" width="0" name="buttonload_iframe"> </iframe> - </div> - - <div id="clients_frame" class="hidden_iframe"> - <iframe src="/clients-js" height="0" width="0" name="clients_iframe"> </iframe> - </div> - - <div id="login_frame" class="hidden_iframe"> - <iframe src="/login-js" height="0" width="0" name="login_iframe"> </iframe> - </div> - - <div id="edit_frame" class="hidden_iframe"> - <iframe src="about:blank" height="0" width="0" name="edit_iframe"> </iframe> - </div> - - <script language="javascript" type="text/javascript"> - init(); - </script> - </body> -</html> Copied: branches/xml-class-rework/projects/quickhoney/website/templates/index.xml (from rev 1962, branches/xml-class-rework/projects/quickhoney/website/templates/index.bknr) =================================================================== --- branches/xml-class-rework/projects/quickhoney/website/templates/index.bknr 2006-07-12 09:06:31 UTC (rev 1962) +++ branches/xml-class-rework/projects/quickhoney/website/templates/index.xml 2006-07-16 08:54:30 UTC (rev 1963) @@ -0,0 +1,321 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html + xmlns="http://www.w3.org/1999/xhtml" + xmlns:bknr="http://bknr.net" + xmlns:quickhoney="http://quickhoney.com" + > + <head> + <link rel="stylesheet" href="/static/styles.css" /> + <script src="/static/javascript.js" type="text/javascript"> + </script> + <title>QuickHoney</title> + </head> + + <body id="quickhoney"> + + <a onclick="show_page('quickhoney')" href="#"> + <img alt="quickhoney" class="menu" id="m_quickhoney" src="/image/quickhoney" /> + </a> + <a onclick="show_page('pixel')" href="#"> + <img alt="pixel" class="menu" id="m_pixel" src="/image/pixel" /> + </a> + <a onclick="show_page('vector')" href="#"> + <img alt="vector" class="menu" id="m_vector" src="/image/vector" /> + </a> + <a onclick="show_page('photo')" href="#"> + <img alt="photo" class="menu" id="m_photo" src="/image/photo" /> + </a> + <a onclick="show_page('clients')" href="#"> + <img alt="clients" class="menu" id="m_clients" src="/image/clients" /> + </a> + <a onclick="show_page('contact')" href="#"> + <img alt="contact" class="menu" id="m_contact" src="/image/contact" /> + </a> + + <p id="path" class="text"> </p> + <p id="version" class="text"><quickhoney:version-and-last-change /></p> + + <div id="elements"> + <div id="quickhoney"> + <img alt="quickhoney" class="inherited_image" id="homeimage" src="/image/trans" onload="home_loaded(this);" /> + </div> + + <div id="directory"> + <a href="#"> + <img alt="button" class="button" id="button0" onload="reveal_image(this);" src="/image/trans" /> + </a> + <a href="#"> + <img alt="button" class="button" id="button1" onload="reveal_image(this);" src="/image/trans" /> + </a> + <a href="#"> + <img alt="button" class="button" id="button2" onload="reveal_image(this);" src="/image/trans" /> + </a> + <a href="#"> + <img alt="button" class="button" id="button3" onload="reveal_image(this);" src="/image/trans" /> + </a> + <a href="#"> + <img alt="button" class="button" id="button4" onload="reveal_image(this);" src="/image/trans" /> + </a> + <a href="#"> + <img alt="button" class="button" id="button5" onload="reveal_image(this);" src="/image/trans" /> + </a> + </div> + + <div id="results"> + <p id="page_navbar" class="text"> + </p> + + <p id="result_page_count" class="text"> + </p> + + <div id="thumbnails"> + </div> + </div> + + <div id="browse"> + <span id="image_navbar" class="text"> + </span> + <span id="full_click" class="text"> + </span> + + <span id="results_navbar" class="text"> + <span id="back_to_results"><a onclick="back_to_results()" href="#">back to results</a></span> + <span id="result_image_count">  + </span> + </span> + + <div id="image_detail"> + </div> + + <div id="metadata" class="text"> + (not available) + </div> + </div> + + <div id="clients"> + <a href="#" onclick="return nice_jobs();"> + <img id="jobs-banner" src="/random-image/button/jobs" border="0" /> + </a> + <img id="clients-type" src="/image/type-niceclients" /> + <p id="client_names"> + </p> + </div> + + <div id="contact"> + <div id="contact-bigimage"> + <img src="/image/contact-peter-nana" /> + </div> + <img class="contact" src="/image/type_contact_email" /> + <p class="contact"> + Peter Stemmler: <a href="mailto:p@quickhoney.com">p(a)quickhoney.com</a><br /> + Nana Rausch: <a href="mailto:n@quickhoney.com">n(a)quickhoney.com</a> + </p> + <img class="contact" src="/image/type_contact_phone" /> + <p class="contact"> + Peter Stemmler: 646.270.5562<br /> + Nana Rausch: 646.270.5592 + </p> + <img class="contact" src="/image/type_contact_address" /> + <p class="contact"> + QuickHoney - New York<br /> + 536 Sixth Avenue, 2nd&3rd Floor<br /> + New York, NY 10011<br /> + USA <br /> + </p> + </div> + + <div id="footer" class="text"> + ©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 <a href="http://headcraft.de/" target="_new"> + headcraft</a> + </div> + </div> + +  + + <div id="cms"> + <div id="upload_form" class="cms_form"> + <form id="upload_form_element" action="/upload-image" method="post" + enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);"> + <div class="cms_title">Upload new image</div> + <p class="cms"> + Category: <b><span id="upload_category"> </span></b><br /><br /> + <input type="file" name="image-file" /><br /> + </p> + <p class="cms"> + Client:<br /> + <input type="text" id="upload_client" name="upload_client" value="" /><br /> + <div id="upload_client_select"> + </div> + </p> + <p class="cms"> + <input type="submit" name="upload" value="upload" /> + </p> + </form> + </div> + + <div id="pixel_button_upload_form" class="cms_form"> + <form action="/upload-button" method="post" + enctype="multipart/form-data" target="upload_result" onsubmit="do_button_upload(this.target);"> + <input type="hidden" name="directory" value="pixel" /> + <div class="cms_title">Upload new button</div> + <p class="cms"> + Category: + <select name="subdirectory" size="1"> + <option selected="selected"></option> + <option>birdview</option> + <option>parts</option> + <option>icons</option> + <option>editorial</option> + <option>animation</option> + <option>smallworld</option> + </select> + <br /><br /> + <input type="file" name="image-file" /><br /> + </p> + <p class="cms"> + <input type="submit" name="upload" value="upload" /> + </p> + </form> + </div> + + <div id="upload_animation_form" class="cms_form"> + <form id="upload_form_element" action="/upload-animation" method="post" + enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);"> + <div class="cms_title">Upload new animatoin</div> + <p class="cms"> + Image:<br /> + <input type="file" name="image-file" /><br /> + Animation (Flash File):<br /> + <input type="file" name="animation-file" /><br /> + </p> + <p class="cms"> + Client:<br /> + <input type="text" id="upload_client" name="upload_client" value="" /><br /> + <div id="upload_animation_client_select"> + </div> + </p> + <p class="cms"> + <input type="submit" name="upload" value="upload" /> + </p> + </form> + </div> + + <div id="edit_form" class="cms_form"> + <form id="edit_form_element" action="/edit-image-js" target="edit_iframe" method="post" + onsubmit="return do_edit();"> + <div class="cms_title">Edit image</div> + <p class="cms"> + Client:<br /> + <input type="text" id="edit_client" name="client" value="" /><br /> + <div id="edit_client_select"> + </div> + </p> + <p class="cms"> + <input type="submit" name="action" value="edit" /> + <input type="submit" name="action" value="delete" onclick="return confirm('Really delete this image?');" /> + </p> + </form> + </div> + + <div id="edit_quickhoney_form" class="cms_form"> + <div class="cms_title">Upload home image</div> + <form action="/upload-image/home/button" method="post" + enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);"> + <p class="cms"> + <input type="file" name="image-file" /><br /> + </p> + <p class="cms"> + <input type="submit" name="action" value="upload" /> + </p> + </form> + <div class="cms_title">Delete this home image</div> + <form id="delete_homeimage_form_element" action="/edit-image-js" target="edit_iframe" method="post"> + <input type="submit" name="action" value="delete" onclick="return confirm('Really delete this home image?');" /> + </form> + </div> + + <div id="saving_edits_form" class="cms_form"> + <div class="cms_title">Saving Edits</div> + <p class="cms"> + Your request is being processed. + </p> + </div> + + <div id="image_edited_form" class="cms_form"> + <div class="cms_title">Edits saved</div> + <p class="cms"> + Your image edits have been saved. + </p> + </div> + + <div id="image_deleted_form" class="cms_form"> + <div class="cms_title">Image deleted</div> + <p class="cms"> + The image has been deleted. + </p> + </div> + + <div id="login_form" class="cms_form"> + <form method="post" name="login_form" onsubmit="return send_login();"> + <b>Login</b> <br /> + Username<br /> + <input type="text" name="username" /><br /> + Password<br /> + <input type="password" name="password" /><br /><br /> + <a href="#" onclick="send_login();" class="cmslink">login</a> + <input class="invisibleSubmit" type="submit" /> + </form> + </div> + + <div id="login_failure" class="cms_form"> + <b>Login failed</b> <br /> + Please check your user name and password. + </div> + + <div id="login_status" class="cms_form"> + <p>You are logged in as <b id="username"> </b></p> + <p><a href="#" onclick="send_logout();" class="cmslink">logout</a></p> + </div> + + </div> + + <div id="debugger" class="debugger"> + <b>Debugger</b> <br /> <br /> + <a id="clear_debug_window" href="#" onclick="clear_debug_window()" class="debugger">clear debug window</a><br /> <br /> + <p id="debugger_text" class="debugger"> + </p> + </div> + + <p id="cue"> + query database + </p> + + <div id="query_frame" class="hidden_iframe"> + <iframe src="about:blank" height="0" width="0" name="query_iframe"> </iframe> + </div> + + <div id="buttonload_frame" class="hidden_iframe"> + <iframe src="about:blank" height="0" width="0" name="buttonload_iframe"> </iframe> + </div> + + <div id="clients_frame" class="hidden_iframe"> + <iframe src="/clients-js" height="0" width="0" name="clients_iframe"> </iframe> + </div> + + <div id="login_frame" class="hidden_iframe"> + <iframe src="/login-js" height="0" width="0" name="login_iframe"> </iframe> + </div> + + <div id="edit_frame" class="hidden_iframe"> + <iframe src="about:blank" height="0" width="0" name="edit_iframe"> </iframe> + </div> + + <script language="javascript" type="text/javascript"> + init(); + </script> + </body> +</html> Deleted: branches/xml-class-rework/projects/quickhoney/website/templates/user-error.bknr =================================================================== --- branches/xml-class-rework/projects/quickhoney/website/templates/user-error.bknr 2006-07-12 09:06:31 UTC (rev 1962) +++ branches/xml-class-rework/projects/quickhoney/website/templates/user-error.bknr 2006-07-16 08:54:30 UTC (rev 1963) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html - xmlns="http://www.w3.org/1999/xhtml" - xmlns:bknr="http://bknr.net" - xmlns:lisp-ecoop05="http://lisp-ecoop05.bknr.net" - xmlns:menu="http://bknr.net/menu" - > -Your request could not be processed because an error occured: -<pre> -$(error-message) -</pre> -</html> \ No newline at end of file Copied: branches/xml-class-rework/projects/quickhoney/website/templates/user-error.xml (from rev 1962, branches/xml-class-rework/projects/quickhoney/website/templates/user-error.bknr) =================================================================== --- branches/xml-class-rework/projects/quickhoney/website/templates/user-error.bknr 2006-07-12 09:06:31 UTC (rev 1962) +++ branches/xml-class-rework/projects/quickhoney/website/templates/user-error.xml 2006-07-16 08:54:30 UTC (rev 1963) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html + xmlns="http://www.w3.org/1999/xhtml" + xmlns:bknr="http://bknr.net" + xmlns:lisp-ecoop05="http://lisp-ecoop05.bknr.net" + xmlns:menu="http://bknr.net/menu" + > +Your request could not be processed because an error occured: +<p> +$(error-message) +</p> +</html> \ No newline at end of file

1 0

[bknr-cvs] r1962 - branches
by bknr＠bknr.net 12 Jul '06

12 Jul '06

Author: hhubner Date: 2006-07-12 05:06:31 -0400 (Wed, 12 Jul 2006) New Revision: 1962 Added: branches/grin/ Log: Create branch for GRIN maintenance. Copied: branches/grin (from rev 1768, trunk)

1 0

[bknr-cvs] r1961 - branches/xml-class-rework/projects/lisp-ecoop/website/templates
by bknr＠bknr.net 10 Jul '06

10 Jul '06

Author: pcostanza Date: 2006-07-10 09:53:43 -0400 (Mon, 10 Jul 2006) New Revision: 1961 Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml Log: Slides, 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-06-29 17:34:32 UTC (rev 1960) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-07-10 13:53:43 UTC (rev 1961) @@ -17,12 +17,10 @@ <h2>Important News</h2> <ul> <li>The <a href="programme">programme</a> is now available.</li> -<li>Nick Levine is going to give a keynote presentation entitled <a href="http://lisp-ecoop06.bknr.net/profile/556"><i>How to stay poor, with macros and closures.</i></a> (See the link for the recently uploaded abstract for his presentation.)</li> <li>We have accepted five papers for presentation, and a breakout group on <a href="http://vaxbusters.org/workshop/"><i>Lisp Hardware revisited.</i></a></li> -<li>The workshop will also contain tutorials about CLIM and reflection and metaprogramming in Lisp.</li> -<li>There is still enough room for more participants, so please contact <a href="mailto:pc@p-cos.net">Pascal Costanza</a> if you wish to attend the workshop.</li> +<li>Didier Verna has received the best paper award for his paper on <a href="submission/39808">Beating C in Scientific Computing Applications</a>. Congratulations!</li> +<li>You can now also download slides for the accepted papers.</li> </ul> -<p>Please see the <a href="news">News section</a> for more details.</p> <h2>Important Dates</h2> <ul> Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml 2006-06-29 17:34:32 UTC (rev 1960) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml 2006-07-10 13:53:43 UTC (rev 1961) @@ -5,6 +5,13 @@ <h1>News</h1> +<h3>July 10, 2006</h3> + +<ul> +<li>Didier Verna has received the best paper award for his paper on <a href="submission/39808">Beating C in Scientific Computing Applications</a>. Congratulations!</li> +<li>You can now also download slides for the accepted papers.</li> +</ul> + <h3>June 29, 2006</h3> <ul>

1 0

[bknr-cvs] r1960 - branches/xml-class-rework/projects/lisp-ecoop/website/templates
by bknr＠bknr.net 29 Jun '06

29 Jun '06

Author: pcostanza Date: 2006-06-29 13:34:32 -0400 (Thu, 29 Jun 2006) New Revision: 1960 Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml Log: Updated news. Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-06-29 17:29:03 UTC (rev 1959) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-06-29 17:34:32 UTC (rev 1960) @@ -16,9 +16,10 @@ <h2>Important News</h2> <ul> +<li>The <a href="programme">programme</a> is now available.</li> <li>Nick Levine is going to give a keynote presentation entitled <a href="http://lisp-ecoop06.bknr.net/profile/556"><i>How to stay poor, with macros and closures.</i></a> (See the link for the recently uploaded abstract for his presentation.)</li> <li>We have accepted five papers for presentation, and a breakout group on <a href="http://vaxbusters.org/workshop/"><i>Lisp Hardware revisited.</i></a></li> -<li>The workshop will also contain tutorials about CLIM and/or reflection and metaprogramming in Lisp.</li> +<li>The workshop will also contain tutorials about CLIM and reflection and metaprogramming in Lisp.</li> <li>There is still enough room for more participants, so please contact <a href="mailto:pc@p-cos.net">Pascal Costanza</a> if you wish to attend the workshop.</li> </ul> <p>Please see the <a href="news">News section</a> for more details.</p> Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml 2006-06-29 17:29:03 UTC (rev 1959) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/news.xml 2006-06-29 17:34:32 UTC (rev 1960) @@ -5,6 +5,12 @@ <h1>News</h1> +<h3>June 29, 2006</h3> + +<ul> +<li>The <a href="programme">programme</a> is now available.</li> +</ul> + <h3>June 4, 2006</h3> <ul>

1 0

[bknr-cvs] r1959 - branches/xml-class-rework/projects/lisp-ecoop/website/templates
by bknr＠bknr.net 29 Jun '06

29 Jun '06

Author: pcostanza Date: 2006-06-29 13:29:03 -0400 (Thu, 29 Jun 2006) New Revision: 1959 Added: branches/xml-class-rework/projects/lisp-ecoop/website/templates/programme.xml Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml branches/xml-class-rework/projects/lisp-ecoop/website/templates/menu.xml Log: Added the programmme. Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-06-21 04:39:31 UTC (rev 1958) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/home.xml 2006-06-29 17:29:03 UTC (rev 1959) @@ -5,7 +5,7 @@ <h1>3rd European Lisp Workshop</h1> -<p>July 3 - Nantes, Frances - co-located with ECOOP 2006</p> +<p>July 3 - Nantes, France - co-located with ECOOP 2006</p> <p> <a href="http://www.alu.org" target="_new"> Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/menu.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/menu.xml 2006-06-21 04:39:31 UTC (rev 1958) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/menu.xml 2006-06-29 17:29:03 UTC (rev 1959) @@ -4,6 +4,7 @@ <item url="news" title="News" /> <item url="people" title="People" /> <item url="submissions" title="Submissions" /> + <item url="programme" title="Programme" /> <item url="registration" title="Registration" /> <item url="contact" title="Organization / Contact" /> <!-- Added: branches/xml-class-rework/projects/lisp-ecoop/website/templates/programme.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/programme.xml 2006-06-21 04:39:31 UTC (rev 1958) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/programme.xml 2006-06-29 17:29:03 UTC (rev 1959) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet type="text/xsl" href="lisp-ecoop.xsl" ?> +<lisp-ecoop:page name="programme" + xmlns:lisp-ecoop="http://lisp-ecoop06.bknr.net"> + +<h1>Workshop Programme</h1> + +<h3>9:00 - 10:30</h3> + +<ul> + <li>Introduction</li> + <li>Nick Levine, "How to stay poor, with macros and closures"</li> +</ul> + +<h3>10:30 - 11:00</h3> + +<ul> + <li>Coffee Break</li> +</ul> + +<h3>11:00 - 12:30</h3> + +<ul> + <li>Marie Beurton-Aimar, Nicolas Parisey. <i>An agent-based framework to simulate metabolic processes.</i></li> + <li>Brecht Desmet, Ellie D'Hondt, Pascal Costanza, and Theo D'Hondt. <i>Simulation of Quantum Computations in Lisp.</i></li> + <li>David Lewis, Christophe Rhodes. <i>Lisp tools for musicology - Research aids for an Electronic Corpus of Lute Music.</i></li> + <li>Rudi Schlatte. <i>Naturalising Foreign Libraries.</i></li> + <li>Didier Verna. <i>Beating C in Scientific Computing Applications - On the Behavior and Performance of LISP, Part 1.</i></li> +</ul> + +<h3>12:30 - 14:00</h3> + +<ul> + <li>Lunch Break</li> +</ul> + +<h3>14:00 - 15:30</h3> + +<ul> + <li>Short introduction to the breakout group about Lisp hardware, then in parallel:</li> + <li>Lisp hardware breakout group</li> + <li>Tutorial on CLIM</li> + <li>Tutorial on Reflection and Metaprogramming</li> +</ul> + +<h3>15:30 - 16:00</h3> + +<ul> + <li>Coffee Break</li> +</ul> + +<h3>16:00 - 17:00</h3> + +<ul> + <li>Summary of the Lisp hardware breakout group</li> + <li>Lightning Talks</li> +</ul> + +</lisp-ecoop:page>

1 0