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

Fix some minor visual things.

Browse source
This commit is contained in:
Víðir Valberg Guðmundsson 2019-03-27 09:51:48 +01:00
parent 313ce98f8a
commit 5db3b8bf23
3 changed files with 133 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/profiles/templates/account/password_change.html
View file

@ -16,7 +16,7 @@
<form class="login" method="POST"> <form class="login" method="POST">
{% csrf_token %} {% csrf_token %}
{% bootstrap_form form %} {% bootstrap_form form %}
<button class="form-control btn btn-primary" type="submit">Save</button> <button class="btn btn-primary" type="submit">Save</button>
</form> </form>
</div> </div>
</div> </div>

24
src/profiles/templates/shop/order_detail.html
View file

@ -4,12 +4,11 @@
{% block profile_content %} {% block profile_content %}
<div class="panel-group">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel panel-heading"> <div class="panel-heading">
<h4>Details for Order #{{ order.id }}</h4> <h4>Details for Order #{{ order.id }}</h4>
</div> </div>
<div class="panel panel-body"> <div class="panel-body">
{% if not order.paid %} {% if not order.paid %}
<form method="POST" class="form-inline"> <form method="POST" class="form-inline">
{% csrf_token %} {% csrf_token %}
@ -91,23 +90,30 @@
</div> </div>
{% if order.paid %} {% if order.paid %}
<div class="panel panel-footer"> <div class="panel-footer">
<h4>Your order is paid in full.</h4> <h4>Your order is paid in full.</h4>
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% if not order.paid %} {% if not order.paid %}
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel panel-heading"> <div class="panel-heading">
<h4>Terms and Payment Options</h4><i class="icon-btc"></i> <h4>Terms and Payment Options</h4><i class="icon-btc"></i>
</div> </div>
<div class="panel panel-body"> <div class="panel-body">
<form method="POST" class="form-inline"> <form method="POST" class="form-inline">
{% csrf_token %} {% csrf_token %}
<div class="checkbox" style="margin-top: -10px;"> <div class="checkbox" style="margin-top: -10px;">
<label><input type="checkbox" name="accept_terms"> I accept the <a href="{% url 'general-terms' %}">general terms &amp; conditions</a>. Finally I accept to adhere to our <a href="{% url 'conduct' %}">Code of Conduct</a> during events as well as in BornHack online channels.</label> <label>
<input type="checkbox" name="accept_terms" />
I accept the <a href="{% url 'general-terms' %}">general terms &amp; conditions</a>.
Finally I accept to adhere to our <a href="{% url 'conduct' %}">Code of Conduct</a>
during events as well as in BornHack online channels.
</label>
</div> </div>
<div class="btn-group btn-group-justified"> <div class="btn-group btn-group-justified">
<div class="btn-group"> <div class="btn-group">
{% bootstrap_button "<i class='glyphicon glyphicon-bitcoin'></i> Blockchain" button_type="submit" button_class="btn-primary" name="payment_method" value="blockchain" %} {% bootstrap_button "<i class='glyphicon glyphicon-bitcoin'></i> Blockchain" button_type="submit" button_class="btn-primary" name="payment_method" value="blockchain" %}
@ -125,12 +131,12 @@
</form> </form>
<div class="alert alert-info" style="margin-top: 5px; margin-bottom: -10px;">* Please consider the alternatives before choosing credit card. Credit cards are expensive and difficult for us to handle. Thank you!</div> <div class="alert alert-info" style="margin-top: 5px; margin-bottom: -10px;">* Please consider the alternatives before choosing credit card. Credit cards are expensive and difficult for us to handle. Thank you!</div>
</div> </div>
<div class="panel panel-footer"> <div class="panel-footer">
<i>Bank transfers take up to a week to get registered, but the other <i>Bank transfers take up to a week to get registered, but the other
payment methods should be more or less instant. Please payment methods should be more or less instant. Please
<a href="{% url 'contact' %}">contact us</a> if your have questions.</i> <a href="{% url 'contact' %}">contact us</a> if your have questions.</i>
</div> </div>
</div> </div>
{% endif %} {% endif %}
</div>
{% endblock %} {% endblock %}

2
src/profiles/templates/tickets/ticket_detail.html
View file

@ -15,7 +15,7 @@
{% csrf_token %} {% csrf_token %}
{% bootstrap_field form.name %} {% bootstrap_field form.name %}
{% bootstrap_field form.email %} {% bootstrap_field form.email %}
<button class="btn btn-primary form-control" type="submit"><i class="glyphicon glyphicon-check"></i> Save</button> <button class="btn btn-primary" type="submit"><i class="glyphicon glyphicon-check"></i> Save</button>
</form> </form>
</div> </div>