amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ungleich/dynamicweb into develop

Browse source
This commit is contained in:
Henry Bravo 2017-05-25 13:31:16 -05:00
commit 549acd400a
71 changed files with 151 additions and 4129 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosting/templates/hosting/order_detail.html
View file

@ -61,7 +61,7 @@
{% url 'hosting:payment' as payment_url %}
{% if payment_url in request.META.HTTP_REFERER %}
<div class=" content pull-right">
<a href="{% url 'hosting:key_pair'%}" ><button class="btn btn-info">{% trans "Finish Configuration"%}</button></a>
<a href="{% url 'hosting:virtual_machines'%}" ><button class="btn btn-info">{% trans "Finish Configuration"%}</button></a>
</div>
{% endif %}
</div>

1
hosting/templates/hosting/virtual_machine_key.html
View file

@ -112,7 +112,6 @@
</script>
{%endif%}
{% if next_url %}
<script type="text/javascript">
window.location.href = '{{next_url}}';