[bknr-cvs] hans changed trunk/projects/quickhoney/
BKNR Commits
bknr at bknr.net
Sun Jul 20 23:07:22 UTC 2008
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>
More information about the Bknr-cvs
mailing list