Commit e8aff0b9 authored by Olav Kvittem's avatar Olav Kvittem

ny felles meny med iperf

parent 6ae47831
......@@ -7,7 +7,7 @@
<style type="text/css">
</style>
<script type="text/javascript" src="/js/jquery-1.10.1.min.js"></script>
<script type="text/javascript" src="/js/jquery-ui-1.10.3/jquery-1.9.1.js"></script>
<script>
var mp_url="https://kind.uninett.no/autoregister/utstyr_mp.json";
......@@ -44,27 +44,13 @@ function make_select( elm, url){
</head>
<body>
<div id=meny></div>
<script>
$.get("/meny.html", function(data){
$('#meny').append(data);
}, 'html' );
</script>
<!--
<div id="logo"><img src="images/UNINETT_logo_0613.jpg" alt="uninettlogo" /> Måletjenester</div>
<span align=right><a href=http://uninett.no><img src="images/UNINETT_logo_menu.jpg" alt="uninettlogo" /></a></span>
-->
<table border=0 width=100%><tr><td>
<ul id="menu">
<li><a href="/">Oversikt</a></li>
<li><a href="/yt">Yt</a></li>
<li><a href="/nettvei">Nettvei</a></li>
<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><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>
<div id=logo> <a href=http://uninett.no><img src="images/UNINETT_logo_t.png" alt="uninettlogo" /></a></div>
<p>
<script>
......@@ -90,6 +76,7 @@ Merk at noen av tjenestene er lukket og krever innlogging).</p>
<table border=0 width=100%><tr><td>
<p><a href="/nettvei/">Nettvei</a> viser ruten trafikken tar fra målepålen mot deg.
<p><a href=/yt/>Yt</a> måler hvor fort du kan overføre data mellom deg og målepålen. Enkel og brukervennlig.
<p><a href="/iperf/">Iperf</a> måler ytelsen fra målepålen mot en annen målepåle eller maskin med Iperf. </p>
<p><a href="/ndt/">NDT</a> (Network Diagnostic Tool) måler ytelsen fra din klient mot målepålen - Er mer teknisk. </p>
<td align=right>
......
......@@ -251,19 +251,12 @@ $(document).ready( function(){
</head>
<body>
<ul id="menu">
<li><a href="/">Oversikt</a></li>
<li><a href="/yt">Yt</a></li>
<li><a href="/nettvei">Nettvei</a></li>
<li><a href="http://ntnu-mp.ntnu.no:7123">NDT</a></li>
<li><a href="http://mping.uninett.no/">MPing</a></li>
<li><a href="http://ntnu-mp.ntnu.no/matrix">Multicast beacon</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>
</div>
<div id=meny></div>
<script>
$.get("/meny.html", function(data){
$('#meny').append(data);
}, 'html' );
</script>
<p>
......
......@@ -3,6 +3,7 @@
<head>
<title>UNINETT: NDT-tjener</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<script type="text/javascript" src="/js/jquery-ui-1.10.3/jquery-1.9.1.js"></script>
<link rel="icon" href="/favicon.ico" type="image/png">
<link rel="stylesheet" type="text/css" media="all" href="/style/mp-style.css" />
<!-- -->
......@@ -15,21 +16,13 @@
</head>
<body>
<ul id="menu">
<li><a href="/">Oversikt</a></li>
<li><a href="/yt">Yt</a></li>
<li><a href="/nettvei">Nettvei</a></li>
<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><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>
</div>
<div id=meny></div>
<script>
$.get("/meny.html", function(data){
$('#meny').append(data);
}, 'html' );
</script>
<div class="kropp">
<!-- <h1>UNINETT: NDT-tjener</h1> -->
......
......@@ -262,21 +262,12 @@ $(document).ready( function(){
</head>
<body>
<ul id="menu">
<li><a href="/">Oversikt</a></li>
<li><a href="/yt">Yt</a></li>
<li><a href="/nettvei">Nettvei</a></li>
<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://' + 'testnett.uninett.no' + '/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>
</div>
<div id=meny></div>
<script>
$.get("/meny.html", function(data){
$('#meny').append(data);
}, 'html' );
</script>
<p>
......
......@@ -163,20 +163,13 @@ function ResultsUpload(dlspeed, ulspeed, rtt){
</head>
<body>
<ul id="menu">
<li><a href="/">Oversikt</a></li>
<li><a href="/yt">Yt</a></li>
<li><a href="/nettvei">Nettvei</a></li>
<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://' + 'testnett.uninett.no' + '/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>
</div>
<div id=meny></div>
<script>
$.get("/meny.html", function(data){
$('#meny').append(data);
}, 'html' );
</script>
<h2>Simple web throughput test</h2>
<table><tr><td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment