Commit 23124730 authored by Olav Kvittem's avatar Olav Kvittem

opprydding i utseende, sorterer alfabetisk mp-er i menyer

parent 777c3c2b
......@@ -3,7 +3,7 @@
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button>
<a class="navbar-brand" href="#"><img src="/uninett-theme/images/UNINETT_logo.svg" alt="Uninett logo" type="image/svg+xml"></a>
<a class="navbar-brand" href="http://www.uninett.no/"><img src="/uninett-theme/images/UNINETT_logo.svg" alt="Uninett logo" type="image/svg+xml"></a>
</div>
<div class="navbar-department">
......
<div class="gutter uninett-padded uninett-color-lightBlue">
<h3>Iperf throughput analysis by <span id=hostname></span>
<script>$("#hostname").html(location.hostname)</script> </h3>
<div class="gutter uninett-padded uninett-color-lightBlue">
<p> <span id=tr_button></span>
<script>make_select( '#tr_button', mp_url );</script>
<div id=busy><img src=/images/ajax-loader.gif> Testing - please wait for test to complete.<p></div>
......@@ -34,7 +34,7 @@
<li>You may run the iperf program manually on your own host as client or server.
<li>Iperf is available as a comman line
version and also with a more visual Java based interface.
<li> Download from http://iperf.sourceforge.net/ .
<li> Download from <a href="http://iperf.sourceforge.net/">iperf.sourceforge.net</a> .
</div>
</div>
......
......@@ -22,7 +22,7 @@
<body>
<?php include '../body-bs.html'?>
<script>
$("#title-bs").html('Mleple'); // title
$("#title-bs").html('<a href="https://www.uninett.no/malepale-detaljer">Mleple</a>'); // title
$('#top-menu-bs').load("/top-menu-bs.html");
$('#body-bs').load("iperf-body.html", // main body content
function(responseText, textStatus, XMLHttpRequest){
......
......@@ -135,6 +135,16 @@ html+= 'action="javascript:iperf( $(\'#tr_host\').val(), $(\'#tr_times\').val(),
var request=$.ajax( {url: url, type: 'GET', dataType: 'json', crossDomain: true } );
request.done( function( mps){
// console.log(mps);
mps.sort( function(a, b) {
var textA = a.navn.toLowerCase();
var textB = b.navn.toLowerCase();
if (textA < textB)
return -1;
if (textA > textB)
return 1;
return 0;
});
$.each(mps, function(mp) {
items.push( mps[mp].navn);
// html+='<option value="' + mps[mp].navn + '">' + mps[mp].navn + '</option>';
......
......@@ -12,7 +12,7 @@ a {
<ul id="menu" class='nav navbar'>
<li><a href="/">Oversikt</a></li>
<li><a href="/yt/">Yt</a></li>
<li><a href="/nettvei/">Rute</a></li>
<li><a href="/rute/">Rute</a></li>
<li><a href="/iperf/">Iperf</a>
<!-- ndt discontinued due kernel tcp problems
<li><a href="/ndt/">NDT</a></li>
......
......@@ -10,7 +10,7 @@
<body>
<?php include 'body-bs.html'?>
<script>
$("#title-bs").html('Mleple'); // title
$("#title-bs").html('<a href="https://www.uninett.no/malepale-detaljer">Mleple</a>'); // title
$('#top-menu-bs').load("/top-menu-bs.html");
$('#body-bs').load("mp-web-bs.html"); // main body content
</script>
......
......@@ -7,11 +7,11 @@ This implements a web front end to a json traceroute service.
<h3>Route analysis <!-- by <script>document.write(location.hostname)--></script></h3>
<div class="uninett-color-lightBlue uninett-padded gutter">
<h3>Route analysis <!-- by <script>document.write(location.hostname)--></script></h3>
<span id=tr_button></span>
<script>make_select( '#tr_button', mp_url );</script>
......
......@@ -29,7 +29,7 @@
<body>
<?php include '../body-bs.html'?>
<script>
$("#title-bs").html('Mleple'); // title
$("#title-bs").html('<a href="https://www.uninett.no/malepale-detaljer">Mleple</a>'); // title
$('#top-menu-bs').load("/top-menu-bs.html");
$('#body-bs').load("traceroute-body.html", // main body content
function(responseText, textStatus, XMLHttpRequest){
......
......@@ -132,6 +132,16 @@ html+= 'action="javascript:traceroute( $(\'#tr_host\').val(), $(\'#tr_times\').v
var request=$.ajax( {url: url, type: 'GET', dataType: 'json', crossDomain: true } );
request.done( function( mps){
// console.log(mps);
mps.sort( function(a, b) {
var textA = a.navn.toLowerCase();
var textB = b.navn.toLowerCase();
if (textA < textB)
return -1;
if (textA > textB)
return 1;
return 0;
});
$.each(mps, function(mp) {
items.push( mps[mp].navn);
// html+='<option value="' + mps[mp].navn + '">' + mps[mp].navn + '</option>';
......
<ul id="top-menu-ul" class='nav navbar-nav'>
<li> <a href="/">Oversikt</a></li>
<li><a href="/yt/">Yt</a></li>
<li><a href="/nettvei/">Nettvei</a></li>
<li><a href="/nettvei/">Rute</a></li>
<li><a href="/iperf/">Iperf</a>
<!-- ndt discontinued due kernel tcp problems
<li><a href="/ndt/">NDT</a></li>
......
<h3>Yt - Simple web throughput test</h3>
<div class="col-lg-12 gutter uninett-padded uninett-color-lightBlue">
<h2>Yt - Simple web throughput test</h2>
<table><tr><td>
<button class="btn btn-primary btn-lg" id="test" onclick="test_performance()">Test throughput!</button>
......
......@@ -16,7 +16,7 @@
<body>
<?php include '../body-bs.html'?>
<script>
$("#title-bs").html('Mleple'); // title
$("#title-bs").html('<a href="https://www.uninett.no/malepale-detaljer">Mleple</a>'); // title
$('#top-menu-bs').load("/top-menu-bs.html");
$('#body-bs').load("jsbandwidth-body.html", // main body content
function(responseText, textStatus, XMLHttpRequest){
......
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