From bknr at bknr.net Mon Jul 10 13:53:44 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Mon, 10 Jul 2006 09:53:44 -0400 (EDT) Subject: [bknr-cvs] r1961 - branches/xml-class-rework/projects/lisp-ecoop/website/templates Message-ID: <20060710135344.9E3A94E003@common-lisp.net> 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 @@
Please see the News section for more details.
- - | -|
- - - - | -|
- - - - - | -|
- - | -
+ + | +|
+ + + + | +|
+ + + + + | +|
+ + | +
-
-
- --
-
- Peter Stemmler: p at quickhoney.com
- Nana Rausch: n at quickhoney.com
-
- Peter Stemmler: 646.270.5562
- Nana Rausch: 646.270.5592
-
- QuickHoney - New York
- 536 Sixth Avenue, 2nd&3rd Floor
- New York, NY 10011
- USA
-
- Your request is being processed. -
-- Your image edits have been saved. -
-- The image has been deleted. -
-You are logged in as
- -- query database -
- -+
+
+ ++
+
+ Peter Stemmler: p at quickhoney.com
+ Nana Rausch: n at quickhoney.com
+
+ Peter Stemmler: 646.270.5562
+ Nana Rausch: 646.270.5592
+
+ QuickHoney - New York
+ 536 Sixth Avenue, 2nd&3rd Floor
+ New York, NY 10011
+ USA
+
+ Your request is being processed. +
++ Your image edits have been saved. +
++ The image has been deleted. +
+You are logged in as
+ ++ query database +
+ +-$(error-message) -- \ 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 @@ + + + +Your request could not be processed because an error occured: +
+$(error-message) +
+ \ No newline at end of file From bknr at bknr.net Sun Jul 16 08:55:40 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 16 Jul 2006 04:55:40 -0400 (EDT) Subject: [bknr-cvs] r1964 - branches/xml-class-rework/bknr/src/data Message-ID: <20060716085540.1725677013@common-lisp.net> 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))) From bknr at bknr.net Sun Jul 16 11:49:48 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 16 Jul 2006 07:49:48 -0400 (EDT) Subject: [bknr-cvs] r1965 - in branches/xml-class-rework/projects/quickhoney: src website/static Message-ID: <20060716114948.8F6725C167@common-lisp.net> 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'); } From bknr at bknr.net Sun Jul 16 13:41:48 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 16 Jul 2006 09:41:48 -0400 (EDT) Subject: [bknr-cvs] r1966 - in branches/xml-class-rework/projects/quickhoney: src website/static website/templates Message-ID: <20060716134148.8831F710EF@common-lisp.net> 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 @@@@ -238,6 +238,23 @@
From bknr at bknr.net Sun Jul 16 17:49:03 2006 From: bknr at bknr.net (bknr at bknr.net) Date: Sun, 16 Jul 2006 13:49:03 -0400 (EDT) Subject: [bknr-cvs] r1967 - in branches/xml-class-rework/projects/bos: . payment-website/infosystem payment-website/static payment-website/templates/de Message-ID: <20060716174903.5975F18004@common-lisp.net> 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 @@