diff --git a/bornhack/static_src/css/bornhack.css b/bornhack/static_src/css/bornhack.css index 2943fcfc..09078f53 100644 --- a/bornhack/static_src/css/bornhack.css +++ b/bornhack/static_src/css/bornhack.css @@ -105,3 +105,7 @@ footer { bottom: 0px; padding: 5px; } + +.breadcrumb > li.pull-right::before { + content: ""; +} diff --git a/shop/templates/product_detail.html b/shop/templates/product_detail.html index 0d47aa14..7e546ab9 100644 --- a/shop/templates/product_detail.html +++ b/shop/templates/product_detail.html @@ -3,23 +3,52 @@ {% block shop_content %} -
+
{{ product.description }} -
+ ++ This product is available from + {{ product.available_in.lower|date:"Y-m-d H:i" }} +
+ + {% endif %} + + {% else %} Signup or login -to order this product -{% endif %} -{% endblock %} + to order this product + {% endif %} + {% endblock %} + +
Categories:
{% for category in categories %}
+ class="label label-{% if category.slug == current_category.slug %}primary{% else %}default{% endif %}">
{{category}}
{% endfor %}
diff --git a/shop/views.py b/shop/views.py
index e7c85b33..2f0c9125 100644
--- a/shop/views.py
+++ b/shop/views.py
@@ -110,7 +110,7 @@ class ShopIndexView(ListView):
context['products'] = context['products'].filter(
category__slug=category
)
- context['current_category'] = category
+ context['current_category'] = categoryobj
context['categories'] = ProductCategory.objects.annotate(
num_products=Count('products')
).filter(