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

small CoC related corrections

Browse source
This commit is contained in:
Thomas Steen Rasmussen 2016-06-06 17:39:51 +02:00
parent 219ad2e5fd
commit 88adb6352d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bornhack/templates/coc.html
View file

@ -29,9 +29,10 @@
<ul> <ul>
<li>Find a member of event staff and let them know. All our volunteer staff will be briefed on how to handle a harassment situation.</li> <li>Find a member of event staff and let them know. All our volunteer staff will be briefed on how to handle a harassment situation.</li>
<li>Drop us an email at conduct@bornhack.org</li> <li>Drop us an email at conduct@bornhack.org</li>
<li>Call the duty officer on +4527808090 (24 hours)</li>
</ul> </ul>
</p> </p>
<p>If you have any comments or queries, you can get in touch with our comfort team at conduct@bornhack.org.</p> <p>If you have any comments or queries, you can get in touch with our conduct team at conduct@bornhack.org.</p>
{% endblock %} {% endblock %}

2
shop/templates/order_detail.html
View file

@ -85,7 +85,7 @@ quantities - so make sure your order is correct before proceeding!</p>
{% csrf_token %} {% csrf_token %}
<p> <p>
<div class="checkbox"> <div class="checkbox">
<label><input type="checkbox" name="accept_terms"> Accept <a href="{% url 'general-terms' %}">general terms &amp; conditions</a>. If you have puchased merchandise you also accept that the payment will be drawn on your account when you pay, but the merchandise will not be delivered until you pick it up during the event. Finally you accept to adhere to our <a href="{% url 'conduct' %}">Code of Conduct</a> during the event as well as online.</label> <label><input type="checkbox" name="accept_terms"> Accept <a href="{% url 'general-terms' %}">general terms &amp; conditions</a>. If you have puchased merchandise you also accept that the payment will be drawn on your account when you pay, but the merchandise will not be delivered until you pick it up during the event. Finally you accept to adhere to our <a href="{% url 'conduct' %}">Code of Conduct</a> during the event as well as in our online channels.</label>
</div> </div>
</p> </p>
{% 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" %}