Revision: 3529 Author: hans URL: http://bknr.net/trac/changeset/3529

Checkpoint hey/buy box, working mostly

U trunk/projects/quickhoney/src/handlers.lisp A trunk/projects/quickhoney/upgrade-stuff/buy-file.gif A trunk/projects/quickhoney/upgrade-stuff/buy-print.gif U trunk/projects/quickhoney/upgrade-stuff/buy-right-line.gif A trunk/projects/quickhoney/upgrade-stuff/buy-t-shirt.gif D trunk/projects/quickhoney/upgrade-stuff/buy_file.gif D trunk/projects/quickhoney/upgrade-stuff/buy_print.gif D trunk/projects/quickhoney/upgrade-stuff/buy_t_shirt.gif U trunk/projects/quickhoney/upgrade-stuff/import.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-07-20 12:06:10 UTC (rev 3528) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-07-20 15:10:00 UTC (rev 3529) @@ -59,7 +59,7 @@ "") (or (quickhoney-image-spider-keywords image) "") (mapcar (lambda (keyword) - (format nil "~(~A~):true" (substitute #_ #- (symbol-name keyword)))) + (format nil "'~(~A~)':true" (symbol-name keyword))) (intersection *editable-keywords* (store-image-keywords image)))))

(defmethod layout-to-javascript ((layout layout))

Copied: trunk/projects/quickhoney/upgrade-stuff/buy-file.gif (from rev 3527, trunk/projects/quickhoney/upgrade-stuff/buy_file.gif) =================================================================== (Binary files differ)

Copied: trunk/projects/quickhoney/upgrade-stuff/buy-print.gif (from rev 3527, trunk/projects/quickhoney/upgrade-stuff/buy_print.gif) =================================================================== (Binary files differ)

Modified: trunk/projects/quickhoney/upgrade-stuff/buy-right-line.gif =================================================================== (Binary files differ)

Copied: trunk/projects/quickhoney/upgrade-stuff/buy-t-shirt.gif (from rev 3527, trunk/projects/quickhoney/upgrade-stuff/buy_t_shirt.gif) =================================================================== (Binary files differ)

Deleted: trunk/projects/quickhoney/upgrade-stuff/buy_file.gif =================================================================== (Binary files differ)

Deleted: trunk/projects/quickhoney/upgrade-stuff/buy_print.gif =================================================================== (Binary files differ)

Deleted: trunk/projects/quickhoney/upgrade-stuff/buy_t_shirt.gif =================================================================== (Binary files differ)

Modified: trunk/projects/quickhoney/upgrade-stuff/import.lisp =================================================================== --- trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-07-20 12:06:10 UTC (rev 3528) +++ trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-07-20 15:10:00 UTC (rev 3529) @@ -5,7 +5,7 @@

(dolist (name '(#P"overlay-close.gif" #P"hey.gif" - #P"buy.gif" #P"buy_print.gif" #P"buy_file.gif" #P"buy_t_shirt.gif" + #P"buy.gif" #P"buy-print.gif" #P"buy-file.gif" #P"buy-t-shirt.gif" #P"buy-right-line.gif" #P"button-bottom.gif" #P"add-to-cart.gif" #P"checkout.gif")) (handler-case

Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-07-20 12:06:10 UTC (rev 3528) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-07-20 15:10:00 UTC (rev 3529) @@ -633,7 +633,6 @@

function set_button_images(_button_images) {

- debug('set_button_images'); button_images = _button_images;

if (current_directory == 'home' @@ -1002,7 +1001,7 @@ $("edit_keywords").value = current_image.spider_keywords; map(function(keyword) { $('edit_' + keyword).checked = current_image.keywords[keyword] ? true : false; - }, ['explicit', 'buy_file', 'buy_print', 'buy_t_shirt']); + }, ['explicit', 'buy-file', 'buy-print', 'buy-t-shirt']); show_cms_window("edit_form"); } } @@ -1238,21 +1237,21 @@ height += 22; buttons.push(make_image_action_button(keyword, make_buy_form, 22)); } - }, ['buy_file', 'buy_print', 'buy_t_shirt']); + }, ['buy-file', 'buy-print', 'buy-t-shirt']); buttons.push(make_image_action_button('hey', make_hey_form, 23)); replaceChildNodes('image_action_buttons', buttons); if (buyable) { appendChildNodes('image_action_buttons', IMG({ id: 'buy', src: recolored_image_path('buy'), width: 127, height: 22})); } appendChildNodes('image_action_buttons', 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', {}, .3, + YAHOO.util.Easing.easeBoth); $('image_action_buttons').onmouseover = function () { - (new YAHOO.util.Anim('image_action_buttons', { left: { to: 518 }, width: { to: 127 } }, .3, - YAHOO.util.Easing.easeBoth)) - .animate(); + animator.attributes = { width: { to: 127 }, left: { to: 518 } }; + animator.animate(); } $('image_action_buttons').onmouseout = function () { - (new YAHOO.util.Anim('image_action_buttons', { left: { to: 584 }, width: { to: 60 } }, .3, - YAHOO.util.Easing.easeBoth)) - .animate(); + animator.attributes = { width: { to: 60 }, left: { to: 584 } }; + animator.animate(); } } \ No newline at end of file

Modified: trunk/projects/quickhoney/website/static/styles.css =================================================================== --- trunk/projects/quickhoney/website/static/styles.css 2008-07-20 12:06:10 UTC (rev 3528) +++ trunk/projects/quickhoney/website/static/styles.css 2008-07-20 15:10:00 UTC (rev 3529) @@ -487,6 +487,8 @@

#overlay { z-index: 100; + top: 144px; + left: 36px; position: absolute; background: white; border: 1px solid #000000; @@ -514,7 +516,7 @@ #image_action_buttons { position: absolute; left: 584px; - top: 32px; + top: 28px; width: 60px; overflow: hidden; z-index: 100; @@ -528,9 +530,9 @@ }

#image_action_buttons #buy-right-line { - z-index: 200; + z-index: 100; position: absolute; - left: 60px; + right: 0px; top: 0px; }

Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-07-20 12:06:10 UTC (rev 3528) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-07-20 15:10:00 UTC (rev 3529) @@ -50,16 +50,20 @@ <div id="elements"> <div id="home_page"> <a href="#pixel"> - <img alt="home pixel" class="home_button" id="home_pixel" src="/image/trans" width="318" height="318" onload="reveal_image(this);" /> + <img alt="home pixel" class="home_button" id="home_pixel" src="/image/trans" width="318" height="318" + onclick="show_page('pixel')" onload="reveal_image(this);" /> </a> <a href="#vector"> - <img alt="home vector" class="home_button" id="home_vector" src="/image/trans" width="318" height="318" onload="reveal_image(this);" /> + <img alt="home vector" class="home_button" id="home_vector" src="/image/trans" width="318" height="318" + onclick="show_page('vector')" onload="reveal_image(this);" /> </a> <a href="#news"> - <img alt="home news" class="home_button" id="home_news" src="/image/trans" width="318" height="318" onload="reveal_image(this);" /> + <img alt="home news" class="home_button" id="home_news" src="/image/trans" width="318" height="318" + onclick="show_page('news')" onload="reveal_image(this);" /> </a> <a href="#shop"> - <img alt="home shop" class="home_button" id="home_shop" src="/image/trans" width="318" height="318" onload="reveal_image(this);" /> + <img alt="home shop" class="home_button" id="home_shop" src="/image/trans" width="318" height="318" + onclick="show_page('shop')" onload="reveal_image(this);" /> </a> </div>