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

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

27 Aug '08

Revision: 3744 Author: hans URL: http://bknr.net/trac/changeset/3744 Reimplement login and logout, now a separate page is used to log in. U trunk/projects/quickhoney/src/handlers.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/website/static/javascript.js A trunk/projects/quickhoney/website/static/login.css U trunk/projects/quickhoney/website/templates/index.xml A trunk/projects/quickhoney/website/templates/login.xml Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2008-08-27 17:27:40 UTC (rev 3743) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-08-27 23:57:40 UTC (rev 3744) @@ -92,8 +92,19 @@ (defmethod handle ((handler json-login-handler)) (with-json-response () (encode-object-element "admin" (admin-p (bknr-session-user))) + (when (and (anonymous-p (bknr-session-user)) + (query-param "__username")) + (encode-object-element "login_failed" t)) (encode-object-element "login" (user-login (bknr-session-user))))) +(defclass json-logout-handler (page-handler) + ()) + +(defmethod handle ((handler json-logout-handler)) + (setf (session-value 'bknr-session) nil) + (with-json-response () + (encode-object-element "logged_out" t))) + (defclass json-clients-handler (page-handler) ()) Modified: trunk/projects/quickhoney/src/news.lisp =================================================================== --- trunk/projects/quickhoney/src/news.lisp 2008-08-27 17:27:40 UTC (rev 3743) +++ trunk/projects/quickhoney/src/news.lisp 2008-08-27 23:57:40 UTC (rev 3744) @@ -13,10 +13,9 @@ (html-stream s ((:div :class (format nil "newsentry news_~(~A~)" category)) - ((:img :src (format nil "http://~A/image/~A/cutout-button,,~A,98,98,4" + ((:img :src (format nil "http://~A/image/~A" (website-host) - (store-object-id image) - (if is-vector "00ccff" "ff00ff"))) + (store-object-id image))) (:div (:h1 (:princ (store-image-name image))) (:princ (format nil "~A by ~A | " Modified: trunk/projects/quickhoney/src/tags.lisp =================================================================== --- trunk/projects/quickhoney/src/tags.lisp 2008-08-27 17:27:40 UTC (rev 3743) +++ trunk/projects/quickhoney/src/tags.lisp 2008-08-27 23:57:40 UTC (rev 3744) @@ -37,4 +37,14 @@ (define-bknr-tag first-image-link () (html ((:a :href #?"/image-browse/$((bknr.images:store-image-name (first (bknr.datastore:class-instances 'quickhoney-image))))") - (emit-tag-children)))) \ No newline at end of file + (emit-tag-children)))) + +(define-bknr-tag login-status () + (cond + ((bknr.web::admin-p (bknr-session-user)) + (redirect "/index")) + ((and (bknr.web::anonymous-p (bknr-session-user)) + (query-param "__username")) + (html (:h1 "Login failed, please try again"))) + (t + (html (:h1 "Please login"))))) \ No newline at end of file Modified: trunk/projects/quickhoney/src/webserver.lisp =================================================================== --- trunk/projects/quickhoney/src/webserver.lisp 2008-08-27 17:27:40 UTC (rev 3743) +++ trunk/projects/quickhoney/src/webserver.lisp 2008-08-27 23:57:40 UTC (rev 3744) @@ -23,6 +23,7 @@ ("/animation" animation-handler) ("/json-image-query" json-image-query-handler) ("/json-login" json-login-handler) + ("/json-logout" json-logout-handler) ("/json-clients" json-clients-handler) ("/json-buttons" json-buttons-handler) ("/json-edit-image" json-edit-image-handler) Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-08-27 17:27:40 UTC (rev 3743) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-08-27 23:57:40 UTC (rev 3744) @@ -59,21 +59,12 @@ debug('debug window cleared'); } -/* login */ +/* login status */ -function show_login() { - $("login_failure").style.visibility = 'hidden'; - $("login_form").style.visibility = 'visible'; -} +function login_status(json_result) { -function hide_status() { - $("login_status").style.visibility = 'hidden'; -} + log('login_status, admin: ' + json_result.admin + ' login: ' + json_result.login); -function login_complete(json_result) { - - log('login_complete, admin: ' + json_result.admin + ' login: ' + json_result.login); - logged_in = json_result.admin; if (logged_in) { @@ -96,6 +87,7 @@ var elements = $("cms").childNodes; if (logged_in) { + for (var i = 0; i < elements.length; i++) { if (elements[i].id) { elements[i].style.visibility = (elements[i].id == name) ? "visible" : "hidden"; @@ -103,13 +95,13 @@ } $("login_status").style.visibility = 'visible'; + } else { for (var i = 0; i < elements.length; i++) { if (elements[i].id) { elements[i].style.visibility = "hidden"; } } - $("login_form").style.visibility = 'visible'; } } @@ -121,10 +113,9 @@ function send_logout() { logged_in = false; - loadJSONDoc("/logout") + show_cms_window(); + loadJSONDoc("/json-logout") .addCallbacks(function () {}, alert); - - show_cms_window("login_form"); } /* image editing */ @@ -1170,7 +1161,7 @@ } load_button_images(); - loadJSONDoc("/json-login").addCallbacks(login_complete, alert); + loadJSONDoc("/json-login").addCallbacks(login_status, alert); loadJSONDoc('/json-news-archive/quickhoney').addCallbacks(initialize_news_archive, alert); if (!document.location.href.match(/#/)) { @@ -1489,4 +1480,20 @@ animator.attributes = { width: { to: 60 }, left: { to: 624 } }; animator.animate(); } -} \ No newline at end of file +} + +/* login stuff */ + +function init_login () { + $('username').focus(); + $('login_form').style.display = 'block'; +} + +function do_login () { + + $('login_form').style.display = 'none'; + $('logging-in').style.display = 'block'; + + return true; +} + Added: trunk/projects/quickhoney/website/static/login.css =================================================================== --- trunk/projects/quickhoney/website/static/login.css (rev 0) +++ trunk/projects/quickhoney/website/static/login.css 2008-08-27 23:57:40 UTC (rev 3744) @@ -0,0 +1,4 @@ +body { margin: 2em } +table { margin-bottom: 1em } +.label { padding-right: 1em } +h1 { margin: 1em 0em 2em 0em } \ No newline at end of file Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-08-27 17:27:40 UTC (rev 3743) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-08-27 23:57:40 UTC (rev 3744) @@ -358,23 +358,6 @@ </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> Added: trunk/projects/quickhoney/website/templates/login.xml =================================================================== --- trunk/projects/quickhoney/website/templates/login.xml (rev 0) +++ trunk/projects/quickhoney/website/templates/login.xml 2008-08-27 23:57:40 UTC (rev 3744) @@ -0,0 +1,46 @@ +<?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/yui/reset-fonts/reset-fonts.css" /> + <link rel="stylesheet" href="/static/login.css" /> + <script src="/MochiKit/MochiKit.js" type="text/javascript"> </script> + <script src="/static/javascript.js" type="text/javascript"> </script> + <title>QuickHoney CMS Login</title> + </head> + + <body id="login"> + + <img id="logo" src="/image/quickhoney-black"/> + + <form method="POST" id="login_form" style="display: none" onsubmit="do_login()"> + + <quickhoney:login-status /> + + <table> + <tbody> + <tr> + <td class="label"><label for="username">Username:</label></td> + <td><input name="__username" id="username" /><br/></td> + </tr> + <tr> + <td class="label"><label for="password">Password:</label></td> + <td><input name="__password" id="password" type="password" /></td> + </tr> + </tbody> + </table> + <button name="login" type="submit">login</button> + </form> + + <h1 id="logging-in" style="display: none">Logging in...</h1> + + <script language="javascript" type="text/javascript"> + init_login(); + </script> + </body> +</html>

1 0

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

27 Aug '08

Revision: 3743 Author: hans URL: http://bknr.net/trac/changeset/3743 implement drop shadows for overlay windows U trunk/projects/quickhoney/website/static/javascript.js A trunk/projects/quickhoney/website/static/shadow-grid.gif A trunk/projects/quickhoney/website/static/shadow.png A trunk/projects/quickhoney/website/static/ydsf.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-27 10:13:01 UTC (rev 3742) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-08-27 17:27:40 UTC (rev 3743) @@ -1233,10 +1233,14 @@ var overlay = $('overlay'); overlay.style.top = '144px'; overlay.className = current_directory; + var inner = DIV({ 'class': 'inner', style: 'background: white'}, + H1(null, title), + IMG({ src: '/image/overlay-close/color,000000,' + pages[current_directory].link_color, + id: 'close', width: 13, height: 13}), + BR()); replaceChildNodes(overlay, - H1(null, title), - IMG({ src: '/image/overlay-close/color,000000,' + pages[current_directory].link_color, - id: 'close', width: 13, height: 13})); + DIV({ 'class': 'ydsf' }, + inner)); overlay.style.width = width + 'px'; $('close').style.left = (width - 23) + 'px'; $('close').onclick = overlay_remove; @@ -1244,7 +1248,7 @@ for (var i = 3; i < arguments.length; i++) { elements.push(arguments[i]); } - appendChildNodes(overlay, DIV({id: id}, elements)); + appendChildNodes(inner, DIV({id: id}, elements)); overlay.style.visibility = 'inherit'; } Added: trunk/projects/quickhoney/website/static/shadow-grid.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/website/static/shadow-grid.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/projects/quickhoney/website/static/shadow.png =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/website/static/shadow.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/projects/quickhoney/website/static/ydsf.css =================================================================== --- trunk/projects/quickhoney/website/static/ydsf.css (rev 0) +++ trunk/projects/quickhoney/website/static/ydsf.css 2008-08-27 17:27:40 UTC (rev 3743) @@ -0,0 +1,92 @@ +/* + yDSF (ydnar Drop-Shadow-Fu) + ydnar(a)sixapart.com - http://www.sixapart.com +*/ + +.ydsf { + display: block; + position: relative; + margin: 4px -4px -4px 4px; + background: url(shadow-grid.gif) repeat; +} + +/* ie6 ignores this selector */ +html>body .ydsf { + margin: 10px -10px -10px 10px; + background: url(shadow.png) right bottom no-repeat; +} + +/* shadow corners */ +.ydsf:before, +.ydsf:after { + content: " "; + display: block; + width: 10px; + height: 10px; + background: inherit; +} + +.ydsf:before { + position: absolute; + top: 0; + right: 0; + margin: -10px 0 0 auto; + background-position: right top; +} + +.ydsf:after { + margin: -10px 0 0 -10px; + background-position: left bottom; +} + +.ydsf .inner { + display: block; + position: relative; + overflow: hidden; /* prevents margin leakage from child elements */ + left: -4px; + top: -4px; +} + +/* ie6 ignores this selector */ +html>body .ydsf .inner { + left: -10px; + top: -10px; + margin: 0; +} + + +/* helper classes (not YDSF related) */ + +.demo-ydsf { + position: relative; + border: 1px solid #999; + padding: 10px; + background: #fff url(gradient.jpg) left top repeat-x; +} + +.clear { + clear: both; + overflow: hidden; + width: 1px; + height: 1px; + margin: 0 -1px -1px 0; + border: 0; + padding: 0; + font-size: 0; + line-height: 0; +} + +.left { + float: left; + display: inline; /* fixes ie double margin-left bug */ +} + +.right { float: right; } + +.note { + width: 200px; + border: 1px solid #666; + padding: 10px; + background: #ffc; + color: #333; +} Property changes on: trunk/projects/quickhoney/website/static/ydsf.css ___________________________________________________________________ Name: svn:executable + * Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-08-27 10:13:01 UTC (rev 3742) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-08-27 17:27:40 UTC (rev 3743) @@ -9,6 +9,7 @@ <head> <link rel="stylesheet" href="/static/yui/reset-fonts/reset-fonts.css" /> <link rel="stylesheet" href="/static/styles.css" /> + <link rel="stylesheet" href="/static/ydsf.css" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="/rss/quickhoney" /> <script src="/static/detectplugins.js" type="text/javascript"> </script> <script src="/static/AC_QuickTime.js" type="text/javascript"> </script>

1 0

[bknr-cvs] edi changed trunk/thirdparty/drakma/request.lisp
by BKNR Commits 27 Aug '08

27 Aug '08

Revision: 3742 Author: edi URL: http://bknr.net/trac/changeset/3742 Read content as binary if length is known Also, read trailers from the right stream U trunk/thirdparty/drakma/request.lisp Modified: trunk/thirdparty/drakma/request.lisp =================================================================== --- trunk/thirdparty/drakma/request.lisp 2008-08-27 02:40:48 UTC (rev 3741) +++ trunk/thirdparty/drakma/request.lisp 2008-08-27 10:13:01 UTC (rev 3742) @@ -143,34 +143,35 @@ #+:lispworks 'lw:simple-char #-:lispworks 'character 'octet)) (chunkedp (chunked-stream-input-chunking-p (flexi-stream-stream stream)))) - #+:clisp - (setf (flexi-stream-element-type stream) element-type) - (multiple-value-prog1 - (values (cond ((eql content-length 0) (if textp "" nil)) - (content-length - (when chunkedp - ;; see RFC 2616, section 4.4 - (error "Got Content-Length header although input chunking is on.")) - (let ((result (make-array content-length - :element-type element-type - :fill-pointer t))) - (setf (fill-pointer result) - (read-sequence result stream)) - result)) - ((or chunkedp must-close) - ;; no content length, read until EOF (or end of chunking) - (let ((buffer (make-array +buffer-size+ - :element-type element-type)) - (result (make-array 0 - :element-type element-type - :adjustable t))) - (loop for index = 0 then (+ index pos) - for pos = (read-sequence buffer stream) - do (adjust-array result (+ index pos)) - (replace result buffer :start1 index :end2 pos) - while (= pos +buffer-size+)) - result))) - (chunked-input-stream-trailers stream))))) + (values (cond ((eql content-length 0) nil) + (content-length + (when chunkedp + ;; see RFC 2616, section 4.4 + (error "Got Content-Length header although input chunking is on.")) + (setf (flexi-stream-element-type stream) 'octet) + (let ((result (make-array content-length :element-type 'octet))) + #+:clisp + (setf (flexi-stream-element-type stream) 'octet) + (read-sequence result stream) + (when textp + (setf result + (octets-to-string result :external-format (flexi-stream-external-format stream)) + #+:clisp #+:clisp + (flexi-stream-element-type stream) element-type)) + result)) + ((or chunkedp must-close) + ;; no content length, read until EOF (or end of chunking) + #+:clisp + (setf (flexi-stream-element-type stream) element-type) + (let ((buffer (make-array +buffer-size+ :element-type element-type)) + (result (make-array 0 :element-type element-type :adjustable t))) + (loop for index = 0 then (+ index pos) + for pos = (read-sequence buffer stream) + do (adjust-array result (+ index pos)) + (replace result buffer :start1 index :end2 pos) + while (= pos +buffer-size+)) + result))) + (chunked-input-stream-trailers (flexi-stream-stream stream))))) (defun http-request (uri &rest args &key (protocol :http/1.1)

1 0

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

27 Aug '08

Revision: 3741 Author: hans URL: http://bknr.net/trac/changeset/3741 Update news layout, fix news archive navigation styling. U trunk/projects/quickhoney/website/static/styles.css Modified: trunk/projects/quickhoney/website/static/styles.css =================================================================== --- trunk/projects/quickhoney/website/static/styles.css 2008-08-27 02:38:29 UTC (rev 3740) +++ trunk/projects/quickhoney/website/static/styles.css 2008-08-27 02:40:48 UTC (rev 3741) @@ -597,8 +597,7 @@ visibility: hidden; } -.archive span.title { font-size: 1.2em; padding-bottom: 5px; } -.archive a.year { font-size: 1.2em; padding-bottom: 2em; } +.archive a.year { font-size: 1.2em; margin: 2px 0px 2px 0px; } .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; font-size: 0.8em; }

1 0

[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