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

Merge pull request #266 from levivm/develop

Browse source 
Develop
This commit is contained in:
Levi Velázquez 2017-05-23 11:51:07 -05:00 committed by GitHub
commit 9dee72a91c
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
datacenterlight/templates/datacenterlight/index.html
View file

@ -227,7 +227,7 @@
<h3>{% trans "VM hosting" %} </h3> <h3>{% trans "VM hosting" %} </h3>
</div> </div>
<div class="price"> <div class="price">
<span>15CHF</span> <span>15CHF/month</span>
</div> </div>
<div class="descriptions"> <div class="descriptions">
<div class="description"> <div class="description">

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

@ -36,7 +36,7 @@
CORE: {{config.cpu|floatformat}}, CORE: {{config.cpu|floatformat}},
RAM: {{config.memory|floatformat}} GiB, RAM: {{config.memory|floatformat}} GiB,
SSD: {{config.disk_size|floatformat}} GiB, SSD: {{config.disk_size|floatformat}} GiB,
PRICE: {{config.price|floatformat}} CHF PRICE: {{config.price|floatformat}} CHF/Month
</option> </option>
{% endfor %} {% endfor %}
</select> </select>

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

@ -104,7 +104,7 @@
<div class="row "> <div class="row ">
<div class="col-md-12 inline-headers"> <div class="col-md-12 inline-headers">
<h3>{% trans "Current pricing"%}</h3> <h3>{% trans "Current pricing"%}</h3>
<span class="h3 pull-right"><strong>{{virtual_machine.price|floatformat}} CHF</strong>/mo</span> <span class="h3 pull-right"><strong>{{virtual_machine.price|floatformat}} CHF</strong>/month</span>
<hr> <hr>
</div> </div>
</div> </div>

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

@ -26,7 +26,8 @@
<thead> <thead>
<tr> <tr>
<th>{% trans "ID"%}</th> <th>{% trans "ID"%}</th>
<th>{% trans "Amount"%}</th> <th>{% trans "Ipv4"%}</th>
<th>{% trans "Ipv6"%}</th>
<th>{% trans "Status"%}</th> <th>{% trans "Status"%}</th>
<th></th> <th></th>
</tr> </tr>
@ -35,7 +36,12 @@
{% for vm in vms %} {% for vm in vms %}
<tr> <tr>
<td scope="row">{{vm.vm_id}}</td> <td scope="row">{{vm.vm_id}}</td>
<td>{{vm.price}} CHF</td> {% if virtual_machine.ipv6
<td>{{virtual_machine.ipv4}}</td>
<td>{{virtual_machine.ipv6}}</td>
{% endif %}
<td> <td>
{% if vm.state == 'ACTIVE' %} {% if vm.state == 'ACTIVE' %}