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

Doing previous orders button a bit more prominent

Browse source
This commit is contained in:
Víðir Valberg Guðmundsson 2016-05-30 18:54:40 +02:00
parent e9adcdd1cf
commit c214036c51
3 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bornhack/static_src/css/bornhack.css
View file

@ -83,6 +83,11 @@ a, a:active, a:focus {
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
} }
.btn-grey {
background-color: #777;
color: rgb(255, 255, 255);
}
#map { #map {
height: 500px; height: 500px;
} }

16
shop/templates/shop_base.html
View file

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

15
shop/templates/shop_index.html
View file

@ -2,22 +2,19 @@
{% load bootstrap3 %} {% load bootstrap3 %}
{% load shop_tags %} {% load shop_tags %}
{% block shop_content %} {% block shop_left_top %}
<div class="row">
<div class="col-md-12">
<p> <p>
Categories: Categories:
{% 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 %}">
{{category}} {{category}}
</a>&nbsp; </a>&nbsp;
{% endfor %}</p> {% endfor %}
<p><i>Looking for your <a href="{% url 'shop:order_list' %}">previous orders</a>?</i></p> </p>
</div> {% endblock %}
</div>
{% block shop_content %}
<hr /> <hr />
<div class="row"> <div class="row">