Commit f12236c6 authored by Andreas Åkre Solberg's avatar Andreas Åkre Solberg
Browse files

Restructure listing of VMs with descriptions etc.

parent de1c43ce
Pipeline #2951 passed with stages
in 1 minute and 34 seconds
......@@ -29,6 +29,10 @@ class Machine {
view.may.stop = true;
}
if (view.fqdn === '') {
view.fqdn = null;
}
console.log(" ======= ======= ======= ======= ======= ======= ======= =======");
console.log(view);
......
......@@ -34,9 +34,9 @@
<thead>
<tr>
<th>Eier</th>
<th>VM navn</th>
<!-- <th>VM navn</th> -->
<th>Beskrivelse</th>
<th>IP adresse</th>
<!-- <th>IP adresse</th> -->
<th>VM Status</th>
<th>Instanstype</th>
......@@ -48,24 +48,25 @@
{{#vms}}
<tr>
<td>
<td rowspan="2" style="vertical-align: center; min-width: 250px">
{{#icon}}
<img style="margin-top: -7px; max-height: 40px; max-width: 40px; border: 0px solid #b6b6b6; box-shadow: 1px 1px 2px #aaa;" class="img-circle img-thumbnail" src="{{ icon }}" alt="Profile photo">
{{/icon}}
{{ owner }}</td>
<td>{{ name }}</td>
<!-- <td>{{ name }}</td> -->
<td>{{ extended_properties.vm_description }}</td>
<td class="ttcol">{{ publicIp }}</td>
<td>{{ provisioning_state }}</td>
<td><a target="_blank" href="https://docs.microsoft.com/nb-no/azure/virtual-machines/windows/sizes-general#av2-series">{{ vm_size }}</a></td>
<td>
<td rowspan="2">
{{#may.stop}}<i style="color: #484" class="glyphicon glyphicon-play"></i> {{/may.stop}}
{{#may.start}}<i style="color: red" class="glyphicon glyphicon-pause"></i> {{/may.start}}
{{ display_status }}</td>
<td>
<td rowspan="2">
{{#may.stop}}<button type="button" name="button" data-vmid="{{ name }}" class="vmstop btn btn-xs btn-default"><i class="glyphicon glyphicon-pause"></i> Stopp</button>{{/may.stop}}
{{#may.start}}<button type="button" name="button" data-vmid="{{ name }}" class="vmstart btn btn-xs btn-primary"><i class="glyphicon glyphicon-play"></i> Start</button>{{/may.start}}
{{#may.delete}}<button type="button" name="button" data-vmid="{{ name }}" class="vmdelete btn btn-xs btn-danger" ><i class="glyphicon glyphicon-remove"></i> Delete</button>{{/may.delete}}
......@@ -73,6 +74,21 @@
<!-- <button type="button" name="button" class="btn btn-xs btn-default"><i class="glyphicon glyphicon-console"></i> SSH</button> -->
</td>
</tr>
<tr>
<td colspan="3">
<tt style="padding-left: 2em; font-size: 80%">
{{#fqdn}}
{{.}}
{{/fqdn}}
{{^fqdn}}
{{ name }} -
{{ publicIp }}
{{/fqdn}}
</tt>
</td>
<!-- <td class="ttcol">{{ publicIp }}</td> -->
</tr>
{{/vms}}
</tbody>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment