frodovdr/octonet
1
0
Fork 0
mirror of https://github.com/DigitalDevices/octonet.git synced 2023-10-10 11:36:52 +00:00
Code Issues Releases Wiki Activity

HTML bugs/typpos/some HTML5 cleanup

Browse Source 
Also added hidden s2 pls code converter (s2pls.html)
This commit is contained in:
mvoelkel
2016-06-30 18:25:11 +02:00
parent 2d45e01ea7
commit 681eb61e36
4 changed files with 182 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
octoserve/var/www/s2pls.html Normal file
View File

@@ -0,0 +1,124 @@
<!DOCTYPE HTML>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>OctopusNet</title>
<link rel="stylesheet" type="text/css" href="/style.css">
<script type="text/javascript" src="/menu.js"></script>
<!-- Add included scripts here -->
<!-- Add page scripts here -->
<script type="text/javascript">
function RootToGold()
{
var root = parseInt(document.getElementById("RootCode").value);
if( root >= 1 && root <= 262143 )
{
var g = 0;
var X = 1;
for( g = 0; g < 262144; g += 1)
{
if( X == root ) break;
X = ((( X ^ (X >> 7)) & 1) << 17) | (X >> 1);
}
document.getElementById("GfR").firstChild.nodeValue = g;
}
else
document.getElementById("GfR").firstChild.nodeValue = "invalid";
}
function GoldToRoot()
{
var gold = parseInt(document.getElementById("GoldCode").value);
if( gold >= 0 && gold <= 262142 )
{
var g = 0;
var X = 1;
for( g = 0; g < 262143; g += 1)
{
if( g == gold ) break;
X = ((( X ^ (X >> 7)) & 1) << 17) | (X >> 1);
}
document.getElementById("RfG").firstChild.nodeValue = X;
}
else
document.getElementById("RfG").firstChild.nodeValue = "invalid";
}
</script>
</head>
<body onload="OnLoad()">
<table class="maintable">
<colgroup>
<col style="width:182px"/>
<col style="width:728px"/>
</colgroup>
<tr><td class="maintd" colspan="2">
<a href="http://www.digitaldevices.de"><img src="/BannerDD.jpg" alt="DD" width="910" height="130" /></a>
</td></tr>
<tr><td class="maintd" colspan="2">&nbsp;</td></tr>
<tr>
<td class="maintd"><script type="text/javascript">CreateMenu();</script></td>
<td class="content">
<div>
<!-- Begin Content -->
<h3 style="margin:auto;text-align:center">DVB-S2 PLS Code Converter</h3>
<p>
<table class="table" style="margin:auto">
<colgroup>
<col style="width:80px"/>
<col style="width:80px"/>
<col style="width:80px"/>
<col style="width:80px"/>
</colgroup>
<tr>
<td style="text-align:right">
Root:&nbsp;
</td>
<td>
<form action="">
<input id="RootCode" type="number" value="1" maxlength="6" style="width: 80px" oninput="RootToGold()" />
</form>
</td>
<td>
-> Gold:
</td>
<td id="GfR" style="text-align:left">
0
</td>
</tr>
<tr>
<td style="text-align:right">
Gold:&nbsp;
</td>
<td>
<form action="">
<input id="GoldCode" type="number" value="0" maxlength="6" style="width: 80px" oninput="GoldToRoot()" />
</form>
</td>
<td>
-> Root:
</td>
<td id="RfG" style="text-align:left">
1
</td>
</tr>
<!-- End Content -->
</div>
</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
</table>
</body>
</html>

23
octoserve/var/www/streamstatus.html
View File

@@ -114,10 +114,10 @@ function OnLoad()
<body onload="OnLoad()">
<table class="maintable" align="center">
<table class="maintable">
<colgroup>
<col width="182px"/>
<col width="728px"/>
<col style="width:182px"/>
<col style="width:728px"/>
</colgroup>
<tr><td class="maintd" colspan="2">
<a href="http://www.digitaldevices.de"><img src="/BannerDD.jpg" alt="DD" width="910" height="130" /></a>
@@ -128,15 +128,14 @@ function OnLoad()
<td class="maintd">
<div class="content">
<!-- Begin Content -->
<table id="streamstatus" align="center">
<table id="streamstatus" style="margin:auto">
<colgroup>
<col width="80px"/>
<col width="80px"/>
<col width="80px"/>
<col width="100px"/>
<col width="130px"/>
<col width="170px"/>
<col style="width:80px"/>
<col style="width:80px"/>
<col style="width:80px"/>
<col style="width:100px"/>
<col style="width:130px"/>
<col style="width:170px"/>
</colgroup>
<tr>
<th>Stream</th>
@@ -161,8 +160,6 @@ function OnLoad()
</script>
</table>
<!-- End Content -->
</div>
</td>

48
octoserve/var/www/system.html
View File

@@ -336,11 +336,13 @@ function ToggleHelp(id)
<h3>Layer 2 Quality of Service</h3>
This is defined in the <b>IEEE 802.1Q</b> VLAN standard, and provides QoS in a local network.<br/>
For it to work all components in the LAN must either be transparent to it or need to support it.
<li><b>hubs:</b> always transparent.</li>
<li><b>dumb switches:</b> usually transparent, better ones use it to prioritise the traffic.</li>
<li><b>smart switches:</b> depends on setting.</li>
<li><b>PCs and the like:</b> newer systems support it by default, for older systems check the LAN adapter settings.</li>
<li><b>WLAN access points:</b> depends on firmware and model. OpenWRT based devices usually work.</li>
<ul>
<li><b>hubs:</b> always transparent.</li>
<li><b>dumb switches:</b> usually transparent, better ones use it to prioritise the traffic.</li>
<li><b>smart switches:</b> depends on setting.</li>
<li><b>PCs and the like:</b> newer systems support it by default, for older systems check the LAN adapter settings.</li>
<li><b>WLAN access points:</b> depends on firmware and model. OpenWRT based devices usually work.</li>
</ul>
</div>
</div>
<div id="qos_hlpD" onclick="ToggleHelp('qos_hlpD')"
@@ -349,11 +351,13 @@ function ToggleHelp(id)
<h3>Layer 2 Quality of Service</h3>
Dies ist im <b>IEEE 802.1Q</b> VLAN Standard definiert und erlaubt QoS im lokalem Netz.<br/>
Damit es funktioniert m&uuml;ssen alle Netzwerkkompenenten im LAN entweder transparent sein oder es unterst&uuml;tzen.
<li><b>Hubs:</b> sind immer transparent</li>
<li><b>Dumb Switches:</b> normalerweise transparent, bessere priorisieren damit den Datenverkehr</li>
<li><b>Smart Switches:</b> h&auml;ngt von den Einstellungen ab</li>
<li><b>PCs und dergleichen:</b> neue Systeme unterst&uuml;tzten es defaultmässig, für &auml;ltere in den Einstellungen der Netzwerkarte nachschauen</li>
<li><b>WLAN Accesspoints:</b> h&auml;ngt von Modell und deren Firmware ab. OpenWRT basierte Ger&auml;te unterst&uuml;tzen es normalerweise</li>
<ul>
<li><b>Hubs:</b> sind immer transparent</li>
<li><b>Dumb Switches:</b> normalerweise transparent, bessere priorisieren damit den Datenverkehr</li>
<li><b>Smart Switches:</b> h&auml;ngt von den Einstellungen ab</li>
<li><b>PCs und dergleichen:</b> neue Systeme unterst&uuml;tzten es defaultmässig, für &auml;ltere in den Einstellungen der Netzwerkarte nachschauen</li>
<li><b>WLAN Accesspoints:</b> h&auml;ngt von Modell und deren Firmware ab. OpenWRT basierte Ger&auml;te unterst&uuml;tzen es normalerweise</li>
</ul>
</div>
</div>
<div id="nosw_hlpE" onclick="ToggleHelp('nosw_hlpE')"
@@ -361,11 +365,12 @@ function ToggleHelp(id)
<div style="position: relative; margin:20px; clear:both">
<h3>Multiswitch emulation on OctopusNet S8</h3>
Multiswitch emulation allows to connect directly a Quad/Quattro LNB to the 4 inputs on the S8.
Disabling configures the S8 to a standard 4 input system.
<br/>
Use quad setting for connection to a quad LNB or to 4 outputs from a multiswitch.
<br/>
Use quattro setting for connection to a quattro LNB or to the trunk outputs from a multiswitch. Ensure to connect the VL/VH/HL/HH cables correctly.
<p>
<ul>
<li>Disabling configures the S8 as a standard 4 tuner system.</li>
<li>Use quad setting for connection to a quad LNB or to 4 outputs from a multiswitch.</li>
<li>Use quattro setting for connection to a quattro LNB or to the trunk outputs from a multiswitch. Ensure to connect the VL/VH/HL/HH cables correctly.</li>
</ul>
<p/>
With the quad/quattro settings only the reception of a single satellite is supported. For full flexibility an EN50607 LNB or switch is recommended.
</div>
@@ -375,13 +380,14 @@ function ToggleHelp(id)
<div style="position: relative; margin:20px; clear:both">
<h3>Multischalter-Emulation OctopusNet S8</h3>
Multischalter-Emulation erlaubt den direkten Anschlu&szlig; eines Quad/Quattro LNB an die S8
Abschalten konfiguriert die S8 als ein Standardsystem mit 4 Eing&auml;ngen.
<br/>
Für einen Quad LNB oder für 4 Ausg&auml;nge von einem Multiswitch Quad Einstellung ausw&auml;hlen.
<br/>
Für einen Quattro LNB oder für den Stammausgang eines Multiswitches Quattro Einstellung ausw&auml;hlen.
<p>
<ul>
<li>Abschalten konfiguriert die S8 als ein Standardsystem mit 4 Tunern.</li>
<li>Für einen Quad LNB oder für 4 Ausg&auml;nge von einem Multiswitch Quad Einstellung ausw&auml;hlen.</li>
<li>Für einen Quattro LNB oder f&uuml;r den Stammausgang eines Multiswitches Quattro Einstellung ausw&auml;hlen.</li>
</ul>
<p/>
In der Quad oder Quattro Einstellung wird nur der Empfang eines Satelliten unterst&uuml;tzt. Für volle Flexibilit&auml; wird der Einsatz eines EN50607 LNB bzw Switch empfohlen.
In der Quad oder Quattro Einstellung wird nur der Empfang eines Satelliten unterst&uuml;tzt. Für volle Flexibilit&auml;t wird der Einsatz eines EN50607 LNB bzw Switch empfohlen.
</div>
</div>
<div id="strict_hlpE" onclick="ToggleHelp('strict_hlpE')"

37
octoserve/var/www/tunerstatus.html
View File

@@ -40,22 +40,22 @@ function Show(TunerList)
{
for( var i = 0; i < TunerList.length ; i++ )
{
if( TunerList[i].Status != "Inactive" )
if( TunerList[i].Status == "Active" && TunerList[i].Lock )
{
if( TunerList[i].Lock )
{
document.getElementById("tdStatus"+i).firstChild.nodeValue = "Locked";
document.getElementById("tdStrength"+i).firstChild.nodeValue = (TunerList[i].Strength/1000+108.75).toFixed(1)+" dBµV";
document.getElementById("tdSNR"+i).firstChild.nodeValue = (TunerList[i].SNR/1000).toFixed(1) + " dB";
document.getElementById("tdQuality"+i).firstChild.nodeValue = TunerList[i].Quality.toFixed(0) + "%";
}
else
{
}
else
{
if( TunerList[i].Status == "Active" )
document.getElementById("tdStatus"+i).firstChild.nodeValue = "No Signal";
document.getElementById("tdStrength"+i).firstChild.nodeValue = "";
document.getElementById("tdSNR"+i).firstChild.nodeValue = "";
document.getElementById("tdQuality"+i).firstChild.nodeValue = "";
}
else
document.getElementById("tdStatus"+i).firstChild.nodeValue = "";
document.getElementById("tdStrength"+i).firstChild.nodeValue = "";
document.getElementById("tdSNR"+i).firstChild.nodeValue = "";
document.getElementById("tdQuality"+i).firstChild.nodeValue = "";
}
document.getElementById("trTuner"+i).style.display = "table-row";
}
@@ -76,10 +76,10 @@ function OnLoad()
</head>
<body onload="OnLoad()">
<table class="maintable" align="center">
<table class="maintable">
<colgroup>
<col width="182px"/>
<col width="728px"/>
<col style="width:182px"/>
<col style="width:728px"/>
</colgroup>
<tr><td class="maintd" colspan="2">
<a href="http://www.digitaldevices.de"><img src="/BannerDD.jpg" alt="DD" width="910" height="130" /></a>
@@ -90,8 +90,14 @@ function OnLoad()
<td class="maintd">
<div class="content">
<!-- Begin Content -->
<table id="tunerstatus" align="center">
<table id="tunerstatus" style="margin:auto">
<colgroup>
<col style="width:80px"/>
<col style="width:140px"/>
<col style="width:140px"/>
<col style="width:140px"/>
<col style="width:140px"/>
</colgroup>
<tr>
<th>Tuner</th>
<th>Lock</th>
@@ -113,7 +119,6 @@ function OnLoad()
</script>
</table>
<!-- End Content -->
</div>
</td>