Skip to content

Commit

Permalink
Merge pull request #2119 from OnlineDynamic/accessibilityandsecurityd…
Browse files Browse the repository at this point in the history
…ec24

Fix UI for scenario where fpp version unknown
  • Loading branch information
OnlineDynamic authored Jan 13, 2025
2 parents 4831578 + 8996bb2 commit f0976c6
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 22 deletions.
8 changes: 8 additions & 0 deletions www/css/fpp.css
Original file line number Diff line number Diff line change
Expand Up @@ -3617,3 +3617,11 @@ a.api-anchor {
display: block;
text-align: left;
}

/* Compatibility / Accessibility fixes - last review Jan 2025 */
/* JQuery UI Overrides */
.ui-helper-zfix {
-ms-filter: "alpha(opacity=0)";
filter: "alpha(opacity=0)";
}

55 changes: 40 additions & 15 deletions www/fppunknown_versions.php
Original file line number Diff line number Diff line change
@@ -1,28 +1,53 @@
<?php

function getFPPVersion() { return "Unknown"; }
function getFPPBranch() { return "Unknown"; }
function getFPPVersionFloat() { return 99.999; }
function getFPPVersionFloatStr() { return "99.999"; }
function getFPPMajorVersion() { return "99"; }
function getFPPMinorVersion() { return "999"; }
function getFPPPatchVersion() { return "Unknown"; }
function getFPPVersionTriplet() { return "99.999"; }
function getFPPVersion()
{
return "Unknown";
}
function getFPPBranch()
{
return "Unknown";
}
function getFPPVersionFloat()
{
return 99.999;
}
function getFPPVersionFloatStr()
{
return "99.999";
}
function getFPPMajorVersion()
{
return "99";
}
function getFPPMinorVersion()
{
return "999";
}
function getFPPPatchVersion()
{
return "";
}
function getFPPVersionTriplet()
{
return "99.999";
}

function writeFPPVersionJavascriptFunctions() {
?>
function writeFPPVersionJavascriptFunctions()
{
?>

function getFPPVersion() { return "Unknown"; }
function getFPPBranch() { return "Unknown"; }
function getFPPVersionFloat() { return 99.999; }
function getFPPVersionFloatStr() { return "99.999"; }
function getFPPMajorVersion() { return "99"; }
function getFPPMinorVersion() { return "999"; }
function getFPPPatchVersion() { return "Unknown"; }
function getFPPPatchVersion() { return ""; }
function getFPPVersionTriplet() { return "99.999"; }
?>
?>

</script>
<?
</script>
<?
}
?>
?>
4 changes: 2 additions & 2 deletions www/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ function NextPlaylistEntry() {
<i class='fas fa-fw fa-volume-down'></i>
</button>
<input type="range" min="0" max="100" class="slider" id="remoteVolumeSlider"
oninput="RemoteVolumeControlChange(this.value)">
title="remoteVolumeSlider" oninput="RemoteVolumeControlChange(this.value)">
<button class='volumeButton buttons' onClick="IncrementVolume();"
aria-label="IncrementVolume">
<i class='fas fa-fw fa-volume-up'></i>
Expand Down Expand Up @@ -514,7 +514,7 @@ function NextPlaylistEntry() {
</div>
<div class="row playlistSelectRow">
<div class="col-auto playlistSelectCol">
<select id="playlistSelect" name="playlistSelect"
<select id="playlistSelect" title="playlistSelect" name="playlistSelect"
class="form-control form-control-lg form-control-rounded has-shadow"
size="1" onClick="PopulatePlaylistDetailsEntries(true,'');"
onChange="PopulatePlaylistDetailsEntries(true,'');">
Expand Down
10 changes: 5 additions & 5 deletions www/menu.inc
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ function list_plugin_entries($menu)
<? if (!file_exists(__DIR__ . "/../src/fppd")) { ?>
<div id='rebuildPopup' title='FPP Upgrade' style="display: none">
<textarea style='width: 99%; height: 97%;' disabled id='rebuildText'>

</textarea>
</div>
<script>
function RebuildFPPDDone() {
Expand Down Expand Up @@ -353,7 +353,7 @@ function list_plugin_entries($menu)
<a class="dropdown-item" href="plugins.php"><i class="fas fa-puzzle-piece"></i> Plugin
Manager</a>
<? if ($uiLevel >= 2) { ?>
<a class="dropdown-item" href="packages.php"><i class="fas fa-box"></i> Packages </a>
<a class="dropdown-item" href="packages.php"><i class="fas fa-box"></i> Packages </a>
<? } ?>
<?php list_plugin_entries("content"); ?>
</div>
Expand Down Expand Up @@ -413,8 +413,8 @@ function list_plugin_entries($menu)
target="_blank" rel="noopener noreferrer"><i class="fas fa-comments"></i> Forums <i
class="fas fa-external-link-alt external-link"></i></a>
<a class="<?= $externalLinkClass ?>"
href="https://github.com/FalconChristmas/fpp/issues" target="_blank" rel="noopener noreferrer"><i
class="fas fa-bug"></i> Issue Tracker <i
href="https://github.com/FalconChristmas/fpp/issues" target="_blank"
rel="noopener noreferrer"><i class="fas fa-bug"></i> Issue Tracker <i
class="fas fa-external-link-alt external-link"></i></a>
<a class="dropdown-item" href="help.php"><i class="fas fa-question-circle"></i> Help
Index</a>
Expand Down Expand Up @@ -450,4 +450,4 @@ function list_plugin_entries($menu)
</nav>


</div>
</div>

0 comments on commit f0976c6

Please sign in to comment.