Commit 8ca64b64 authored by Olav Kvittem's avatar Olav Kvittem

adding uninett-theme

parent 243f1023
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
<head> <head>
<meta http-equiv="Content-Language" content="no" /> <meta http-equiv="Content-Language" content="no" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<!-- done in meny.html
<link rel="stylesheet" type="text/css" media="all" href="/uninett-theme/css/uninett.css" />
<link rel="stylesheet" type="text/css" media="all" href="/style/mp-style.css" />
-->
<link rel="stylesheet" type="text/css" media="all" href="/style/mp-style.css" /> <link rel="stylesheet" type="text/css" media="all" href="/style/mp-style.css" />
<style type="text/css"> <style type="text/css">
</style> </style>
...@@ -44,7 +48,7 @@ function make_select( elm, url){ ...@@ -44,7 +48,7 @@ function make_select( elm, url){
</head> </head>
<body> <body>
<div id=meny></div> <div id=meny class="navbar navbar-nav"></div>
<script> <script>
$.get("/meny.html", function(data){ $.get("/meny.html", function(data){
$('#meny').append(data); $('#meny').append(data);
......
...@@ -5,7 +5,7 @@ This implements a web front end to a json iperf service. ...@@ -5,7 +5,7 @@ This implements a web front end to a json iperf service.
--> -->
<head> <head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> <META http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<script type="text/javascript" src="/js/jquery-ui-1.10.3/jquery-1.9.1.js"></script> <script type="text/javascript" src="/js/jquery-ui-1.10.3/jquery-1.9.1.js"></script>
<script type="text/javascript" src="/js/jquery-ui-1.10.3/ui/jquery-ui.js"></script> <script type="text/javascript" src="/js/jquery-ui-1.10.3/ui/jquery-ui.js"></script>
...@@ -14,8 +14,7 @@ This implements a web front end to a json iperf service. ...@@ -14,8 +14,7 @@ This implements a web front end to a json iperf service.
<!-- <script type="text/javascript" src=Highcharts/js/modules/exporting.js></script> --> <!-- <script type="text/javascript" src=Highcharts/js/modules/exporting.js></script> -->
<!-- <script type="text/javascript" data-main="main" src="/js/require.js"></script> --> <!-- <script type="text/javascript" data-main="main" src="/js/require.js"></script> -->
<link rel="stylesheet" type="text/css" media="all" href="/style/mp-style.css" /> <link rel="stylesheet" type="text/css" media="all" href="/style/mp-style.css" />
<style type="text/css" title="currentStyle">
<style type="text/css" title="currentStyle">
@import "/js/jquery-ui-1.10.3/themes/base/jquery-ui.css"; @import "/js/jquery-ui-1.10.3/themes/base/jquery-ui.css";
@import "/js/demo_page.css"; @import "/js/demo_page.css";
@import "/js/jquery.dataTables_themeroller.css"; @import "/js/jquery.dataTables_themeroller.css";
...@@ -53,6 +52,12 @@ function make_table(mtr_rows){ ...@@ -53,6 +52,12 @@ function make_table(mtr_rows){
// //
function iperf(host, nobs, interval){ function iperf(host, nobs, interval){
if ( ! nobs ) nobs=10; if ( ! nobs ) nobs=10;
if (nobs > 100) {
nobs=100;
alert ('Max number of seconds allowed for test is 100');
}
if (interval > nobs) interval=nobs;
if ( ! host) host=""; if ( ! host) host="";
var html='<table cellpadding="0" cellspacing="0" border="0" class="display" id="tracetable">'; var html='<table cellpadding="0" cellspacing="0" border="0" class="display" id="tracetable">';
html+='<caption>Bandwidth report at ' + new Date().toLocaleTimeString() + '</caption>'; html+='<caption>Bandwidth report at ' + new Date().toLocaleTimeString() + '</caption>';
...@@ -133,7 +138,7 @@ function make_select( elm, url){ ...@@ -133,7 +138,7 @@ function make_select( elm, url){
var html='<form name="iperf_form" id="iperf_form"'; var html='<form name="iperf_form" id="iperf_form"';
html+= 'action="javascript:iperf( $(\'#tr_host\').val(), $(\'#tr_times\').val(), $(\'#tr_interval\').val() )">'; html+= 'action="javascript:iperf( $(\'#tr_host\').val(), $(\'#tr_times\').val(), $(\'#tr_interval\').val() )">';
html+='<input type="submit" value="Test" class=button/> to '; html+='<input type="submit" value="Test" class=button/> to ';
html+='<input id=tr_host value="" placeholder="my host" title="Automatisk utfylling av mleplenavn"></input>'; html+='<input id=tr_host value="" placeholder="my host" title="Automatisk utfylling av målepålenavn"></input>';
html+=' for <input id=tr_times value=10 style="width:3em;text-align:right"> seconds</input>'; html+=' for <input id=tr_times value=10 style="width:3em;text-align:right"> seconds</input>';
// html+=', using <input id=tr_size value=64 style="width:3em;text-align:right"> bytes packets</input>'; // html+=', using <input id=tr_size value=64 style="width:3em;text-align:right"> bytes packets</input>';
html+=', report every <input id=tr_interval value=1 style="width:3em;text-align:right"> seconds.'; html+=', report every <input id=tr_interval value=1 style="width:3em;text-align:right"> seconds.';
...@@ -285,7 +290,7 @@ $(document).ready( function(){ ...@@ -285,7 +290,7 @@ $(document).ready( function(){
<p>Iperf troughput analysis test from this host towards the target host. <p>Iperf troughput analysis test from this host towards the target host.
<ul> <ul>
<li>Press the 'Iperf' button above to do the test. <li>Press the 'Iperf' button above to do the test.
<li>Host(to) field has autocompletion for Mlepler. <li>Host(to) field has autocompletion for Målepåler.
<li>Graphs have mouseover info, and click legend to remove curve <li>Graphs have mouseover info, and click legend to remove curve
</ul> </ul>
......
<link rel="stylesheet" type="text/css" media="all" href="/uninett-theme/css/uninett.css" />
<table border=0 width=100%><tr><td> <table border=0 width=100%><tr><td>
<ul id="menu"> <ul id="menu">
<li><a href="/">Oversikt</a></li> <li><a href="/">Oversikt</a></li>
...@@ -13,8 +14,8 @@ ...@@ -13,8 +14,8 @@
<!-- <li><a href="/appmon">AppMon</a></li> --> <!-- <li><a href="/appmon">AppMon</a></li> -->
</ul> </ul>
<td> <td>
</table>
<div id=logo> <a href=http://uninett.no><img src="/images/UNINETT_logo_t.png" alt="uninettlogo" /></a></div> <div id=logo> <a href=http://uninett.no><img src="/images/UNINETT_logo_t.png" alt="uninettlogo" /></a></div>
</table>
<!-- <!--
<div id="logo"><img src="images/UNINETT_logo_0613.jpg" alt="uninettlogo" /> Mletjenester</div> <div id="logo"><img src="images/UNINETT_logo_0613.jpg" alt="uninettlogo" /> Mletjenester</div>
<span align=right><a href=http://uninett.no><img src="images/UNINETT_logo_menu.jpg" alt="uninettlogo" /></a></span> <span align=right><a href=http://uninett.no><img src="images/UNINETT_logo_menu.jpg" alt="uninettlogo" /></a></span>
......
...@@ -53,6 +53,14 @@ function make_table(mtr_rows){ ...@@ -53,6 +53,14 @@ function make_table(mtr_rows){
// //
function traceroute(host, nobs, psize, interval){ function traceroute(host, nobs, psize, interval){
if ( ! nobs ) nobs=10; if ( ! nobs ) nobs=10;
// resistance to big number overflow and DOS attacks
if (nobs > 100) {
nobs=100;
alert ('Max number of times allowed for test is 100');
}
if ( psize > 10000) psize = 10000;
if ( interval > 100) interval = 100;
if ( ! host) host=""; if ( ! host) host="";
var html='<table cellpadding="0" cellspacing="0" border="0" class="display" id="tracetable">'; var html='<table cellpadding="0" cellspacing="0" border="0" class="display" id="tracetable">';
html+='<caption>Route report at ' + new Date().toLocaleTimeString() + '</caption><thead>'; html+='<caption>Route report at ' + new Date().toLocaleTimeString() + '</caption><thead>';
......
...@@ -2,7 +2,7 @@ body { ...@@ -2,7 +2,7 @@ body {
background:rgb(230,225,221); background:rgb(230,225,221);
margin:0px; margin:0px;
padding:0px; padding:0px;
font-family:sans-serif; /* font-family:sans-serif; */
} }
a { a {
color:#000; color:#000;
...@@ -121,7 +121,7 @@ h1, h2 , h3 { ...@@ -121,7 +121,7 @@ h1, h2 , h3 {
float: right; float: right;
} }
/*
body, div, span, input, td, element {font-size:normal;} body, div, span, input, td, element {font-size:normal;}
@media (min-width:321px) { /* smartphones, iPhone, portrait 480x320 phones */ @media (min-width:321px) { /* smartphones, iPhone, portrait 480x320 phones */
body, div, span, input, td, element {font-size:x-large;} body, div, span, input, td, element {font-size:x-large;}
...@@ -147,3 +147,4 @@ body, div, span, input, td, element {font-size:normal;} ...@@ -147,3 +147,4 @@ body, div, span, input, td, element {font-size:normal;}
body, div, span, input, td, element {font-size:small;} body, div, span, input, td, element {font-size:small;}
button {font-size:medium;} button {font-size:medium;}
} }
*/
\ No newline at end of file
This diff is collapsed.
## Fonts
The Colfax fonts are licenced separately, and is not included in this repository.
Drop the fonts in this folder.
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="141.731px" height="38.307px" viewBox="0 0 141.731 38.307" enable-background="new 0 0 141.731 38.307"
xml:space="preserve">
<g>
<g>
<g>
<path fill="#ED1B34" d="M141.731,31.802c0,3.579-2.928,6.505-6.505,6.505H6.508C2.927,38.307,0,35.381,0,31.802V6.505
C0,2.926,2.927,0,6.508,0h128.719c3.577,0,6.505,2.926,6.505,6.505V31.802z"/>
</g>
</g>
<g>
<g>
<g>
<path fill="#FFFFFF" d="M24.309,9.398h4.958v12.668c0,4.729-3.315,7.93-8.595,7.93c-5.281,0-8.598-3.201-8.598-7.93V9.398h4.963
v12.784c0,2.422,1.444,3.69,3.635,3.69s3.636-1.269,3.636-3.69V9.398z"/>
<path fill="#FFFFFF" d="M45.575,29.595l-7.559-11.799v11.799h-4.847V9.398h4.701L45.456,21.2V9.398h4.85v20.197H45.575z"/>
<path fill="#FFFFFF" d="M60.229,29.595h-4.96V9.398h4.96V29.595z"/>
<path fill="#FFFFFF" d="M66.996,9.398L74.582,21.2V9.398H66.996z"/>
<path fill="#FFFFFF" d="M80.224,9.398H94.85v4.125h-9.665v3.778h8.809v4.127h-8.809v4.042h9.698v4.124H80.224V9.398z"/>
<path fill="#FFFFFF" d="M112.252,9.398v4.185h-5.451v16.012h-4.964V13.583h-5.451V9.398H112.252z"/>
<path fill="#FFFFFF" d="M129.657,9.398v4.185h-5.456v16.012h-4.957V13.583h-5.456V9.398H129.657z"/>
</g>
</g>
<polygon fill="#FFFFFF" points="73.462,29.595 65.875,17.792 65.875,29.595 "/>
</g>
</g>
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="300.661px" height="400.881px" viewBox="0 0 300.661 400.881" enable-background="new 0 0 300.661 400.881"
xml:space="preserve">
<g>
<g>
<g>
<polygon fill="#F16676" points="200.44,300.661 300.661,200.44 200.44,100.22 "/>
</g>
<g>
<polygon fill="#F16676" points="100.221,200.44 0,100.22 100.221,0 "/>
</g>
</g>
<g>
<polygon fill="#ED1C24" points="100.221,200.44 200.441,100.22 100.221,0 "/>
</g>
<g>
<polygon fill="#F7ACBC" points="100.221,400.881 0,300.661 100.221,200.44 "/>
</g>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="100.2163" y1="199.5537" x2="199.6631" y2="300.7515">
<stop offset="0" style="stop-color:#670000"/>
<stop offset="0.0611" style="stop-color:#710000"/>
<stop offset="0.3954" style="stop-color:#A30B17"/>
<stop offset="0.6743" style="stop-color:#CA1528"/>
<stop offset="0.8838" style="stop-color:#E21931"/>
<stop offset="1" style="stop-color:#ED1B34"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="200.441,300.661 200.44,300.659 200.44,100.22 100.22,200.44 100.221,200.441
100.221,400.881 "/>
</g>
</g>
</svg>
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<script type="text/javascript" src="/js/jquery-ui-1.10.3/jquery-1.9.1.js"></script> <script type="text/javascript" src="/js/jquery-ui-1.10.3/jquery-1.9.1.js"></script>
<link rel="stylesheet" type="text/css" media="all" href="/style/mp-style.css" /> <link rel="stylesheet" type="text/css" media="all" href="/style/mp-style.css" />
<link rel="stylesheet" type="text/css" media="all" href="/uninett-theme/css/uninett.css" />
<script type="text/javascript"> <script type="text/javascript">
var testno=0; var testno=0;
var start = 0; var start = 0;
......
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