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

[bknr-cvs] hans changed trunk/projects/quickhoney/website/static/javascript.js
by BKNR Commits 27 Aug '08

27 Aug '08

Revision: 3740 Author: hans URL: http://bknr.net/trac/changeset/3740 Repair deep linking, add function to determine scroll position (not yet used). U trunk/projects/quickhoney/website/static/javascript.js Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-08-27 02:08:00 UTC (rev 3739) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-08-27 02:38:29 UTC (rev 3740) @@ -20,7 +20,6 @@ /* logged_in - will be set when the user has CMS access */ var logged_in; -var wants_cms = false; /* current colors */ @@ -81,15 +80,7 @@ replaceChildNodes("username", json_result.login); $("login_status").style.visibility = 'visible'; show_cms_window(); - } else { - if (wants_cms && (document.login_form.username.value || document.login_form.password.value)) { - $("login_form").style.visibility = 'hidden'; - $("login_failure").style.visibility = 'visible'; - setTimeout("show_login();", 2000); - } } - - show_page('home'); } /* CMS functionality */ @@ -226,6 +217,20 @@ return result; } +function getScrollXY() { + if (typeof (window.pageYOffset) == 'number') { + // Netscape compliant + return { x: window.pageXOffset, y: window.pageYOffset }; + } else if (document.body && ( document.body.scrollLeft || document.body.scrollTop)) { + // DOM compliant + return { x: document.body.scrollLeft, y: document.body.scrollTop }; + } else if (document.documentElement && (document.documentElement.scrollLeft || document.documentElement.scrollTop)) { + // IE standards compliant mode + return { x: document.documentElement.scrollLeft, y: document.documentElement.scrollTop }; + } else { + return { x: 0, y: 0 }; + } +} function make_upload_item(item, revealer) { item.category = (findValue(item.keywords, 'pixel') == -1) ? 'vector' : 'pixel';

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/
by BKNR Commits 27 Aug '08

27 Aug '08

Revision: 3739 Author: hans URL: http://bknr.net/trac/changeset/3739 Make news entries wider, change archive rendering to suit Nana's taste. U trunk/projects/quickhoney/src/imageproc.lisp U trunk/projects/quickhoney/website/static/javascript.js U trunk/projects/quickhoney/website/static/styles.css Modified: trunk/projects/quickhoney/src/imageproc.lisp =================================================================== --- trunk/projects/quickhoney/src/imageproc.lisp 2008-08-27 01:13:34 UTC (rev 3738) +++ trunk/projects/quickhoney/src/imageproc.lisp 2008-08-27 02:08:00 UTC (rev 3739) @@ -107,7 +107,7 @@ width height) thumbnail-image))) -(defparameter +news-image-width+ 428 +(defparameter +news-image-width+ 486 "Width of news images") (defparameter +news-image-corner-radius+ 8 "Corner radius for news images") Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-08-27 01:13:34 UTC (rev 3738) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-08-27 02:08:00 UTC (rev 3739) @@ -288,10 +288,8 @@ log('news year ' + year + ' month ' + month); map(function (element) { - if (element.href) { - ((element.href.match(/#news\/(\d+)/)[1] == year) ? addElementClass : removeElementClass) - (element, 'active'); - } + ((element.year == year && (month || element.month)) ? addElementClass : removeElementClass) + (element, 'active'); }, $('archive-navigation').childNodes); for (i = 1; i <= 12; i++) { @@ -315,19 +313,23 @@ var currentYear; var activeYear = document.location.href.replace(/.*news\/(\d+).*/, "$1"); replaceChildNodes('archive-navigation', - SPAN({ 'class': 'title' }, 'Archive'), BR(), map(function (entry) { var year = entry[0]; var month = entry[1]; var result = []; if (year != currentYear) { currentYear = year; - var link = A({ href: '#news/' + year, 'class': 'year' }, year, BR()); + var link = A({ href: '#news/' + year, + 'class': 'year' + (year == activeYear ? ' active' : '') }, + year, BR()); + link.year = year; result.push(link); } var link = A({ href: '#news/' + year + '/' + month, 'class': 'month ' + 'm' + month + (year == activeYear ? ' active' : '')}, month_names[month - 1], BR()); + link.month = month; + link.year = year; result.push(link); return result; }, data.months)); Modified: trunk/projects/quickhoney/website/static/styles.css =================================================================== --- trunk/projects/quickhoney/website/static/styles.css 2008-08-27 01:13:34 UTC (rev 3738) +++ trunk/projects/quickhoney/website/static/styles.css 2008-08-27 02:08:00 UTC (rev 3739) @@ -382,11 +382,11 @@ /* news styles */ #newsentries { - width: 428px; + width: 486px; } .newsentry { - width: 428px; + width: 486px; } .autonews { @@ -417,7 +417,7 @@ .news_vector { background-color: #00ccff; } .news_pixel { background-color: #ff00ff; } .autonews a { color: white } -div.news_sep { width: 428px; height: 17px; background-image: url(/image/news-sep); } +div.news_sep { width: 486px; height: 17px; background-image: url(/image/news-sep); } /* cms styles */ @@ -597,19 +597,21 @@ visibility: hidden; } -.archive span.title, .archive a.year { font-size: 1.5em; margin-bottom: 1em; } +.archive span.title { font-size: 1.2em; padding-bottom: 5px; } +.archive a.year { font-size: 1.2em; padding-bottom: 2em; } +.archive a.year.active { color: #000; } .archive a.month.active { display: block; } -.archive a.month { display: none; padding: 0px 5px 2px 5px; margin-top: 2px; } -#archive-navigation.m1 a.m1 { color: #fff; background-color: #30be01; } -#archive-navigation.m2 a.m2 { color: #fff; background-color: #30be01; } -#archive-navigation.m3 a.m3 { color: #fff; background-color: #30be01; } -#archive-navigation.m4 a.m4 { color: #fff; background-color: #30be01; } -#archive-navigation.m5 a.m5 { color: #fff; background-color: #30be01; } -#archive-navigation.m6 a.m6 { color: #fff; background-color: #30be01; } -#archive-navigation.m7 a.m7 { color: #fff; background-color: #30be01; } -#archive-navigation.m8 a.m8 { color: #fff; background-color: #30be01; } -#archive-navigation.m9 a.m9 { color: #fff; background-color: #30be01; } -#archive-navigation.m10 a.m10 { color: #fff; background-color: #30be01; } -#archive-navigation.m11 a.m11 { color: #fff; background-color: #30be01; } -#archive-navigation.m12 a.m12 { color: #fff; background-color: #30be01; } +.archive a.month { display: none; padding: 0px 5px 2px 5px; margin-top: 2px; font-size: 0.8em; } +#archive-navigation.m1 a.m1 { color: #000; } +#archive-navigation.m2 a.m2 { color: #000; } +#archive-navigation.m3 a.m3 { color: #000; } +#archive-navigation.m4 a.m4 { color: #000; } +#archive-navigation.m5 a.m5 { color: #000; } +#archive-navigation.m6 a.m6 { color: #000; } +#archive-navigation.m7 a.m7 { color: #000; } +#archive-navigation.m8 a.m8 { color: #000; } +#archive-navigation.m9 a.m9 { color: #000; } +#archive-navigation.m10 a.m10 { color: #000; } +#archive-navigation.m11 a.m11 { color: #000; } +#archive-navigation.m12 a.m12 { color: #000; } .archive { padding-left: 1em; }

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/website/static/javascript.js
by BKNR Commits 27 Aug '08

27 Aug '08

Revision: 3738 Author: hans URL: http://bknr.net/trac/changeset/3738 Fix button reloading for Safari, which does not call onload when an image src is set to the same image as the one already loaded into the img element. U trunk/projects/quickhoney/website/static/javascript.js Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-08-26 18:55:34 UTC (rev 3737) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-08-27 01:13:34 UTC (rev 3738) @@ -639,7 +639,7 @@ map(function (directory) { var id = 'home_' + directory; $(id).style.visibility = 'hidden'; - $(id).src = random_button_image('home', directory, 318, 318, directory); + $(id).replace(random_button_image('home', directory, 318, 318, directory)); }, home_buttons); if (subcategories[current_directory]) { @@ -649,7 +649,7 @@ map(function (subdirectory_name) { var id = 'button' + i++; $(id).style.visibility = 'hidden'; - $(id).src = random_button_image(current_directory, subdirectory_name, 208, 208, current_directory); + $(id).replace(random_button_image(current_directory, subdirectory_name, 208, 208, current_directory)); $(id).parentNode.href = '#' + current_directory + '/' + subdirectory_name; }, subcategories[current_directory]); } @@ -690,7 +690,14 @@ var animator = this; map(function (image) { $(image).animator = animator; - $(image).reveal = function (image) { image.animator.imageLoaded() } + $(image).reveal = function () { this.animator.imageLoaded() } + $(image).replace = function (path) { + if (this.src.match(path + '$')) { + this.reveal(); + } else { + this.src = path; + } + } }, images); }

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/website/
by BKNR Commits 26 Aug '08

26 Aug '08

Revision: 3737 Author: hans URL: http://bknr.net/trac/changeset/3737 Partially revive the CMS Correct menuu row positioning Make home buttons quadratic again U trunk/projects/quickhoney/website/static/javascript.js U trunk/projects/quickhoney/website/static/styles.css U trunk/projects/quickhoney/website/templates/index.xml Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-08-26 11:01:47 UTC (rev 3736) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-08-26 18:55:34 UTC (rev 3737) @@ -73,10 +73,10 @@ function login_complete(json_result) { - logged_in = json_result.admin; - log('login_complete, admin: ' + json_result.admin + ' login: ' + json_result.login); + logged_in = json_result.admin; + if (logged_in) { replaceChildNodes("username", json_result.login); $("login_status").style.visibility = 'visible'; @@ -124,21 +124,14 @@ function send_login() { - loadJSONDoc("/json-login?__username=" - + document.login_form.username.value - + "&__password=" - + document.login_form.password.value) - .addCallbacks(login_complete, alert); - - show_cms_window(); - return false; } function send_logout() { logged_in = false; - window.frames['login_iframe'].window.location.replace('/logout'); + loadJSONDoc("/logout") + .addCallbacks(function () {}, alert); show_cms_window("login_form"); } @@ -394,8 +387,12 @@ function show_cue(text) { $("cue").style.visibility = 'visible'; $('footer').style.visibility = 'hidden'; - display_cue = text; - animate_cue(); + if (display_cue) { + display_cue = text; + } else { + display_cue = text; + animate_cue(); + } } function hide_cue() { @@ -642,7 +639,7 @@ map(function (directory) { var id = 'home_' + directory; $(id).style.visibility = 'hidden'; - $(id).src = random_button_image('home', directory, 318, 208, directory); + $(id).src = random_button_image('home', directory, 318, 318, directory); }, home_buttons); if (subcategories[current_directory]) { @@ -1159,6 +1156,7 @@ } load_button_images(); + loadJSONDoc("/json-login").addCallbacks(login_complete, alert); loadJSONDoc('/json-news-archive/quickhoney').addCallbacks(initialize_news_archive, alert); if (!document.location.href.match(/#/)) { Modified: trunk/projects/quickhoney/website/static/styles.css =================================================================== --- trunk/projects/quickhoney/website/static/styles.css 2008-08-26 11:01:47 UTC (rev 3736) +++ trunk/projects/quickhoney/website/static/styles.css 2008-08-26 18:55:34 UTC (rev 3737) @@ -148,6 +148,13 @@ .autonews a { color: #30be01; } +#m_home { top: 30px; left: 36px; } +#m_pixel { top: 36px; left: 250px; } +#m_vector { top: 36px; left: 331px; } +#m_news { top: 36px; left: 423px; } +#m_shop { top: 36px; left: 508px; } +#m_contact { top: 36px; left: 584px; } + #menu img.selected { visibility: hidden; z-index: 110; @@ -156,7 +163,6 @@ #menu a { position: absolute; padding: 0px; - top: 36px; border-width: 0px; } @@ -167,17 +173,6 @@ border-width: 0px; } -#m_quickhoney { - top: 28px; - left: 36px; -} - -#m_pixel { left: 250px; } -#m_vector { left: 331px; } -#m_news { left: 423px; } -#m_shop { left: 508px; } -#m_contact { left: 584px; } - /* path / version */ #path-and-version { @@ -314,7 +309,7 @@ a.home_button img { width: 318px; - height: 208px; + height: 318px; } #home div { Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-08-26 11:01:47 UTC (rev 3736) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-08-26 18:55:34 UTC (rev 3737) @@ -60,21 +60,21 @@ <div id="home" class="page"> <div> <a href="#pixel" class="home_button"> - <img alt="home pixel" id="home_pixel" src="/image/trans" width="318" height="208" + <img alt="home pixel" id="home_pixel" src="/image/trans" width="318" height="318" onclick="shuffle_button_images()" onload="reveal_image(this);" class="button-image" /> </a> <a href="#vector" class="home_button"> - <img alt="home vector" id="home_vector" src="/image/trans" width="318" height="208" + <img alt="home vector" id="home_vector" src="/image/trans" width="318" height="318" onclick="shuffle_button_images()" onload="reveal_image(this);" class="button-image" /> </a> </div> <div> <a href="#news" class="home_button"> - <img alt="home news" id="home_news" src="/image/trans" width="318" height="208" + <img alt="home news" id="home_news" src="/image/trans" width="318" height="318" onclick="shuffle_button_images()" onload="reveal_image(this);" class="button-image" /> </a> <a href="#shop" class="home_button"> - <img alt="home shop" id="home_shop" src="/image/trans" width="318" height="208" + <img alt="home shop" id="home_shop" src="/image/trans" width="318" height="318" onclick="shuffle_button_images()" onload="reveal_image(this);" class="button-image" /> </a> </div>

1 0

[bknr-cvs] edi changed tags/thirdparty/flexi-streams-1.0.7/
by BKNR Commits 26 Aug '08

26 Aug '08

Revision: 3736 Author: edi URL: http://bknr.net/trac/changeset/3736 Tag it A tags/thirdparty/flexi-streams-1.0.7/ Copied: tags/thirdparty/flexi-streams-1.0.7 (from rev 3735, trunk/thirdparty/flexi-streams)

1 0

[bknr-cvs] edi changed trunk/thirdparty/flexi-streams/
by BKNR Commits 26 Aug '08

26 Aug '08

Revision: 3735 Author: edi URL: http://bknr.net/trac/changeset/3735 Update to 1.0.7 U trunk/thirdparty/flexi-streams/CHANGELOG U trunk/thirdparty/flexi-streams/decode.lisp U trunk/thirdparty/flexi-streams/doc/index.html U trunk/thirdparty/flexi-streams/flexi-streams.asd Modified: trunk/thirdparty/flexi-streams/CHANGELOG =================================================================== --- trunk/thirdparty/flexi-streams/CHANGELOG 2008-08-26 00:44:15 UTC (rev 3734) +++ trunk/thirdparty/flexi-streams/CHANGELOG 2008-08-26 11:01:26 UTC (rev 3735) @@ -1,3 +1,7 @@ +Version 1.0.7 +2008-08-26 +Don't read a second time if the first READ-SEQUENCE already reached EOF (Drakma bug report by Stas Boukarev) + Version 1.0.6 2008-08-25 Don't use a reserve if we can't rewind the stream (Drakma bug report by Stas Boukarev) Modified: trunk/thirdparty/flexi-streams/decode.lisp =================================================================== --- trunk/thirdparty/flexi-streams/decode.lisp 2008-08-26 00:44:15 UTC (rev 3734) +++ trunk/thirdparty/flexi-streams/decode.lisp 2008-08-26 11:01:26 UTC (rev 3735) @@ -1,5 +1,5 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: FLEXI-STREAMS; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/flexi-streams/decode.lisp,v 1.34 2008/08/26 00:38:06 edi Exp $ +;;; $Header: /usr/local/cvsrep/flexi-streams/decode.lisp,v 1.35 2008/08/26 10:59:22 edi Exp $ ;;; Copyright (c) 2005-2008, Dr. Edmund Weitz. All rights reserved. @@ -92,6 +92,7 @@ (buffer-pos 0) (buffer-end 0) (index start) + donep ;; whether we will later be able to rewind the stream if ;; needed (to get rid of unused octets in the buffer) (can-rewind-p (maybe-rewind stream 0)) @@ -120,6 +121,8 @@ (fill-buffer (end) "Tries to fill the buffer from BUFFER-POS to END and returns NIL if the buffer doesn't contain any new data." + (when donep + (return-from fill-buffer nil)) ;; put data from octet stack into buffer if there is any (loop (when (>= buffer-pos end) @@ -132,6 +135,9 @@ (setq buffer-end (read-sequence buffer stream :start buffer-pos :end end)) + ;; we reached EOF, so we remember this + (when (< buffer-end end) + (setq donep t)) ;; BUFFER-POS is only greater than zero if the buffer ;; already contains unread data from the octet stack ;; (see below), so we test for ZEROP here and do /not/ Modified: trunk/thirdparty/flexi-streams/doc/index.html =================================================================== --- trunk/thirdparty/flexi-streams/doc/index.html 2008-08-26 00:44:15 UTC (rev 3734) +++ trunk/thirdparty/flexi-streams/doc/index.html 2008-08-26 11:01:26 UTC (rev 3735) @@ -229,7 +229,7 @@ <p> FLEXI-STREAMS together with this documentation can be downloaded from <a href="http://weitz.de/files/flexi-streams.tar.gz">http://weitz.de/files/flexi-streams.tar.gz</a>. The -current version is 1.0.6. +current version is 1.0.7. <p> Before you install FLEXI-STREAMS you first need to install the <a @@ -1114,7 +1114,7 @@ his work on making FLEXI-STREAMS faster. <p> -$Header: /usr/local/cvsrep/flexi-streams/doc/index.html,v 1.125 2008/08/26 00:38:08 edi Exp $ +$Header: /usr/local/cvsrep/flexi-streams/doc/index.html,v 1.126 2008/08/26 10:59:24 edi Exp $ <p><a href="http://weitz.de/index.html">BACK TO MY HOMEPAGE</a> </body> Modified: trunk/thirdparty/flexi-streams/flexi-streams.asd =================================================================== --- trunk/thirdparty/flexi-streams/flexi-streams.asd 2008-08-26 00:44:15 UTC (rev 3734) +++ trunk/thirdparty/flexi-streams/flexi-streams.asd 2008-08-26 11:01:26 UTC (rev 3735) @@ -1,5 +1,5 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/flexi-streams/flexi-streams.asd,v 1.78 2008/08/26 00:38:06 edi Exp $ +;;; $Header: /usr/local/cvsrep/flexi-streams/flexi-streams.asd,v 1.79 2008/08/26 10:59:22 edi Exp $ ;;; Copyright (c) 2005-2008, Dr. Edmund Weitz. All rights reserved. @@ -35,7 +35,7 @@ (in-package :flexi-streams-system) (defsystem :flexi-streams - :version "1.0.6" + :version "1.0.7" :serial t :components ((:file "packages") (:file "mapping")

1 0

[bknr-cvs] edi changed tags/thirdparty/flexi-streams-1.0.6/
by BKNR Commits 26 Aug '08

26 Aug '08

Revision: 3734 Author: edi URL: http://bknr.net/trac/changeset/3734 Tag 1.0.6 A tags/thirdparty/flexi-streams-1.0.6/ Copied: tags/thirdparty/flexi-streams-1.0.6 (from rev 3733, trunk/thirdparty/flexi-streams)

1 0

[bknr-cvs] edi changed trunk/thirdparty/flexi-streams/
by BKNR Commits 26 Aug '08

26 Aug '08

Revision: 3733 Author: edi URL: http://bknr.net/trac/changeset/3733 Update to 1.0.6 U trunk/thirdparty/flexi-streams/CHANGELOG U trunk/thirdparty/flexi-streams/decode.lisp U trunk/thirdparty/flexi-streams/doc/index.html U trunk/thirdparty/flexi-streams/flexi-streams.asd Modified: trunk/thirdparty/flexi-streams/CHANGELOG =================================================================== --- trunk/thirdparty/flexi-streams/CHANGELOG 2008-08-25 01:24:05 UTC (rev 3732) +++ trunk/thirdparty/flexi-streams/CHANGELOG 2008-08-26 00:43:52 UTC (rev 3733) @@ -1,3 +1,7 @@ +Version 1.0.6 +2008-08-25 +Don't use a reserve if we can't rewind the stream (Drakma bug report by Stas Boukarev) + Version 1.0.5 2008-08-01 Export RUN-ALL-TESTS instead of RUN-TESTS (caught by Nick Allen) Modified: trunk/thirdparty/flexi-streams/decode.lisp =================================================================== --- trunk/thirdparty/flexi-streams/decode.lisp 2008-08-25 01:24:05 UTC (rev 3732) +++ trunk/thirdparty/flexi-streams/decode.lisp 2008-08-26 00:43:52 UTC (rev 3733) @@ -1,5 +1,5 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: FLEXI-STREAMS; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/flexi-streams/decode.lisp,v 1.33 2008/05/30 09:04:15 edi Exp $ +;;; $Header: /usr/local/cvsrep/flexi-streams/decode.lisp,v 1.34 2008/08/26 00:38:06 edi Exp $ ;;; Copyright (c) 2005-2008, Dr. Edmund Weitz. All rights reserved. @@ -73,7 +73,7 @@ "Non-hygienic utility macro which defines methods for READ-SEQUENCE* and OCTETS-TO-STRING* for the class FORMAT-CLASS. BODY is described in the docstring of DEFINE-CHAR-ENCODERS but can additionally contain -a form (UNGET <form>) which has to be replaced by the correct code to +a form \(UNGET <form>) which has to be replaced by the correct code to `unread' the octets for the character designated by <form>." (let* ((body `((block char-decoder (locally @@ -101,8 +101,8 @@ ;; performance-wise to make RESERVE significantly bigger ;; (and thus put potentially a lot more octets into ;; OCTET-STACK), especially for UTF-8 - (reserve (cond ((not (floatp factor)) 0) - ((not can-rewind-p) (* 2 integer-factor)) + (reserve (cond ((or (not (floatp factor)) + (not can-rewind-p)) 0) (t (ceiling (* (- factor integer-factor) (- end start))))))) (declare (fixnum buffer-pos buffer-end index integer-factor reserve) (boolean can-rewind-p)) Modified: trunk/thirdparty/flexi-streams/doc/index.html =================================================================== --- trunk/thirdparty/flexi-streams/doc/index.html 2008-08-25 01:24:05 UTC (rev 3732) +++ trunk/thirdparty/flexi-streams/doc/index.html 2008-08-26 00:43:52 UTC (rev 3733) @@ -229,7 +229,7 @@ <p> FLEXI-STREAMS together with this documentation can be downloaded from <a href="http://weitz.de/files/flexi-streams.tar.gz">http://weitz.de/files/flexi-streams.tar.gz</a>. The -current version is 1.0.5. +current version is 1.0.6. <p> Before you install FLEXI-STREAMS you first need to install the <a @@ -1114,7 +1114,7 @@ his work on making FLEXI-STREAMS faster. <p> -$Header: /usr/local/cvsrep/flexi-streams/doc/index.html,v 1.124 2008/08/01 10:12:41 edi Exp $ +$Header: /usr/local/cvsrep/flexi-streams/doc/index.html,v 1.125 2008/08/26 00:38:08 edi Exp $ <p><a href="http://weitz.de/index.html">BACK TO MY HOMEPAGE</a> </body> Modified: trunk/thirdparty/flexi-streams/flexi-streams.asd =================================================================== --- trunk/thirdparty/flexi-streams/flexi-streams.asd 2008-08-25 01:24:05 UTC (rev 3732) +++ trunk/thirdparty/flexi-streams/flexi-streams.asd 2008-08-26 00:43:52 UTC (rev 3733) @@ -1,5 +1,5 @@ ;;; -*- Mode: LISP; Syntax: COMMON-LISP; Package: CL-USER; Base: 10 -*- -;;; $Header: /usr/local/cvsrep/flexi-streams/flexi-streams.asd,v 1.77 2008/08/01 10:12:40 edi Exp $ +;;; $Header: /usr/local/cvsrep/flexi-streams/flexi-streams.asd,v 1.78 2008/08/26 00:38:06 edi Exp $ ;;; Copyright (c) 2005-2008, Dr. Edmund Weitz. All rights reserved. @@ -35,7 +35,7 @@ (in-package :flexi-streams-system) (defsystem :flexi-streams - :version "1.0.5" + :version "1.0.6" :serial t :components ((:file "packages") (:file "mapping")

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/
by BKNR Commits 25 Aug '08

25 Aug '08

Revision: 3732 Author: hans URL: http://bknr.net/trac/changeset/3732 Improve button display dynamics. Correct some element positions. U trunk/projects/quickhoney/src/handlers.lisp U trunk/projects/quickhoney/website/static/javascript.js U trunk/projects/quickhoney/website/static/styles.css U trunk/projects/quickhoney/website/templates/index.xml Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2008-08-22 23:14:51 UTC (rev 3731) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-08-25 01:24:05 UTC (rev 3732) @@ -459,7 +459,9 @@ (:method ((item quickhoney-news-item)) (encode-object-element "type" "news") (encode-object-element "title" (quickhoney-news-item-title item)) - (encode-object-element "text" (quickhoney-news-item-text item)))) + (encode-object-element "text" (quickhoney-news-item-text item)) + (encode-object-element "width" (store-image-width item)) + (encode-object-element "height" (store-image-height item)))) (defmethod handle-object ((handler json-news-handler) (channel rss-channel)) (with-json-response () Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-08-22 23:14:51 UTC (rev 3731) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-08-25 01:24:05 UTC (rev 3732) @@ -6,6 +6,8 @@ /* directory definitions */ +var home_buttons = ['pixel', 'vector', 'news', 'shop']; + var subcategories = { pixel: ['birdview', 'parts', 'icons', 'editorial', 'animation', 'smallworld'], vector: ['portraits', 'celebrities', 'blackwhite', 'icons', 'editorial', 'nudes'] @@ -231,7 +233,7 @@ return result; } -function make_upload_item(item) +function make_upload_item(item, revealer) { item.category = (findValue(item.keywords, 'pixel') == -1) ? 'vector' : 'pixel'; item.subcategory = intersection(item.keywords, subcategories[item.category])[0]; @@ -240,10 +242,10 @@ onclick: function () { jump_to(item.category + '/' + item.subcategory + '/' + item.name) } }; return DIV({ 'class': 'newsentry autonews news_' + item.category }, A(link_dest, - IMG({ src: "/image/" + item.name + '/cutout-button,,' + color + ',98,98,4,' + item.category, - style: 'visibility: hidden', - width: 98, height: 98, - onload: 'reveal_image(this)' })), + revealer.IMG({ src: "/image/" + item.name + '/cutout-button,,' + color + ',98,98,4,' + item.category, + style: 'visibility: hidden', + width: 98, height: 98, + onload: 'reveal_image(this)' })), DIV(null, H1(null, item.name), item.date, ' by ', item.owner, ' | ', @@ -252,12 +254,12 @@ item.description)); } -function make_news_item(item) +function make_news_item(item, revealer) { return DIV({ 'class': 'newsentry' }, - IMG({ src: "/image/" + item.name + '/news-article-cutout', - style: 'visibility: hidden', - onload: 'reveal_image(this)' }), + revealer.IMG({ src: "/image/" + item.name + '/news-article-cutout', + style: 'visibility: hidden', + onload: 'reveal_image(this)' }), DIV(null, H1(null, item.title), item.date, ' by ', item.owner, ' | ', @@ -269,12 +271,13 @@ function load_news(data) { try { + var revealer = new ImageGroupRevealer(function () { hide_cue(); $('newsentries').style.visibility = 'inherit' }); if (data.items.length > max_news_items) { data.items.length = max_news_items; } replaceChildNodes('newsentries', map(function (item) { - return [ ((item.type == 'upload') ? make_upload_item : make_news_item)(item), + return [ ((item.type == 'upload') ? make_upload_item : make_news_item)(item, revealer), DIV({ 'class': 'news_sep' }) ]; }, data.items)); $('archive-navigation').style.visibility = 'inherit'; @@ -303,7 +306,8 @@ } if (month || !year) { - replaceChildNodes('newsentries'); + show_cue('loading news'); + $('newsentries').style.visibility = 'hidden'; loadJSONDoc('/json-news/quickhoney' + (month ? ('?month=' + subpath) : '')) .addCallbacks(load_news, alert); } @@ -351,7 +355,6 @@ var query_result = []; var query_result_pages = []; var query_position = 0; -var wait_count = 0; var reload_query = false; function display_query_result() { @@ -377,15 +380,30 @@ display_path(); } -function check_query_result() { +var display_cue = false; +var wait_count = 0; - if (query_result.length == 0) { - wait_count++; - $("cue").innerHTML = 'query database ' + "-\\|/".charAt(wait_count % 4); - setTimeout("check_query_result()", 250); +function animate_cue() { + + if (display_cue) { + $("cue").innerHTML = display_cue + ' ' + "-\\|/".charAt(wait_count++ % 4); + setTimeout("animate_cue()", 100); } } +function show_cue(text) { + $("cue").style.visibility = 'visible'; + $('footer').style.visibility = 'hidden'; + display_cue = text; + animate_cue(); +} + +function hide_cue() { + $("cue").style.visibility = 'hidden'; + $('footer').style.visibility = 'inherit'; + display_cue = false; +} + var db_cache = {}; function process_query_result(key, json_result) { @@ -408,9 +426,8 @@ } debug('got ', query_result.length.toString(), ' images'); - $("cue").style.visibility = 'hidden'; display_query_result(); - wait_count = 0; + hide_cue(); } function query_imagedb(directory, subdirectory, force) { @@ -429,12 +446,9 @@ process_query_result(key, db_cache[key]); } else { - $("cue").style.visibility = 'visible'; - + show_cue('querying database'); loadJSONDoc("/json-image-query/" + key) .addCallbacks(partial(process_query_result, key), alert); - - check_query_result(); } } @@ -446,7 +460,7 @@ } var pages = { - home: new Page('953cfd'), + home: new Page('953cfd', function() { current_directory = 'home'; shuffle_button_images() }), pixel: new Page('ff00ff', partial(directory, 'pixel')), vector: new Page('00ccff', @@ -624,13 +638,16 @@ function shuffle_button_images(category) { if (!category || category == current_directory) { try { + $('home_pixel').animator.reset(); map(function (directory) { var id = 'home_' + directory; $(id).style.visibility = 'hidden'; $(id).src = random_button_image('home', directory, 318, 208, directory); - }, ['pixel', 'vector', 'news', 'shop']); + }, home_buttons); if (subcategories[current_directory]) { + $('button0').animator.reset(); + var buttons_loaded = 0; var i = 0; map(function (subdirectory_name) { var id = 'button' + i++; @@ -646,12 +663,57 @@ } } +function ImageLoadAnimator (images) { + + this.images = images; + this.reset = function () { + show_cue('loading images'); + this.revealer && this.revealer.cancel(); + this.loaded = 0; + } + + function reveal_images(animator, images, n) { + try { + $(images[n]).style.visibility = 'inherit'; + if (++n != images.length) { + animator.revealer = callLater(0.1, reveal_images, animator, images, n); + } else { + animator.loaded = 0; + } + } + catch (e) { alert(e.message); } + } + + this.imageLoaded = function () { + if (++this.loaded == this.images.length) { + hide_cue(); + reveal_images(this, this.images, 0); + } + } + var animator = this; + map(function (image) { + $(image).animator = animator; + $(image).reveal = function (image) { image.animator.imageLoaded() } + }, images); +} + +function seq(start, end) { + var retval = []; + for (var i = start; i < end; i++) { + retval.push(i); + } + return retval; +} + function load_button_images() { map(function (button) { button.style.visibility = 'hidden'; }, getElementsByTagAndClassName('img', 'button-image')); + new ImageLoadAnimator(map(partial(operator['add'], 'button'), seq(0, 6))); + new ImageLoadAnimator(map(partial(operator['add'], 'home_'), home_buttons)); + loadJSONDoc('/json-buttons' + '/home/pixel,vector,news,shop' + '/pixel/' + subcategories['pixel'].join(',') @@ -811,7 +873,12 @@ } function reveal_image(image) { - image.style.visibility = 'inherit'; + /* log('reveal_image ' + image.src + ' reveal ' + image.reveal); */ + if (image.reveal) { + image.reveal(image); + } else { + image.style.visibility = 'inherit'; + } } function display_thumbnail_page() { @@ -1093,9 +1160,11 @@ load_button_images(); loadJSONDoc('/json-news-archive/quickhoney').addCallbacks(initialize_news_archive, alert); - - jump_to(((document.location.href + "#").split("#")[1]) || "home"); + if (!document.location.href.match(/#/)) { + document.location.href += '#home'; + } + poll_path(); } @@ -1334,9 +1403,40 @@ return '/image/' + name + '/color,ff00ff,' + pages[current_directory].link_color; } -function make_image_action_button(name, action, height) +function IMG$(obj) { + obj.style = 'visibility: hidden'; + obj.onload = 'reveal_image(this)'; + return IMG(obj); +} + +function ImageGroupRevealer (done_callback) { + + this.images = []; + this.loaded = 0; + this.done_callback = done_callback; + + this.IMG = function(obj) { + var image = IMG$(obj); + image.revealer = this; + image.reveal = function (image) { image.revealer.imageLoaded() } + this.images.push(image); + return image; + } + this.imageLoaded = function () { + if (++this.loaded == this.images.length) { + if (this.done_callback) { + this.done_callback(); + } + map(function (image) { + image.style.visibility = 'inherit'; + }, this.images); + } + } +} + +function make_image_action_button(name, action, height, revealer) { - var div = DIV(null, IMG({ src: recolored_image_path(name), width: 127, height: height })); + var div = DIV(null, revealer.IMG({ src: recolored_image_path(name), width: 127, height: height })); div.onclick = function() { action(); return false; }; return div; } @@ -1346,20 +1446,21 @@ var buttons = []; var buyable = false; var height = 23; + var revealer = new ImageGroupRevealer(); map(function (keyword) { if (current_image.keywords[keyword]) { buyable = true; height += 22; - buttons.push(make_image_action_button(keyword, partial(make_buy_form, keyword), 22)); + buttons.push(make_image_action_button(keyword, partial(make_buy_form, keyword), 22, revealer)); } }, ['buy-file', 'buy-print', 'buy-t-shirt']); - buttons.push(make_image_action_button('hey', make_hey_form, 23)); + buttons.push(make_image_action_button('hey', make_hey_form, 23, revealer)); replaceChildNodes('image_action_buttons', buttons); if (buyable) { - appendChildNodes('image_action_buttons', IMG({ id: 'buy', src: recolored_image_path('buy'), width: 37, height: 22})); - appendChildNodes('image_action_buttons', IMG({ id: 'buy-top', src: recolored_image_path('buy-top'), width: 90, height: 1})); + appendChildNodes('image_action_buttons', revealer.IMG({ id: 'buy', src: recolored_image_path('buy'), width: 37, height: 22})); + appendChildNodes('image_action_buttons', revealer.IMG({ id: 'buy-top', src: recolored_image_path('buy-top'), width: 90, height: 1})); } - appendChildNodes('image_action_buttons', IMG({ id: 'buy-right-line', src: recolored_image_path('buy-right-line'), width: 1, height: height})); + appendChildNodes('image_action_buttons', revealer.IMG({ id: 'buy-right-line', src: recolored_image_path('buy-right-line'), width: 1, height: height})); var animator = new YAHOO.util.Anim('image_action_buttons', {}, 0.3, YAHOO.util.Easing.easeBoth); $('image_action_buttons').onmouseover = function () { Modified: trunk/projects/quickhoney/website/static/styles.css =================================================================== --- trunk/projects/quickhoney/website/static/styles.css 2008-08-22 23:14:51 UTC (rev 3731) +++ trunk/projects/quickhoney/website/static/styles.css 2008-08-25 01:24:05 UTC (rev 3732) @@ -308,7 +308,7 @@ a.home_button { visibility: inherit; - margin: 0px 12px 0px 0px; + margin: 0px 7px 0px 0px; border-width: 0px; } @@ -318,14 +318,14 @@ } #home div { - padding-bottom: 12px; + padding-bottom: 10px; } /* directory */ a.button { visibility: inherit; - margin: 0px 12px 0px 0px; + margin: 0px 7px 0px 0px; border-width: 0px; } @@ -335,7 +335,7 @@ } #directory div { - padding-bottom: 12px; + padding-bottom: 10px; } /* footer */ @@ -348,15 +348,15 @@ /* cue bar */ -p#cue { +#cue { position: absolute; visibility: hidden; left: 0px; top: 0px; - width: 120px; text-align: left; color: white; background-color: red; + padding: 0em 0.5em 0em 0.5em; } /* iframes for javascript loading */ @@ -584,14 +584,14 @@ } #overlay td.t-shirt-sample { - width: 188px; + width: 196px; height: 132px; background-image: url(/image/t-shirt-sample-background); background-repeat: no-repeat; } #overlay img#t-shirt-sample { - padding-left: 43px; + padding-left: 44px; padding-top: 16px; } @@ -602,9 +602,9 @@ visibility: hidden; } -.archive span.title, .archive a.year { font-size: 1.5em; } +.archive span.title, .archive a.year { font-size: 1.5em; margin-bottom: 1em; } .archive a.month.active { display: block; } -.archive a.month { display: none; } +.archive a.month { display: none; padding: 0px 5px 2px 5px; margin-top: 2px; } #archive-navigation.m1 a.m1 { color: #fff; background-color: #30be01; } #archive-navigation.m2 a.m2 { color: #fff; background-color: #30be01; } #archive-navigation.m3 a.m3 { color: #fff; background-color: #30be01; } Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-08-22 23:14:51 UTC (rev 3731) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-08-25 01:24:05 UTC (rev 3732) @@ -388,9 +388,9 @@ </p> </div> - <p id="cue"> + <div id="cue"> query database - </p> + </div> <div id="edit_frame" class="hidden_iframe"> <iframe src="about:blank" height="0" width="0" name="edit_iframe"> </iframe>

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/
by BKNR Commits 22 Aug '08

22 Aug '08

Revision: 3731 Author: hans URL: http://bknr.net/trac/changeset/3731 QuickHoney v2.0 - Supports deep links and back button, RSS feed with uploaded images. Refactored to use innerHTML sparingly, use absolute positioning in fewer places, reduce number of server interactions, be smarter about recoloring menu items. Not yet completely done, but gone a long way towards the new release. U trunk/projects/quickhoney/src/handlers.lisp U trunk/projects/quickhoney/src/image.lisp U trunk/projects/quickhoney/src/imageproc.lisp U trunk/projects/quickhoney/src/layout.lisp U trunk/projects/quickhoney/src/make-core.lisp U trunk/projects/quickhoney/src/news.lisp U trunk/projects/quickhoney/src/tags.lisp U trunk/projects/quickhoney/src/webserver.lisp U trunk/projects/quickhoney/upgrade-stuff/import.lisp A trunk/projects/quickhoney/upgrade-stuff/quickhoney-black.png A trunk/projects/quickhoney/upgrade-stuff/t-shirt-sample.gif U trunk/projects/quickhoney/website/static/javascript.js U trunk/projects/quickhoney/website/static/styles.css U trunk/projects/quickhoney/website/templates/image-full.xml U trunk/projects/quickhoney/website/templates/index.xml Change set too large, please see URL above

1 0