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

[bknr-cvs] ksprotte changed trunk/projects/bos/m2/poi.lisp
by BKNR Commits 09 Sep '08

09 Sep '08

Revision: 3860 Author: ksprotte URL: http://bknr.net/trac/changeset/3860 STORE-OBJECT-ID of each POI now present in its Java-script representation U trunk/projects/bos/m2/poi.lisp Modified: trunk/projects/bos/m2/poi.lisp =================================================================== --- trunk/projects/bos/m2/poi.lisp 2008-09-09 08:57:35 UTC (rev 3859) +++ trunk/projects/bos/m2/poi.lisp 2008-09-09 09:21:48 UTC (rev 3860) @@ -210,7 +210,8 @@ (store-objects-with-class 'poi)) #'(lambda (poi-1 poi-2) (string-lessp (slot-string poi-1 'title language) (slot-string poi-2 'title language))))) (format t " -var poi = { symbol: ~S, +var poi = { id: ~S, + symbol: ~S, icon: ~S, name: ~S, untertitel: ~S, @@ -220,6 +221,7 @@ thumbnail: ~D }; " + (store-object-id poi) (poi-name poi) (poi-icon poi) (slot-string poi 'title language)

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/website/static/
by BKNR Commits 09 Sep '08

09 Sep '08

Revision: 3859 Author: hans URL: http://bknr.net/trac/changeset/3859 Remove debugger, improve load appearance. U trunk/projects/quickhoney/website/static/index.css U trunk/projects/quickhoney/website/static/javascript.js Modified: trunk/projects/quickhoney/website/static/index.css =================================================================== --- trunk/projects/quickhoney/website/static/index.css 2008-09-09 08:45:08 UTC (rev 3858) +++ trunk/projects/quickhoney/website/static/index.css 2008-09-09 08:57:35 UTC (rev 3859) @@ -7,6 +7,10 @@ a:active { outline: none } a:focus { -moz-outline-style: none } +#logo { + margin: 290px 0px 305px 105px; +} + .page { display: none; border: 0px; @@ -156,6 +160,7 @@ /* path / version */ #path-and-version { + visibility: hidden; position: absolute; top: 68px; left: 36px; @@ -314,7 +319,7 @@ #cue { position: absolute; - visibility: hidden; + visibility: visible; left: 0px; background-color: white; top: 8px; @@ -399,7 +404,7 @@ /* cms styles */ -p.cms { +.cms { margin-top: 10px; } Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 08:45:08 UTC (rev 3858) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 08:57:35 UTC (rev 3859) @@ -36,30 +36,6 @@ return document.getElementById(id); } -/* debugger */ - -var want_debugger = false; -var debug_string = ''; - -function debug() { - var message = ''; - for (var i = 0; i < arguments.length; i++) { - message += arguments[i]; - } - if (window.console && window.console.log) { - window.console.log(message); - } - if (want_debugger) { - debug_string += message + '<br />'; - $("debugger_text").innerHTML = debug_string; - } -} - -function clear_debug_window() { - debug_string = ''; - debug('debug window cleared'); -} - /* login status */ function login_status(json_result) { @@ -79,7 +55,7 @@ function show_cms_window(name) { - debug('show_cms_window ' + name); + log('show_cms_window ' + name); $("cms").style.top = "106px"; $("cms").style.left = "730px"; @@ -392,7 +368,7 @@ // make sure that the right elements are displayed if (document.show_picture) { - debug('directly jump to ' + document.show_picture); + log('directly jump to ' + document.show_picture); for (var i = 0; i < query_result.length; i++) { if (query_result[i].name == document.show_picture) { display_image(i); @@ -442,14 +418,14 @@ } } - debug('got ', query_result.length.toString(), ' images'); + log('got ', query_result.length.toString(), ' images'); display_query_result(); hide_cue(); } function query_imagedb(directory, subdirectory, force) { - debug('query_imagedb - keywords: ', directory, " ", subdirectory); + log('query_imagedb - keywords: ', directory, " ", subdirectory); var key = directory + ((subdirectory == "browseall") ? "" : ("/" + subdirectory)) + ((subdirectory == "smallworld") ? "?layout=smallworld" : ""); @@ -522,9 +498,10 @@ function show_page(pagename, subpath) { var page = pages[pagename]; - debug('show_page ' + pagename + ' subpath ' + subpath + ' current_directory ' + current_directory); + log('show_page ' + pagename + ' subpath ' + subpath + ' current_directory ' + current_directory); $('loading').style.display = 'none'; + $('path-and-version').style.visibility = 'visible'; /* workaround for IE, which does not display the overlapping menu items expectedly */ map(function (keyword) { @@ -598,7 +575,7 @@ function home_loaded(image) { - debug('home_loaded - image is ' + image + ' width: ' + image.width); + log('home_loaded - image is ' + image + ' width: ' + image.width); reveal_image(image); } @@ -732,7 +709,7 @@ function directory(directory_name, subpath) { - debug('directory: ', directory_name, ' subpath: ', subpath, ' current_directory: ', current_directory); + log('directory: ', directory_name, ' subpath: ', subpath, ' current_directory: ', current_directory); replaceChildNodes("thumbnails", " "); @@ -769,7 +746,7 @@ function subdirectory(subdirectory, page) { - debug('subdirectory: ', subdirectory, ' page: ', page); + log('subdirectory: ', subdirectory, ' page: ', page); $('explicit').checked = (subdirectory == 'nudes'); @@ -887,6 +864,21 @@ } } +function wait_for_images(callback) { + var complete = true; + map(function (image) { + if (!image.complete) { + complete = false; + } + }, getElementsByTagAndClassName('img', null)); + + if (complete) { + callback(); + } else { + callLater(.2, partial(wait_for_images, callback)); + } +} + function display_thumbnail_page() { var current_page_index = position_to_page_number(query_position) - 1; @@ -951,7 +943,7 @@ query_position = index; current_image = query_result[index]; - debug('display_image index ' + index); + log('display_image index ' + index); overlay_remove(); display_path(); @@ -976,7 +968,7 @@ var percent = Math.round(100 * ratio); - debug("calculated scaling: ratio " + (Math.round(ratio * 100) / 100) + " percent " + percent + " width " + display_width + " height " + display_height); + log("calculated scaling: ratio " + (Math.round(ratio * 100) / 100) + " percent " + percent + " width " + display_width + " height " + display_height); var may_enlarge = (current_directory == 'pixel' && (current_image.ratio < 1)); @@ -1095,7 +1087,7 @@ /* open the upload window */ function do_upload(target) { - debug('do_upload - target is ', target); + log('do_upload - target is ', target); var upload_window = window.open('', target, "width=500,height=300,status=no,toolbar=no,menubar=no,resizable=no,scrollbars=no"); upload_window.focus(); @@ -1106,7 +1098,7 @@ /* open the button upload window */ function do_button_upload(target) { - debug('do_button_upload - target is ', target); + log('do_button_upload - target is ', target); var upload_window = window.open('', target, "width=500,height=300,status=no,toolbar=no,menubar=no,resizable=no,scrollbars=no"); upload_window.focus(); @@ -1134,7 +1126,7 @@ function safari_compatibility_hack() { // for safari, we change the style sheet so that images are not hidden during load - debug('changing stylesheet for safari'); + log('changing stylesheet for safari'); for (var i = 0; i < document.styleSheets.length; i++) { var rules = document.styleSheets[i][document.all ? 'rules' : 'cssRules']; for (var j = 0; j < rules.length; j++) { @@ -1147,22 +1139,14 @@ } } -function enable_debuger() -{ - want_debugger = true; - - $("debugger").style.visibility = 'visible'; - $("debugger").style.left = '730px'; - $("debugger").style.width = '400px'; - $("debugger").style.heigth = '640px'; -} - -function init() { +function init_() { if (navigator.userAgent.indexOf("Safari") != -1) { safari = true; safari_compatibility_hack(); } + show_cue('initializing'); + load_button_images(); loadJSONDoc("/json-login").addCallbacks(login_status, alert); loadJSONDoc("/json-clients").addCallbacks(set_clients, alert); @@ -1175,10 +1159,14 @@ poll_path(); } +function init() { + wait_for_images(init_); +} + function jump_to(path) { document.current_path = path; - debug('jump_to - path is ', path); + log('jump_to - path is ', path); path = decodeURI(path.replace(/[&#].*/, "")); var components = path.split("/");

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/src/tags.lisp
by BKNR Commits 09 Sep '08

09 Sep '08

Revision: 3858 Author: hans URL: http://bknr.net/trac/changeset/3858 Fix some XHTML 1.0 validation errors. U trunk/projects/quickhoney/src/tags.lisp Modified: trunk/projects/quickhoney/src/tags.lisp =================================================================== --- trunk/projects/quickhoney/src/tags.lisp 2008-09-09 08:43:17 UTC (rev 3857) +++ trunk/projects/quickhoney/src/tags.lisp 2008-09-09 08:45:08 UTC (rev 3858) @@ -48,6 +48,7 @@ (html ((:img :src #?"/image/$(image-name)" :class "image" + :alt "" :width (bknr.images:store-image-width image) :height (bknr.images:store-image-height image))) ((:div :class "metadata" :style #?"height: $((bknr.images:store-image-height image))px")

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/website/templates/image-browse.xml
by BKNR Commits 09 Sep '08

09 Sep '08

Revision: 3857 Author: hans URL: http://bknr.net/trac/changeset/3857 Fix some XHTML 1.0 validation errors. U trunk/projects/quickhoney/website/templates/image-browse.xml Modified: trunk/projects/quickhoney/website/templates/image-browse.xml =================================================================== --- trunk/projects/quickhoney/website/templates/image-browse.xml 2008-09-09 08:42:03 UTC (rev 3856) +++ trunk/projects/quickhoney/website/templates/image-browse.xml 2008-09-09 08:43:17 UTC (rev 3857) @@ -16,7 +16,7 @@ </head> <body id="image-browse"> <div id="logo"> - <img src="/image/quickhoney-black" id="the_logo" name="logo" border="0" /> + <img src="/image/quickhoney-black" alt="" id="the_logo" name="logo" border="0" /> </div> <script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/website/templates/index.xml
by BKNR Commits 09 Sep '08

09 Sep '08

Revision: 3856 Author: hans URL: http://bknr.net/trac/changeset/3856 Fix some XHTML 1.0 validation errors. U trunk/projects/quickhoney/website/templates/index.xml Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-09-09 08:39:51 UTC (rev 3855) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-09 08:42:03 UTC (rev 3856) @@ -66,7 +66,7 @@ </div> <div id="loading" class="page"> - <img src="/image/startscreen" id="logo" border="0" width="438" height="67" /> + <img alt="" src="/image/startscreen" id="logo" border="0" width="438" height="67" /> </div> <div id="home" class="page"> @@ -308,25 +308,23 @@ <div class="cms_title">Create news entry</div> <form action="/upload-news" method="post" id="edit_news_form" enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);"> + <table class="cms"> + <tbody> + <tr> + <td>Image:</td> + <td><input type="file" name="image-file" /></td> + </tr> + <tr> + <td>Title:</td> + <td><input name="title" size="60"/></td> + </tr> + <tr> + <td>Text:</td> + <td><textarea class="mce_editor" name="text" cols="60" rows="10"> </textarea></td> + </tr> + </tbody> + </table> <p class="cms"> - <table> - <tbody> - <tr> - <td>Image:</td> - <td><input type="file" name="image-file" /></td> - </tr> - <tr> - <td>Title:</td> - <td><input name="title" size="60"/></td> - </tr> - <tr> - <td>Text:</td> - <td><textarea class="mce_editor" name="text" cols="60" rows="10"> </textarea></td> - </tr> - </tbody> - </table> - </p> - <p class="cms"> <input type="submit" name="action" value="upload" /> </p> </form>

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/website/templates/index.xml
by BKNR Commits 09 Sep '08

09 Sep '08

Revision: 3855 Author: hans URL: http://bknr.net/trac/changeset/3855 Fix some XHTML 1.0 validation errors. U trunk/projects/quickhoney/website/templates/index.xml Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-09-09 08:34:50 UTC (rev 3854) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-09 08:39:51 UTC (rev 3855) @@ -3,7 +3,6 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" - xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:bknr="http://bknr.net/" xmlns:quickhoney="http://quickhoney.com/" > @@ -27,37 +26,37 @@ <div id="overlay" class="page"> </div> - <a id="checkout" href="#cart" onclick="show_page('cart');"><img src="/image/checkout" width="112" height="24"/></a> + <a id="checkout" href="#cart" onclick="show_page('cart');"><img src="/image/checkout" alt="" width="112" height="24"/></a> <div id="menu"> <a onclick="shuffle_button_images('home')" href="#home" id="m_home"> - <img alt="home" class="menu" src="/image/quickhoney" /> + <img alt="" class="menu" src="/image/quickhoney" /> </a> <a onclick="shuffle_button_images('pixel')" href="#pixel" id="m_pixel"> - <img alt="pixel" class="unselected" src="/image/pixel-unselected" /> - <img alt="pixel" class="selected" src="/image/pixel-selected" /> + <img alt="" class="unselected" src="/image/pixel-unselected" /> + <img alt="" class="selected" src="/image/pixel-selected" /> </a> <a onclick="shuffle_button_images('vector')" href="#vector" id="m_vector"> - <img alt="vector" class="unselected" src="/image/vector-unselected" /> - <img alt="vector" class="selected" src="/image/vector-selected" /> + <img alt="" class="unselected" src="/image/vector-unselected" /> + <img alt="" class="selected" src="/image/vector-selected" /> </a> <a onclick="shuffle_button_images('pen')" href="#pen" id="m_pen"> - <img alt="pen" class="unselected" src="/image/pen-unselected" /> - <img alt="pen" class="selected" src="/image/pen-selected" /> + <img alt="" class="unselected" src="/image/pen-unselected" /> + <img alt="" class="selected" src="/image/pen-selected" /> </a> <a onclick="shuffle_button_images('news')" href="#news" id="m_news"> - <img alt="news" class="unselected" src="/image/news-unselected" /> - <img alt="news" class="selected" src="/image/news-selected" /> + <img alt="" class="unselected" src="/image/news-unselected" /> + <img alt="" class="selected" src="/image/news-selected" /> </a>  <a onclick="shuffle_button_images('contact')" href="#contact" id="m_contact"> - <img alt="contact" class="unselected" src="/image/contact-unselected" /> - <img alt="contact" class="selected" src="/image/contact-selected" /> + <img alt="" class="unselected" src="/image/contact-unselected" /> + <img alt="" class="selected" src="/image/contact-selected" /> </a> </div> @@ -67,27 +66,27 @@ </div> <div id="loading" class="page"> - <h1>Loading site...</h1> + <img src="/image/startscreen" id="logo" border="0" width="438" height="67" /> </div> <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="318" + <img alt="" id="home_pixel" src="/image/trans" width="318" height="318" 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="318" + <img alt="" id="home_vector" src="/image/trans" width="318" height="318" onload="reveal_image(this);" class="button-image" /> </a> </div> <div> <a href="#pen" class="home_button"> - <img alt="home pen" id="home_pen" src="/image/trans" width="318" height="318" + <img alt="" id="home_pen" src="/image/trans" width="318" height="318" onload="reveal_image(this);" class="button-image" /> </a> <a href="#news" class="home_button"> - <img alt="home news" id="home_news" src="/image/trans" width="318" height="318" + <img alt="" id="home_news" src="/image/trans" width="318" height="318" onload="reveal_image(this);" class="button-image" /> </a> </div> @@ -98,24 +97,24 @@ <div id="directory" class="subform"> <div> <a href="#" class="button"> - <img alt="button0" id="button0" onload="reveal_image(this);" src="/image/trans" class="button-image" /> + <img alt="" id="button0" onload="reveal_image(this);" src="/image/trans" class="button-image" /> </a> <a href="#" class="button"> - <img alt="button1" id="button1" onload="reveal_image(this);" src="/image/trans" class="button-image" /> + <img alt="" id="button1" onload="reveal_image(this);" src="/image/trans" class="button-image" /> </a> <a href="#" class="button"> - <img alt="button2" id="button2" onload="reveal_image(this);" src="/image/trans" class="button-image" /> + <img alt="" id="button2" onload="reveal_image(this);" src="/image/trans" class="button-image" /> </a> </div> <div> <a href="#" class="button"> - <img alt="button3" id="button3" onload="reveal_image(this);" src="/image/trans" class="button-image" /> + <img alt="" id="button3" onload="reveal_image(this);" src="/image/trans" class="button-image" /> </a> <a href="#" class="button"> - <img alt="button4" id="button4" onload="reveal_image(this);" src="/image/trans" class="button-image" /> + <img alt="" id="button4" onload="reveal_image(this);" src="/image/trans" class="button-image" /> </a> <a href="#" class="button"> - <img alt="button5" id="button5" onload="reveal_image(this);" src="/image/trans" class="button-image" /> + <img alt="" id="button5" onload="reveal_image(this);" src="/image/trans" class="button-image" /> </a> </div> </div> @@ -173,7 +172,7 @@ <div id="contact" class="page"> <div style="height: 300px"> - <img id="contactimage" src="/image/pixelcontact"/> + <img id="contactimage" alt="" src="/image/pixelcontact"/> <br /><br /> <h1>email</h1> <p> @@ -220,8 +219,8 @@ <p class="cms"> Client:<br /> <input type="text" id="upload_client" name="client" value="" /><br /> - <div id="upload_client_select"> - </div> + <span id="upload_client_select"> + </span> Keywords:<br /> <input type="text" id="upload_keywords" name="spider-keywords" value="" /><br /> <input type="checkbox" id="explicit" name="explicit" value="1" /> Explicit<br/> @@ -261,7 +260,7 @@ </div> <div id="upload_animation_form" class="cms_form"> - <form id="upload_form_element" action="/upload-animation" method="post" + <form id="upload_animation_form_element" action="/upload-animation" method="post" enctype="multipart/form-data" target="upload_result" onsubmit="do_upload(this.target);"> <div class="cms_title">Upload new animatoin</div> <p class="cms"> @@ -272,9 +271,9 @@ </p> <p class="cms"> Client:<br /> - <input type="text" id="upload_client" name="client" value="" /><br /> - <div id="upload_animation_client_select"> - </div> + <input type="text" id="upload_animation_client" name="client" value="" /><br /> + <span id="upload_animation_client_select"> + </span> </p> <p class="cms"> <input type="submit" name="upload" value="upload" /> @@ -289,8 +288,8 @@ <p class="cms"> Client:<br /> <input type="text" id="edit_client" name="client" value="" /><br /> - <div id="edit_client_select"> - </div> + <span id="edit_client_select"> + </span> Keywords:<br /> <input type="text" id="edit_keywords" name="spider-keywords" value="" /><br /> <input type="checkbox" id="edit_explicit" name="explicit" value="1" /> Explicit<br/> @@ -368,7 +367,7 @@ </p> </div> - <div id="cue"><img src="/static/spinner.gif" width="16" height="16"/></div> + <div id="cue"><img alt="" src="/static/spinner.gif" width="16" height="16"/></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/website/templates/frontpage.xml
by BKNR Commits 09 Sep '08

09 Sep '08

Revision: 3854 Author: hans URL: http://bknr.net/trac/changeset/3854 fix HTML validation errors. U trunk/projects/quickhoney/website/templates/frontpage.xml Modified: trunk/projects/quickhoney/website/templates/frontpage.xml =================================================================== --- trunk/projects/quickhoney/website/templates/frontpage.xml 2008-09-09 06:20:55 UTC (rev 3853) +++ trunk/projects/quickhoney/website/templates/frontpage.xml 2008-09-09 08:34:50 UTC (rev 3854) @@ -2,7 +2,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html - xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns="http://www.w3.org/1999/xhtml" xmlns:bknr="http://bknr.net" xmlns:quickhoney="http://quickhoney.com/" @@ -17,7 +16,7 @@ <body id="frontpage"> <p> - <img src="/image/startscreen" id="logo" border="0" width="438" height="67" /> + <img src="/image/startscreen" alt="" id="logo" border="0" width="438" height="67" /> </p> <div id="static-info"> <div>

1 0

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

09 Sep '08

Revision: 3853 Author: hans URL: http://bknr.net/trac/changeset/3853 Add dummy button for home page. U trunk/projects/quickhoney/src/handlers.lisp A trunk/projects/quickhoney/upgrade-stuff/button-dummy.png U trunk/projects/quickhoney/upgrade-stuff/import.lisp U trunk/projects/quickhoney/website/static/javascript.js Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2008-09-09 05:58:22 UTC (rev 3852) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-09-09 06:20:55 UTC (rev 3853) @@ -258,7 +258,7 @@ (warn "No images for ~A ~A found" category subcategory)) (encode-array-element type) (dolist (image (or images - (list (store-image-with-name "trans")))) + (list (store-image-with-name "button-dummy")))) (encode-array-element (store-object-id image)) (when (zerop (decf count)) (return))))))))))))) Added: trunk/projects/quickhoney/upgrade-stuff/button-dummy.png =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/button-dummy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/projects/quickhoney/upgrade-stuff/import.lisp =================================================================== --- trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-09-09 05:58:22 UTC (rev 3852) +++ trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-09-09 06:20:55 UTC (rev 3853) @@ -32,7 +32,7 @@ #P"contact-selected.png" #P"contact-unselected.png" #P"quickhoney.png" #P"quickhoney-black.png" #P"pixelcontact.gif" - #P"startscreen.png")) + #P"startscreen.png" #P"button-dummy.png")) (replace-image pathname)) (replace-image #p"news-sep.gif") Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 05:58:22 UTC (rev 3852) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 06:20:55 UTC (rev 3853) @@ -524,6 +524,8 @@ debug('show_page ' + pagename + ' subpath ' + subpath + ' current_directory ' + current_directory); + $('loading').style.display = 'none'; + /* workaround for IE, which does not display the overlapping menu items expectedly */ map(function (keyword) { $('m_' + keyword).style.zIndex = (keyword == pagename) ? 101 : 100; @@ -1156,8 +1158,6 @@ } function init() { - $('loading').style.display = 'none'; - if (navigator.userAgent.indexOf("Safari") != -1) { safari = true; safari_compatibility_hack();

1 0

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

09 Sep '08

Revision: 3852 Author: hans URL: http://bknr.net/trac/changeset/3852 Replace Javascript cue by a animated GIF spinner. U trunk/projects/quickhoney/website/static/index.css U trunk/projects/quickhoney/website/static/javascript.js A trunk/projects/quickhoney/website/static/spinner.gif U trunk/projects/quickhoney/website/templates/index.xml Modified: trunk/projects/quickhoney/website/static/index.css =================================================================== --- trunk/projects/quickhoney/website/static/index.css 2008-09-09 04:57:43 UTC (rev 3851) +++ trunk/projects/quickhoney/website/static/index.css 2008-09-09 05:58:22 UTC (rev 3852) @@ -316,10 +316,10 @@ position: absolute; visibility: hidden; left: 0px; - top: 0px; + background-color: white; + top: 8px; text-align: left; color: white; - background-color: red; padding: 0em 0.5em 0em 0.5em; } Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 04:57:43 UTC (rev 3851) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-09-09 05:58:22 UTC (rev 3852) @@ -411,32 +411,14 @@ display_path(); } -var display_cue = false; -var wait_count = 0; - -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'; - if (display_cue) { - display_cue = text; - } else { - display_cue = text; - animate_cue(); - } } function hide_cue() { $("cue").style.visibility = 'hidden'; $('footer').style.visibility = 'inherit'; - display_cue = false; } var db_cache = {}; Added: trunk/projects/quickhoney/website/static/spinner.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/website/static/spinner.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-09-09 04:57:43 UTC (rev 3851) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-09-09 05:58:22 UTC (rev 3852) @@ -368,9 +368,7 @@ </p> </div> - <div id="cue"> - query database - </div> + <div id="cue"><img src="/static/spinner.gif" width="16" height="16"/></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 09 Sep '08

09 Sep '08

Revision: 3851 Author: hans URL: http://bknr.net/trac/changeset/3851 make front page look nicer. U trunk/projects/quickhoney/upgrade-stuff/import.lisp A trunk/projects/quickhoney/upgrade-stuff/startscreen.png U trunk/projects/quickhoney/website/static/frontpage.css U trunk/projects/quickhoney/website/templates/frontpage.xml Modified: trunk/projects/quickhoney/upgrade-stuff/import.lisp =================================================================== --- trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-09-09 04:21:45 UTC (rev 3850) +++ trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-09-09 04:57:43 UTC (rev 3851) @@ -11,7 +11,7 @@ (format t "~&; error importing ~S: ~A~%" pathname e)))) (dolist (name '(#p"type-news.png" #p"type-pixel.png" #p"type-shop.png" - #p"type-vector.png" #p"type-stuff.png" #p"type-pen.png" )) + #p"type-vector.png" #p"type-stuff.png" #p"type-pen.png")) (replace-image name :keywords '(:type))) (dolist (pathname '(#P"overlay-close.gif" @@ -31,7 +31,8 @@ #P"shop-selected.png" #P"shop-unselected.png" #P"contact-selected.png" #P"contact-unselected.png" #P"quickhoney.png" #P"quickhoney-black.png" - #P"pixelcontact.gif")) + #P"pixelcontact.gif" + #P"startscreen.png")) (replace-image pathname)) (replace-image #p"news-sep.gif") Added: trunk/projects/quickhoney/upgrade-stuff/startscreen.png =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/startscreen.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/projects/quickhoney/website/static/frontpage.css =================================================================== --- trunk/projects/quickhoney/website/static/frontpage.css 2008-09-09 04:21:45 UTC (rev 3850) +++ trunk/projects/quickhoney/website/static/frontpage.css 2008-09-09 04:57:43 UTC (rev 3851) @@ -1,8 +1,5 @@ #logo { - position: absolute; - right: 10px; - top: 10px; - z-index: 2; + margin: 5em 0em 5em 10em; } #frontpage p { Modified: trunk/projects/quickhoney/website/templates/frontpage.xml =================================================================== --- trunk/projects/quickhoney/website/templates/frontpage.xml 2008-09-09 04:21:45 UTC (rev 3850) +++ trunk/projects/quickhoney/website/templates/frontpage.xml 2008-09-09 04:57:43 UTC (rev 3851) @@ -12,27 +12,30 @@ <link rel="stylesheet" href="/static/quickhoney.css" /> <link rel="stylesheet" href="/static/frontpage.css" /> <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="/rss/quickhoney" /> - <script src="/static/javascript.js" type="text/javascript"> - </script> <title>QuickHoney - Nana Rausch + Peter Stemmler</title> </head> <body id="frontpage"> <p> - <img src="/image/quickhoney-black" id="logo" border="0" width="442" height="70" /> + <img src="/image/startscreen" id="logo" border="0" width="438" height="67" /> </p> - <div> - <h1>QuickHoney Illustrations</h1> - <p>Studio for Illustration, New York</p> - <h1>Peter Stemmler</h1> - <p>Phone: 646.270.5562<br/>Email: p(a)quickhoney.com</p> - <h1>Nana Rausch</h1> - <p>Phone 646.270.5592<br/>Email: n(a)quickhoney.com</p> + <div id="static-info"> + <div> + <h1>QuickHoney Illustrations</h1> + <p>Studio for Illustration, New York</p> + <h1>Peter Stemmler</h1> + <p>Phone: 646.270.5562<br/>Email: p(a)quickhoney.com</p> + <h1>Nana Rausch</h1> + <p>Phone 646.270.5592<br/>Email: n(a)quickhoney.com</p> + </div> + <p> + This site requires Firefox, Safari or Internet Explorer and Javascript for full viewing pleasure. + </p> + <p>Enter our <a href="/image-browse">Image gallery</a> for basic view.</p> </div> - <p> - This site requires Firefox, Safari or Internet Explorer and Javascript for full viewing pleasure. - </p> - <p>Enter our <a href="/image-browse">Image gallery</a> for basic view.</p> + <div id="loading" style="display: none"> + Loading, please hold on... + </div> <script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); @@ -42,6 +45,8 @@ pageTracker._trackPageview(); </script> <script type="text/javascript"> + document.getElementById('static-info').style.display = 'none'; + document.getElementById('loading').style.display = 'block'; document.location.href = '/index'; </script> </body>

1 0