diff --git a/sites/demo/static/demo/fonts/icomoon.dev.svg b/sites/demo/static/demo/fonts/icomoon.dev.svg
index 55b1c5801af..faf7bcbb9a4 100644
--- a/sites/demo/static/demo/fonts/icomoon.dev.svg
+++ b/sites/demo/static/demo/fonts/icomoon.dev.svg
@@ -75,6 +75,38 @@ q0.00-16.25 -11.563-28.125t-28.438-11.875z" data-tags="plus" />
+
+
+
\ No newline at end of file
diff --git a/sites/demo/static/demo/fonts/icomoon.eot b/sites/demo/static/demo/fonts/icomoon.eot
index 8814dbd0d30..e55c6701e30 100644
Binary files a/sites/demo/static/demo/fonts/icomoon.eot and b/sites/demo/static/demo/fonts/icomoon.eot differ
diff --git a/sites/demo/static/demo/fonts/icomoon.svg b/sites/demo/static/demo/fonts/icomoon.svg
index 111d77912e8..740c6f35ffa 100644
--- a/sites/demo/static/demo/fonts/icomoon.svg
+++ b/sites/demo/static/demo/fonts/icomoon.svg
@@ -75,6 +75,38 @@ q0.00-16.25 -11.563-28.125t-28.438-11.875z" />
+
+
+
\ No newline at end of file
diff --git a/sites/demo/static/demo/fonts/icomoon.ttf b/sites/demo/static/demo/fonts/icomoon.ttf
index 3651439f2e0..1b9fc358f88 100644
Binary files a/sites/demo/static/demo/fonts/icomoon.ttf and b/sites/demo/static/demo/fonts/icomoon.ttf differ
diff --git a/sites/demo/static/demo/fonts/icomoon.woff b/sites/demo/static/demo/fonts/icomoon.woff
index 5423646cd48..3b715eeb637 100644
Binary files a/sites/demo/static/demo/fonts/icomoon.woff and b/sites/demo/static/demo/fonts/icomoon.woff differ
diff --git a/sites/demo/static/demo/fonts/lte-ie7.js b/sites/demo/static/demo/fonts/lte-ie7.js
index b85c0eede6c..bcf62fe026f 100644
--- a/sites/demo/static/demo/fonts/lte-ie7.js
+++ b/sites/demo/static/demo/fonts/lte-ie7.js
@@ -20,7 +20,10 @@ window.onload = function() {
'icon-mail' : '',
'icon-plus' : '+',
'icon-noun_project_62' : '!',
- 'icon-arrow-down' : '"'
+ 'icon-arrow-down' : '"',
+ 'icon-check-alt' : '#',
+ 'icon-x-altx-alt' : '$',
+ 'icon-checkout-half-wheel' : '%'
},
els = document.getElementsByTagName('*'),
i, attr, html, c, el;
diff --git a/sites/demo/static/demo/img/ui/sprite.png b/sites/demo/static/demo/img/ui/sprite.png
new file mode 100644
index 00000000000..04e317a1fb2
Binary files /dev/null and b/sites/demo/static/demo/img/ui/sprite.png differ
diff --git a/sites/demo/static/demo/js/site/ui.js b/sites/demo/static/demo/js/site/ui.js
index 3b307d0725e..f21145fd9d4 100644
--- a/sites/demo/static/demo/js/site/ui.js
+++ b/sites/demo/static/demo/js/site/ui.js
@@ -59,6 +59,21 @@
});
}
+ function matchHeight(hasChanged) {
+ if (!hasChanged) {
+ return;
+ }
+ var matchHeight = $('[data-behaviours~="match-height"]');
+
+ if(matchHeight.length > 1) {
+ var rowHeight = matchHeight.closest('.row-fluid').height() - 40;
+
+ matchHeight.each(function() {
+ $(this).css('min-height', rowHeight);
+ });
+ }
+ }
+
// Register modernizr function against all viewports
site.responsive.register(svgModernizr);
@@ -71,6 +86,5 @@
site.responsive.register(megaCarousel, ['desktop', 'tablet']);
site.responsive.register(productCarousel, ['desktop', 'tablet']);
site.responsive.register(productSingleCarousel, ['desktop', 'tablet']);
- // site.responsive.register(productAffix, ['desktop', 'tablet']);
}(site, jQuery));
\ No newline at end of file
diff --git a/sites/demo/static/demo/less/bootstrap/forms.less b/sites/demo/static/demo/less/bootstrap/forms.less
index 10ddac1a77a..1a74be84485 100755
--- a/sites/demo/static/demo/less/bootstrap/forms.less
+++ b/sites/demo/static/demo/less/bootstrap/forms.less
@@ -603,6 +603,11 @@ input.search-query {
select {
.input-block-level();
}
+ .checkbox, .radio {
+ input {
+ width:auto;
+ }
+ }
}
.form-search label,
.form-inline label,
diff --git a/sites/demo/static/demo/less/bootstrap/layouts.less b/sites/demo/static/demo/less/bootstrap/layouts.less
index ddaa1e26f80..a2ad157b79d 100755
--- a/sites/demo/static/demo/less/bootstrap/layouts.less
+++ b/sites/demo/static/demo/less/bootstrap/layouts.less
@@ -20,6 +20,6 @@ body {
}
.page_inner {
- padding:@gridGutterWidth 0;
+ padding:@gridGutterWidth 0 50px;
.clearfix();
}
\ No newline at end of file
diff --git a/sites/demo/static/demo/less/bootstrap/type.less b/sites/demo/static/demo/less/bootstrap/type.less
index ac3b60c622a..1f84a8a164a 100755
--- a/sites/demo/static/demo/less/bootstrap/type.less
+++ b/sites/demo/static/demo/less/bootstrap/type.less
@@ -119,12 +119,18 @@ h3 {
// -------------------------
.page-header {
+ .clearfix();
margin: 0 0 (@baseLineHeight * 1.5);
h1 {
font-size:@headingTwoSize;
line-height: 38px;
text-transform: uppercase;
}
+ .verisign {
+ position: relative;
+ top:-10px;
+ float:right;
+ }
}
.well .sub-header {
margin: 0 0 (@baseLineHeight);
diff --git a/sites/demo/static/demo/less/page/checkout.less b/sites/demo/static/demo/less/page/checkout.less
index 3ddcfbe1f52..0b975536295 100644
--- a/sites/demo/static/demo/less/page/checkout.less
+++ b/sites/demo/static/demo/less/page/checkout.less
@@ -19,6 +19,7 @@
margin-bottom: 18px;
}
}
+//Basket column names
.basket-title {
clear:both;
border:1px solid #ddd;
@@ -40,6 +41,7 @@
border-bottom-width:1px;
}
}
+//Basket list item
.basket-items {
border-bottom:1px solid lighten(@grayLight, 30%);
padding:15px 0;
@@ -95,52 +97,35 @@
.checkout-proceed {
float:right;
text-align: right;
- > span {
+ margin-bottom:30px;
+ span {
+ display:inline-block;
+ text-align: left;
+ margin:0 20px;
+ }
+ .credit-cards {
+ margin:0;
+ }
+ > strong {
font-size:@headingFourSize;
text-transform: uppercase;
display:block;
margin:20px 0;
}
}
-
-.shipping_address {
- h2 {
- margin-bottom: @baseLineHeight;
- }
-}
+//Shipping addresses
.choose-block {
- margin-top:10px;
ul {
.remove_bullets();
.clearfix();
li {
- width: @third;
- float: left;
.default-address {
background-color: @grayLighter;
}
}
}
- .well {
- position:relative;
- form {
- position:relative;
- padding-bottom:35px;
- margin-bottom:0;
- .ship-address {
- bottom: 0;
- position: absolute;
- }
- }
- .remove-item {
- position:absolute;
- bottom: 10px;
- right: 19px;
- margin-bottom: 0;
- input {
- margin-bottom: 0;
- }
- }
+ form {
+ margin-bottom:0;
}
.well-info.default-address {
background-color: @successBackground;
@@ -160,35 +145,34 @@
}
}
}
-
-.total {
- background-color:#FDF5D9!important;
+.shipping-payment {
+ .span6 > .well {
+ min-height:380px;
+ }
}
+//Checkout navigation
.checkoutNav {
+ .container-fluid {
+ max-width: 960px;
+ }
position: relative;
- margin:30px 0 60px;
- hr {
- margin:0;
- border-top:2px solid @navbarInverseBackground;
+ margin:30px 0 50px;
+ background:#F2F2F2;
+ padding:5px 0;
+ border-top:2px solid @navbarInverseBackground;
+ border-bottom:1px solid #DDD;
+ i {
+ display:none;
+ vertical-align: bottom;
position: absolute;
- bottom:0;
- left:0;
width:100%;
- }
- i {
- font-size: @headingTwoSize;
- line-height: @headingFourSize;
- vertical-align: middle;
- position: relative;
- top:5px;
- }
- div {
- height:25px;
- overflow: hidden;
+ left:0;
+ top:-25px;
}
ul {
.clearfix();
li {
+ position: relative;
list-style: none;
display:block;
text-align: center;
@@ -199,11 +183,45 @@
text-transform: uppercase;
color:@navbarInverseBackground;
font-size: 18px;
+ &.visited {
+ color:@green;
+ i:first-child + i {
+ display:inline-block;
+ font-size: @headingThreeSize;
+ line-height: @headingThreeSize;
+ }
+ a {
+ color:@green;
+ }
+ }
&.active {
- color:@blue;
- border-bottom:2px solid yellow;
+ i:first-child {
+ display:inline-block;
+ font-size: @headingTwoSize;
+ line-height: @headingTwoSize;
+ height:32px;
+ overflow: hidden;
+ top:-38px;
+ }
}
}
}
}
+//Footer and Checkout images
+.credit-cards,
+.verisign {
+ display:inline-block;
+ vertical-align: middle;
+ margin:0 4px;
+}
+.credit-cards {
+ width:178px;
+ height:21px;
+ background: url(/static/demo/img/ui/sprite.png) 0 -49px repeat transparent;
+}
+.verisign {
+ width:100px;
+ height:49px;
+ background: url(/static/demo/img/ui/sprite.png) 0 0 repeat transparent;
+}
diff --git a/sites/demo/static/demo/less/page/head_foot.less b/sites/demo/static/demo/less/page/head_foot.less
index d9fa8087fb6..15da32eb502 100644
--- a/sites/demo/static/demo/less/page/head_foot.less
+++ b/sites/demo/static/demo/less/page/head_foot.less
@@ -52,10 +52,20 @@
left:0;
}
}
+ .credit-cards,
+ .verisign {
+ margin:0;
+ }
+ .credit-cards {
+ margin-top:5px;
+ }
}
//Checkout header
.checkout-page .header-content {
margin-top:10px;
+ p {
+ margin-bottom:30px;
+ }
}
// OSCAR FOOTER UNIQUE STYLES
// -----------
@@ -113,6 +123,10 @@
.footer-disclaimer {
font-size: @fontSizeSmall;
line-height: @baseLineHeight * 2;
- text-align: right;
background: #091624;
+ .clearfix();
+ p {
+ margin:0;
+ text-align: center;
+ }
}
diff --git a/sites/demo/static/demo/less/page/icomoon.less b/sites/demo/static/demo/less/page/icomoon.less
index 5d07f8ff6bd..e786eeb9527 100644
--- a/sites/demo/static/demo/less/page/icomoon.less
+++ b/sites/demo/static/demo/less/page/icomoon.less
@@ -27,7 +27,7 @@ Instead of a list of all class selectors,
you can use the generic selector below, but it's slower:
[class*="icon-"] {
*/
-.icon-cart, .icon-star, .icon-lock, .icon-mobile, .icon-earth, .icon-arrow-right, .icon-search, .icon-truck, .icon-twitter, .icon-facebook, .icon-pinterest, .icon-mail, .icon-plus, .icon-noun_project_62, .icon-arrow-down {
+.icon-cart, .icon-star, .icon-lock, .icon-mobile, .icon-earth, .icon-arrow-right, .icon-search, .icon-truck, .icon-twitter, .icon-facebook, .icon-pinterest, .icon-mail, .icon-plus, .icon-noun_project_62, .icon-arrow-down, .icon-check-alt, .icon-x-altx-alt, .icon-checkout-half-wheel {
font-family: 'icomoon';
speak: none;
font-style: normal;
@@ -82,3 +82,12 @@ you can use the generic selector below, but it's slower:
.icon-arrow-down:before {
content: "\22";
}
+.icon-check-alt:before {
+ content: "\23";
+}
+.icon-x-altx-alt:before {
+ content: "\24";
+}
+.icon-checkout-half-wheel:before {
+ content: "\25";
+}
diff --git a/sites/demo/templates/basket/basket.html b/sites/demo/templates/basket/basket.html
new file mode 100644
index 00000000000..d2d51e7feb4
--- /dev/null
+++ b/sites/demo/templates/basket/basket.html
@@ -0,0 +1,7 @@
+{% extends "oscar/basket/basket.html" %}
+{% load i18n %}
+
+
+{% block headertext %}
+{% trans "Basket" %}
+{% endblock %}
\ No newline at end of file
diff --git a/sites/demo/templates/basket/partials/basket_content.html b/sites/demo/templates/basket/partials/basket_content.html
index 79309954a3f..9262bd3e7ad 100644
--- a/sites/demo/templates/basket/partials/basket_content.html
+++ b/sites/demo/templates/basket/partials/basket_content.html
@@ -93,11 +93,15 @@
{% trans "Totals" %}
{% block formactions %}
{% trans "Demo site help" %}
diff --git a/sites/demo/templates/checkout/checkout.html b/sites/demo/templates/checkout/checkout.html
new file mode 100644
index 00000000000..501246ea858
--- /dev/null
+++ b/sites/demo/templates/checkout/checkout.html
@@ -0,0 +1,107 @@
+{% extends "oscar/checkout/checkout.html" %}
+{% load currency_filters %}
+{% load thumbnail %}
+{% load i18n %}
+
+{% block shipping_address %}
+
+
{% trans "Shipping" %}
+
+ {% if shipping_address %}
+
{% trans "Address" %}
+
+ {% for field in shipping_address.active_address_fields %}
+ {{ field }}
+ {% endfor %}
+
+ {% if shipping_address.phone_number %}
+
{% trans "Contact number" %}: {{ shipping_address.phone_number }}
+ {% endif %}
+
+ {% if shipping_address.notes %}
+
{% trans "Shipping notes" %}
+
{{ shipping_address.notes|linebreaks }}
+ {% endif %}
+
+
{% trans "Shipping method" %}
+
{{ shipping_method.name }}
+ {% if shipping_method.description %}
+ - {{ shipping_method.description }}
+ {% endif %}
+
+
+
+ {% block shipping_address_actions %}
+
+ {% endblock %}
+
+ {% else %}
+ {% trans "No shipping is required for this order" %}
+ {% endif %}
+
+
+{% endblock shipping_address %}
+
+{% block payment_method %}
+
+
{% trans "Payment" %}
+
+
{% trans "Payment details to go here" %}
+
+
+
+{% endblock payment_method %}
+
+{% block order_contents %}
+
{% trans "Order contents" %}
+
+
+
{% trans "Items in basket" %}
+ {% trans "Quantity" %}
+ {% trans "Price" %}
+
+
+{% for line in basket.all_lines %}
+
+
+
+
+ {% with image=line.product.primary_image %}
+ {% thumbnail image.original "200x200" upscale=False as thumb %}
+
+ {% endthumbnail %}
+ {% endwith %}
+
+
{{ line.product.stockrecord.partner.name }}
+
+
+
+ {{ line.quantity }}
+
+
+
{{ line.line_price_incl_tax|currency }}
+
+
+
+{% endfor %}
+
+
+
+
+
{% trans "Totals" %}
+ {% include 'basket/partials/basket_totals.html' %}
+
+ {% block order_contents_actions %}
+
+
+ {% endblock %}
+
+
+
+{% endblock order_contents %}
\ No newline at end of file
diff --git a/sites/demo/templates/checkout/gateway.html b/sites/demo/templates/checkout/gateway.html
new file mode 100644
index 00000000000..dd2775ac8f8
--- /dev/null
+++ b/sites/demo/templates/checkout/gateway.html
@@ -0,0 +1,55 @@
+{% extends "oscar/checkout/shipping_address.html" %}
+{% load currency_filters %}
+{% load i18n %}
+
+{% block content %}
+
+
+
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/sites/demo/templates/checkout/layout.html b/sites/demo/templates/checkout/layout.html
index a4445ebfc0a..fab6db96354 100644
--- a/sites/demo/templates/checkout/layout.html
+++ b/sites/demo/templates/checkout/layout.html
@@ -3,9 +3,17 @@
{% load currency_filters %}
{% load promotion_tags %}
{% load category_tags %}
+{% load compress %}
+{% load staticfiles %}
+{% load i18n %}
{% block body_class %}checkout-page{% endblock body_class %}
+{% block extrahead %}
+
+
+{% endblock %}
+
{% block layout %}
{% block checkout-nav %}
@@ -60,3 +72,9 @@ {{ page.title }}
{% include "partials/footer.html" %}
{% endblock %}
+
+{% block extrascripts %}
+{% compress js %}
+ {% include "partials/extrascripts.html" %}
+{% endcompress %}
+{% endblock %}
diff --git a/sites/demo/templates/checkout/nav.html b/sites/demo/templates/checkout/nav.html
index 556cf80061a..b5046c6b2dd 100644
--- a/sites/demo/templates/checkout/nav.html
+++ b/sites/demo/templates/checkout/nav.html
@@ -1,10 +1,9 @@
{% load i18n %}
-
diff --git a/sites/demo/templates/checkout/payment_details.html b/sites/demo/templates/checkout/payment_details.html
index 1854a33fc77..a937a0dc59f 100644
--- a/sites/demo/templates/checkout/payment_details.html
+++ b/sites/demo/templates/checkout/payment_details.html
@@ -1,19 +1,23 @@
{% extends 'oscar/checkout/payment_details.html' %}
{% load i18n %}
-{% block payment_details_content %}
+{% block payment_details %}
+
+
+ {% block payment_details_content %}
Pay with a bankcard
-{% endblock %}
+ {% endblock %}
+{% endblock payment_details %}
\ No newline at end of file
diff --git a/sites/demo/templates/checkout/preview.html b/sites/demo/templates/checkout/preview.html
index 6e0a436baad..fd9451a746e 100644
--- a/sites/demo/templates/checkout/preview.html
+++ b/sites/demo/templates/checkout/preview.html
@@ -4,10 +4,8 @@
{% block payment_method %}
-
-
+
{% trans "Payment" %}
+
{% blocktrans with amount=order_total_incl_tax|currency %}{{ amount }} will be debited from your bankcard.{% endblocktrans %}
{% endblock %}
-{% block hiddenforms %}
- {{ bankcard_form.as_p }}
-{% endblock %}
+
+{% block place_order %}
+
+
+{% endblock place_order %}
\ No newline at end of file
diff --git a/sites/demo/templates/checkout/shipping_address.html b/sites/demo/templates/checkout/shipping_address.html
new file mode 100644
index 00000000000..2c54bad0481
--- /dev/null
+++ b/sites/demo/templates/checkout/shipping_address.html
@@ -0,0 +1,78 @@
+{% extends "oscar/checkout/shipping_address.html" %}
+{% load i18n %}
+
+{% block header %}
+
+{% endblock %}
+
+{% block shipping_address %}
+ {% if request.user.is_authenticated %}
+ {% if addresses %}
+
+
An address from your addressbook?
+
+
+ {% for address in addresses %}
+
+
+
+ {% for field in address.active_address_fields %}
+ {{ field }}
+ {% endfor %}
+
+
+
+
+ {% if forloop.counter|divisibleby:4 %}
+
+ {% if not forloop.last %}
{% endif %}
+ {% endif %}
+ {% endfor %}
+
+
+
+ {% endif %}
+ {% endif %}
+
+
+
+{% endblock shipping_address %}
\ No newline at end of file
diff --git a/sites/demo/templates/checkout/shipping_methods.html b/sites/demo/templates/checkout/shipping_methods.html
new file mode 100644
index 00000000000..2c3e2cf4b6d
--- /dev/null
+++ b/sites/demo/templates/checkout/shipping_methods.html
@@ -0,0 +1,47 @@
+{% extends "oscar/checkout/shipping_methods.html" %}
+{% load currency_filters %}
+{% load i18n %}
+
+{% block shipping_method %}
+
+
+
+
{% trans "Method" %}
+ {% trans "Cost" %}
+
+
+{% for method in methods %}
+
+
+
+
{{ method.name }}
+ {% if method.description %}
+
{{ method.description|safe }}
+ {% endif %}
+ {% if method.is_discounted %}
+
+ {% with discount=method.get_discount %}
+ {% blocktrans with amount=discount.discount|currency name=discount.name %}
+ This includes a discount of {{ amount }} as
+ your basket qualifies for the '{{ name }}' offer.
+ {% endblocktrans %}
+ {% endwith %}
+
+ {% endif %}
+
+
+ {{ method.basket_charge_incl_tax|currency }}
+
+
+
+
+
+
+{% endfor %}
+{% endblock shipping_method %}
\ No newline at end of file
diff --git a/sites/demo/templates/checkout/user_address_delete.html b/sites/demo/templates/checkout/user_address_delete.html
new file mode 100644
index 00000000000..d6027d6ca0e
--- /dev/null
+++ b/sites/demo/templates/checkout/user_address_delete.html
@@ -0,0 +1,16 @@
+{% extends "oscar/checkout/user_address_delete.html" %}
+{% load i18n %}
+
+
+{% block shipping_address %}
+
+
+{% endblock shipping_address %}
diff --git a/sites/demo/templates/checkout/user_address_form.html b/sites/demo/templates/checkout/user_address_form.html
new file mode 100644
index 00000000000..96232a8807a
--- /dev/null
+++ b/sites/demo/templates/checkout/user_address_form.html
@@ -0,0 +1,21 @@
+{% extends "oscar/checkout/user_address_form.html" %}
+{% load i18n %}
+
+{% block shipping_address %}
+
+
+
+{% endblock shipping_address %}
diff --git a/sites/demo/templates/partials/footer.html b/sites/demo/templates/partials/footer.html
index 4bbd0dcdfc4..7daf4e2c6a3 100644
--- a/sites/demo/templates/partials/footer.html
+++ b/sites/demo/templates/partials/footer.html
@@ -59,7 +59,11 @@
{% trans "Contact us" %}