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

[bknr-cvs] r1908 - in branches/xml-class-rework/projects/lisp-ecoop: src website/static website/templates
by bknr＠bknr.net 08 Mar '06

08 Mar '06

Author: hhubner Date: 2006-03-08 01:49:37 -0500 (Wed, 08 Mar 2006) New Revision: 1908 Added: branches/xml-class-rework/projects/lisp-ecoop/website/templates/create-submission.xml Modified: branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js branches/xml-class-rework/projects/lisp-ecoop/website/templates/upload.xml branches/xml-class-rework/projects/lisp-ecoop/website/templates/user-error.xml Log: First version for Pascal to test. Modified: branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp 2006-03-07 20:03:26 UTC (rev 1907) +++ branches/xml-class-rework/projects/lisp-ecoop/src/handlers.lisp 2006-03-08 06:49:37 UTC (rev 1908) @@ -14,14 +14,21 @@ (defmethod handle-form ((handler add-participant-handler) (action (eql nil)) req) (with-lisp-ecoop-page (req "Create new participant") - ((:form :method "post" :enctype "multipart/form-data") + ((:form :method "post" :enctype "multipart/form-data" :onsubmit "return check_participant_form(this);") ((:table :border "1") (:tr (:th "Login") (:td (text-field "login" :size 15))) (:tr (:th "Full Name") (:td (text-field "full-name" :size 25))) (:tr (:th "Email") - (:td (text-field "email" :size 25)))) + (:td (text-field "email" :size 25))) + (:tr (:th "Submission") + (:td ((:select :name "submission" :id "submission-selector" :size "1") + (dolist (submission (sort (copy-list (class-instances 'submission)) + #'string-lessp :key #'submission-title)) + (html ((:option :value (store-object-id submission)) + (:princ-safe (submission-title submission)))))) + ((:input :type "submit" :onclick "return create_submission_window();" :value "new"))))) (submit-button "create" "create")))) (defmethod handle-form ((handler add-participant-handler) (action (eql :create)) req) @@ -37,7 +44,7 @@ (:default-initargs :class 'participant :query-function #'find-user)) (defmethod handle-object-form ((handler edit-participant-handler) (action (eql nil)) (participant participant) req) - (with-lisp-ecoop-page (req #?"Edit participant ((user-login participant))") + (with-lisp-ecoop-page (req #?"Edit participant $((user-login participant))") ((:form :method "post" :enctype "multipart/form-data") ((:table :border "1") (:tr (:th "Login") @@ -66,7 +73,22 @@ (with-http-body (req *ent* :external-format '(unsigned-byte 8)) (write-sequence pdf net.aserve::*html-stream*))))) +(defclass make-submission-handler (admin-only-handler page-handler) + ()) +(defmethod handle ((handler make-submission-handler) req) + (with-query-params (req title abstract) + (let ((submission (make-object 'submission :title title :abstract abstract))) + (with-lisp-ecoop-page (req #?"Submission created") + (html ((:script :type "text/javascript") + (:princ-safe #?" +if (window.opener) { + opener.add_submission($((store-object-id submission)), '$(title)'); + window.close(); +} else { + window.location.href = 'edit-submission/$((store-object-id submission))'; +}"))))))) + (defclass upload-document-handler (object-handler) () (:default-initargs :class 'submission)) @@ -111,6 +133,7 @@ (define-bknr-webserver-module participants ("/add-participant" add-participant-handler) ("/edit-participant" edit-participant-handler) + ("/make-submission" make-submission-handler) ("/pdf" pdf-handler) ("/upload-document" upload-document-handler) ("/delete-document" delete-document-handler) Modified: branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp 2006-03-07 20:03:26 UTC (rev 1907) +++ branches/xml-class-rework/projects/lisp-ecoop/src/webserver.lisp 2006-03-08 06:49:37 UTC (rev 1908) @@ -17,13 +17,12 @@ (make-instance 'website :name "LISP ECOOP CMS" :base-href base-href + :template-base-directory (namestring (merge-pathnames #p"templates/" *website-directory*)) + :template-command-packages '((:lisp-ecoop . :lisp-ecoop.tags) + (:bknr . :bknr.web) + (:menu . :bknr.site-menu)) :handler-definitions `(("/" redirect-handler :to "home") - ("/" template-handler - :destination ,(namestring (merge-pathnames #p"templates/" *website-directory*)) - :command-packages ((:lisp-ecoop . :lisp-ecoop.tags) - (:bknr . :bknr.web) - (:menu . :bknr.site-menu))) ("/static" directory-handler :destination ,(unix-namestring (merge-pathnames #p"static/" *website-directory*)))) :modules '(user images stats mailinglist mailinglist-registration participants schedule) Modified: branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js 2006-03-07 20:03:26 UTC (rev 1907) +++ branches/xml-class-rework/projects/lisp-ecoop/website/static/javascript.js 2006-03-08 06:49:37 UTC (rev 1908) @@ -1,6 +1,6 @@ // -*- Java -*- -var POPUP_WINDOW_PARAMS = 'width=500,height=300,status=no,toolbar=no,menubar=no,resizable=yes,scrollbars=yes'; +var POPUP_WINDOW_PARAMS = 'width=700,height=450,status=no,toolbar=no,menubar=no,resizable=yes,scrollbars=yes'; function http_request(url) { @@ -93,3 +93,50 @@ return true; } +// Create Participant form check + +function check_form_fields(form) +{ + var input_complete = true; + var first_missing; + for (var i = 1; i < arguments.length; i++) { + var field = form[arguments[i]]; + if (field.value.match(/^\S+$/)) { + field.style.background = '#fff'; + } else { + input_complete = false; + field.style.background = '#faa'; + if (!first_missing) { + first_missing = field; + } + } + } + + if (!input_complete) { + first_missing.focus(); + } + + return input_complete; +} + +function check_participant_form(form) { + return check_form_fields(form, 'login', 'full-name', 'email'); +} + +// Make a new submission + +function create_submission_window() { + window.add_submission = function(id, title) { + var submission_selector = document.getElementById('submission-selector'); + submission_selector.innerHTML = '<option selected="selected" value="' + id + '">' + title + '</option>' + submission_selector.innerHTML; + submission_selector.selectedIndex = 0; + } + + open('/create-submission', 'createsubmission', POPUP_WINDOW_PARAMS); + + return false; +} + +function check_create_submission_form(form) { + return check_form_fields(form, 'title'); +} Added: branches/xml-class-rework/projects/lisp-ecoop/website/templates/create-submission.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/create-submission.xml 2006-03-07 20:03:26 UTC (rev 1907) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/create-submission.xml 2006-03-08 06:49:37 UTC (rev 1908) @@ -0,0 +1,43 @@ +<?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:lisp-ecoop="http://lisp-ecoop06.bknr.net"> + <head> + <title>Create submission</title> + <link rel="stylesheet" type="text/css" href="/static/document-utils.css" /> + <script src="/static/document-utils.js" language="javascript" type="text/javascript"> </script> + <script src="/static/javascript.js" language="javascript" type="text/javascript"> </script> + </head> + <body class="utility-window" onload="init()"> + <div id="form" class="page"> + <h1>Create a Submission</h1> + <p> + Using this form, a new submission may be created. + </p> + <form method="post" name="create_submission_form" id="create_submission_form" enctype="multipart/form-data" + action="/make-submission" onsubmit="return check_create_submission_form(this);"> + <label for="title">Title</label><br/> + <input type="text" size="40" maxlength="40" name="title" id="title_input"/><br/> + <label for="abstract">Abstract</label><br/> + <textarea name="abstract" cols="72" rows="10"> </textarea><br/> + <button type="submit" name="submit">Create</button> + </form> + <p> + <a href="#" onclick="window.close();">Cancel</a> + </p> + </div> + <div id="progress" class="page"> + Creating submission... + </div> + <div id="success" class="page"> + Submission created. + </div> + <div id="failed" class="page"> + <p> + Cannot create submission: <span id="error-message"> </span> + </p> + <a href="#" onclick="window.close();">Dang!</a> + </div> + </body> +</html> Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/upload.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/upload.xml 2006-03-07 20:03:26 UTC (rev 1907) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/upload.xml 2006-03-08 06:49:37 UTC (rev 1908) @@ -28,10 +28,10 @@ </p> </div> <div id="progress" class="page"> - Upload in progress, please wait + Upload in progress, please wait.... </div> <div id="success" class="page"> - Done uploading + Done uploading. </div> <div id="failed" class="page"> <p> Modified: branches/xml-class-rework/projects/lisp-ecoop/website/templates/user-error.xml =================================================================== --- branches/xml-class-rework/projects/lisp-ecoop/website/templates/user-error.xml 2006-03-07 20:03:26 UTC (rev 1907) +++ branches/xml-class-rework/projects/lisp-ecoop/website/templates/user-error.xml 2006-03-08 06:49:37 UTC (rev 1908) @@ -7,8 +7,16 @@ xmlns:lisp-ecoop="http://lisp-ecoop06.bknr.net" xmlns:menu="http://bknr.net/menu" > -Your request could not be processed because an error occured: + <head> + <title>Error</title> + <link rel="stylesheet" type="text/css" href="$(base)static/styles.css" /> + </head> + <body> + <h2> + Your request could not be processed because an error occured: + </h2> <pre> $(error-message) </pre> + </body> </html> \ No newline at end of file

1 0

[bknr-cvs] r1907 - in trunk/projects/quickhoney/website: static templates
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 15:03:26 -0500 (Tue, 07 Mar 2006) New Revision: 1907 Modified: trunk/projects/quickhoney/website/static/styles.css trunk/projects/quickhoney/website/templates/frontpage.bknr Log: More changes that were lost. Modified: trunk/projects/quickhoney/website/static/styles.css =================================================================== --- trunk/projects/quickhoney/website/static/styles.css 2006-03-07 19:47:58 UTC (rev 1906) +++ trunk/projects/quickhoney/website/static/styles.css 2006-03-07 20:03:26 UTC (rev 1907) @@ -5,6 +5,11 @@ background-color: #ffffff; } +#hidden-vcard { + visibility: hidden; + height: 0px; +} + /* cms styles */ h1 { Modified: trunk/projects/quickhoney/website/templates/frontpage.bknr =================================================================== --- trunk/projects/quickhoney/website/templates/frontpage.bknr 2006-03-07 19:47:58 UTC (rev 1906) +++ trunk/projects/quickhoney/website/templates/frontpage.bknr 2006-03-07 20:03:26 UTC (rev 1907) @@ -10,10 +10,16 @@ <link rel="stylesheet" href="/static/styles.css" /> <script src="/static/javascript.js" type="text/javascript"> </script> - <title>QuickHoney</title> + <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">

1 0

[bknr-cvs] r1906 - trunk/projects/quickhoney/website/static
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 14:47:58 -0500 (Tue, 07 Mar 2006) New Revision: 1906 Modified: trunk/projects/quickhoney/website/static/javascript.js Log: Correct correction Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 19:46:37 UTC (rev 1905) +++ trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 19:47:58 UTC (rev 1906) @@ -743,8 +743,8 @@ var image = row[image_index]; thumbnail_html += '<a href="#" onclick="display_image(' + "'" + image.position + "'" + ');">' - + '<img class="inherited_image" width="' + cell_width + '" height="' + cell_height + ',8" ' - + ' src="/image/' + image.name + '/cell,' + background_color + ',' + cell_width + ',' + cell_height + '" ' + + '<img class="inherited_image" width="' + cell_width + '" height="' + cell_height + '" ' + + ' src="/image/' + image.name + '/cell,' + background_color + ',' + cell_width + ',' + cell_height + ',8" ' + ' onload="reveal_image(this);" />' + '</a>'; }

1 0

[bknr-cvs] r1905 - trunk/projects/quickhoney/website/static
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 14:46:37 -0500 (Tue, 07 Mar 2006) New Revision: 1905 Modified: trunk/projects/quickhoney/website/static/javascript.js Log: Re-add thumbnail borders. Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 19:44:34 UTC (rev 1904) +++ trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 19:46:37 UTC (rev 1905) @@ -743,7 +743,7 @@ var image = row[image_index]; thumbnail_html += '<a href="#" onclick="display_image(' + "'" + image.position + "'" + ');">' - + '<img class="inherited_image" width="' + cell_width + '" height="' + cell_height + '" ' + + '<img class="inherited_image" width="' + cell_width + '" height="' + cell_height + ',8" ' + ' src="/image/' + image.name + '/cell,' + background_color + ',' + cell_width + ',' + cell_height + '" ' + ' onload="reveal_image(this);" />' + '</a>';

1 0

[bknr-cvs] r1904 - trunk/projects/quickhoney/src
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 14:44:34 -0500 (Tue, 07 Mar 2006) New Revision: 1904 Added: trunk/projects/quickhoney/src/mods.lisp Log: Several manual modifications as ordererd by quickhoney. Added: trunk/projects/quickhoney/src/mods.lisp =================================================================== --- trunk/projects/quickhoney/src/mods.lisp 2006-03-07 19:43:24 UTC (rev 1903) +++ trunk/projects/quickhoney/src/mods.lisp 2006-03-07 19:44:34 UTC (rev 1904) @@ -0,0 +1,17 @@ +(in-package :quickhoney) + +(setq *images* (get-keywords-intersection-store-images '(:city))) + +(with-transaction (:korrektur) + (dolist (image *images*) + (setf (store-image-keywords image) (remove :city (store-image-keywords image))) + (pushnew :landscape (store-image-keywords image)))) + +(import-image "/home/hans/type-t-shirt.png" :keywords '(:type) :keywords-from-dir nil) + +(with-transaction (:korrektur) + (dolist (image (remove-if-not #'(lambda (image) (scan "shirt" (store-image-name image))) (class-instances 'quickhoney-image))) + (setf (store-image-keywords image) (remove :special (store-image-keywords image))) + (push :t-shirt (store-image-keywords image)))) + +(import-image "/home/hans/contact-peter-nana.png" :keywords '(:type) :keywords-from-dir nil) \ No newline at end of file

1 0

[bknr-cvs] r1903 - trunk/projects/quickhoney/src
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 14:43:24 -0500 (Tue, 07 Mar 2006) New Revision: 1903 Modified: trunk/projects/quickhoney/src/webserver.lisp Log: Add "stats" module Modified: trunk/projects/quickhoney/src/webserver.lisp =================================================================== --- trunk/projects/quickhoney/src/webserver.lisp 2006-03-07 19:42:39 UTC (rev 1902) +++ trunk/projects/quickhoney/src/webserver.lisp 2006-03-07 19:43:24 UTC (rev 1903) @@ -33,7 +33,7 @@ ("/favicon.ico" file-handler :destination ,(unix-namestring (merge-pathnames #p"static/favicon.ico" *website-directory*)) :content-type "application/x-icon")) - :modules '(user images) + :modules '(user images stats) :admin-navigation '(("user" . "/user/") ("images" . "/edit-images") ("import" . "/import")

1 0

[bknr-cvs] r1902 - trunk/projects/quickhoney/website/static
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 14:42:39 -0500 (Tue, 07 Mar 2006) New Revision: 1902 Modified: trunk/projects/quickhoney/website/static/javascript.js Log: Recover "nice_jobs" and some other changes that got lost somewhere. Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 19:33:03 UTC (rev 1901) +++ trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 19:42:39 UTC (rev 1902) @@ -527,17 +527,17 @@ document.getElementById("path").innerHTML = path_links.join(" / "); } -/* home image - called from homeimage.onload */ +/* home image */ function home_loaded(image) { debug('home_loaded - image is ' + image + ' width: ' + image.width); - image.style.left = (36 + (648 - image.width) / 2) + 'px'; - image.style.top = (114 + (648 - image.height) / 2) + 'px'; - reveal_image(image); + document.getElementById("homeimage").style.left = (36 + (648 - image.width) / 2) + 'px'; + document.getElementById("homeimage").style.top = (114 + (648 - image.height) / 2) + 'px'; + if (logged_in) { var current_home_image = image.src.substring(image.src.indexOf('/image/') + 7); if (current_home_image != 'trans') { @@ -744,7 +744,7 @@ thumbnail_html += '<a href="#" onclick="display_image(' + "'" + image.position + "'" + ');">' + '<img class="inherited_image" width="' + cell_width + '" height="' + cell_height + '" ' - + ' src="/image/' + image.name + '/cell,' + background_color + ',' + cell_width + ',' + cell_height + ',8" ' + + ' src="/image/' + image.name + '/cell,' + background_color + ',' + cell_width + ',' + cell_height + '" ' + ' onload="reveal_image(this);" />' + '</a>'; } @@ -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";

1 0

[bknr-cvs] r1901 - trunk/projects/quickhoney/website/templates
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 14:33:03 -0500 (Tue, 07 Mar 2006) New Revision: 1901 Modified: trunk/projects/quickhoney/website/templates/index.bknr Log: Changed wrong image before. Modified: trunk/projects/quickhoney/website/templates/index.bknr =================================================================== --- trunk/projects/quickhoney/website/templates/index.bknr 2006-03-07 19:31:04 UTC (rev 1900) +++ trunk/projects/quickhoney/website/templates/index.bknr 2006-03-07 19:33:03 UTC (rev 1901) @@ -105,7 +105,7 @@ <div id="contact"> <div id="contact-bigimage"> - <img src="/image/contact_nanapeter" /> + <img src="/image/contact-peter-nana" /> </div> <img class="contact" src="/image/type_contact_email" /> <p class="contact"> @@ -117,7 +117,7 @@ Peter Stemmler: 646.270.5562<br /> Nana Rausch: 646.270.5592 </p> - <img class="contact" src="/image/contact-peter-nana" /> + <img class="contact" src="/image/type_contact_address" /> <p class="contact"> QuickHoney - New York<br /> 536 Sixth Avenue, 2nd&3rd Floor<br />

1 0

[bknr-cvs] r1900 - trunk/projects/quickhoney/website/templates
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 14:31:04 -0500 (Tue, 07 Mar 2006) New Revision: 1900 Modified: trunk/projects/quickhoney/website/templates/index.bknr Log: Contact image changed. Change copyright notice to show 2006. Modified: trunk/projects/quickhoney/website/templates/index.bknr =================================================================== --- trunk/projects/quickhoney/website/templates/index.bknr 2006-03-07 18:58:28 UTC (rev 1899) +++ trunk/projects/quickhoney/website/templates/index.bknr 2006-03-07 19:31:04 UTC (rev 1900) @@ -117,7 +117,7 @@ Peter Stemmler: 646.270.5562<br /> Nana Rausch: 646.270.5592 </p> - <img class="contact" src="/image/type_contact_address" /> + <img class="contact" src="/image/contact-peter-nana" /> <p class="contact"> QuickHoney - New York<br /> 536 Sixth Avenue, 2nd&3rd Floor<br /> @@ -127,7 +127,7 @@ </div> <div id="footer" class="text"> - ©1998-2005 QuickHoney Nana Rausch & Peter Stemmler. No part of + ©1998-2006 QuickHoney Nana Rausch & Peter Stemmler. No part of this website may be reproduced in any manner without permission. Programming by Hübner/Odendahl <a href="http://headcraft.de/" target="_new"> headcraft</a>

1 0

[bknr-cvs] r1899 - trunk/projects/quickhoney/website/static
by bknr＠bknr.net 07 Mar '06

07 Mar '06

Author: hhubner Date: 2006-03-07 13:58:28 -0500 (Tue, 07 Mar 2006) New Revision: 1899 Modified: trunk/projects/quickhoney/website/static/javascript.js Log: Change city -> t-shirt Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 18:55:49 UTC (rev 1898) +++ trunk/projects/quickhoney/website/static/javascript.js 2006-03-07 18:58:28 UTC (rev 1899) @@ -6,7 +6,7 @@ directory_button['pixel'] = ['birdview', 'parts', 'icons', 'editorial', 'animation', 'smallworld']; directory_button['vector'] = ['portraits', 'celebrities', 'blackwhite', 'icons', 'editorial', 'nudes']; -directory_button['photo'] = ['browseall', 'city', 'landscape', 'shopping', 'food', 'special']; +directory_button['photo'] = ['browseall', 't-shirt', 'landscape', 'shopping', 'food', 'special']; /* safari global variable - used to trigger some compatibility hacks */

1 0