diff --git a/ui/src/components/widgets/ListView.vue b/ui/src/components/widgets/ListView.vue index 9c15a4544d4..3b13303c708 100644 --- a/ui/src/components/widgets/ListView.vue +++ b/ui/src/components/widgets/ListView.vue @@ -33,7 +33,7 @@ {{ text }} - + diff --git a/ui/src/components/widgets/Status.vue b/ui/src/components/widgets/Status.vue index cf3065cc99f..22c95336076 100644 --- a/ui/src/components/widgets/Status.vue +++ b/ui/src/components/widgets/Status.vue @@ -47,8 +47,10 @@ export default { case 'Started': status = 'success' break - case 'Stopped': + case 'Disabled': + case 'Down': case 'Error': + case 'Stopped': status = 'error' break case 'Migrating': diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js index 6c759904ea2..30a76360832 100644 --- a/ui/src/config/section/compute.js +++ b/ui/src/config/section/compute.js @@ -117,6 +117,12 @@ export default { label: 'Reset SSH Key', dataView: true }, + { + api: 'assignVirtualMachine', + icon: 'user-add', + label: 'Assign Instance to Another Account', + dataView: true + }, { api: 'destroyVirtualMachine', icon: 'delete', diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue index 76ebec2fc03..8a74e2528c0 100644 --- a/ui/src/views/AutogenView.vue +++ b/ui/src/views/AutogenView.vue @@ -3,7 +3,7 @@ - + {{ action.label }} @@ -322,6 +322,7 @@ export default { this.columns.push({ title: this.$t(key), dataIndex: key, + width: key === 'state' ? '8%' : '', scopedSlots: { customRender: key }, sorter: (a, b) => String(a[key]).length - String(b[key]).length }) diff --git a/ui/src/views/compute/InstanceView.vue b/ui/src/views/compute/InstanceView.vue index f8309921bfe..f94be6852a8 100644 --- a/ui/src/views/compute/InstanceView.vue +++ b/ui/src/views/compute/InstanceView.vue @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ Dynamic Scalable - + {{ vm.state }} @@ -43,26 +43,23 @@ {{ (totalStorage / (1024 * 1024 * 1024.0)).toFixed(2) }} GB Storage ({{ vm.templatename }}) - - Disk Read {{ vm.diskkbsread }} KB - Disk Write {{ vm.diskkbswrite }} KB - - - Disk Read (IO) {{ vm.diskioread }} - Disk Write (IO) {{ vm.diskiowrite }} - + + Read {{ vm.diskkbsread }} KB + Write {{ vm.diskkbswrite }} KB + Read (IO) {{ vm.diskioread }} + Write (IO) {{ vm.diskiowrite }} + - - {{ vm && vm.nic ? vm.nic.length : 0 }} NIC(s): - RX {{ vm.networkkbsread }} KB - TX {{ vm.networkkbswrite }} KB + + RX {{ vm.networkkbsread }} KB + TX {{ vm.networkkbswrite }} KB - - {{ eth.ipaddress }} ({{ eth.networkname }}) - + + eth{{ index }} {{ eth.ipaddress}} ({{ eth.networkname }}) + @@ -189,7 +186,7 @@ - {{ item.id }} + {{ item.id }} @@ -382,7 +379,7 @@ export default { height: 100%; min-height: 100%; transition: 0.3s; - .account-center-avatarHolder { + .resource-details { text-align: center; margin-bottom: 24px; & > .avatar { @@ -406,10 +403,11 @@ export default { margin-bottom: 4px; } } - .account-center-detail { + .resource-center-detail { p { margin-bottom: 8px; padding-left: 12px; + padding-right: 12px; position: relative; font-awesome-icon, .svg-inline--fa {
{{ vm.state }}
- - {{ vm && vm.nic ? vm.nic.length : 0 }} NIC(s): - RX {{ vm.networkkbsread }} KB - TX {{ vm.networkkbswrite }} KB + + RX {{ vm.networkkbsread }} KB + TX {{ vm.networkkbswrite }} KB - - {{ eth.ipaddress }} ({{ eth.networkname }}) - + + eth{{ index }} {{ eth.ipaddress}} ({{ eth.networkname }}) +
@@ -189,7 +186,7 @@