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

adding uninett-theme

parent 243f1023
......@@ -3,6 +3,10 @@
<head>
<meta http-equiv="Content-Language" content="no" />
<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" />
<style type="text/css">
</style>
......@@ -44,7 +48,7 @@ function make_select( elm, url){
</head>
<body>
<div id=meny></div>
<div id=meny class="navbar navbar-nav"></div>
<script>
$.get("/meny.html", function(data){
$('#meny').append(data);
......
......@@ -5,7 +5,7 @@ This implements a web front end to a json iperf service.
-->
<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/ui/jquery-ui.js"></script>
......@@ -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" data-main="main" src="/js/require.js"></script> -->
<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/demo_page.css";
@import "/js/jquery.dataTables_themeroller.css";
......@@ -53,6 +52,12 @@ function make_table(mtr_rows){
//
function iperf(host, nobs, interval){
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="";
var html='<table cellpadding="0" cellspacing="0" border="0" class="display" id="tracetable">';
html+='<caption>Bandwidth report at ' + new Date().toLocaleTimeString() + '</caption>';
......@@ -133,7 +138,7 @@ function make_select( elm, url){
var html='<form name="iperf_form" id="iperf_form"';
html+= 'action="javascript:iperf( $(\'#tr_host\').val(), $(\'#tr_times\').val(), $(\'#tr_interval\').val() )">';
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+=', 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.';
......@@ -285,7 +290,7 @@ $(document).ready( function(){
<p>Iperf troughput analysis test from this host towards the target host.
<ul>
<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
</ul>
......
<link rel="stylesheet" type="text/css" media="all" href="/uninett-theme/css/uninett.css" />
<table border=0 width=100%><tr><td>
<ul id="menu">
<li><a href="/">Oversikt</a></li>
......@@ -13,8 +14,8 @@
<!-- <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>
</table>
<!--
<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>
......
......@@ -53,6 +53,14 @@ function make_table(mtr_rows){
//
function traceroute(host, nobs, psize, interval){
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="";
var html='<table cellpadding="0" cellspacing="0" border="0" class="display" id="tracetable">';
html+='<caption>Route report at ' + new Date().toLocaleTimeString() + '</caption><thead>';
......
......@@ -2,7 +2,7 @@ body {
background:rgb(230,225,221);
margin:0px;
padding:0px;
font-family:sans-serif;
/* font-family:sans-serif; */
}
a {
color:#000;
......@@ -121,7 +121,7 @@ h1, h2 , h3 {
float: right;
}
/*
body, div, span, input, td, element {font-size:normal;}
@media (min-width:321px) { /* smartphones, iPhone, portrait 480x320 phones */
body, div, span, input, td, element {font-size:x-large;}
......@@ -147,3 +147,4 @@ body, div, span, input, td, element {font-size:normal;}
body, div, span, input, td, element {font-size:small;}
button {font-size:medium;}
}
*/
\ No newline at end of file
@font-face{
font-family: 'colfaxThin';
src: url('../fonts/colfaxThin.eot');
src: url('../fonts/colfaxThin.eot?#iefix') format('embedded-opentype'),
url('../fonts/colfaxThin.woff') format('woff'),
url('../fonts/colfaxThin.ttf') format('truetype'),
url('../fonts/colfaxThin.svg#webfont') format('svg');
}
@font-face{
font-family: 'colfaxLight';
src: url('../fonts/colfaxLight.eot');
src: url('../fonts/colfaxLight.eot?#iefix') format('embedded-opentype'),
url('../fonts/colfaxLight.woff') format('woff'),
url('../fonts/colfaxLight.ttf') format('truetype'),
url('../fonts/colfaxLight.svg#webfont') format('svg');
}
@font-face{
font-family: 'colfaxRegular';
src: url('../fonts/colfaxRegular.eot');
src: url('../fonts/colfaxRegular.eot?#iefix') format('embedded-opentype'),
url('../fonts/colfaxRegular.woff') format('woff'),
url('../fonts/colfaxRegular.ttf') format('truetype'),
url('../fonts/colfaxRegular.svg#webfont') format('svg');
}
@font-face{
font-family: 'colfaxRegularItalic';
src: url('../fonts/colfaxRegularItalic.eot');
src: url('../fonts/colfaxRegularItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/colfaxRegularItalic.woff') format('woff'),
url('../fonts/colfaxRegularItalic.ttf') format('truetype'),
url('../fonts/colfaxRegularItalic.svg#webfont') format('svg');
}
@font-face{
font-family: 'colfaxMedium';
src: url('../fonts/colfaxMedium.eot');
src: url('../fonts/colfaxMedium.eot?#iefix') format('embedded-opentype'),
url('../fonts/colfaxMedium.woff') format('woff'),
url('../fonts/colfaxMedium.ttf') format('truetype'),
url('../fonts/colfaxMedium.svg#webfont') format('svg');
}
@font-face{
font-family: 'colfaxBold';
src: url('../fonts/colfaxBold.eot');
src: url('../fonts/colfaxBold.eot?#iefix') format('embedded-opentype'),
url('../fonts/colfaxBold.woff') format('woff'),
url('../fonts/colfaxBold.ttf') format('truetype'),
url('../fonts/colfaxBold.svg#webfont') format('svg');
}
body {
background-color:#eeebe8;
font-family: 'colfaxRegular', Arial, sans-serif;
font-size: 16px;
line-height: 1.6;
padding-top: 70px;
}
h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
font-family: "colfaxMedium", Helvetica, Arial, sans-serif;
font-weight: Normal;
line-height: 1.1;
}
h1, h2, h3 {
margin-top: 0px;
}
h1, .h1 {
font-size: 46px;
}
h2, .h2 {
font-size: 36px;
}
.lead {
margin-bottom: 20px;
font-size: 24px;
font-weight: Normal;
font-family: 'colfaxRegularItalic', Helvetica, Arial, sans-serif;
line-height: 1.5;
}
.uninett-author {
font-family: 'colfaxRegular', Helvetica, Arial, sans-serif;
font-size: 12px;
color: #999;
margin-top: 16px;
margin-bottom: 16px;
}
.uninett-author-results {
font-family: 'colfaxRegular', Helvetica, Arial, sans-serif;
font-size: 12px;
color: #999;
margin-top: 10px;
margin-bottom: 10px;
}
a {
color: #005c9e;
}
a:hover, a:focus {
color: #252677;
}
b, strong {
font-family: 'colfaxMedium';
font-weight: normal;
}
i, em {
font-family: 'colfaxRegularItalic';
font-weight: normal;
}
.form-control {
-webkit-appearance: none;
border-radius: 4;
-webkit-border-radius: 4px;
}
input[type="search"] {
-webkit-appearance: none;
border-radius: 3px;
}
.navbar-fixed-top {
border-width: 0 0 0px;
}
.navbar {
min-height: 70px;
border: 0px;
}
.navbar-default {
background-color: #fff;
border-color: #fff;
}
.navbar-brand {
padding: 16px 14px;
}
.navbar-nav {
margin-top: 17px;
float: none;
}
.navbar-nav > li > a {
font-family: 'colfaxRegular', Arial, sans-serif;
font-size: 15px;
color: #666464;
padding-left: 25px;
padding-right: 25px;
padding-top: 13px;
padding-bottom: 9px;
}
.navbar-nav .uninett-search {
float:right;
}
.navbar-nav .uninett-login {
float:right;
z-index: 100;
}
.navbar-header:after {
clear: none !important;
}
.uninett-menu-search {
margin-top: 6px;
}
.navbar-form-uninett {
margin-left: 0px;
margin-right: 0px;
padding: 0px;
border-top: 0px solid transparent;
border-bottom: 0px solid transparent;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);
margin-top: 0px;
margin-bottom: 0px;
}
.navbar-default .navbar-nav > li > a {
color: #666464;
}
.navbar-default .navbar-nav > li > a:hover {
color: #000000;
}
.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
background-color: #fff;
color: #eb212e;
}
.navbar-toggle {
border: 0px solid transparent;
border-radius: 0px;
margin-right: 6px;
}
.navbar-toggle .icon-bar {
border-radius: 0px;
height: 3px;
}
.navbar-default .navbar-toggle .icon-bar {
background-color: #231f20;
}
.department {
font-family: 'colfaxLight', Arial, sans-serif;
font-size: 26px;
color: #6a5f58;
float: left;
padding-right: 25px;
padding-top: 16px;
}
.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
color: #eb212e;
background-color: #ffffff;
}
.dropdown-menu {
font-family: 'colfaxRegular', Arial, sans-serif;
font-size: 14px;
padding: 13px 4px;
margin: 2px 0 0;
background-color: #ffffff;
border: 0px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0);
border-radius: 0px;
}
.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
color: #000000;
background-color: #ffffff;
}
.dropdown-menu > li > a {
color: #666464;
}
.navbar-default .navbar-nav > .open > a .caret, .navbar-default .navbar-nav > .open > a:hover .caret, .navbar-default .navbar-nav > .open > a:focus .caret {
border-top-color: #eb212e;
border-bottom-color: #eb212e;
}
.dropdown-menu>.active>a, .dropdown-menu>.active>a:hover, .dropdown-menu>.active>a:focus {
background-color: #eb212e;
}
.jumbotron {
margin-bottom: 0px;
margin-top: 20px;
background-color: #92ceef;
}
.jumbotron h1 {
line-height: 1;
letter-spacing: 0px;
font-family: 'colfaxThin', Arial, sans-serif;
font-size: 60px;
color: #fff;
}
.jumbotron p {
line-height: 1.2;
letter-spacing: 0px;
font-family: 'colfaxLight', Arial, sans-serif;
font-size: 20px;
}
.container .jumbotron {
border-radius: 0px;
}
.uninett-padded {
padding: 40px;
}
.uninett-whole-row {
margin-left: 0px;
margin-right: 0px;
margin-top: 20px;
}
.uninett-whole-row-col {
padding-left: 0px;
padding-right: 0px;
}
.gutter {
margin-top: 20px;
}
.uninett-color-lightBlue {
background-color: #92ceef;
}
.uninett-color-blue {
background-color: #005c9e;
}
.uninett-color-darkBlue {
background-color: #00404c;
}
.uninett-color-lightGreen {
background-color: #4cc0be;
}
.uninett-color-green {
background-color: #00b086;
}
.uninett-color-darkGreen {
background-color: #006b49;
}
.uninett-color-white {
background-color: #ffffff;
}
.uninett-color-red {
background-color: #eb212e;
}
.uninett-color-orange {
background-color: #f3823e;
}
.uninett-fontColor-black {
color: #231f20;
}
.uninett-fontColor-grey {
color: #a0a0a0;
}
.uninett-fontColor-white {
color: #ffffff;
}
.uninett-fontColor-red {
color: #eb212e;
}
.uninett-pattern1 {
background-image:url(../images/uninett_struktur1.jpg);
}
/* BUTTONS */
.btn-default {
font-family: 'colfaxMedium', Arial, sans-serif;
color: #231f20;
background-color: #f2f2f2;
border-color: #f2f2f2;
}
.btn-default:hover, .btn-default:focus, .btn-default:active, .btn-default.active, .open .dropdown-toggle.btn-default {
color: #231f20;
background-color: #dfdfdf;
border-color: #dfdfdf;
}
.btn-primary {
font-family: 'colfaxMedium', Arial, sans-serif;
color: #ffffff;
background-color: #337db1;
border-color: #337db1;
}
.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary {
color: #ffffff;
background-color: #005c9e;
border-color: #005c9e;
}
.btn-success {
font-family: 'colfaxMedium', Arial, sans-serif;
color: #ffffff;
background-color: #33c09e;
border-color: #33c09e;
}
.btn-success:hover, .btn-success:focus, .btn-success:active, .btn-success.active, .open .dropdown-toggle.btn-success {
color: #ffffff;
background-color: #00b086;
border-color: #00b086;
}
.btn-info {
font-family: 'colfaxMedium', Arial, sans-serif;
color: #ffffff;
background-color: #8fc1dd;
border-color: #8fc1dd;
}
.btn-info:hover, .btn-info:focus, .btn-info:active, .btn-info.active, .open .dropdown-toggle.btn-info {
color: #ffffff;
background-color: #73b1d4;
border-color: #73b1d4;
}
.btn-warning {
font-family: 'colfaxMedium', Arial, sans-serif;
color: #ffffff;
background-color: #f59b65;
border-color: #f59b65;
}
.btn-warning:hover, .btn-warning:focus, .btn-warning:active, .btn-warning.active, .open .dropdown-toggle.btn-warning {
color: #ffffff;
background-color: #f3823e;
border-color: #f3823e;
}
.btn-danger {
font-family: 'colfaxMedium', Arial, sans-serif;
color: #ffffff;
background-color: #ef4d58;
border-color: #ef4d58;
}
.btn-danger:hover, .btn-danger:focus, .btn-danger:active, .btn-danger.active, .open .dropdown-toggle.btn-danger {
color: #ffffff;
background-color: #eb212e;
border-color: #eb212e;
}
.btn-group>.btn, .btn-group-vertical>.btn {
margin-right: 3px;
}
.nav-pills>li.active>a, .nav-pills>li.active>a:hover, .nav-pills>li.active>a:focus {
font-family: 'colfaxMedium', Arial, sans-serif;
color: #ffffff;
background-color: #337db1;
}
.glyphicon_search_menu {
top: 14px;
margin-left: -27px;
font-size: 18px;
}
.breadcrumb {
opacity: 0.5;
border-radius: 0px;
font-family: 'colfaxRegularItalic', Arial, sans-serif;
font-size: 12px;
padding: 4px 11px;
margin-bottom: 16px;
background-color: #f5f5f5;
}
.pagination>.active>a, .pagination>.active>span, .pagination>.active>a:hover, .pagination>.active>span:hover, .pagination>.active>a:focus, .pagination>.active>span:focus {
background-color: #337db1;
border-color: #337db1;
}
.pager li>a, .pager li>span {
display: inline-block;
padding: 5px 14px;
background-color: #f2f2f2;
border: 1px solid #f2f2f2;
border-radius: 4px;
}
.alert-success {
background-color: #e5f7f3;
border-color: #e5f7f3;
color: #00b086;
}
.alert-info {
background-color: #e5eef5;
border-color: #e5eef5;
color: #005c9e;
}
.alert-warning {
background-color: #fef2eb;
border-color: #fef2eb;
color: #f3823e;
}
.alert-danger {
background-color: #fde8ea;
border-color: #fde8ea;
color: #eb212e;
}
.alert-dismissable .close {
top: -4px;
right: -18px;
}
.close {
font-size: 27px;
font-weight: normal;
font-family: 'colfaxMedium', Arial, sans-serif;
}
.alert .alert-link {
font-weight: normal;
font-family: 'colfaxMedium', Arial, sans-serif;
}
.progress-bar-success {
background-color: #4cc8aa;
}
.progress-bar-info {
background-color: #4c8dbb;