Permalink
Browse files

merging up to head

  • Loading branch information...
2 parents 22c2a1d + 9b9a7de commit 99ebffe8535b0fc3a98a3b3569c8c3734651ed66 @vincentwoo committed May 4, 2012
Showing with 50 additions and 17 deletions.
  1. +4 −2 TODO
  2. +12 −4 css/style.css
  3. +34 −11 index.html
View
6 TODO
@@ -2,9 +2,9 @@ i'm starring items i think are truly must-dos by demo time
*- Flexible merchant logo area (support for no logo)
*- Flexible item image area (support for no logo)
-*- Multi quantity on single item
-*- Multi quantity on multi line item
*- Spinner? (Different design spinner?)
+*- Tax/Total area fitting to size of content within it
+*- Flexible left frame area
[done]- Plus icon/image on "Add New" on multi-instrument selector
[done]- "X" close in top-right of main frame
@@ -18,6 +18,8 @@ i'm starring items i think are truly must-dos by demo time
[done]- Multi line item
[done]- Remove taxes line if 0.00 taxes
[done]- Remove subtotal line if 0.00 taxes
+[done]*- Multi quantity on single item
+[done]*- Multi quantity on multi line item
- Find way to make change instrument button look more change-y
- A/B test toggle on "Buy Now" being full-size or having a ~5px margin (more button-y)
View
16 css/style.css
@@ -98,6 +98,14 @@ body {
border-bottom: 1px solid #ccc;
padding: 15px 15px 10px 15px;
}
+ #iteminfo_quantity {
+ border-bottom: 1px solid #ccc;
+ padding: 15px 15px 10px 15px;
+ }
+ #iteminfo_quantity_price {
+ font-weight: bold;
+ font-size: 14px;
+ }
#iteminfo_multi {
border-bottom: 1px solid #ccc;
padding: 15px 10px 0px 10px;
@@ -126,7 +134,7 @@ body {
background-size: contain;
}
#cost {
- width: 50%;
+ width: 55%;
font-size: 15px;
float: left;
position: relative;
@@ -364,16 +372,16 @@ div.lineitems {
}
div.item_data {
- width: 230px;
+ width: 200px;
margin-bottom: 2px;
float: left;
}
div.item_name {
float: left;
margin-top: 4px;
- width: 170px;
- max-width: 170px;
+ width: 150px;
+ max-width: 150px;
white-space: nowrap;
overflow: hidden;
}
View
45 index.html
@@ -60,14 +60,18 @@
$('#multi_instrument_list').empty();
if (state == 'logged_multi_line') {
- $('#subtotal_price').text('$519.94');
- $('#taxes_price').text('$41.60');
- $('#total_price').text('$561.54');
+ $('#subtotal_price').text('$5,024.84');
+ $('#taxes_price').text('$401.99');
+ $('#total_price').text('$5,426.83');
} else if (state == 'logged_multi') {
$('#subtotal_price').text('$1.99');
$('#taxes_price').text('$0.00');
$('#total_price').text('$1.99');
- } else {
+ } else if (state == 'logged_multi_quantity') {
+ $('#subtotal_price').text('$7.96');
+ $('#taxes_price').text('$0.64');
+ $('#total_price').text('$8.60');
+ }else {
$('#subtotal_price').text('$1.99');
$('#taxes_price').text('$0.16');
$('#total_price').text('$2.15');
@@ -94,13 +98,19 @@
if (state == 'logged_multi_line') {
$('#iteminfo_multi').show();
$('#iteminfo_one').hide();
- } else if (state == 'logged_multi') {
+ $('#iteminfo_quantity').hide();
+ } else if (state == 'logged_multi_quantity') {
+ $('#iteminfo_one').hide();
+ $('#iteminfo_quantity').show();
+ $('#iteminfo_multi').hide();
+ } else {
$('#iteminfo_one').show();
+ $('#iteminfo_quantity').hide();
$('#iteminfo_multi').hide();
}
$('#buyflow').fadeIn('fast', function() {
- if (state != 'logged_one' && state != 'logged_multi' && state != 'logged_multi_line') {
+ if (state != 'logged_one' && state != 'logged_multi' && state != 'logged_multi_line' && state != 'logged_multi_quantity') {
slideOut();
$('#buybutton').addClass('disabled');
} else {
@@ -190,11 +200,12 @@
<body>
<div id="main">
<div id="config">
- <input type="radio" name="state" value="logged_multi_line"> Multi Line Item<br />
+ <input type="radio" name="state" value="logged_multi_quantity"> Single Item/Multi Quantity<br />
+ <input type="radio" name="state" value="logged_multi_line"> Multi Line Item/Quantity<br />
<input type="radio" name="state" value="logged_multi"> Logged in (n instruments)<br />
- <input type="radio" name="state" value="logged_one"> Logged in (1 instrument)<br />
- <input type="radio" name="state" value="notlogged" checked> Not Logged in <br />
+ <input type="radio" name="state" value="logged_one" checked> Logged in (1 instrument)<br />
<input type="radio" name="state" value="newuser"> New user <br />
+ <input type="radio" name="state" value="notlogged"> Not Logged in <br />
</div>
<div id="button"></div>
</div>
@@ -205,6 +216,18 @@
<div id="butter">
<img src="images/x_close.gif" id="close" />
</div>
+ <div id="iteminfo_quantity">
+ <img id="itemimage" src="images/eagle.png" />
+ <b>A Mighty Eagle (Qty: 4)</b>
+ <p>
+ A mighty eagle decimates your enemies with deadly precision - buy one today. <span id='iteminfo_quantity_price'>($1.99 each)</span>
+ </p>
+ <div style="float: right">
+ Sold by <b>Rovio</b>
+ <img src="images/logo_rovio.png" style="vertical-align: middle; height: 35px; width: auto" />
+ </div>
+ <div style="clear:both"></div>
+ </div>
<div id="iteminfo_one">
<img id="itemimage" src="images/eagle.png" />
<b>A Mighty Eagle</b>
@@ -245,7 +268,7 @@
<img id="itemimage_multi" src="images/eagle.png" />
<div class='item_name'><b>The Mightiest Eagle</b></div>
</div>
- <div class='item_price'><b>$4.99</b></div>
+ <div class='item_price'><b>$4.99</b> <span class='quantity'>x2</span></div>
</div>
<div class='lineitem'>
<div class='item_data'>
@@ -259,7 +282,7 @@
<img id="itemimage_multi" src="images/honeybadger.jpg" />
<div class='item_name'><b>Honey Badger</b></div>
</div>
- <div class='item_price'><b>$499.99</b></div>
+ <div class='item_price'><b>$499.99</b> <span class='quantity'>x10</span></div>
</div>
</div>
<div style="float: right">

0 comments on commit 99ebffe

Please sign in to comment.