sentral matrix, bort med appmon

index.html

@@ -57,9 +57,10 @@ function make_select( elm, url){
 <li id=ndthost></li>
 <script>$("#ndthost").html('<a href="http://' + document.location.hostname + '/ndt/">NDT</a>');</script>
  <li><a href="http://mping.uninett.no/">MPing</a></li>
- <li id=dbeacon></li>
-<script>$("#dbeacon").html('<a href="http://' + document.location.hostname + '/matrix">Multicast beacon</a>');</script>
- <li><a href="/appmon">AppMon</a></li>
+ <li><a href="http://testnett.uninett.no/matrix/">Multicast beacon</a></li>
+<!-- <li id=dbeacon></li>
+<script>$("#dbeacon").html('<a href="http://' + document.location.hostname + '/matrix">Multicast beacon</a>');</script> -->
+<!-- <li><a href="/appmon">AppMon</a></li> -->
 </ul>
 <td>
 </table>

ndt/tcpbw100.html

@@ -22,9 +22,10 @@
 <li id=ndthost></li>
 <script>document.getElementById("ndthost").innerHTML='<a href="http://' + document.location.hostname + '/ndt/>NDT</a>';</script>
  <li><a href="http://mping.uninett.no/">MPing</a></li>
- <li id=dbeacon></li>
-<script>document.getElementById("dbeacon").innerHTML='<a href="http://' + document.location.hostname + '/matrix">Multicast beacon</a>';</script>
- <li><a href="/appmon">AppMon</a></li>
+ <li><a href="http://testnett.uninett.no/matrix/">Multicast beacon</a></li>
+<!-- <li id=dbeacon></li>
+<script>document.getElementById("dbeacon").innerHTML='<a href="http://' + document.location.hostname + '/matrix">Multicast beacon</a>';</script> -->
+<!-- <li><a href="/appmon">AppMon</a></li> -->
 </ul>
  <div id=logo>
    <a href=http://uninett.no><img src="/images/UNINETT_logo_t.png" alt="uninettlogo" /></a>

nettvei/traceroute.html

@@ -271,7 +271,7 @@ $(document).ready( function(){
  <li><a href="http://mping.uninett.no/">MPing</a></li>
  <li id=dbeacon></li>
 <script>$("#dbeacon").html('<a href="http://' + document.location.hostname + '/matrix">Multicast beacon</a>');</script>
- <li><a href="/appmon">AppMon</a></li>
+<!--  <li><a href="/appmon">AppMon</a></li> -->
 </ul>
 
 <div id=logo> 

yt/jsbandwidth.html

@@ -165,7 +165,7 @@ function ResultsUpload(dlspeed, ulspeed, rtt){
  <li><a href="http://mping.uninett.no/">MPing</a></li>
  <li id=dbeacon></li>
 <script>$("#dbeacon").html('<a href="http://' + document.location.hostname + '/matrix">Multicast beacon</a>');</script>
- <li><a href="/appmon">AppMon</a></li>
+<!-- <li><a href="/appmon">AppMon</a></li> -->
 </ul>
  <div id=logo>
    <a href=http://uninett.no><img src="/images/UNINETT_logo_t.png" alt="uninettlogo" /></a>