ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

Merge pull request #345 from pcoder/bug/3237/GiB_to_GB

Browse source 
Replaced all GiB to GB
This commit is contained in:
Levi Velázquez 2017-06-15 11:08:09 -05:00 • committed by GitHub
commit cd0c4ff1f1
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hosting/templates/hosting/bill_detail.html
View file

@ -49,8 +49,8 @@
<tr> <tr>
<td>{{ vm.name }}</td> <td>{{ vm.name }}</td>
<td><span class="pull-right">{{ vm.cores }}</span></td> <td><span class="pull-right">{{ vm.cores }}</span></td>
<td><span class="pull-right">{{ vm.memory|floatformat }} GiB </span></td> <td><span class="pull-right">{{ vm.memory|floatformat }} GB </span></td>
<td><span class="pull-right">{{ vm.disk_size|floatformat }} GiB </span></td> <td><span class="pull-right">{{ vm.disk_size|floatformat }} GB </span></td>
<td><span class="pull-right">{{ vm.price|floatformat }} CHF</span></td> <td><span class="pull-right">{{ vm.price|floatformat }} CHF</span></td>
</tr> </tr>

6
hosting/templates/hosting/includes/_pricing.html
View file

@ -42,14 +42,14 @@
<li> <li>
<div class="form-group"> <div class="form-group">
<div class="btn-group"> <div class="btn-group">
<label for="memory">Memory: {{vm.memory}} GiB</label> <label for="memory">Memory: {{vm.memory}} GB</label>
</div> </div>
</div> </div>
</li> </li>
<li> <li>
<div class="form-group row"> <div class="form-group row">
<div class="col-xs-offset-1 col-xs-9 col-sm-12 col-md-12 col-md-offset-0"> <div class="col-xs-offset-1 col-xs-9 col-sm-12 col-md-12 col-md-offset-0">
<label for="Disk Size">Disk Size: {{vm.disk_size}} GiB</label> <label for="Disk Size">Disk Size: {{vm.disk_size}} GB</label>
</div> </div>
</div> </div>
</li> </li>
@ -79,4 +79,4 @@
</div> </div>
</div> </div>
</div> </div>

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

@ -51,9 +51,9 @@
<div class="content"> <div class="content">
<p><b>{% trans "Cores"%}</b> <span class="pull-right">{{vm.cores}}</span></p> <p><b>{% trans "Cores"%}</b> <span class="pull-right">{{vm.cores}}</span></p>
<hr> <hr>
<p><b>{% trans "Memory"%}</b> <span class="pull-right">{{vm.memory}} GiB</span></p> <p><b>{% trans "Memory"%}</b> <span class="pull-right">{{vm.memory}} GB</span></p>
<hr> <hr>
<p><b>{% trans "Disk space"%}</b> <span class="pull-right">{{vm.disk_size}} GiB</span></p> <p><b>{% trans "Disk space"%}</b> <span class="pull-right">{{vm.disk_size}} GB</span></p>
<hr> <hr>
<h4>{% trans "Total"%}<p class="pull-right"><b>{{vm.price}} CHF</b></p></h4> <h4>{% trans "Total"%}<p class="pull-right"><b>{{vm.price}} CHF</b></p></h4>
</div> </div>

4
hosting/templates/hosting/payment.html
View file

@ -18,10 +18,10 @@
class="pull-right">{{request.session.specs.cpu|floatformat}}</span></p> class="pull-right">{{request.session.specs.cpu|floatformat}}</span></p>
<hr> <hr>
<p><b>{%trans "Memory"%}</b> <span <p><b>{%trans "Memory"%}</b> <span
class="pull-right">{{request.session.specs.memory|floatformat}} GiB</span></p> class="pull-right">{{request.session.specs.memory|floatformat}} GB</span></p>
<hr> <hr>
<p><b>{%trans "Disk space"%}</b> <span <p><b>{%trans "Disk space"%}</b> <span
class="pull-right">{{request.session.specs.disk_size|floatformat}} GiB</span></p> class="pull-right">{{request.session.specs.disk_size|floatformat}} GB</span></p>
<hr> <hr>
<h4>Total<p <h4>Total<p
class="pull-right"><b>{{request.session.specs.price }} CHF</b></p></h4> class="pull-right"><b>{{request.session.specs.price }} CHF</b></p></h4>

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

@ -80,14 +80,14 @@
<div class="col-md-3"> <div class="col-md-3">
<div class="well text-center box-setting"> <div class="well text-center box-setting">
<i class="fa fa-tachometer" aria-hidden="true"></i> {% trans "Memory"%} <br/> <i class="fa fa-tachometer" aria-hidden="true"></i> {% trans "Memory"%} <br/>
<span class="label label-success">{{virtual_machine.memory}} GiB</span> <span class="label label-success">{{virtual_machine.memory}} GB</span>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="well text-center box-setting"> <div class="well text-center box-setting">
<i class="fa fa-hdd-o" aria-hidden="true"></i> <i class="fa fa-hdd-o" aria-hidden="true"></i>
<span>{% trans "Disk"%}</span> <span>{% trans "Disk"%}</span>
<span class="label label-success">{{virtual_machine.disk_size|floatformat:2}} GiB</span> <span class="label label-success">{{virtual_machine.disk_size|floatformat:2}} GB</span>
</div> </div>
</div> </div>
</div><!--/row--> </div><!--/row-->