changed virtual machine list
This commit is contained in:
		
					parent
					
						
							
								d71c3093e8
							
						
					
				
			
			
				commit
				
					
						8d81220202
					
				
			
		
					 4 changed files with 7 additions and 5 deletions
				
			
		| 
						 | 
					@ -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">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -98,7 +98,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>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -26,7 +26,7 @@
 | 
				
			||||||
				<thead> 
 | 
									<thead> 
 | 
				
			||||||
				<tr> 
 | 
									<tr> 
 | 
				
			||||||
					<th>{% trans "ID"%}</th>
 | 
										<th>{% trans "ID"%}</th>
 | 
				
			||||||
					<th>{% trans "Amount"%}</th>
 | 
										<th>{% trans "Ipv4"%}</th>
 | 
				
			||||||
					<th>{% trans "Status"%}</th>
 | 
										<th>{% trans "Status"%}</th>
 | 
				
			||||||
					<th></th>
 | 
										<th></th>
 | 
				
			||||||
				</tr>
 | 
									</tr>
 | 
				
			||||||
| 
						 | 
					@ -35,7 +35,9 @@
 | 
				
			||||||
					{% 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.ip %}
 | 
				
			||||||
 | 
											<td>{{vm.price}}</td> 
 | 
				
			||||||
 | 
					                        {% endif %}
 | 
				
			||||||
						<td>
 | 
											<td>
 | 
				
			||||||
                           
 | 
					                           
 | 
				
			||||||
							{% if vm.state == 'ACTIVE' %}
 | 
												{% if vm.state == 'ACTIVE' %}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue