Skip to content

Wireless and VM improvements #2007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
limetech merged 14 commits into from
Feb 11, 2025
Merged

Wireless and VM improvements #2007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9b20881
Update create_network_ini
bergware Feb 9, 2025
8b4832c
rc.nginx add wireless connection as management port
bergware Feb 9, 2025
09bc746
rc.nginx remove unnecessary code
bergware Feb 9, 2025
a1e0672
Revamped VM page styling
bergware Feb 9, 2025
26d02c9
Wireless support for VMs
bergware Feb 9, 2025
dad99d9
Handle wired to wireless changeover when cable gets disconnected
bergware Feb 9, 2025
57186fe
Add wireless to wireguard
bergware Feb 10, 2025
a471fc0
Update WG0.page
bergware Feb 10, 2025
88e400b
swal: disable animation
bergware Feb 10, 2025
ab61ab3
VM: fixe layout with XML display
bergware Feb 10, 2025
e663456
style fix
bergware Feb 10, 2025
48be2e5
VM: style update
bergware Feb 10, 2025
cbd4936
VM: force wireless interface MAC address for VMs
bergware Feb 11, 2025
5b4c94d
Update rc.docker
bergware Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions emhttp/plugins/dynamix.vm.manager/include/VMedit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?PHP
/* Copyright 2005-2023, Lime Technology
* Copyright 2012-2023, Bergware International.
/* Copyright 2005-2025, Lime Technology
* Copyright 2012-2025, Bergware International.
* Copyright 2015-2021, Derek Macias, Eric Schultz, Jon Panozzo.
*
* This program is free software; you can redistribute it and/or
Expand All @@ -25,8 +25,8 @@
switch ($display['theme']) {
case 'gray' : $bgcolor = '#121510'; $border = '#606e7f'; $top = -44; break;
case 'azure': $bgcolor = '#edeaef'; $border = '#606e7f'; $top = -44; break;
case 'black': $bgcolor = '#212121'; $border = '#2b2b2b'; $top = -58; break;
default : $bgcolor = '#ededed'; $border = '#e3e3e3'; $top = -58; break;
case 'black': $bgcolor = '#212121'; $border = '#2b2b2b'; $top = -64; break;
default : $bgcolor = '#ededed'; $border = '#e3e3e3'; $top = -64; break;
}

$templateslocation = "/boot/config/plugins/dynamix.vm.manager/savedtemplates.json";
Expand Down Expand Up @@ -119,34 +119,35 @@
<div id="template_img_chooser_outer">
<div id="template_img_chooser">
<?
$arrImagePaths = [
"$docroot/plugins/dynamix.vm.manager/templates/images/*.png" => '/plugins/dynamix.vm.manager/templates/images/',
"$docroot/boot/config/plugins/dynamix.vm.manager/templates/images/*.png" => '/boot/config/plugins/dynamix.vm.manager/templates/images/'
];
foreach ($arrImagePaths as $strGlob => $strIconURLBase) {
foreach (glob($strGlob) as $png_file) {
echo '<div class="template_img_chooser_inner"><img src="'.$strIconURLBase.basename($png_file).'" basename="'.basename($png_file).'"><p>'.basename($png_file,'.png').'</p></div>';
}
$arrImagePaths = [
"$docroot/plugins/dynamix.vm.manager/templates/images/*.png" => '/plugins/dynamix.vm.manager/templates/images/',
"$docroot/boot/config/plugins/dynamix.vm.manager/templates/images/*.png" => '/boot/config/plugins/dynamix.vm.manager/templates/images/'
];
foreach ($arrImagePaths as $strGlob => $strIconURLBase) {
foreach (glob($strGlob) as $png_file) {
echo '<div class="template_img_chooser_inner"><img src="'.$strIconURLBase.basename($png_file).'" basename="'.basename($png_file).'"><p>'.basename($png_file,'.png').'</p></div>';
}
}
?>
</div>
</div>
</td>
<td></td>
</tr>
</table>

<table>
<tr style="line-height: 16px; vertical-align: middle;">
<tr>
<td>_(Autostart)_:</td>
<td><div style="margin-left:-10px;padding-top:6px"><input type="checkbox" id="domain_autostart" name="domain[autostart]" style="display:none" class="autostart" value="1" <?if ($arrLoad['autostart']) echo 'checked'?>></div></td>
<td>
<span class="width"><input type="checkbox" id="domain_autostart" name="domain[autostart]" style="display:none" class="autostart" value="1" <?if ($arrLoad['autostart']) echo 'checked'?>></span>
</td>
<td></td>
</tr>
</table>

<blockquote class="inline_help">
<p>If you want this VM to start with the array, set this to yes.</p>
</blockquote>

<div id="form_content"><?eval('?>'.parse_file("$docroot/plugins/dynamix.vm.manager/templates/{$arrLoad['form']}",false))?></div>

</form>
</div>

Expand All @@ -167,18 +168,17 @@ function isinlineXMLMode() {
return ($.cookie('vmmanager_inline_mode') == 'show');
}

function hidexml(checked)
{
function hidexml(checked) {
var form = document.getElementById("vmform"); // Replace "yourFormId" with the actual ID of your form
var xmlElements = form.getElementsByClassName("xml");
if (checked == 0) xmldisplay = "none"; else xmldisplay = "";
// Unhide each element
for (var i = 0; i < xmlElements.length; i++) {
xmlElements[i].style.display = xmldisplay; // Setting to empty string will revert to default style
}
var xmlElements = form.getElementsByClassName("xml");
if (checked == 0) xmldisplay = "none"; else xmldisplay = "";
// Unhide each element
for (var i = 0; i < xmlElements.length; i++) {
xmlElements[i].style.display = xmldisplay; // Setting to empty string will revert to default style
}
}

$(function() {
$(function(){
$('.autostart').switchButton({
on_label: "_(Yes)_",
off_label: "_(No)_",
Expand Down
Loading