-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #637 from informa/issue/557/demo
Browse.html styling
- Loading branch information
Showing
12 changed files
with
300 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,7 +30,7 @@ body { | |
.page { | ||
} | ||
.page_inner { | ||
padding:@gridGutterWidth; | ||
padding:@gridGutterWidth 0; | ||
.clearfix(); | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
{% extends "oscar/catalogue/browse.html" %} | ||
|
||
{% load currency_filters %} | ||
{% load basket_tags %} | ||
{% load promotion_tags %} | ||
{% load product_tags %} | ||
{% load i18n %} | ||
|
||
{% block header %}{% endblock %} | ||
|
||
{% block content %} | ||
|
||
<div class="category-title"> | ||
{% if category.image %} | ||
<img src="{{ category.image.url }}" alt="{{ summary }}" /> | ||
{% endif %} | ||
<div> | ||
<h1>{{ summary }}</h1> | ||
{% if category.description %} | ||
<p>{{ category.description|safe|truncatechars:250 }}</p> | ||
{% endif %} | ||
</div> | ||
</div> | ||
|
||
|
||
{% if products.count %} | ||
<section> | ||
<div class="mod"> | ||
<ol class="products four"> | ||
{% for product in products %} | ||
<li {% if forloop.counter|divisibleby:"4" %}class="no-margin"{% endif %}>{% render_product product %}</li> | ||
{% endfor %} | ||
</ol> | ||
{% include "partials/pagination.html" %} | ||
</div> | ||
</section> | ||
{% else %} | ||
<p class="nonefound">{% trans "No products found." %}</p> | ||
{% endif %} | ||
{% endblock content %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
{% extends "oscar/catalogue/detail.html" %} | ||
{% load currency_filters %} | ||
{% load history_tags %} | ||
{% load reviews_tags %} | ||
{% load staticfiles %} | ||
{% load product_tags %} | ||
{% load i18n %} | ||
|
||
{% block product_gallery %} | ||
<div class="span6"> | ||
{# change this to flexslider } | ||
</div> | ||
{% endblock %} | ||
|
||
|
||
{% block product_main %} | ||
<div class="span6"> | ||
<h4>{{ product.stockrecord.partner.name }}</h4> | ||
<h1>{{ product.get_title }}</h1> | ||
|
||
{% block product_stock_record %} | ||
{% include "catalogue/partials/stock_record.html" %} | ||
{% endblock %} | ||
|
||
{% comment %} | ||
{# will use this else where} | ||
{% if product.rating != None %} | ||
<p class="star {{ product.rating|as_stars }}"> | ||
<small><a href="{% url catalogue:reviews-list product.slug product.id %}"> | ||
{% blocktrans count reviews|length as num_reviews %} | ||
1 custom review | ||
{% plural %} | ||
{{ num_reviews }} customer reviews | ||
{% endblocktrans %} | ||
</a></small> | ||
| ||
<a id="write_review" href="{% url catalogue:reviews-add product.slug product.id %}#addreview" class="btn btn-success btn-small">{% trans "Write a review" %}</a> | ||
</p> | ||
{% else %} | ||
<p class="star"> | ||
<a id="write_review" href="{% url catalogue:reviews-add product.slug product.id %}#addreview" class="btn btn-success btn-small">{% trans "Write a review" %}</a> | ||
</p> | ||
{% endif %} | ||
{% endcomment %} | ||
|
||
<hr/> | ||
|
||
{% block product_basket_form %} | ||
{% include "catalogue/partials/add_to_basket_form.html" %} | ||
{% endblock %} | ||
</div><!-- /span6 --> | ||
{% endblock %} |
13 changes: 13 additions & 0 deletions
13
sites/demo/templates/catalogue/partials/add_to_basket_form_compact.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{% load basket_tags %} | ||
{% load i18n %} | ||
|
||
{% basket_form request.basket product as basket_form single %} | ||
<form action="{% url basket:add %}" method="post"> | ||
{% csrf_token %} | ||
{{ basket_form.as_p }} | ||
{% if product.is_available_to_buy %} | ||
<button type="submit" class="btn btn-block btn-primary btn-full">{% trans "Add to basket" %}</button> | ||
{% else %} | ||
<span class="btn btn-info btn-block disabled">{% trans "Out of Stock" %}</span> | ||
{% endif %} | ||
</form> |
Oops, something went wrong.