diff options
| author | Ian Moore <ian.moore@fireeye.com> | 2015-08-08 18:28:58 -0400 |
|---|---|---|
| committer | Ian Moore <ian.moore@fireeye.com> | 2015-08-08 18:28:58 -0400 |
| commit | 8abdc86733317e83848962e499434e5233b9e792 (patch) | |
| tree | 81d54130059062f34fd1f6c6b5adeca913efb247 | |
| parent | f10958502572efa46f396f14c7016a6c0ec79104 (diff) | |
| download | phpvirtualbox-8abdc86733317e83848962e499434e5233b9e792.zip phpvirtualbox-8abdc86733317e83848962e499434e5233b9e792.tar.gz phpvirtualbox-8abdc86733317e83848962e499434e5233b9e792.tar.bz2 | |
Show disk encryption settings in details
| -rw-r--r-- | js/phpvirtualbox.js | 3 | ||||
| -rw-r--r-- | panes/settingsStorage.html | 11 |
2 files changed, 11 insertions, 3 deletions
diff --git a/js/phpvirtualbox.js b/js/phpvirtualbox.js index abd7ca6..1b7225e 100644 --- a/js/phpvirtualbox.js +++ b/js/phpvirtualbox.js @@ -2359,8 +2359,9 @@ var vboxMedia = { */ mediumPrint: function(m,nosize,usehtml) { var name = vboxMedia.getName(m); + var enc = vboxMedia.getEncryptionSettings(m); if(nosize || !m || m.hostDrive) return name; - return name + ' (' + (m.deviceType == 'HardDisk' ? (usehtml ? '<i>': '') + trans(m.type,'VBoxGlobal', null, 'MediumType') + (usehtml ? '</i>': '') + ', ': '') + vboxMbytesConvert(m.logicalSize) + ')'; + return name + ' (' + (m.deviceType == 'HardDisk' ? trans(m.type,'VBoxGlobal', null, 'MediumType') + ', ' + (enc && enc.id ? trans('Encrypted', 'VBoxGlobal') + ', ' : '') : '') + vboxMbytesConvert(m.logicalSize) + ')'; }, /** diff --git a/panes/settingsStorage.html b/panes/settingsStorage.html index d02204d..5056343 100644 --- a/panes/settingsStorage.html +++ b/panes/settingsStorage.html @@ -154,6 +154,10 @@ <td><span id='vboxSettingsHDattached' class='vboxRunningEnabled'>Some Virtual
Machine Name</span></td>
</tr>
+ <tr>
+ <th><span class='translate vboxRunningEnabled'>Encrypted with key:</span></th>
+ <td><span id='vboxSettingsHDEncrypted' class='vboxRunningEnabled'>--</span></td>
+ </tr>
</table>
</div>
@@ -1446,13 +1450,16 @@ function vboxSettingsSelectAttachment(tbl) { var disp = vboxMedia.getMediumById(m.base);
name = vboxMedia.getName(disp);
-
+
+ var encSettings = vboxMedia.getEncryptionSettings(disp);
+
$('#vboxSettingsHDvsize').html(vboxMbytesConvert(disp.logicalSize));
$('#vboxSettingsHDasize').html(vboxBytesConvert(disp.size));
$('#vboxSettingsHDDetails').html(vboxMedia.getHardDiskVariant(disp));
$('#vboxSettingsHDlocation').html(disp.location);
$('#vboxSettingsHDtype').html(trans(disp.type,'VBoxGlobal') + ' (' + disp.format + ')');
- $('#vboxSettingsHDattached').html(vboxMedia.attachedTo(disp));
+ $('#vboxSettingsHDattached').html(vboxMedia.attachedTo(disp));
+ $('#vboxSettingsHDEncrypted').html(encSettings && encSettings.id ? encSettings.id : '--');
} else {
|