mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-25 20:01:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update ELEC Templates

Browse Source
This commit is contained in:
SimonFair
2022-08-16 18:22:52 +01:00
parent 75da483e81
commit 172f78513f
3 changed files with 218 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.vm.manager/templates/Custom.form.php
+3 -3
View File
@@ -892,18 +892,18 @@
<tr id="autoportline" name="autoportline" class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced autoportline">
<td>_(VM Console AutoPort)_:</td>
<td>
<select <?=$disabled?> id="autoport" name="gpu[<?=$i?>][autoport]" class="narrow" onchange="AutoportChange(this)">
<select id="autoport" name="gpu[<?=$i?>][autoport]" class="narrow" onchange="AutoportChange(this)">
<?
echo mk_option($arrGPU['autoport'], 'yes', _('Yes'));
echo mk_option($arrGPU['autoport'], 'no', _('No'));
?>
</select>
<span id="Porttext" <?=$disbaled?> <?=$hiddenport?>>_(VM Console Port)_:</span>
<span id="Porttext" <?=$hiddenport?>>_(VM Console Port)_:</span>
<input type="number" size="5" maxlength="5" id="port" name="gpu[<?=$i?>][port]" title="_(port for virtual console)_" value="<?=$arrGPU['port']?>" <?=$hiddenport?> >
<span id="WSPorttext" <?=$disbaled?> <?=$hiddenwsport?>>_(VM Console WS Port)_:</span>
<span id="WSPorttext" <?=$hiddenwsport?>>_(VM Console WS Port)_:</span>
<input type="number" size="5" maxlength="5" id="wsport" name="gpu[<?=$i?>][wsport]" title="_(wsport for virtual console)_" value="<?=$arrGPU['wsport']?>" <?=$hiddenwsport?> >
</td>
plugins/dynamix.vm.manager/templates/LibreELEC.form.php
+111 -10
View File
@@ -28,6 +28,7 @@
$arrValidOtherDevices = getValidOtherDevices();
$arrValidUSBDevices = getValidUSBDevices();
$arrValidDiskDrivers = getValidDiskDrivers();
$arrValidProtocols = getValidVMRCProtocols();
$arrValidNetworks = getValidNetworks();
$strCPUModel = getHostCPUModel();
@@ -235,9 +236,13 @@
],
'gpu' => [
[
'id' => '',
'mode' => 'qxl',
'keymap' => 'en-us'
'id' => 'virtual',
'protocol' => 'vnc',
'autoport' => 'yes',
'model' => 'qxl',
'keymap' => 'en-us',
'port' => -1 ,
'wsport' => -1
]
],
'audio' => [
@@ -706,8 +711,8 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
<select name="gpu[<?=$i?>][id]" class="gpu narrow">
<?
if ($i == 0) {
// Only the first video card can be VNC
echo mk_option($arrGPU['id'], 'vnc', _('VNC'));
// Only the first video card can be VNC or SPICE
echo mk_option($arrGPU['id'], 'virtual', _('Virtual'));
} else {
echo mk_option($arrGPU['id'], '', _('None'));
}
@@ -719,6 +724,43 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
</select>
</td>
</tr>
<?if ($i == 0) {
$hiddenport = $hiddenwsport = "" ;
if ($arrGPU['autoport'] == "no"){
if ($arrGPU['protocol'] == "vnc") $hiddenport = $hiddenwsport = "" ;
if ($arrGPU['protocol'] == "spice") $hiddenport = "" ;
}
?>
<tr class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced protocol">
<td>_(VM Console Protocol)_:</td>
<td>
<select id="protocol" name="gpu[<?=$i?>][protocol]" class="narrow" title="_(protocol for virtual console)_" onchange="ProtocolChange(this)" >
<?mk_dropdown_options($arrValidProtocols, $arrGPU['protocol']);?>
</select>
</td>
</tr>
<tr id="autoportline" name="autoportline" class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced autoportline">
<td>_(VM Console AutoPort)_:</td>
<td>
<select id="autoport" name="gpu[<?=$i?>][autoport]" class="narrow" onchange="AutoportChange(this)">
<?
echo mk_option($arrGPU['autoport'], 'yes', _('Yes'));
echo mk_option($arrGPU['autoport'], 'no', _('No'));
?>
</select>
<span id="Porttext" <?=$hiddenport?>>_(VM Console Port)_:</span>
<input type="number" size="5" maxlength="5" id="port" name="gpu[<?=$i?>][port]" title="_(port for virtual console)_" value="<?=$arrGPU['port']?>" <?=$hiddenport?> >
<span id="WSPorttext" <?=$hiddenwsport?>>_(VM Console WS Port)_:</span>
<input type="number" size="5" maxlength="5" id="wsport" name="gpu[<?=$i?>][wsport]" title="_(wsport for virtual console)_" value="<?=$arrGPU['wsport']?>" <?=$hiddenwsport?> >
</td>
</tr>
<tr><td><span id="WSPorttext" <?=$hiddenwsport?>>_(VM Console WS Port)_:</span></td>
</tr>
<?}?>
<tr class="<?if ($arrGPU['id'] == 'virtual') echo 'was';?>advanced romfile">
<td>_(Graphics ROM BIOS)_:</td>
<td>
@@ -730,8 +772,13 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
<blockquote class="inline_help">
<p>
<b>Graphics Card</b><br>
If you wish to assign a graphics card to the VM, select it from this list.
If you wish to assign a graphics card to the VM, select it from this list, otherwise leave it set to virtual.
</p>
<p class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced protocol">
<b>virtual video protocol VDA/SPICE</b><br>
If you wish to assign a protocol type, specify one here.
</p>
<p class="<?if ($arrGPU['id'] == 'virtual') echo 'was';?>advanced romfile">
<b>Graphics ROM BIOS</b><br>
@@ -835,7 +882,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
echo mk_option("", $key, "- "._($key)." -", "disabled");
foreach ($arrValidNetworks as $strNetwork) {
foreach ($arrValidNetworks[$key] as $strNetwork) {
echo mk_option($arrNic['network'], $strNetwork, $strNetwork);
}
}
@@ -895,7 +942,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
echo mk_option("", $key, "- "._($key)." -", "disabled");
foreach ($arrValidNetworks as $strNetwork) {
foreach ($arrValidNetworks[$key] as $strNetwork) {
echo mk_option($domain_bridge, $strNetwork, $strNetwork);
}
}
@@ -1000,7 +1047,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
</blockquote>
<?}?>
</div>
</div>
<div class="xmlview">
<textarea id="addcode" name="xmldesc" placeholder="_(Copy &amp; Paste Domain XML Configuration Here)_." autofocus><?=htmlspecialchars($hdrXML).htmlspecialchars($strXML)?></textarea>
@@ -1036,6 +1083,49 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
<script src="<?autov('/plugins/dynamix.vm.manager/scripts/codemirror/addon/hint/libvirt-schema.js')?>"></script>
<script src="<?autov('/plugins/dynamix.vm.manager/scripts/codemirror/mode/xml/xml.js')?>"></script>
<script type="text/javascript">
function AutoportChange(autoport) {
if (autoport.value === "yes") {
document.getElementById("port").style.visibility="hidden";
document.getElementById("Porttext").style.visibility="hidden";
document.getElementById("wsport").style.visibility="hidden";
document.getElementById("WSPorttext").style.visibility="hidden";
} else {
var protocol = document.getElementById("protocol").value ;
if (protocol === "vnc") {
document.getElementById("port").style.visibility="visible";
document.getElementById("Porttext").style.visibility="visible";
document.getElementById("wsport").style.visibility="visible";
document.getElementById("WSPorttext").style.visibility="visible";
} else {
document.getElementById("port").style.visibility="visible";
document.getElementById("Porttext").style.visibility="visible";
document.getElementById("wsport").style.visibility="hidden";
document.getElementById("WSPorttext").style.visibility="hidden";
}
}
}
function ProtocolChange(protocol) {
var autoport = document.getElementById("autoport").value ;
if (autoport === "yes") {
document.getElementById("port").style.visibility="hidden";
document.getElementById("Porttext").style.visibility="hidden";
document.getElementById("wsport").style.visibility="hidden";
document.getElementById("WSPorttext").style.visibility="hidden";
} else {
if (protocol.value === "vnc") {
document.getElementById("port").style.visibility="visible";
document.getElementById("Porttext").style.visibility="visible";
document.getElementById("wsport").style.visibility="visible";
document.getElementById("WSPorttext").style.visibility="visible";
} else {
document.getElementById("port").style.visibility="visible";
document.getElementById("Porttext").style.visibility="visible";
document.getElementById("wsport").style.visibility="hidden";
document.getElementById("WSPorttext").style.visibility="hidden";
}
}
}
$(function() {
function completeAfter(cm, pred) {
var cur = cm.getCursor();
@@ -1124,8 +1214,19 @@ $(function() {
var mylabel = $(this).children('option:selected').text();
var myindex = $(this).closest('table').data('index');
if (myindex == 0) {
$vnc_sections = $('.autoportline,.protocol,.vncmodel,.vncpassword,.vnckeymap');
if (myvalue == 'virtual') {
$vnc_sections.filter('.wasadvanced').removeClass('wasadvanced').addClass('advanced');
slideDownRows($vnc_sections.not(isVMAdvancedMode() ? '.basic' : '.advanced'));
} else {
slideUpRows($vnc_sections);
$vnc_sections.filter('.advanced').removeClass('advanced').addClass('wasadvanced');
}
}
$romfile = $(this).closest('table').find('.romfile');
if (myvalue == 'vnc' || myvalue == '') {
if (myvalue == 'virtual' || myvalue == '') {
slideUpRows($romfile.not(isVMAdvancedMode() ? '.basic' : '.advanced'));
$romfile.filter('.advanced').removeClass('advanced').addClass('wasadvanced');
} else {
plugins/dynamix.vm.manager/templates/OpenELEC.form.php
+104 -11
View File
@@ -30,6 +30,7 @@
$arrValidDiskDrivers = getValidDiskDrivers();
$arrValidNetworks = getValidNetworks();
$strCPUModel = getHostCPUModel();
$arrValidProtocols = getValidVMRCProtocols();
// Read localpaths in from openelec.cfg
$strOpenELECConfig = "/boot/config/plugins/dynamix.vm.manager/openelec.cfg";
@@ -235,9 +236,13 @@
],
'gpu' => [
[
'id' => '',
'mode' => 'qxl',
'keymap' => 'en-us'
'id' => 'virtual',
'protocol' => 'vnc',
'autoport' => 'yes',
'model' => 'qxl',
'keymap' => 'en-us',
'port' => -1 ,
'wsport' => -1
]
],
'audio' => [
@@ -706,8 +711,8 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
<select name="gpu[<?=$i?>][id]" class="gpu narrow">
<?
if ($i == 0) {
// Only the first video card can be VNC
echo mk_option($arrGPU['id'], 'vnc', _('VNC'));
// Only the first video card can be VNC or Spice
echo mk_option($arrGPU['id'], 'virtual', _('Virtual'));
} else {
echo mk_option($arrGPU['id'], '', _('None'));
}
@@ -719,7 +724,42 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
</select>
</td>
</tr>
<tr class="<?if ($arrGPU['id'] == 'vnc') echo 'was';?>advanced romfile">
<?if ($i == 0) {
$hiddenport = $hiddenwsport = "" ;
if ($arrGPU['autoport'] == "no"){
if ($arrGPU['protocol'] == "vnc") $hiddenport = $hiddenwsport = "" ;
if ($arrGPU['protocol'] == "spice") $hiddenport = "" ;
}
?>
<tr class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced protocol">
<td>_(VM Console Protocol)_:</td>
<td>
<select id="protocol" name="gpu[<?=$i?>][protocol]" class="narrow" title="_(protocol for virtual console)_" onchange="ProtocolChange(this)" >
<?mk_dropdown_options($arrValidProtocols, $arrGPU['protocol']);?>
</select>
</td>
</tr>
<tr id="autoportline" name="autoportline" class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced autoportline">
<td>_(VM Console AutoPort)_:</td>
<td>
<select id="autoport" name="gpu[<?=$i?>][autoport]" class="narrow" onchange="AutoportChange(this)">
<?
echo mk_option($arrGPU['autoport'], 'yes', _('Yes'));
echo mk_option($arrGPU['autoport'], 'no', _('No'));
?>
</select>
<span id="Porttext" <?=$hiddenport?>>_(VM Console Port)_:</span>
<input type="number" size="5" maxlength="5" id="port" name="gpu[<?=$i?>][port]" title="_(port for virtual console)_" value="<?=$arrGPU['port']?>" <?=$hiddenport?> >
<span id="WSPorttext" <?=$hiddenwsport?>>_(VM Console WS Port)_:</span>
<input type="number" size="5" maxlength="5" id="wsport" name="gpu[<?=$i?>][wsport]" title="_(wsport for virtual console)_" value="<?=$arrGPU['wsport']?>" <?=$hiddenwsport?> >
</td>
</tr>
<?}?>
<tr class="<?if ($arrGPU['id'] == 'virtual') echo 'was';?>advanced romfile">
<td>_(Graphics ROM BIOS)_:</td>
<td>
<input type="text" name="gpu[<?=$i?>][rom]" autocomplete="off" spellcheck="false" data-pickcloseonfile="true" data-pickfilter="rom,bin" data-pickmatch="^[^.].*" data-pickroot="/mnt/" value="<?=htmlspecialchars($arrGPU['rom'])?>" placeholder="_(Path to ROM BIOS file)_ (_(optional)_)" title="_(Path to ROM BIOS file)_ (_(optional)_)" />
@@ -733,7 +773,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
If you wish to assign a graphics card to the VM, select it from this list.
</p>
<p class="<?if ($arrGPU['id'] == 'vnc') echo 'was';?>advanced romfile">
<p class="<?if ($arrGPU['id'] == 'virtual') echo 'was';?>advanced romfile">
<b>Graphics ROM BIOS</b><br>
If you wish to use a custom ROM BIOS for a Graphics card, specify one here.
</p>
@@ -835,7 +875,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
echo mk_option("", $key, "- "._($key)." -", "disabled");
foreach ($arrValidNetworks as $strNetwork) {
foreach ($arrValidNetworks[$key] as $strNetwork) {
echo mk_option($arrNic['network'], $strNetwork, $strNetwork);
}
}
@@ -895,7 +935,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
echo mk_option("", $key, "- "._($key)." -", "disabled");
foreach ($arrValidNetworks as $strNetwork) {
foreach ($arrValidNetworks[$key] as $strNetwork) {
echo mk_option($domain_bridge, $strNetwork, $strNetwork);
}
}
@@ -1036,6 +1076,49 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
<script src="<?autov('/plugins/dynamix.vm.manager/scripts/codemirror/addon/hint/libvirt-schema.js')?>"></script>
<script src="<?autov('/plugins/dynamix.vm.manager/scripts/codemirror/mode/xml/xml.js')?>"></script>
<script type="text/javascript">
function AutoportChange(autoport) {
if (autoport.value === "yes") {
document.getElementById("port").style.visibility="hidden";
document.getElementById("Porttext").style.visibility="hidden";
document.getElementById("wsport").style.visibility="hidden";
document.getElementById("WSPorttext").style.visibility="hidden";
} else {
var protocol = document.getElementById("protocol").value ;
if (protocol === "vnc") {
document.getElementById("port").style.visibility="visible";
document.getElementById("Porttext").style.visibility="visible";
document.getElementById("wsport").style.visibility="visible";
document.getElementById("WSPorttext").style.visibility="visible";
} else {
document.getElementById("port").style.visibility="visible";
document.getElementById("Porttext").style.visibility="visible";
document.getElementById("wsport").style.visibility="hidden";
document.getElementById("WSPorttext").style.visibility="hidden";
}
}
}
function ProtocolChange(protocol) {
var autoport = document.getElementById("autoport").value ;
if (autoport === "yes") {
document.getElementById("port").style.visibility="hidden";
document.getElementById("Porttext").style.visibility="hidden";
document.getElementById("wsport").style.visibility="hidden";
document.getElementById("WSPorttext").style.visibility="hidden";
} else {
if (protocol.value === "vnc") {
document.getElementById("port").style.visibility="visible";
document.getElementById("Porttext").style.visibility="visible";
document.getElementById("wsport").style.visibility="visible";
document.getElementById("WSPorttext").style.visibility="visible";
} else {
document.getElementById("port").style.visibility="visible";
document.getElementById("Porttext").style.visibility="visible";
document.getElementById("wsport").style.visibility="hidden";
document.getElementById("WSPorttext").style.visibility="hidden";
}
}
}
$(function() {
function completeAfter(cm, pred) {
var cur = cm.getCursor();
@@ -1123,9 +1206,19 @@ $(function() {
var myvalue = $(this).val();
var mylabel = $(this).children('option:selected').text();
var myindex = $(this).closest('table').data('index');
if (myindex == 0) {
$vnc_sections = $('.autoportline,.protocol,.vncmodel,.vncpassword,.vnckeymap');
if (myvalue == 'virtual') {
$vnc_sections.filter('.wasadvanced').removeClass('wasadvanced').addClass('advanced');
slideDownRows($vnc_sections.not(isVMAdvancedMode() ? '.basic' : '.advanced'));
} else {
slideUpRows($vnc_sections);
$vnc_sections.filter('.advanced').removeClass('advanced').addClass('wasadvanced');
}
}
$romfile = $(this).closest('table').find('.romfile');
if (myvalue == 'vnc' || myvalue == '') {
if (myvalue == 'virtual' || myvalue == '') {
slideUpRows($romfile.not(isVMAdvancedMode() ? '.basic' : '.advanced'));
$romfile.filter('.advanced').removeClass('advanced').addClass('wasadvanced');
} else {
@@ -1170,7 +1263,7 @@ $(function() {
} while (gpu);
form.find('select[name="gpu[0][id]"] option').each(function(){
var gpu = $(this).val();
if (gpu != 'vnc' && !gpus.includes(gpu)) form.append('<input type="hidden" name="pci[]" value="'+gpu+'#remove">');
if (gpu != 'virtual' && !gpus.includes(gpu)) form.append('<input type="hidden" name="pci[]" value="'+gpu+'#remove">');
});
// remove unused sound cards
var sound = [], i = 0;