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

Fix conflicts

Browse source
This commit is contained in:
Henry Bravo 2017-06-05 14:55:41 -05:00
commit c69694274f
26 changed files with 533 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hosting/templates/hosting/create_virtual_machine.html
View file

@ -21,7 +21,7 @@
<form method="POST" action="">
{% csrf_token %}
<div class="form-group">
Select VM Template:
{% trans "Select VM Template:" %}
<select name="vm_template_id">
{% for template in templates %}
<option value="{{template.id}}">{{template.name}} </option>
@ -29,14 +29,14 @@
</select>
</div>
<div class="form-group">
Select VM Configuration:
{% trans "Select VM Configuration:" %}
<select name="configuration">
{% for config in configuration_options %}
<option value="{{config.id}}">
CORE: {{config.cpu|floatformat}},
RAM: {{config.memory|floatformat}} GiB,
SSD: {{config.disk_size|floatformat}} GiB,
PRICE: {{config.price|floatformat}} CHF/Month
RAM: {{config.memory|floatformat}} GB,
SSD: {{config.disk_size|floatformat}} GB,
PRICE: {{config.price|floatformat}} {% trans "CHF/Month" %}
</option>
{% endfor %}
</select>