Skip to content

Fix: PHP Warnings & Share/Device prev/next buttons on narrow screens #2373

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 3 commits into from
Sep 17, 2025
Merged

Fix: PHP Warnings & Share/Device prev/next buttons on narrow screens #2373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb43127
Fix: Share/Device prev/next buttons on narrow screens
Squidly271 Sep 17, 2025
12ab3df
Fix: PHP error when changing container network if wireguard isn't ena…
Squidly271 Sep 17, 2025
04882c3
Fix: Silence PHP error on docker networks.
Squidly271 Sep 17, 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
4 changes: 2 additions & 2 deletions emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,8 +1094,8 @@ function prepareCategory() {
$n = $x ? 1 : 0; while (isset($$eth["VLANID:$n"]) && $$eth["VLANID:$n"] != $x) $n++;
if (!empty($$eth["DESCRIPTION:$n"])) $name .= ' -- '.compress(trim($$eth["DESCRIPTION:$n"]));
} elseif (preg_match('/^wg[0-9]+$/',$network)) {
$conf = file("/etc/wireguard/$network.conf");
if ($conf[1][0]=='#') $name .= ' -- '.compress(trim(substr($conf[1],1)));
$conf = is_file("/etc/wireguard/$network.conf") ? file("/etc/wireguard/$network.conf") : [];
if ( ($conf[1][0]??'')=='#') $name .= ' -- '.compress(trim(substr($conf[1],1)));
} elseif (substr($network,0,4)=='wlan') {
$name .= ' -- '._('Wireless interface');
}
Expand Down
2 changes: 1 addition & 1 deletion emhttp/plugins/dynamix.docker.manager/include/DockerClient.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,7 @@ public function getDockerContainers() {
foreach($ct['NetworkSettings']['Networks'] as $netName => $netVals) {
$i = $c['NetworkMode']=='host' ? $host : $netVals['IPAddress'];
$c['Networks'][$netName] = [ 'IPAddress' => $i ];
if ($driver[$netName]=='ipvlan' || $driver[$netName]=='macvlan') {
if ( isset($driver[$netName]) && ($driver[$netName]=='ipvlan' || $driver[$netName]=='macvlan') ) {
if (!isset($c['Ports']['vlan'])) $c['Ports']['vlan'] = [];
$c['Ports']['vlan']["$i"] = $i;
}
Expand Down
4 changes: 2 additions & 2 deletions emhttp/plugins/dynamix/DeviceInfo.page
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1932,11 +1932,11 @@ _(Name)_:
<script>
$(function() {
<?if (count($sheets)>1):?>
var ctrl = "<span class='inline-flex flex-row items-center gap-2'><span class='waitmsg fa fa-circle-o-notch fa-span fa-fw' style='display:none;'></span><a href='/<?=$path?>?name=<?=$prev?>' title='_(previous device)_'>";
var ctrl = "<span class='inline-flex flex-row items-center gap-2<?= $tabbed ? ' menuNavButtonsTabbed' : ''?>'><span class='waitmsg fa fa-circle-o-notch fa-span fa-fw' style='display:none;'></span><a href='/<?=$path?>?name=<?=$prev?>' title='_(previous device)_'>";
ctrl += "<button type='button' onclick='this.disabled=true;$(\".waitmsg\").show();'><i class='fa fa-chevron-left fa-fw'></i></button></a>";
ctrl += "<a href='/<?=$path?>?name=<?=$next?>' title='_(next device)_'><button type='button' onclick='this.disabled=true;$(\".waitmsg\").show();'><i class='fa fa-chevron-right fa-fw'></i></button></a></span>";
<?if ($tabbed):?>
$('.tabs').append(ctrl);
$('.tabs-container').append(ctrl);
<?else:?>
$('div[class=title]:first .right').append(ctrl);
<?endif;?>
Expand Down
4 changes: 2 additions & 2 deletions emhttp/plugins/dynamix/Share.page
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function toggleButton(button,id) {

<?if ($name):?>
const prevNextButtons = `
<div class="buttons-spaced flex-shrink-0">
<div class="buttons-spaced flex-shrink-0<?= $tabbed ? ' menuNavButtonsTabbed' : ''?>">
<a class="button" href="/Shares/Share?name=<?=$prev?>" title="_(previous user share)_">
<i class="fa fa-chevron-left fa-fw"></i>
</a>
Expand All @@ -59,7 +59,7 @@ const prevNextButtons = `
`;

$(function() {
const target = <?= $tabbed ? '".tabs"' : '".title:first .right"' ?>;
const target = <?= $tabbed ? '".tabs-container"' : '".title:first .right"' ?>;
$(target).append(prevNextButtons);
});
<?endif;?>
Expand Down
Empty file modified emhttp/plugins/dynamix/sheets/ShareEdit.css
100644 → 100755
View file
Open in desktop
Empty file.
10 changes: 10 additions & 0 deletions emhttp/plugins/dynamix/styles/default-base.css
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,16 @@ a.button {
}
}

.menuNavButtonsTabbed {
position: absolute;
right: 0;
}
@media (max-width: 1024px) {
.menuNavButtonsTabbed {
position: relative;
right: auto;
}
}
input[type="checkbox"] {
vertical-align: middle;
margin-right: 6px;
Expand Down
Loading