reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

Html design is hard...

Browse source
This commit is contained in:
Víðir Valberg Guðmundsson 2016-05-30 19:58:58 +02:00
parent 2fdfacc4d7
commit 8981f0a387
2 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shop/templates/shop_base.html
View file

@ -2,13 +2,8 @@
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-12">
{% block shop_left_top %}
{% endblock %}
</div>
<div class="col-md-6">
<div class="pull-right"> <div class="pull-right">
{% if user.is_authenticated and user.orders.exists %} {% if user.is_authenticated and user.orders.exists %}
<a href="{% url 'shop:order_list' %}" class="btn btn-grey">Previous orders</a> <a href="{% url 'shop:order_list' %}" class="btn btn-grey">Previous orders</a>
@ -17,7 +12,6 @@
</div> </div>
</div> </div>
{% block shop_content %} {% block shop_content %}
{% endblock %} {% endblock %}

10
shop/templates/shop_index.html
View file

@ -2,9 +2,11 @@
{% load bootstrap3 %} {% load bootstrap3 %}
{% load shop_tags %} {% load shop_tags %}
{% block shop_left_top %} {% block shop_content %}
<div class="row">
<div class="col-md-12">
<p> <p>
Categories: Categories:<br />
{% for category in categories %} {% for category in categories %}
<a href="{% url 'shop:index' %}?category={{category.slug}}" <a href="{% url 'shop:index' %}?category={{category.slug}}"
class="label label-{% if category.slug == current_category %}primary{% else %}default{% endif %}"> class="label label-{% if category.slug == current_category %}primary{% else %}default{% endif %}">
@ -12,9 +14,9 @@
</a>&nbsp; </a>&nbsp;
{% endfor %} {% endfor %}
</p> </p>
{% endblock %} </div>
</div>
{% block shop_content %}
<hr /> <hr />
<div class="row"> <div class="row">