diff options
Diffstat (limited to 'web/nms.gathering.org/nms2/index.html')
| -rw-r--r-- | web/nms.gathering.org/nms2/index.html | 111 |
1 files changed, 57 insertions, 54 deletions
diff --git a/web/nms.gathering.org/nms2/index.html b/web/nms.gathering.org/nms2/index.html index 869fee0..9327e72 100644 --- a/web/nms.gathering.org/nms2/index.html +++ b/web/nms.gathering.org/nms2/index.html @@ -1,44 +1,46 @@ <!DOCTYPE html> - <html lang="en"> -<head> - <meta name="generator" content="HTML Tidy for Linux (vers 25 March 2009), see www.w3.org"> - <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <head> <meta charset="utf-8"> - - <title>NMS2</title> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> <meta name="description" content=""> <meta name="author" content=""> - <script src="js/jquery-1.10.2.min.js" type="text/javascript"> - </script><!--<script src="http://cdn.jsdelivr.net/qtip2/2.2.1/jquery.qtip.min.js"></script>--> - <link href="css/bootstrap.min.css" rel="stylesheet" type="text/css"> - <link href="css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css"> - <link href="css/slider.css" rel="stylesheet" type="text/css"> + <link rel="icon" href="../../favicon.ico"> + + <title>NMS2</title> + + <!-- Bootstrap core CSS --> + <link href="css/bootstrap.min.css" rel="stylesheet"> - <style type="text/css"> - body { - padding-top: 60px; - padding-bottom: 40px; - } - .sidebar-nav { - padding: 9px 0; - } + <!-- Custom styles for this template --> + <link href="css/navbar-static-top.css" rel="stylesheet"> - </style> -</head> + <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> + <!--[if lt IE 9]> + <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> + <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> + <![endif]--> + </head> <body id="body"> - <div class="navbar navbar-inverse navbar-fixed-top"> - <div class="navbar-inner"> - <div class="container-fluid"> - <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"></a> - <div class="nav-collapse collapse"> - <p class="navbar-text pull-right" id="speed" title="Client port speed"></p> - <ul class="navbar nav"> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Map mode<span class="caret"></span></a> - <ul class="dropdown-menu" role="menu"> + <nav class="navbar navbar-default navbar-static-top"> + <div class="container-fluid"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> + <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="#">NMS</a> + </div> + <div id="navbar" class="navbar-collapse collapse"> + <ul class="nav navbar-nav"> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Map mode<span class="caret"></span></a> + <ul class="dropdown-menu" role="menu"> <li><a href="#uplink" onclick="setUpdater(handler_uplinks)">Uplink map</a></li> <li><a href="#temp" onclick="setUpdater(handler_temp)">Temperature map</a></li> <li><a href="#ping" onclick="setUpdater(handler_ping)">Ping map</a></li> @@ -50,37 +52,37 @@ <li><a href="#" onclick="document.getElementById('nowPickerBox').style.display = 'block';">Travel in time</a></li> <li><a href="#" onclick="startReplay();" title="Replay from opening 30 minutes per second">Replay TG</a></li> <li class="divider"> </li> + <li class="dropdown-header">Map scale</li> <li><input type="range" id="scaler" name="points" min="0.5" max="3" step="0.01" onchange="scaleChange()" /></li> <li><a href="#">Scale: <div id="scaler-text"></div></a></li> <li class="divider"> </li> <li><a onclick="document.getElementById('aboutBox').style.display = 'block';">About</a></li> - </ul> - </li> - </ul> - <p id="updater_name" class="navbar-text"></p> - </div><!--/.nav-collapse --> - </div> - </div> - </div> + </ul> + </li> + <li><p id="updater_name" class="navbar-text"></p></li> + </li> + </ul> + <ul class="nav navbar-nav navbar-right"> + <li><p id="speed" class="navbar-text" title="Client port speed"></p></li> + </ul> + </div><!--/.nav-collapse --> + </div> + </nav> <div class="container-fluid"> - <div class="panel" style="position: fixed; z-index: 150;"> - <div class="span4"> - <div id="nowPickerBox" style="display:none; background: - white; border: 1px solid #000000;" > + + <div class="row-fluid"> + <div class="span12"> + <div id="nowPickerBox" class="panel" style="position: fixed; display:none; background: white; border: 1px solid #000000; z-index: 130;" > <input type="text" class="form-control" placeholder="YYYY-MM-DD hh:mm:ss" id="nowPicker" value="" /> <button class="btn btn-default" onclick="changeNow();">Travel</button> + <button class="btn" style="float: right;" onclick="document.getElementById('nowPickerBox').style.display = 'none';">Cancel</button> </div> - <div id="info-switch-parent" style="background: silver"> + <div id="info-switch-parent" class="panel" style="display: none; background: silver; position: fixed; z-index: 120;"> <table class="table" id="info-switch-table"></table> </div> - </div> - </div><!--/row--> - - <div class="row-fluid"> - <div class="span12"> <div id="aboutBox" class="panel" style="display: none; background: white; position: fixed; border: 1px solid #000000; z-index: 100;"> - <button onclick="document.getElementById('aboutBox').style.display = 'none';" style="float: right;">X</button> + <button onclick="document.getElementById('aboutBox').style.display = 'none';" class="btn" style="float: right;">X</button> <h1>Welcome to NMS</h1> <h3>Cool stuff:</h3> <ul> @@ -100,11 +102,10 @@ <li>Polish time travel UI</li> <li>Lock scale</li> <li>Clean up various global variables</li> - <li>Split drawing into multiple canvases to fix Firefox - performance (And because it's generally better)</li> + <li>Split blur into separate canvas (canvas is there, it's just + not used)</li> <li>Add DHCP map</li> <li>Add magic map (combined map of sorts)</li> - <li>Upgrade jQuery and Bootstrap</li> <li>Add better control panel stuff</li> <li>Overhaul general UI for a proper bootstrap-approved look.</li> <li>Fix legend display</li> @@ -146,6 +147,8 @@ </div> </div> </div><!--/.fluid-container--> + <script src="js/jquery.min.js" type="text/javascript"> + <ascript src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script> <script src="js/bootstrap.min.js" type="text/javascript"></script> <script type="text/javascript" src="js/nms.js"></script> <script type="text/javascript"> |