57 oscar/static/oscar/less/page/checkout.less
View file
@@ -71,4 +71,59 @@
text-align:right;
background-color:#FDF5D9;
font-weight:bold;
}
}

.checkoutNav ul li {
background: none repeat scroll 0 0 @grayLight;
color: #FFFFFF;
float: left;
height: 24px;
line-height: 24px;
margin: 0;
padding: 1px 0 4px;
position: relative;
text-decoration: none;
h3 {
text-align: center;
font-size: 12px;
}
}

.checkoutNav ul li:after {
border-color: transparent transparent transparent @grayLight;
border-style: solid;
border-width: 15px 0 15px 15px;
content: "";
float: left;
height: 0;
position: absolute;
right: -15px;
top: 0;
width: 0;
}

.checkoutNav ul li.active:after {
border-color: transparent transparent transparent #0088CC;
}

.checkoutNav ul li.active {
background-color: #0088CC;
}

.checkoutNav ul li:before {
border-color: transparent transparent transparent #fff;
border-style: solid;
border-width: 15px 0 15px 15px;
content: "";
float: left;
height: 0;
left: 0;
position: absolute;
top: 0;
width: 0;
}

.checkoutNav ul li.active h3 {
color: #fff;
text-align: center;
}
2 oscar/static/oscar/less/page/head_foot.less
View file
@@ -63,7 +63,7 @@
.clearfix();
.btn {
float:right;
}
}
}
margin:0px;
h4 {
49 oscar/static/oscar/less/responsive.less
View file
@@ -159,17 +159,39 @@
padding-bottom:@baseLineHeight;
margin-bottom:@baseLineHeight;
.product_pod {
margin-bottom:15px;
margin-bottom:0px;
height:auto!important;
padding:0px;
text-align:left;
.star {
clear:none;
margin-left:@quart * 1.15;
margin:0px;
}
.avaliability {
text-align:left;
}
.group-price {
position:static;
border:none;
color:@orange;
text-transform:capitalize;
background-color:none;
.border-radius(none);
.box-shadow(none);
background:none;
margin:0px;
span {
display:inline;
font-size:@baseFontSize;
background:none;
padding:0px;
color:inherit;
}
strong {
padding:0px;
display:inline;
}
}
.product_price {
position:static;
h4 {
@@ -194,9 +216,12 @@
}
.image_container {
width:@quart;
float:left;
margin-right:15px;
margin-bottom:80px;
float:right;
margin-left:15px;
margin-bottom:0px;
img {
height:auto;
}
}
}
}
@@ -249,6 +274,20 @@
width: auto;
margin-bottom:0px;
}
// Carousel
.es-carousel-wrapper {
padding:0px;
border:0px;
}
.es-carousel {
border:0px;
ul {
display:block;
li {
float:none;
}
}
}
}


88 oscar/templates/basket/basket.html
View file
@@ -6,6 +6,28 @@
Basket | {{ block.super }}
{% endblock %}

{% block checkout-nav %}
<nav class="checkoutNav">
<ul class="nav row-fluid">
<li class="active span3">
<h3>1. Basket</h3>
</li>
<li class="disabled span3">
<h3>2. Shipping Address</h3>
</li>
<li class="disabled span3">
<h3>3. Shipping Options</h3>
</li>
<!-- <li class="disabled span3">
<h3>4. Payment</h3>
</li> -->
<li class="disabled span3">
<h3>4. Place Order</h3>
</li>
</ul>
</nav>
{% endblock %}

{% block header %}
<div class="page-header">
<h1>Basket</h1>
@@ -69,14 +91,76 @@ <h1>Basket</h1>
</tbody>
</table>

<div class="row-fluid">
<div class="span6">
{% with product.images.all.0 as image %}
<div class="image_container">
<a href="{{ product.get_absolute_url }}"><img class="thumbnail" src="{{ image.original.url }}" alt="{{ product.get_title }}"></a>
</div>
{% endwith %}
</div>
<div class="span2">
{{ form.quantity }}
</div>
<div class="span2">
</div>
<div class="span2">
</div>
</div>

<div class="sub-heading">
<h3>Basket Updates</h3>
</div>

<div class="row-fluid">
<h4>Delivery Destination</h4>
<div class="span4">
<div class="btn-group">
<button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
USA
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li>
<a href="#">UK</a>
</li>
<li>
<a href="#">Ireland</a>
</li>
<li>
<a href="#">Canada</a>
</li>
</ul>
</div>
</div>
<div class="span7">
<table class="table table-striped table-condensed">
<tbody>
<tr>
<th>Basket Subtotal</th>
<td>{{ form.instance.line_price_excl_tax|currency }}</td>
</tr>
<tr>
<th>Delivery From</th>
<td></td>
</tr>
<tr>
<th>Total</th>
<td>{{ form.instance.line_price_incl_tax|currency }}</td>
</tr>
</tbody>
</table>
</div>
</div>

<div class="form-actions">
Made changes? <input type="submit" value="Update basket" class="btn"/>
<a href="{% url checkout:index %}" class="pull-right btn btn-primary">Checkout</a>
<a href="{% url checkout:index %}" class="pull-right btn btn-primary">Proceed to Checkout</a>
</div>

</form>

{% if request.basket.pk %}

<h4>Basket vouchers</h4>
<ul>
{% for voucher in basket.vouchers.all %}
1 oscar/templates/basket/partials/basket_quick.html
View file
@@ -14,6 +14,7 @@ <h4><a href="{{ line.product.get_absolute_url }}">{{ line.description }}</a></h4
{% endfor %}
<li class="form-actions">
<h4><small>Total Excl Tax: {{ request.basket.total_excl_tax|currency }}</small> Total: {{ basket.total_incl_tax|currency }}</h4>
<p><a href="{% url basket:summary %}" class="btn btn-info btn-small">View Basket</a></p>
<p><a href="{% url checkout:index %}" class="btn btn-primary btn-small">Checkout</a></p>
</li>
{% else %}
68 oscar/templates/catalogue/browse.html
View file
@@ -1,6 +1,8 @@
{% extends "layout.html" %}
{% extends "layout_2_col.html" %}
{% load currency_filters %}
{% load basket_tags %}
{% load promotion_tags %}


{% block title %}
{{ summary }} | {{ block.super }}
@@ -19,39 +21,39 @@
</ul>
{% endblock %}

{% block sidebar %}
<div class="row-fluid">
<aside class="span3" style="position:relative;">
<div class="side_categories" style="padding: 8px 0;">
{% if categories %}
<ul class="nav nav-list">
<li class="nav-header">Browse Categories</li>
{% for category in categories %}
<li><a href="{{ category.0.get_absolute_url }}">{{ category.0.name }}</a>
{% if category.1 %}
<ul>
{% for subcategory in category.1 %}
<li><a href="{{ subcategory.0.get_absolute_url }}">{{ subcategory.0.name }}</a>
{% endfor %}
</ul>
{% endif %}
</li>
{% endfor %}
</ul>
{% endif %}
</div>
</aside><!-- /span3 -->
<div class="span9">
<div class="sub-header">
<h1>{{ summary }}</h1>
</div>
{% if category.description %}
<p>{{ category.description }}</p>
{% endif %}

{% endblock sidebar %}
{% block column_left %}
<div class="side_categories" style="padding: 8px 0;">
{% if categories %}
<ul class="nav nav-list">
<li class="nav-header">Browse Categories</li>
{% for category in categories %}
<li><a href="{{ category.0.get_absolute_url }}">{{ category.0.name }}</a>
{% if category.1 %}
<ul>
{% for subcategory in category.1 %}
<li><a href="{{ subcategory.0.get_absolute_url }}">{{ subcategory.0.name }}</a>
{% endfor %}
</ul>
{% endif %}
</li>
{% endfor %}
</ul>
{% endif %}
</div>
{% endblock %}

{% block content %}
<div class="sub-header">
<h1>{{ summary }}</h1>
</div>
{% if category.description %}
<p>{{ category.description }}</p>
{% endif %}
<div id="promotions">
{% for promotion in promotions_page %}
{% render_promotion promotion %}
{% endfor %}
</div>
{% if products.count %}
<section>
<div class="mod">
@@ -71,6 +73,4 @@ <h1>{{ summary }}</h1>
{% else %}
<p>No products found.</p>
{% endif %}
</div><!-- /span9 -->
</div><!-- /row-fluid -->
{% endblock content %}
3 oscar/templates/catalogue/detail.html
View file
@@ -24,9 +24,6 @@
</ul>
{% endblock %}

{% block sidebar %}
{% endblock sidebar %}

{% block header %}
{% endblock header %}

24 oscar/templates/checkout/checkout.html
View file
@@ -11,7 +11,31 @@ <h2>Checkout</h2>
</div>
{% endblock header %}

{% block checkout-nav %}
<nav class="checkoutNav">
<ul class="nav row-fluid">
<li class="disabled span3">
<h3>1. Basket</h3>
</li>
<li class="disabled span3">
<h3>2. Shipping Address</h3>
</li>
<li class="active span3">
<h3>3. Shipping Options</h3>
</li>
<!-- <li class="disabled span3">
<h3>4. Payment</h3>
</li> -->
<li class="disabled span3">
<h3>4. Place Order</h3>
</li>
</ul>
</nav>
{% endblock %}

{% block content %}


<div class="sub-header">
<h3>Order contents</h3>
</div>
12 oscar/templates/checkout/layout.html
View file
@@ -53,8 +53,10 @@
<div class="container-fluid page">
{% block header %}
{% endblock %}

<div class="page_inner">
{% block checkout-nav %}
{% endblock %}
<!-- The main nav on checkout pages contain links to modal flatpages -->
{% block modal %}
{% load flatpages %}
@@ -74,19 +76,13 @@ <h3>{{ page.title }}</h3>
{% endfor %}
{% endblock %}

{% block sidebar %}
{% endblock %}

{% block flatpage %}
{% endblock %}
{% block content %}{% endblock %}

<div id="promotions">
{% for promotion in promotions_page %}
{% render_promotion promotion %}
{% endfor %}
</div>

{% block content %}{% endblock %}
</div><!-- /page_inner -->
</div>
{% include "partials/footer.html" %}
23 oscar/templates/checkout/shipping_address.html
View file
@@ -4,8 +4,31 @@
Shipping address | {{ block.super }}
{% endblock %}

{% block checkout-nav %}
<nav class="checkoutNav">
<ul class="nav row-fluid">
<li class="disabled span3">
<h3>1. Basket</h3>
</li>
<li class="active span3">
<h3>2. Shipping Address</h3>
</li>
<li class="disabled span3">
<h3>3. Shipping Options</h3>
</li>
<!-- <li class="disabled span3">
<h3>4. Payment</h3>
</li> -->
<li class="disabled span3">
<h3>4. Place Order</h3>
</li>
</ul>
</nav>
{% endblock %}

{% block shipping_address %}


{% if addresses %}
<div class="sub-header">
<h4>Choose a shipping address from your address book</h4>
1 oscar/templates/checkout/shipping_methods.html
View file
@@ -6,6 +6,7 @@
{% endblock %}

{% block shipping_method %}

<table class="table table-striped table-bordered">
<thead>
<tr>
22 oscar/templates/checkout/thank_you.html
View file
@@ -11,6 +11,28 @@ <h2>Checkout / Thank you</h2>
</div>
{% endblock header %}

{% block checkout-nav %}
<nav class="checkoutNav">
<ul class="nav row-fluid">
<li class="disabled span3">
<h3>1. Basket</h3>
</li>
<li class="disabled span3">
<h3>2. Shipping Address</h3>
</li>
<li class="disabled span3">
<h3>3. Shipping Options</h3>
</li>
<!-- <li class="disabled span3">
<h3>4. Payment</h3>
</li> -->
<li class="active span3">
<h3>4. Place Order</h3>
</li>
</ul>
</nav>
{% endblock %}


{% block content %}
<div class="sub-header">
207 oscar/templates/customer/order.html
View file
@@ -7,99 +7,142 @@

{% block header %}
<div class="page-header">
<h2>Order #{{ order.number }}</h2>
<h1>Order #{{ order.number }}</h1>
</div>
{% endblock header %}


{% block content %}

<div class="sub-header">
<h3>Shipping address</h3>
<h2>Shipping address</h2>
</div>
<table class="table table-striped table-bordered">
<tr>
<th>Address</th>
<td>
{% for field in order.shipping_address.active_address_fields %}
{{ field }}<br/>
{% endfor %}
</td>
</tr>
{% if order.shipping_address.phone_number %}
<tr>
<th>Contact number</th>
<td>{{ shipping_address.phone_number }}</td>
</tr>
{% endif %}
{% if order.shipping_address.notes %}
<tr>
<th>Shipping notes</th>
<td>{{ shipping_address.notes }}</td>
</tr>
{% endif %}
</table>
<div class="sub-header">
<h3>Shipping method</h3>
</div>
<p>{{ order.shipping_method }}</p>

<div class="sub-header">
<h3>Order contents</h3>
</div>
<div class="tabbable dashboard">
<ul class="nav nav-tabs">
<li class="active"><a href="#1" data-toggle="tab">Shipping Address</a></li>
<li><a href="#2" data-toggle="tab">Shipping Method</a></li>
<li><a href="#3" data-toggle="tab">Order Contents</a></li>
</ul>

{% csrf_token %}
<table class="table table-striped table-bordered">
<tr>
<th>Product</th>
<th>Availability</th>
<th>Quantity</th>
<th>Line price excl tax</th>
<th>Line price incl tax</th>
<th>Status</th>
<th></th>
</tr>
{% for line in order.lines.all %}
<tr>
<td><a href="{{ line.product.get_absolute_url }}">{{ line.description }}</a></td>
<td>{{ line.product.stockrecord.availability }}</td>
<td>{{ line.quantity }}</td>
<td>{{ line.line_price_before_discounts_excl_tax|currency }}</td>
<td>{{ line.line_price_before_discounts_incl_tax|currency }}</td>
<td>{{ line.shipping_status }}</td>
<td>
<form action="{% url customer:order-line order.number line.id %}" method="POST">
{% csrf_token %}
<input type="hidden" name="action" value="reorder" />
<input type="submit" value="Re-order" />
</form>
<a href="{% url catalogue:reviews-add line.product.slug line.product.id %}">Write a review</a>
</td>
</tr>
{% endfor %}
{% for discount in order.discounts.all %}
<tr>
<td colspan="4">{{ discount.description }}</td>
<td>-{{ discount.amount|currency }}</td>
</tr>
{% endfor %}
</table>
<div class="tab-content">

<table class="table table-striped table-bordered">
<caption>Totals</caption>
<tr>
<th>Basket total (inc. tax)</th>
<td>{{ order.basket_total_incl_tax|currency }}</td>
</tr>
<tr>
<th>Shipping charge (inc. tax)</th>
<td>{{ order.shipping_incl_tax|currency }}</td>
</tr>
<tr>
<th>Order total</th>
<td>{{ order.total_incl_tax|currency }}</td>
</tr>
</table>
<div class="tab-pane active" id="1">
<div class="sub-header">
<h3>Profile</h3>
</div>
<div class="row-fluid">
<div class="span4">
<div class="well well-info">
<h4>Address:</h4>
<p>{% for field in order.shipping_address.active_address_fields %}
{{ field }}<br/>
{% endfor %}</p>
</div>
</div>
<div class="span4">
<div class="well well-info">
<h4>Contact Number:</h4>
<p>{{ shipping_address.phone_number }}</p>
</div>
</div>
<div class="span4">
<div class="well well-info">
<h4>Shipping Notes:</h4>
<p>{{ shipping_address.notes }}</p>
</div>
</div>
</div>
<!-- <table class="table table-striped table-bordered">
<tr>
<th>Address</th>
<td>
{% for field in order.shipping_address.active_address_fields %}
{{ field }}<br/>
{% endfor %}
</td>
</tr>
{% if order.shipping_address.phone_number %}
<tr>
<th>Contact number</th>
<td>{{ shipping_address.phone_number }}</td>
</tr>
{% endif %}
{% if order.shipping_address.notes %}
<tr>
<th>Shipping notes</th>
<td>{{ shipping_address.notes }}</td>
</tr>
{% endif %}
</table> -->
</div>
<div class="tab-pane active" id="2">
<div class="sub-header">
<h3>Shipping method</h3>
</div>
<p>{{ order.shipping_method }}</p>
</div>


<div class="tab-pane active" id="3">
<div class="sub-header">
<h3>Order contents</h3>
</div>

{% csrf_token %}
<table class="table table-striped table-bordered">
<tr>
<th>Product</th>
<th>Availability</th>
<th>Quantity</th>
<th>Line price excl tax</th>
<th>Line price incl tax</th>
<th>Status</th>
<th></th>
</tr>
{% for line in order.lines.all %}
<tr>
<td><a href="{{ line.product.get_absolute_url }}">{{ line.description }}</a></td>
<td>{{ line.product.stockrecord.availability }}</td>
<td>{{ line.quantity }}</td>
<td>{{ line.line_price_before_discounts_excl_tax|currency }}</td>
<td>{{ line.line_price_before_discounts_incl_tax|currency }}</td>
<td>{{ line.shipping_status }}</td>
<td>
<form action="{% url customer:order-line order.number line.id %}" method="POST">
{% csrf_token %}
<input type="hidden" name="action" value="reorder" />
<input type="submit" value="Re-order" />
</form>
<a href="{% url catalogue:reviews-add line.product.slug line.product.id %}">Write a review</a>
</td>
</tr>
{% endfor %}
{% for discount in order.discounts.all %}
<tr>
<td colspan="4">{{ discount.description }}</td>
<td>-{{ discount.amount|currency }}</td>
</tr>
{% endfor %}
</table>

<table class="table table-striped table-bordered">
<caption>Totals</caption>
<tr>
<th>Basket total (inc. tax)</th>
<td>{{ order.basket_total_incl_tax|currency }}</td>
</tr>
<tr>
<th>Shipping charge (inc. tax)</th>
<td>{{ order.shipping_incl_tax|currency }}</td>
</tr>
<tr>
<th>Order total</th>
<td>{{ order.total_incl_tax|currency }}</td>
</tr>
</table>
</div>
</div>
</div>
{% endblock content %}

144 oscar/templates/customer/profile.html
View file
@@ -7,77 +7,92 @@

{% block header %}
<div class="page-header">
<h2>Account</h2>
<h1>Account</h1>
</div>
{% endblock header %}

{% block content %}
<div class="sub-header">
<h3>Account settings</h3>
<h2>Account settings</h2>
</div>

<div class="sub-header">
<h3>Profile</h3>
</div>
<table class="table table-striped table-bordered">
<tbody>
<tr>
<th>Username</th>
<td>{{ request.user.username }}</td>
</tr>
<tr>
<th>Name</th>
<td>{{ request.user.get_full_name|default:'-' }}</td>
</tr>
<tr>
<th>Email address</th>
<td>{{ user.email }}</td>
</tr>
<tr>
<th>Date registered</th>
<td>{{ user.date_joined }}</td>
</tr>
<tr>
<th></th>
<td>
<a href="" class="btn">Edit profile</a>
<a href="" class="btn">Change password</a>
</td>
</tr>
</tbody>
</table>
<div class="tabbable dashboard">
<ul class="nav nav-tabs">
<li class="active"><a href="#1" data-toggle="tab">Profile</a></li>
<li><a href="#2" data-toggle="tab">Order History</a></li>
<li><a href="#3" data-toggle="tab">Address Book</a></li>
<li><a href="#4" data-toggle="tab">Email History</a></li>
</ul>

<div class="tab-content">

<div class="tab-pane active" id="1">
<div class="sub-header">
<h3>Profile</h3>
</div>
<table class="table table-striped table-bordered">
<tbody>
<tr>
<th>Username</th>
<td>{{ request.user.username }}</td>
</tr>
<tr>
<th>Name</th>
<td>{{ request.user.get_full_name|default:'-' }}</td>
</tr>
<tr>
<th>Email address</th>
<td>{{ user.email }}</td>
</tr>
<tr>
<th>Date registered</th>
<td>{{ user.date_joined }}</td>
</tr>
<tr>
<th></th>
<td>
<a href="" class="btn">Edit profile</a>
<a href="" class="btn">Change password</a>
</td>
</tr>
</tbody>
</table>
</div>

<div class="tab-pane" id="2">
<div class="sub-header">
<h3>Order history</h3>
</div>

<div class="sub-header">
<h3>Order history</h3>
</div>

{% if orders %}
<table class="table table-striped table-bordered">
<tr>
<th>Order number</th>
<th>Total inc tax</th>
<th>Date submitted</th>
<th></th>
</tr>
{% for order in orders %}
<tr>
<td>{{ order.number }}</td>
<td>{{ order.total_incl_tax|currency }}</td>
<td>{{ order.date_placed }}</td>
<td>
<a class="btn btn-info" href="{% url customer:order order.number %}">View</a>
</td>
</tr>
{% endfor %}
</table>

<div class="form-actions">
<a href="{% url customer:order-list %}" class="btn">View order history</a>
</div>
{% else %}
<p>You haven't placed any orders yet.</p>
{% endif %}
{% if orders %}
<table class="table table-striped table-bordered">
<tr>
<th>Order number</th>
<th>Total inc tax</th>
<th>Date submitted</th>
<th></th>
</tr>
{% for order in orders %}
<tr>
<td>{{ order.number }}</td>
<td>{{ order.total_incl_tax|currency }}</td>
<td>{{ order.date_placed }}</td>
<td>
<a class="btn btn-info" href="{% url customer:order order.number %}">View</a>
</td>
</tr>
{% endfor %}
</table>

<div class="form-actions">
<a href="{% url customer:order-list %}" class="btn">View order history</a>
</div>
{% else %}
<p>You haven't placed any orders yet.</p>
{% endif %}
</div>

<div class="tab-pane" id="3">
<div class="sub-header">
<h3>Address book</h3>
</div>
@@ -103,7 +118,8 @@ <h3>Address book</h3>
</tr>
</tbody>
</table>

</div>
<div class="tab-pane" id="4">
<div class="sub-header">
<h3>Email history</h3>
</div>
@@ -133,5 +149,7 @@ <h3>Email history</h3>
<a href="{% url oscar-customer-email-history %}" class="btn">View email history</a>
<div>
{% endif %}
</div>
</div><!--End of tab-content -->

{% endblock content %}
3 oscar/templates/flatpages/default.html
View file
@@ -2,9 +2,6 @@

{% load currency_filters %}

{% block sidebar %}
{% endblock sidebar %}

{% block header %}
<div class="page-header">
<h1>{{ flatpage.title }}</h1>
64 oscar/templates/flatpages/help.html
View file
@@ -1,41 +1,35 @@
{% extends "layout.html" %}
{% extends "layout_2_col.html" %}

{% load currency_filters %}

{% block sidebar %}
<div class="row-fluid">
<aside class="span3">
<div class="well" style="padding: 8px 0;">
{% load flatpages %}
<ul class="nav nav-list">
<li class="nav-header">Pages</li>
{% get_flatpages '/help/' as flatpages %}
{% for page in flatpages %}
<li><a href="{{ page.url }}">{{ page.title }}</a></li>
{% endfor %}
</ul>
</div>
</aside><!-- /span3 -->
{% endblock sidebar %}
{% block column_left %}
<div class="well" style="padding: 8px 0;">
{% load flatpages %}
<ul class="nav nav-list">
<li class="nav-header">Pages</li>
{% get_flatpages '/help/' as flatpages %}
{% for page in flatpages %}
<li><a href="{{ page.url }}">{{ page.title }}</a></li>
{% endfor %}
</ul>
</div>
{% endblock %}

{% block flatpage %}
<article class="span9">
<div class="sub-header">
<h1>{{ flatpage.title }}</h1>
</div>
{{ flatpage.content }}
{% load flatpages %}
{% get_flatpages '/help/' as flatpages %}
<dl class="accordion">
{% for page in flatpages %}
<dt>{{ page.title }}</dt>
<dd>
<div>
{{ page.content|safe }}
</div>
</dd>
{% endfor %}
</dl>
</article>
</div><!-- /span9 -->
<div class="sub-header">
<h1>{{ flatpage.title }}</h1>
</div>
{{ flatpage.content }}
{% load flatpages %}
{% get_flatpages '/help/' as flatpages %}
<dl class="accordion">
{% for page in flatpages %}
<dt>{{ page.title }}</dt>
<dd>
<div>
{{ page.content|safe }}
</div>
</dd>
{% endfor %}
</dl>
{% endblock %}
3 oscar/templates/flatpages/style_guide.html
View file
@@ -2,9 +2,6 @@

{% load currency_filters %}

{% block sidebar %}
{% endblock sidebar %}

{% block header %}
<div class="page-header">
<h1>{{ flatpage.title }}</h1>
107 oscar/templates/layout.html
View file
@@ -1,16 +1,10 @@
{% extends "base.html" %}

{% load currency_filters %}
{% load promotion_tags %}
{% load category_tags %}

{% block extrahead %}
{% if product %}
<!-- Colorbox for image galleries -->
<link rel="stylesheet" href="{{ STATIC_URL }}oscar/js/colorbox/colorbox.css" type="text/css" media="screen" charset="utf-8"/>
{% endif %}
<!-- Responsive - will need to be minified -->
<link rel="stylesheet" href="{{ STATIC_URL }}oscar/css/responsive.css" />
{% include "partials/extrahead.html" %}
{% endblock %}

{% block layout %}
@@ -19,109 +13,28 @@
<div class="row-fluid">
{% include "partials/brand.html" %}
</div><!-- /row-fluid -->

<div class="navbar primary">
<div class="navbar-inner">
<div class="container" style="width: auto;">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="btn btn-navbar app-ico ico_shop_bag btn-cart hidden" href="{% url checkout:index %}">
<strong>Basket
{% if request.basket.lines.count %}
Total: {{ basket.total_incl_tax|currency }}
{% endif %}
</strong>
</a>
<a class="brand hidden" href="{% url promotions:home %}">Oscar</a>
<div class="nav-collapse">
<div id="browse" class="nav dropdown">
{% category_tree depth=2 as categories %}
{% if categories %}
<a href="#browse" class="dropdown-toggle" data-toggle="dropdown">Browse Store</a>
<ul class="dropdown-menu nav-tabs nav-stacked">
<li><a href="/products">All Products</a></li>
{% for category in categories %}
<li><a href="{{ category.0.get_absolute_url }}">{{ category.0.name }} {% if category.1 %}<span class="app-ico ico_fill_right"></span>{% endif %}</a>
{% if category.1 %}
<ul class="sub-nav dropdown-menu nav nav-tabs nav-stacked span3">
{% for subcategory in category.1 %}
<li><a href="{{ subcategory.0.get_absolute_url }}" class="app-ico ico_outline_right"> {{ subcategory.0.name }}</a></li>
{% endfor %}
</ul>
{% endif %}
</li>
{% endfor %}
</ul>
{% else %}
<a href="#browse" class="dropdown-toggle" data-toggle="dropdown">Browse Store</a>
<ul class="dropdown-menu nav-tabs nav-stacked">
<li><a href="/products">All Products</a></li>
<li>
<a href="#" >Contains a Submenu <span class="app-ico ico_fill_right"></span></a>
<ul class="sub-nav dropdown-menu nav nav-tabs nav-stacked span3">
<li><a href="#" class="app-ico ico_outline_right"> Submenu Link</a></li>
<li><a href="#" class="app-ico ico_outline_right"> Submenu Link</a></li>
<li><a href="#" class="app-ico ico_outline_right"> Submenu Link</a></li>
<li><a href="#" class="app-ico ico_outline_right"> Submenu Link</a></li>
</ul>
</li>
<li><a href="/">Go Home!</a></li>
</ul>
{% endif %}
</div>
{% include "partials/search.html" %}
</div><!-- /.nav-collapse -->
</div>
</div><!-- /navbar-inner -->
</div><!-- /navbar -->
{% category_tree depth=2 as categories %}
{% include "partials/nav_primary.html" %}
</header><!-- /header -->
{% for message in messages %}
<div class="alert fade in alert-{{ message.tags }}">
<a class="close" data-dismiss="alert">x</a>
{{ message }}
</div>
{% endfor %}
{% include "partials/alert_messages.html" %}
<div class="container-fluid page">
{% block header %}
{% endblock %}
<div class="page_inner">
{% block container_nav %}
{% endblock %}

<div class="page_inner">
{% block breadcrumbs %}
{% endblock %}

{% block sidebar %} {% endblock %}


{% block flatpage %}
{% endblock %}

<div id="promotions">
{% for promotion in promotions_page %}
{% render_promotion promotion %}
{% endfor %}
</div>

{% block content %} {% endblock %}

{% block content %}
{% endblock %}
</div><!-- /page_inner -->
</div><!-- /container-fluid -->
{% include "partials/footer.html" %}
{% endblock %}

{# Block for additional scripts #}
{% block extrascripts %}
<!-- Elastislide carousel js -->
<script src="{{ STATIC_URL }}oscar/js/elastislide/jquery.elastislide.js" type="text/javascript" charset="utf-8"></script>
<!-- Responsive gallery js -->
{% if product %}
<script src="{{ STATIC_URL }}oscar/js/colorbox/jquery.colorbox-min.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ STATIC_URL }}oscar/js/responsivegallery/jquery.tmpl.min.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ STATIC_URL }}oscar/js/responsivegallery/gallery.js" type="text/javascript" charset="utf-8"></script>
{% endif %}
<!-- Front end js -->
<script src="{{ STATIC_URL }}oscar/js/oscar/ui.js" type="text/javascript" charset="utf-8"></script>
{% endblock %}
{% include "partials/extrascripts.html" %}
{% endblock %}
50 oscar/templates/layout_2_col.html
View file
@@ -0,0 +1,50 @@
{% extends "base.html" %}

{% load currency_filters %}
{% load category_tags %}

{% block extrahead %}
{% include "partials/extrahead.html" %}
{% endblock %}

{% block layout %}
{% include "partials/nav_accounts.html" %}
<header class="header container-fluid">
<div class="row-fluid">
{% include "partials/brand.html" %}
</div><!-- /row-fluid -->
{% category_tree depth=2 as categories %}
{% include "partials/nav_primary.html" %}
</header><!-- /header -->
{% include "partials/alert_messages.html" %}
<div class="container-fluid page">
<div class="page_inner">
{% block breadcrumbs %}
{% endblock %}

<div class="row-fluid">
<aside class="span3">
{% block column_left %}
{% endblock %}
</aside>

<div class="span9">
{% block header %}
{% endblock %}

{% block flatpage %}
{% endblock %}

{% block content %}
{% endblock %}
</div><!-- /span9 -->
</div><!-- /row-fluid -->
</div><!-- /page_inner -->
</div><!-- /container-fluid -->
{% include "partials/footer.html" %}
{% endblock %}

{# Block for additional scripts #}
{% block extrascripts %}
{% include "partials/extrascripts.html" %}
{% endblock %}
53 oscar/templates/layout_3_col.html
View file
@@ -0,0 +1,53 @@
{% extends "base.html" %}

{% load currency_filters %}
{% load category_tags %}

{% block extrahead %}
{% include "partials/extrahead.html" %}
{% endblock %}

{% block layout %}
{% include "partials/nav_accounts.html" %}
<header class="header container-fluid">
<div class="row-fluid">
{% include "partials/brand.html" %}
</div><!-- /row-fluid -->
{% category_tree depth=2 as categories %}
{% include "partials/nav_primary.html" %}
</header><!-- /header -->
{% include "partials/alert_messages.html" %}
<div class="container-fluid page">
<div class="page_inner">
{% block breadcrumbs %}
{% endblock %}

<div class="row-fluid">
<aside class="span3">
{% block column_left %}
{% endblock %}
</aside><!-- /span3 -->
<div class="span6">
{% block header %}
{% endblock %}

{% block flatpage %}
{% endblock %}

{% block content %}
{% endblock %}
</div><!-- /span6 -->
<aside class="span3">
{% block column_right %}
{% endblock %}
</aside><!-- /span3 -->
</div><!-- /row-fluid -->
</div><!-- /page_inner -->
</div><!-- /container-fluid -->
{% include "partials/footer.html" %}
{% endblock %}

{# Block for additional scripts #}
{% block extrascripts %}
{% include "partials/extrascripts.html" %}
{% endblock %}
6 oscar/templates/partials/alert_messages.html
View file
@@ -0,0 +1,6 @@
{% for message in messages %}
<div class="alert fade in alert-{{ message.tags }}">
<a class="close" data-dismiss="alert">x</a>
{{ message }}
</div>
{% endfor %}
6 oscar/templates/partials/extrahead.html
View file
@@ -0,0 +1,6 @@
{% if product %}
<!-- Colorbox for image galleries -->
<link rel="stylesheet" href="{{ STATIC_URL }}oscar/js/colorbox/colorbox.css" type="text/css" media="screen" charset="utf-8"/>
{% endif %}
<!-- Responsive - will need to be minified -->
<link rel="stylesheet" href="{{ STATIC_URL }}oscar/css/responsive.css" />
10 oscar/templates/partials/extrascripts.html
View file
@@ -0,0 +1,10 @@
<!-- Elastislide carousel js -->
<script src="{{ STATIC_URL }}oscar/js/elastislide/jquery.elastislide.js" type="text/javascript" charset="utf-8"></script>
<!-- Responsive gallery js -->
{% if product %}
<script src="{{ STATIC_URL }}oscar/js/colorbox/jquery.colorbox-min.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ STATIC_URL }}oscar/js/responsivegallery/jquery.tmpl.min.js" type="text/javascript" charset="utf-8"></script>
<script src="{{ STATIC_URL }}oscar/js/responsivegallery/gallery.js" type="text/javascript" charset="utf-8"></script>
{% endif %}
<!-- Front end js -->
<script src="{{ STATIC_URL }}oscar/js/oscar/ui.js" type="text/javascript" charset="utf-8"></script>
59 oscar/templates/partials/nav_primary.html
View file
@@ -0,0 +1,59 @@
{% load currency_filters %}
{% load category_tags %}
<div class="navbar primary">
<div class="navbar-inner">
<div class="container" style="width: auto;">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="btn btn-navbar app-ico ico_shop_bag btn-cart hidden" href="{% url checkout:index %}">
<strong>Basket
{% if request.basket.lines.count %}
Total: {{ basket.total_incl_tax|currency }}
{% endif %}
</strong>
</a>
<a class="brand hidden" href="{% url promotions:home %}">Oscar</a>
<div class="nav-collapse">
<div id="browse" class="nav dropdown">

{% if categories %}
<a href="#browse" class="dropdown-toggle" data-toggle="dropdown">Browse Store</a>
<ul class="dropdown-menu nav-tabs nav-stacked">
<li><a href="/products">All Products</a></li>
{% for category in categories %}
<li><a href="{{ category.0.get_absolute_url }}">{{ category.0.name }} {% if category.1 %}<span class="app-ico ico_fill_right"></span>{% endif %}</a>
{% if category.1 %}
<ul class="sub-nav dropdown-menu nav nav-tabs nav-stacked span3">
{% for subcategory in category.1 %}
<li><a href="{{ subcategory.0.get_absolute_url }}" class="app-ico ico_outline_right"> {{ subcategory.0.name }}</a></li>
{% endfor %}
</ul>
{% endif %}
</li>
{% endfor %}
</ul>
{% else %}
<a href="#browse" class="dropdown-toggle" data-toggle="dropdown">Browse Store</a>
<ul class="dropdown-menu nav-tabs nav-stacked">
<li><a href="/products">All Products</a></li>
<li>
<a href="#" >Contains a Submenu <span class="app-ico ico_fill_right"></span></a>
<ul class="sub-nav dropdown-menu nav nav-tabs nav-stacked span3">
<li><a href="#" class="app-ico ico_outline_right"> Submenu Link</a></li>
<li><a href="#" class="app-ico ico_outline_right"> Submenu Link</a></li>
<li><a href="#" class="app-ico ico_outline_right"> Submenu Link</a></li>
<li><a href="#" class="app-ico ico_outline_right"> Submenu Link</a></li>
</ul>
</li>
<li><a href="/">Go Home!</a></li>
</ul>
{% endif %}
</div>
{% include "partials/search.html" %}
</div><!-- /.nav-collapse -->
</div>
</div><!-- /navbar-inner -->
</div><!-- /navbar -->
4 oscar/templates/promotions/home.html
View file
@@ -1,7 +1,7 @@
{% extends "promotions/layout.html" %}

{% block sidebar %}
{% endblock sidebar %}
{% block column_left %}
{% endblock %}


{% block header %}
20 oscar/templates/promotions/layout.html
View file
@@ -5,8 +5,7 @@
{% load category_tags %}

{% block extrahead %}
<!-- Responsive - will need to be minified -->
<link rel="stylesheet" href="{{ STATIC_URL }}oscar/css/responsive.css" />
{% include "partials/extrahead.html" %}
{% endblock %}

{% block layout %}
@@ -77,15 +76,8 @@
</div>
</div><!-- /navbar-inner -->
</div><!-- /navbar -->


</header><!-- /header -->
{% for message in messages %}
<div class="alert fade in alert-{{ message.tags }}">
<a class="close" data-dismiss="alert">x</a>
{{ message }}
</div>
{% endfor %}
{% include "partials/alert_messages.html" %}
<div class="container-fluid page home">
<div class="page_inner">
<div class="row-fluid">
@@ -95,7 +87,7 @@
{% render_promotion promotion %}
{% endfor %}
</div>
{% block sidebar %}
{% block column_left %}
{% endblock %}
</aside><!-- /span3 -->
<div class="span9">
@@ -111,7 +103,6 @@
{% endfor %}
</div>


{% block content %}
{% endblock %}
</div><!-- /span9 -->
@@ -123,8 +114,5 @@

{# Block for additional scripts #}
{% block extrascripts %}
<!-- Elastislide carousel js -->
<script src="{{ STATIC_URL }}oscar/js/elastislide/jquery.elastislide.js" type="text/javascript" charset="utf-8"></script>
<!-- Front end js -->
<script src="{{ STATIC_URL }}oscar/js/oscar/ui.js" type="text/javascript" charset="utf-8"></script>
{% include "partials/extrascripts.html" %}
{% endblock %}