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

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

20 Jul '08

Revision: 3530 Author: hans URL: http://bknr.net/trac/changeset/3530 Checkpoint sale overlay windows. U trunk/projects/quickhoney/upgrade-stuff/import.lisp A trunk/projects/quickhoney/upgrade-stuff/print-sample.jpg U trunk/projects/quickhoney/website/static/javascript.js U trunk/projects/quickhoney/website/static/styles.css A trunk/projects/quickhoney/website/static/user-agreement.html U trunk/projects/quickhoney/website/templates/index.xml Modified: trunk/projects/quickhoney/upgrade-stuff/import.lisp =================================================================== --- trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-07-20 15:10:00 UTC (rev 3529) +++ trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-07-20 23:07:21 UTC (rev 3530) @@ -7,6 +7,7 @@ #P"hey.gif" #P"buy.gif" #P"buy-print.gif" #P"buy-file.gif" #P"buy-t-shirt.gif" #P"buy-right-line.gif" + #P"print-sample.jpg" #P"button-bottom.gif" #P"add-to-cart.gif" #P"checkout.gif")) (handler-case (import-image name) Added: trunk/projects/quickhoney/upgrade-stuff/print-sample.jpg =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/print-sample.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-07-20 15:10:00 UTC (rev 3529) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-07-20 23:07:21 UTC (rev 3530) @@ -1175,6 +1175,7 @@ function make_overlay(id, title, width) { + log('make_overlay ' + id); var overlay = $('overlay'); overlay.className = current_directory; replaceChildNodes(overlay, @@ -1210,8 +1211,67 @@ $('hey_send').onclick = hey_send; } -function make_buy_form() +NOTICE = partial(SPAN, { class: 'notice' }); +PRICE = partial(SPAN, { class: 'price' }); +SPACER = partial(DIV, { class: 'spacer' }); +ARTWORK_NAME = partial(SPAN, { class: 'artwork-name' }); + +var make_buy_forms = { + 'buy-file' : function () { + make_overlay('buy-file', 'Buy Art as Vector PDF File', 426, + FORM({ method: 'POST', action: '#' }, + SPACER("Download Artwork ", ARTWORK_NAME(current_image.name), " for one-time private use only. ", + "Please read our ", + A({ href: '/static/user-agreement.html', target: 'user-agreement' }, "User Agreement"), + " and tick the box below to indicate that you agree to be bound to it.", + BR(), BR(), + INPUT({ type: 'checkbox', name: 'agree-to-license'}), + " I have read and understood the 'User Agreement' and agree to be bound to the terms set forth in it", + BR(), BR(), + PRICE('45 â¬'), NOTICE(' (inside EU, incl. tax)*'), BR(), + PRICE('37.82 â¬'), NOTICE(' (outside EU, tax free)*'), BR(), + BUTTON(null, IMG({ src: '/image/add-to-cart', width: 102, height: 40 })), + BR(), BR(), + NOTICE("Please note: Our shop is operating from Germany, that's why there is a sales tax within Europe and none outside")))); + }, + 'buy-print' : function () { + make_overlay('buy-print', 'Buy Art Floating Gallery Plexiglas', 426, + FORM({ method: 'POST', action: '#' }, + SPACER("Fineart print mounted behind plexiglas on aluminium board with a 3/4'' wood brace.", + NOTICE('Please allow 4-6 days for production in addition to the shipping time')), + IMG({ src: '/image/print-sample', width: 426, height: 428 }), + SPACER(ARTWORK_NAME(current_image.name), + TABLE(null, + TBODY(null, + TR(null, + TD(null, INPUT({ type: "radio", name: "size", value: "small"})), + TD(null, + "Small 20cm x 30cm (7.8'' x 11.8'')", BR(), + PRICE('150 â¬'), NOTICE(' (inside EU, incl. tax)*'), BR(), + PRICE('128.32 â¬'), NOTICE(' (outside EU, tax free)*'), BR())), + TR(null, + TD(null, INPUT({ type: "radio", name: "size", value: "large"})), + TD(null, + "Small 33cm x 50cm (13'' x 19.7'')", BR(), + PRICE('190 â¬'), NOTICE('(inside EU, incl. tax)*'), BR(), + PRICE('159.66 â¬'), NOTICE('(outside EU, tax free)*'), BR())))), + BUTTON(null, IMG({ src: '/image/add-to-cart', width: 102, height: 40 })), + BR(), BR(), + NOTICE("Please note: We are shipping from Germany, that's why there is a sales tax within Europe and none outside")))); + }, + 'buy-t-shirt' : function () { + } +}; + +function make_buy_form(keyword) { + log('make_buy_form: ' + keyword); + try { + make_buy_forms[keyword](); + } + catch (e) { + log("error caught while creating buy form: " + e); + } } function recolored_image_path(name) @@ -1235,7 +1295,7 @@ if (current_image.keywords[keyword]) { buyable = true; height += 22; - buttons.push(make_image_action_button(keyword, make_buy_form, 22)); + buttons.push(make_image_action_button(keyword, partial(make_buy_form, keyword), 22)); } }, ['buy-file', 'buy-print', 'buy-t-shirt']); buttons.push(make_image_action_button('hey', make_hey_form, 23)); Modified: trunk/projects/quickhoney/website/static/styles.css =================================================================== --- trunk/projects/quickhoney/website/static/styles.css 2008-07-20 15:10:00 UTC (rev 3529) +++ trunk/projects/quickhoney/website/static/styles.css 2008-07-20 23:07:21 UTC (rev 3530) @@ -547,4 +547,16 @@ #overlay #hey #hey_send { margin-top: 5px; +} + +#overlay span.notice { + color: #999999; +} + +#overlay span.price { + color: #33cc00; +} + +#overlay div.spacer { + padding: 12px; } \ No newline at end of file Added: trunk/projects/quickhoney/website/static/user-agreement.html =================================================================== --- trunk/projects/quickhoney/website/static/user-agreement.html (rev 0) +++ trunk/projects/quickhoney/website/static/user-agreement.html 2008-07-20 23:07:21 UTC (rev 3530) @@ -0,0 +1,176 @@ +<html> + <head> + <title>QuickHoney End User License Agreement</title> + </head> + <body> + <h1>End User License Agreement</h1> + <p> + Christart, Inc. + </p> + <p> + End User License Agreement + </p> + <p> + We are willing to license this Product to you on the condition + that you accept all of the terms of this License Agreement. + </p> + <p> + Read This Agreement Carefully + </p> + <p> + This is a license not a sale. We continue to own the stock files + and/or other content provided to you on this website. This + product is provided under the terms of the following license + agreement which states what you may and may not do with the + product and contains limitations on warranties and remedies. + </p> + <p> + Permitted Uses + </p> + <p> + We, Christart, Inc., hereby grant to you, the customer, a + non-exclusive License to use this Product on the terms and + conditions of this License agreement. Unless the activity is + expressly permitted, you cannot do it. + </p> + <p> + Stock File Product + </p> + <p> + 'Stock File' means any illustration, photograph, digital + animation, video, or other visual representation recorded in any + digital format that is included in any Stock File Product. You + may: + </p> + <p> + * Make modifications or derivative works of any Stock Files + ('Derivative Works'); + </p> + <p> + * Use the Stock File(s) or Derivative Work(s) in any + advertising, promotional material, broadcast media (video, + television, motion picture), web site, and for-sale products in + any quantity, provided the finished product(s) is designed for + viewing purposes only and is not designed or intended for re-use + in any on-line distribution system (including your web page); + </p> + <p> + * Provide a temporary copy to others of those Stock Files and + Derivative Works which are an integral part of your work product + and reasonably required to produce a finished product in the + normal course of your workflow; and + </p> + <p> + * Make one copy of the Stock File Product for backup or archival + purposes. + </p> + <p> + Prohibited Uses + </p> + <p> + You may not do anything with this Product that is not expressly + permitted. In addition, you may not: + </p> + <p> + * Use any backup or archival copy for any purpose other than to + replace an original copy if it is destroyed or becomes + defective; + </p> + <p> + * Use or permit the use of the Product, or any part thereof, in + or in association with fraudulent, pornographic, defamatory, + immoral, infringing or illegal material; + </p> + <p> + * Use or permit the use of the Product, or any part thereof, as + a trademark or service mark, or claim any proprietary rights of + any sort in the Product, or any part thereof; + </p> + <p> + * Sell, sublicense, distribute or otherwise grant rights or make + available for use by others all or a portion of the Product or + Derivative Work(s) in form or formats designed or intended for + re-use of the Stock File(s) or Derivative Work(s); and + </p> + <p> + * Make some or all of the Product available on your web page as + a separate or downloadable reusable file, or disassemble, + decompile or 'unlock', reverse engineer, translate or otherwise + decode the Product for any reason. + </p> + <p> + Copyright + </p> + <p> + CHRISTART, INC. and its suppliers own the Product, and its + structure, organization and code are the valuable trade secrets + of CHRISTART, INC. and its suppliers. Copyright also protects + the Product. You must treat the Product just as you would any + other copyrighted material, such as a book. Trademarks shall be + used in accordance with accepted trademark practice, including + identification of trademark owner's name. Trademarks can only be + used to identify printed or electronic output produced by the + Product. Such use of any trademark does not give you any rights + of ownership in that trademark. Except as stated above, this + License does not grant you any intellectual property rights in + the Product. Unpublished rights are reserved. Transfer + </p> + <p> + You may not rent, lease, sublicense or lend the Product, or a + copy thereof, to another person or legal entity that is not also + a licensee. You may, however, transfer all your rights to use + the Product to another person or legal entity, provided that (i) + you transfer all components of the Product and this License, + including all copies, updates and prior versions, (except work + Product incorporated into finished Product as permitted under + this License), to such person or entity, (ii) that you retain no + copies, including copies stored on a computer or other storage + device, and (iii) the receiving party agrees to be bound by the + terms and conditions of this License. + </p> + <p> + Governing Law and General Provisions + </p> + <p> + This License will be governed by the laws in force in the State + of Florida, USA, excluding the application of its conflicts of + law rules. This License will not be governed by the United + Nations Convention on Contracts for the International Sale of + Goods, the application of which is expressly excluded. If any + part of this License is found void and unenforceable, it will + not affect the validity of the balance of the License, which + shall remain valid and enforceable according to its terms. You + agree that the Product will not be shipped, transferred or + exported into any country or used in any manner prohibited by + the United States Export Administration Act or any other + applicable export laws, restrictions or regulations. This + License shall automatically terminate upon failure by you to + comply with its terms. This License may only be modified in + writing signed by an authorized officer of CHRISTART, INC. + </p> + <p> + Notice to U.S. Government End Users + </p> + <p> + The Product and all its components are 'Commercial Items,' as + that term is defined at 48 C.F.R. S2.101, consisting of + 'Commercial Computer Software' and 'Commercial Computer Software + Documentation,' as such terms are used in 48 C.F.R. S12.212 or + 48 C.F.R. S227.7202, as applicable. Consistent with 48 + C.F.R. S12.212 or 48 C.F.R. SS227.7202-1 through 227.7202-4, as + applicable, the Commercial Computer Software and Commercial + Computer Software Documentation are being Licensed to + U.S. Government end users (A) only as Commercial Items and (B) + with only those rights as are granted to all other end users + pursuant to the terms and conditions herein. + </p> + <p> + CHRISTART, INC. + </p> + <p> + © 2008 Christart, Inc. + </p> + <p> + Christian Clipart + </p> +</html> Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-07-20 15:10:00 UTC (rev 3529) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-07-20 23:07:21 UTC (rev 3530) @@ -9,12 +9,12 @@ <head> <link rel="stylesheet" href="/static/styles.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> - <script src="/MochiKit/MochiKit.js" type="text/javascript"></script> - <script src="/static/javascript.js" type="text/javascript"></script> - <script src="/static/yui/yahoo-dom-event/yahoo-dom-event.js" type="text/javascript"></script> - <script src="/static/yui/animation/animation-min.js" type="text/javascript"></script> + <script src="/static/detectplugins.js" type="text/javascript"> </script> + <script src="/static/AC_QuickTime.js" type="text/javascript"> </script> + <script src="/MochiKit/MochiKit.js" type="text/javascript"> </script> + <script src="/static/javascript.js" type="text/javascript"> </script> + <script src="/static/yui/yahoo-dom-event/yahoo-dom-event.js" type="text/javascript"> </script> + <script src="/static/yui/animation/animation-min.js" type="text/javascript"> </script> <title>QuickHoney</title> </head>

1 0

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

20 Jul '08

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>

1 0

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

20 Jul '08

Revision: 3528 Author: hans URL: http://bknr.net/trac/changeset/3528 checkpoint once more A trunk/projects/quickhoney/upgrade-stuff/buy-right-line.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 Added: trunk/projects/quickhoney/upgrade-stuff/buy-right-line.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/buy-right-line.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/projects/quickhoney/upgrade-stuff/import.lisp =================================================================== --- trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-07-20 07:35:09 UTC (rev 3527) +++ trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-07-20 12:06:10 UTC (rev 3528) @@ -6,6 +6,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-right-line.gif" #P"button-bottom.gif" #P"add-to-cart.gif" #P"checkout.gif")) (handler-case (import-image name) Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-07-20 07:35:09 UTC (rev 3527) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-07-20 12:06:10 UTC (rev 3528) @@ -1231,9 +1231,11 @@ { var buttons = []; var buyable = false; + var height = 23; map(function (keyword) { if (current_image.keywords[keyword]) { buyable = true; + height += 22; buttons.push(make_image_action_button(keyword, make_buy_form, 22)); } }, ['buy_file', 'buy_print', 'buy_t_shirt']); @@ -1242,6 +1244,7 @@ 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})); $('image_action_buttons').onmouseover = function () { (new YAHOO.util.Anim('image_action_buttons', { left: { to: 518 }, width: { to: 127 } }, .3, YAHOO.util.Easing.easeBoth)) Modified: trunk/projects/quickhoney/website/static/styles.css =================================================================== --- trunk/projects/quickhoney/website/static/styles.css 2008-07-20 07:35:09 UTC (rev 3527) +++ trunk/projects/quickhoney/website/static/styles.css 2008-07-20 12:06:10 UTC (rev 3528) @@ -527,6 +527,14 @@ top: 0px; } +#image_action_buttons #buy-right-line { + z-index: 200; + position: absolute; + left: 60px; + top: 0px; +} + + #overlay #hey { padding: 10px 15px 10px 10px; }

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/src/handlers.lisp
by BKNR Commits 20 Jul '08

20 Jul '08

Revision: 3527 Author: hans URL: http://bknr.net/trac/changeset/3527 Remove cruft U trunk/projects/quickhoney/src/handlers.lisp Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2008-07-20 06:57:11 UTC (rev 3526) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-07-20 07:35:09 UTC (rev 3527) @@ -119,10 +119,8 @@ (with-transaction (:edit-image) (setf (quickhoney-image-client image) client (quickhoney-image-spider-keywords image) spider-keywords - (store-image-keywords image) - (append (set-difference (store-image-keywords image) *editable-keywords*) - (image-keywords-from-request-parameters))) - (set-image-keywords-from-request-parameters image)) + (store-image-keywords image) (append (set-difference (store-image-keywords image) *editable-keywords*) + (image-keywords-from-request-parameters)))) (format *js-stream* "parent.image_edited()~%"))) (defmethod handle-object-form ((handler edit-image-js-handler) (action (eql :delete)) (image quickhoney-image))

1 0

[bknr-cvs] hans changed trunk/
by BKNR Commits 20 Jul '08

20 Jul '08

Revision: 3526 Author: hans URL: http://bknr.net/trac/changeset/3526 Animated hey/buy box U trunk/projects/quickhoney/website/static/javascript.js D trunk/projects/quickhoney/website/static/tiny_mce A trunk/projects/quickhoney/website/static/yui U trunk/projects/quickhoney/website/templates/index.xml _U trunk/thirdparty/ Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-07-19 18:56:26 UTC (rev 3525) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-07-20 06:57:11 UTC (rev 3526) @@ -693,7 +693,7 @@ buttons[i].style.visibility = 'hidden'; buttons[i].src = new_image; buttons[i].parentNode.href = '#' + current_directory + '/' + subdirectory_name; - eval("button_links[i].onclick = function onclick(event) { subdirectory('" + subdirectory_name + "'); }"); + YAHOO.util.Event.addListener(buttons[i], 'click', subdirectory_button_click, subdirectory_name); } } @@ -707,6 +707,10 @@ /* subdirectory - second level category with thumbnail pages */ +function subdirectory_button_click(event, dir) { + subdirectory(dir); +} + function subdirectory(subdirectory) { debug('subdirectory: ', subdirectory); @@ -1239,13 +1243,13 @@ appendChildNodes('image_action_buttons', IMG({ id: 'buy', src: recolored_image_path('buy'), width: 127, height: 22})); } $('image_action_buttons').onmouseover = function () { - var e = $('image_action_buttons'); - e.style.left = '518px'; - e.style.width = '127px'; + (new YAHOO.util.Anim('image_action_buttons', { left: { to: 518 }, width: { to: 127 } }, .3, + YAHOO.util.Easing.easeBoth)) + .animate(); } $('image_action_buttons').onmouseout = function () { - var e = $('image_action_buttons'); - e.style.left = '584px'; - e.style.width = '60px'; + (new YAHOO.util.Anim('image_action_buttons', { left: { to: 584 }, width: { to: 60 } }, .3, + YAHOO.util.Easing.easeBoth)) + .animate(); } } \ No newline at end of file Deleted: trunk/projects/quickhoney/website/static/tiny_mce =================================================================== --- trunk/projects/quickhoney/website/static/tiny_mce 2008-07-19 18:56:26 UTC (rev 3525) +++ trunk/projects/quickhoney/website/static/tiny_mce 2008-07-20 06:57:11 UTC (rev 3526) @@ -1 +0,0 @@ -link ../../../../thirdparty/tinymce/jscripts/tiny_mce \ No newline at end of file Added: trunk/projects/quickhoney/website/static/yui =================================================================== --- trunk/projects/quickhoney/website/static/yui (rev 0) +++ trunk/projects/quickhoney/website/static/yui 2008-07-20 06:57:11 UTC (rev 3526) @@ -0,0 +1 @@ +link ../../../../thirdparty/yui/build \ No newline at end of file Property changes on: trunk/projects/quickhoney/website/static/yui ___________________________________________________________________ Name: svn:special + * Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-07-19 18:56:26 UTC (rev 3525) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-07-20 06:57:11 UTC (rev 3526) @@ -9,14 +9,12 @@ <head> <link rel="stylesheet" href="/static/styles.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> - <script src="/MochiKit/MochiKit.js" type="text/javascript"> - </script> - <script src="/static/javascript.js" type="text/javascript"> - </script> + <script src="/static/detectplugins.js" type="text/javascript"></script> + <script src="/static/AC_QuickTime.js" type="text/javascript"></script> + <script src="/MochiKit/MochiKit.js" type="text/javascript"></script> + <script src="/static/javascript.js" type="text/javascript"></script> + <script src="/static/yui/yahoo-dom-event/yahoo-dom-event.js" type="text/javascript"></script> + <script src="/static/yui/animation/animation-min.js" type="text/javascript"></script> <title>QuickHoney</title> </head>

1 0

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

19 Jul '08

Revision: 3525 Author: hans URL: http://bknr.net/trac/changeset/3525 Checkpoint buy/hey widget in partly working state. U trunk/projects/quickhoney/src/handlers.lisp 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-19 18:30:26 UTC (rev 3524) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-07-19 18:56:26 UTC (rev 3525) @@ -108,19 +108,20 @@ (defmethod handle-object-form ((handler edit-image-js-handler) action image) (format t "; invalid action ~A or invalid object ~A~%" action image)) -(defun set-image-keywords-from-request-parameters (image) - (setf (store-image-keywords image) - (set-difference (store-image-keywords image) *editable-keywords*)) - (dolist (keyword *editable-keywords*) - (when (query-param (string-downcase (symbol-name keyword))) - (push keyword (store-image-keywords image)))) - (store-image-keywords image)) - +(defun image-keywords-from-request-parameters () + (let (retval) + (dolist (keyword *editable-keywords* retval) + (when (query-param (string-downcase (symbol-name keyword))) + (push keyword retval))))) + (defmethod handle-object-form ((handler edit-image-js-handler) (action (eql :edit)) image) (with-query-params (client spider-keywords) (with-transaction (:edit-image) (setf (quickhoney-image-client image) client - (quickhoney-image-spider-keywords image) spider-keywords) + (quickhoney-image-spider-keywords image) spider-keywords + (store-image-keywords image) + (append (set-difference (store-image-keywords image) *editable-keywords*) + (image-keywords-from-request-parameters))) (set-image-keywords-from-request-parameters image)) (format *js-stream* "parent.image_edited()~%"))) @@ -233,9 +234,10 @@ ()) (defmethod handle ((handler upload-image-handler)) - (with-query-params (client spider-keywords explicit) + (with-query-params (client spider-keywords) (let ((uploaded-file (request-uploaded-file "image-file")) - (keywords (mapcar #'make-keyword-from-string (decoded-handler-path handler)))) + (keywords (append (mapcar #'make-keyword-from-string (decoded-handler-path handler)) + (image-keywords-from-request-parameters)))) (handler-case (progn (unless uploaded-file @@ -254,8 +256,7 @@ :class-name 'quickhoney-image :keywords (cons :upload keywords) :initargs (list :client client - :spider-keywords spider-keywords - :explicit (when explicit t))))) + :spider-keywords spider-keywords)))) (with-http-response () (with-http-body () (html (:html Modified: trunk/projects/quickhoney/upgrade-stuff/import.lisp =================================================================== --- trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-07-19 18:30:26 UTC (rev 3524) +++ trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-07-19 18:56:26 UTC (rev 3525) @@ -4,7 +4,8 @@ (import-image name :keywords '(:type))) (dolist (name '(#P"overlay-close.gif" - #P"hey.gif" #P"buy-print.gif" #P"buy-file.gif" #P"buy-t-shirt.gif" + #P"hey.gif" + #P"buy.gif" #P"buy_print.gif" #P"buy_file.gif" #P"buy_t_shirt.gif" #P"button-bottom.gif" #P"add-to-cart.gif" #P"checkout.gif")) (handler-case (import-image name) Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-07-19 18:30:26 UTC (rev 3524) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-07-19 18:56:26 UTC (rev 3525) @@ -711,6 +711,8 @@ debug('subdirectory: ', subdirectory); + $('explicit').checked = (subdirectory == 'nudes'); + $("thumbnails").innerHTML = ''; $("directory_page").style.visibility = 'hidden'; @@ -994,7 +996,9 @@ $("edit_form_element").setAttribute("action", "/edit-image-js/" + current_image.id); $("edit_client").value = current_image.client; $("edit_keywords").value = current_image.spider_keywords; - $("edit_explicit").checked = current_image.keywords.explicit ? "checked" : null; + map(function(keyword) { + $('edit_' + keyword).checked = current_image.keywords[keyword] ? true : false; + }, ['explicit', 'buy_file', 'buy_print', 'buy_t_shirt']); show_cms_window("edit_form"); } } @@ -1214,7 +1218,7 @@ function make_image_action_button(name, action, height) { - var div = DIV(null, IMG({ src: recolored_image_path(name), width: 126, height: height })); + var div = DIV(null, IMG({ src: recolored_image_path(name), width: 127, height: height })); div.onclick = function() { action(); return false; }; return div; } @@ -1222,15 +1226,22 @@ function make_image_action_buttons() { var buttons = []; - if (1 || current_image.download_product) { - buttons.push(make_image_action_button('buy-file', make_buy_form, 22)); - } + var buyable = false; + map(function (keyword) { + if (current_image.keywords[keyword]) { + buyable = true; + buttons.push(make_image_action_button(keyword, make_buy_form, 22)); + } + }, ['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})); + } $('image_action_buttons').onmouseover = function () { var e = $('image_action_buttons'); e.style.left = '518px'; - e.style.width = '126px'; + e.style.width = '127px'; } $('image_action_buttons').onmouseout = function () { var e = $('image_action_buttons'); Modified: trunk/projects/quickhoney/website/static/styles.css =================================================================== --- trunk/projects/quickhoney/website/static/styles.css 2008-07-19 18:30:26 UTC (rev 3524) +++ trunk/projects/quickhoney/website/static/styles.css 2008-07-19 18:56:26 UTC (rev 3525) @@ -520,6 +520,13 @@ z-index: 100; } +#image_action_buttons #buy { + z-index: 110; + position: absolute; + left: 0px; + top: 0px; +} + #overlay #hey { padding: 10px 15px 10px 10px; } Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-07-19 18:30:26 UTC (rev 3524) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-07-19 18:56:26 UTC (rev 3525) @@ -197,7 +197,10 @@ </div> Keywords:<br /> <input type="text" id="upload_keywords" name="spider-keywords" value="" /><br /> - <input type="checkbox" name="explicit" value="1" /> Explicit<br/> + <input type="checkbox" id="explicit" name="explicit" value="1" /> Explicit<br/> + <input type="checkbox" name="buy-file" value="1"/> Sell as file<br/> + <input type="checkbox" name="buy-print" value="1"/> Sell as print<br/> + <input type="checkbox" name="buy-t-shirt" value="1"/> Sell as t-shirt<br/> </p> <p class="cms"> <input type="submit" name="upload" value="upload" /> @@ -264,9 +267,9 @@ 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/> - <input type="checkbox" name="buy-file" value="1"/> Sell as file<br/> - <input type="checkbox" name="buy-print" value="1"/> Sell as print<br/> - <input type="checkbox" name="buy-t-shirt" value="1"/> Sell as t-shirt<br/> + <input type="checkbox" id="edit_buy_file" name="buy-file" value="1"/> Sell as file<br/> + <input type="checkbox" id="edit_buy_print" name="buy-print" value="1"/> Sell as print<br/> + <input type="checkbox" id="edit_buy_t_shirt" name="buy-t-shirt" value="1"/> Sell as t-shirt<br/> </p> <p class="cms"> <input type="submit" name="action" value="edit" />

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/upgrade-stuff/buy
by BKNR Commits 19 Jul '08

19 Jul '08

Revision: 3524 Author: hans URL: http://bknr.net/trac/changeset/3524 rename images 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 A trunk/projects/quickhoney/upgrade-stuff/buy_file.gif A trunk/projects/quickhoney/upgrade-stuff/buy_print.gif A trunk/projects/quickhoney/upgrade-stuff/buy_t_shirt.gif 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) Copied: trunk/projects/quickhoney/upgrade-stuff/buy_file.gif (from rev 3523, trunk/projects/quickhoney/upgrade-stuff/buy-file.gif) =================================================================== (Binary files differ) Copied: trunk/projects/quickhoney/upgrade-stuff/buy_print.gif (from rev 3523, trunk/projects/quickhoney/upgrade-stuff/buy-print.gif) =================================================================== (Binary files differ) Copied: trunk/projects/quickhoney/upgrade-stuff/buy_t_shirt.gif (from rev 3523, trunk/projects/quickhoney/upgrade-stuff/buy-t-shirt.gif) =================================================================== (Binary files differ)

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/upgrade-stuff/
by BKNR Commits 19 Jul '08

19 Jul '08

Revision: 3523 Author: hans URL: http://bknr.net/trac/changeset/3523 checkpoint images U trunk/projects/quickhoney/upgrade-stuff/buy-file.gif U trunk/projects/quickhoney/upgrade-stuff/buy-print.gif U trunk/projects/quickhoney/upgrade-stuff/buy-t-shirt.gif U trunk/projects/quickhoney/upgrade-stuff/buy.gif U trunk/projects/quickhoney/upgrade-stuff/hey.gif Modified: trunk/projects/quickhoney/upgrade-stuff/buy-file.gif =================================================================== (Binary files differ) Modified: trunk/projects/quickhoney/upgrade-stuff/buy-print.gif =================================================================== (Binary files differ) Modified: trunk/projects/quickhoney/upgrade-stuff/buy-t-shirt.gif =================================================================== (Binary files differ) Modified: trunk/projects/quickhoney/upgrade-stuff/buy.gif =================================================================== (Binary files differ) Modified: trunk/projects/quickhoney/upgrade-stuff/hey.gif =================================================================== (Binary files differ)

1 0

[bknr-cvs] hans changed trunk/thirdparty/slime/
by BKNR Commits 19 Jul '08

19 Jul '08

Revision: 3522 Author: hans URL: http://bknr.net/trac/changeset/3522 update slime from cvs U trunk/thirdparty/slime/CVS/Entries U trunk/thirdparty/slime/ChangeLog U trunk/thirdparty/slime/contrib/CVS/Entries U trunk/thirdparty/slime/contrib/ChangeLog U trunk/thirdparty/slime/contrib/slime-asdf.el U trunk/thirdparty/slime/contrib/swank-asdf.lisp U trunk/thirdparty/slime/doc/CVS/Entries U trunk/thirdparty/slime/slime.el U trunk/thirdparty/slime/swank-backend.lisp U trunk/thirdparty/slime/swank-sbcl.lisp U trunk/thirdparty/slime/swank.lisp Change set too large, please see URL above

1 0

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

19 Jul '08

Revision: 3521 Author: hans URL: http://bknr.net/trac/changeset/3521 Checkpoint. U trunk/projects/quickhoney/src/handlers.lisp U trunk/projects/quickhoney/src/image.lisp A trunk/projects/quickhoney/upgrade-stuff/add-to-cart.gif A trunk/projects/quickhoney/upgrade-stuff/checkout.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-19 11:42:24 UTC (rev 3520) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-07-19 14:16:31 UTC (rev 3521) @@ -38,32 +38,30 @@ (defclass image-query-js-handler (javascript-handler object-handler) ()) +(defparameter *editable-keywords* '(:explicit :buy-file :buy-print :buy-t-shirt) + "List of keywords that are image keywords which can be edited through the CMS") + (defmethod object-handler-get-object ((handler image-query-js-handler)) (sort (remove-if-not #'(lambda (object) (subtypep (type-of object) 'quickhoney-image)) (get-keywords-intersection-store-images (mapcar #'make-keyword-from-string (decoded-handler-path handler)))) #'< :key #'blob-timestamp)) (defmethod image-to-javascript ((image quickhoney-image)) - (format nil " new parent.ServerImage(~S, ~D, ~S, ~D, ~D, ~S, ~S, ~A)" + (format nil " new parent.ServerImage(~S, ~D, ~S, ~D, ~D, ~S, ~S, ~S, {~{~A~^,~}})" (store-image-name image) (store-object-id image) (image-content-type (blob-mime-type image)) (store-image-width image) (store-image-height image) (or (quickhoney-image-client image) "") + (if (typep image 'quickhoney-animation-image) + (image-content-type (blob-mime-type (quickhoney-animation-image-animation image))) + "") (or (quickhoney-image-spider-keywords image) "") - (if (quickhoney-image-explicit image) "true" "false"))) + (mapcar (lambda (keyword) + (format nil "~(~A~):true" (substitute #\_ #\- (symbol-name keyword)))) + (intersection *editable-keywords* (store-image-keywords image))))) -(defmethod image-to-javascript ((image quickhoney-animation-image)) - (format nil " new parent.ServerImage(~S, ~D, ~S, ~D, ~D, ~S, ~S)" - (store-image-name image) - (store-object-id image) - (image-content-type (blob-mime-type image)) - (store-image-width image) - (store-image-height image) - (or (quickhoney-image-client image) "") - (image-content-type (blob-mime-type (quickhoney-animation-image-animation image))))) - (defmethod layout-to-javascript ((layout layout)) (with-output-to-string (*standard-output*) (format t "[~%") @@ -110,12 +108,20 @@ (defmethod handle-object-form ((handler edit-image-js-handler) action image) (format t "; invalid action ~A or invalid object ~A~%" action image)) +(defun set-image-keywords-from-request-parameters (image) + (setf (store-image-keywords image) + (set-difference (store-image-keywords image) *editable-keywords*)) + (dolist (keyword *editable-keywords*) + (when (query-param (string-downcase (symbol-name keyword))) + (push keyword (store-image-keywords image)))) + (store-image-keywords image)) + (defmethod handle-object-form ((handler edit-image-js-handler) (action (eql :edit)) image) - (with-query-params (client spider-keywords explicit) + (with-query-params (client spider-keywords) (with-transaction (:edit-image) (setf (quickhoney-image-client image) client - (quickhoney-image-spider-keywords image) spider-keywords - (quickhoney-image-explicit image) (when explicit t))) + (quickhoney-image-spider-keywords image) spider-keywords) + (set-image-keywords-from-request-parameters image)) (format *js-stream* "parent.image_edited()~%"))) (defmethod handle-object-form ((handler edit-image-js-handler) (action (eql :delete)) (image quickhoney-image)) Modified: trunk/projects/quickhoney/src/image.lisp =================================================================== --- trunk/projects/quickhoney/src/image.lisp 2008-07-19 11:42:24 UTC (rev 3520) +++ trunk/projects/quickhoney/src/image.lisp 2008-07-19 14:16:31 UTC (rev 3521) @@ -6,12 +6,14 @@ :index-reader images-for-client :index-keys all-clients) (spider-keywords :update :initform nil) - (products :update :initform nil) - (explicit :update :initform nil))) + (products :update :initform nil))) (defmethod rss-item-pub-date ((item quickhoney-image)) (blob-timestamp item)) +(defmethod quickhoney-image-explicit ((image quickhoney-image)) + (member :explicit (store-image-keywords image))) + (defmethod rss-item-encoded-content ((image quickhoney-image)) (let* ((category (first (intersection (store-image-keywords image) '(:vector :pixel)))) (is-vector (eq category :vector))) Added: trunk/projects/quickhoney/upgrade-stuff/add-to-cart.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/add-to-cart.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/projects/quickhoney/upgrade-stuff/checkout.gif =================================================================== (Binary files differ) Property changes on: trunk/projects/quickhoney/upgrade-stuff/checkout.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/projects/quickhoney/upgrade-stuff/import.lisp =================================================================== --- trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-07-19 11:42:24 UTC (rev 3520) +++ trunk/projects/quickhoney/upgrade-stuff/import.lisp 2008-07-19 14:16:31 UTC (rev 3521) @@ -3,7 +3,12 @@ (dolist (name '(#p"type-news.png" #p"type-pixel.png" #p"type-shop.png" #p"type-vector.png")) (import-image name :keywords '(:type))) -(dolist (name '(#P"overlay-close.gif" #P"hey.gif" #P"buy.gif" #P"button-bottom.gif")) - (import-image name)) +(dolist (name '(#P"overlay-close.gif" + #P"hey.gif" #P"buy-print.gif" #P"buy-file.gif" #P"buy-t-shirt.gif" + #P"button-bottom.gif" #P"add-to-cart.gif" #P"checkout.gif")) + (handler-case + (import-image name) + (error (e) + (format t "~&; error importing ~S: ~A~%" name e)))) -(import-image #p"news-sep.png") \ No newline at end of file +(import-image #p"news-sep.gif") \ No newline at end of file Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-07-19 11:42:24 UTC (rev 3520) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-07-19 14:16:31 UTC (rev 3521) @@ -148,7 +148,7 @@ function do_edit() { current_image.client = $("edit_client").value; current_image.spider_keywords = $("edit_keywords").value; - current_image.explicit = $("edit_explicit").checked ? true : false; + current_image.keywords.explicit = $("edit_explicit").checked ? true : false; show_cms_window('saving_edits_form'); // hide edit window until server replies } @@ -254,7 +254,8 @@ var current_subdirectory; var current_image; -function ServerImage(name, id, type, width, height, client, animation_type, spider_keywords, explicit) { +function ServerImage(name, id, type, width, height, client, animation_type, spider_keywords, + keywords) { this.name = name; this.id = id; this.type = type; @@ -263,7 +264,7 @@ this.client = client; this.animation_type = animation_type; this.spider_keywords = spider_keywords; - this.explicit = explicit; + this.keywords = keywords || {}; return this; } @@ -475,33 +476,18 @@ var rules = document.styleSheets[i][document.all ? 'rules' : 'cssRules']; for (var j = 0; j < rules.length; j++) { var rule = rules[j]; - if (rule.selectorText.toLowerCase() == 'a') { + var selectorText = rule.selectorText.toLowerCase(); + if (selectorText == 'a') { rule.style['color'] = '#' + link_color; rule.style['backgroundColor'] = '#' + background_color; - } else if (rule.selectorText == '.text') { + } else if (selectorText == '.text') { rule.style['color'] = '#' + foreground_color; rule.style['backgroundColor'] = '#' + background_color; - } else if (rule.selectorText == 'img.menu') { + } else if (selectorText == 'img.menu') { rule.style['backgroundColor'] = '#' + link_color; } } } - /* - // change menu images - for (var menuname in pages) { - if (menuname == 'home') { - $("m_" + menuname).src = "/image/quickhoney/color,000000," + link_color; - } else { - if (pagename == 'home') { - $("m_" + menuname).src = "/image/" + menuname + "/color,000000,ffffff,ffffff," + link_color; - } else if (pagename == menuname) { - $("m_" + menuname).src = "/image/" + menuname + "/color,000000," + link_color; - } else { - $("m_" + menuname).src = "/image/" + menuname + "/color,000000,ffffff,ffffff," + link_color; - } - } - } - */ } function display_cms_window() { @@ -1008,7 +994,7 @@ $("edit_form_element").setAttribute("action", "/edit-image-js/" + current_image.id); $("edit_client").value = current_image.client; $("edit_keywords").value = current_image.spider_keywords; - $("edit_explicit").checked = current_image.explicit ? "checked" : null; + $("edit_explicit").checked = current_image.keywords.explicit ? "checked" : null; show_cms_window("edit_form"); } } @@ -1102,22 +1088,6 @@ } } -function initEditor() -{ - tinyMCE.init({ - mode: 'textareas', - editor_selector: 'mce_editor', - theme: "advanced", - theme_advanced_buttons1: "bold,italic,underline,separator,strikethrough,justifyleft,justifycenter,justifyright, justifyfull,bullist,numlist,undo,redo,link,unlink", - theme_advanced_buttons2: "", - theme_advanced_buttons3: "", - theme_advanced_toolbar_location: "top", - theme_advanced_toolbar_align: "left", - theme_advanced_statusbar_location: "bottom", - extended_valid_elements: "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]" - }); -} - function enable_debuger() { want_debugger = true; @@ -1164,8 +1134,6 @@ safari_compatibility_hack(); } - initEditor(); - debug('init - done'); // setTimeout("preload_menu_images();", 100); @@ -1241,12 +1209,12 @@ function recolored_image_path(name) { - return '/image/' + name + '/color,000000,' + pages[current_directory].colors[2]; + return '/image/' + name + '/color,ff00ff,' + pages[current_directory].colors[2]; } -function make_image_action_button(name, action) +function make_image_action_button(name, action, height) { - var div = DIV(null, IMG({ src: recolored_image_path(name), width: 60, height: 23 })); + var div = DIV(null, IMG({ src: recolored_image_path(name), width: 126, height: height })); div.onclick = function() { action(); return false; }; return div; } @@ -1255,9 +1223,18 @@ { var buttons = []; if (1 || current_image.download_product) { - buttons.push(make_image_action_button('buy', make_buy_form)); + buttons.push(make_image_action_button('buy-file', make_buy_form, 22)); } - buttons.push(make_image_action_button('hey', make_hey_form)); - buttons.push(DIV(null, IMG({ src: recolored_image_path('button-bottom'), width: 60, height: 1 }))); + buttons.push(make_image_action_button('hey', make_hey_form, 23)); replaceChildNodes('image_action_buttons', buttons); + $('image_action_buttons').onmouseover = function () { + var e = $('image_action_buttons'); + e.style.left = '518px'; + e.style.width = '126px'; + } + $('image_action_buttons').onmouseout = function () { + var e = $('image_action_buttons'); + e.style.left = '584px'; + e.style.width = '60px'; + } } \ No newline at end of file Modified: trunk/projects/quickhoney/website/static/styles.css =================================================================== --- trunk/projects/quickhoney/website/static/styles.css 2008-07-19 11:42:24 UTC (rev 3520) +++ trunk/projects/quickhoney/website/static/styles.css 2008-07-19 14:16:31 UTC (rev 3521) @@ -515,6 +515,8 @@ position: absolute; left: 584px; top: 32px; + width: 60px; + overflow: hidden; z-index: 100; } Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-07-19 11:42:24 UTC (rev 3520) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-07-19 14:16:31 UTC (rev 3521) @@ -13,8 +13,6 @@ </script> <script src="/static/AC_QuickTime.js" type="text/javascript"> </script> - <script src="/static/tiny_mce/tiny_mce.js" type="text/javascript"> - </script> <script src="/MochiKit/MochiKit.js" type="text/javascript"> </script> <script src="/static/javascript.js" type="text/javascript"> @@ -266,6 +264,9 @@ 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/> + <input type="checkbox" name="buy-file" value="1"/> Sell as file<br/> + <input type="checkbox" name="buy-print" value="1"/> Sell as print<br/> + <input type="checkbox" name="buy-t-shirt" value="1"/> Sell as t-shirt<br/> </p> <p class="cms"> <input type="submit" name="action" value="edit" />

1 0