diff options
| -rw-r--r-- | web/nms.gathering.org/index.html | 2 | ||||
| -rw-r--r-- | web/nms.gathering.org/nms2/index.html | 38 | ||||
| -rw-r--r-- | web/nms.gathering.org/nms2/js/nms.js | 11 |
3 files changed, 23 insertions, 28 deletions
diff --git a/web/nms.gathering.org/index.html b/web/nms.gathering.org/index.html index ffcb09b..8043c7d 100644 --- a/web/nms.gathering.org/index.html +++ b/web/nms.gathering.org/index.html @@ -6,7 +6,7 @@ <p>tg light & magic. :-)</p> <ul> - <li><a href="nms2/map.html">NMS 2 NG (Ping, Temp, Uplink, Trafikk, Info)</a> + <li><a href="nms2/">NMS 2 NG (Ping, Temp, Uplink, Trafikk, Info)</a> <br /><i>Trykk på svitsjene (Work in progress)</i> </li> <br /> diff --git a/web/nms.gathering.org/nms2/index.html b/web/nms.gathering.org/nms2/index.html index 304cece..6c0576f 100644 --- a/web/nms.gathering.org/nms2/index.html +++ b/web/nms.gathering.org/nms2/index.html @@ -46,12 +46,11 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" onclick="toggleLayer('aboutBox'); //document.getElementById('aboutBox').style.display = 'block'; hideSwitch();" style="cursor: pointer;" >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 + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Menu <span class="caret"></span> </a> <ul class="dropdown-menu" role="menu"> @@ -66,45 +65,36 @@ <li><a href="#" onclick="toggleLayer('nowPickerBox');document.getElementById('nowPicker').focus();">Travel in time</a></li> <li><a href="#" onclick="startReplay();" title="Replay from opening 120 minutes per second">Replay TG</a></li> <li class="divider"> </li> - <li><a onclick="showTimerDebug(); hideSwitch();" style="cursor: pointer;" >Debug timers</a></li> - </ul> - </li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">View<span class="caret"></span></a> - <ul class="dropdown-menu" role="menu"> + <li class="dropdown-header">View</li> <li><a href="#" onclick="toggleNightMode()">Toggle Night Mode</a></li> <li><a href="#" onclick="showBlurBox()">Tweak Night Mode blur</a></li> <li><a href="#" onclick='showLayer("layerVisibility");'>Set layer visibility</a></li> <li class="divider"> </li> <li class="dropdown-header">Map scale</li> <li><a href="#"><label id="scaler-text" for='scaler'></label><input type="range" id="scaler" name="points" min="0.2" max="3" step="0.01" onchange="scaleChange()" /></a></li> + <li class="divider"> </li> + <li class="dropdown-header">Help</li> + <li><a href="#" onclick="toggleLayer('aboutData');">About TG15 data</a></li> + <li><a href="#" onclick="toggleLayer('aboutBox');" >About NMS</a></li> + <li><a href="#" onclick="toggleLayer('aboutPerformance');" >About Performance</a></li> + <li><a href="#" onclick="toggleLayer('aboutKeybindings');" >Keyboard Shortcuts</a></li> + <li><a onclick="showTimerDebug(); hideSwitch();" style="cursor: pointer;" >Debug timers</a></li> </ul> </li> <li><p id="updater_name" class="navbar-text"></p></li> <div class="navbar-form navbar-left"> <div class="form-group"> - <button class="btn btn-default" id="legend-1"></button> - <button class="btn btn-default" id="legend-2"></button> - <button class="btn btn-default" id="legend-3"></button> - <button class="btn btn-default" id="legend-4"></button> - <button class="btn btn-default" id="legend-5"></button> + <button class="btn btn-default btn-xs" id="legend-1"></button> + <button class="btn btn-default btn-xs" id="legend-2"></button> + <button class="btn btn-default btn-xs" id="legend-3"></button> + <button class="btn btn-default btn-xs" id="legend-4"></button> + <button class="btn btn-default btn-xs" id="legend-5"></button> </div> </div> </li> </ul> <ul class="nav navbar-nav navbar-right"> <li><p id="speed" class="navbar-text" title="Client port speed / Total port speed"></p></li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help - <span class="caret"></span> - </a> - <ul class="dropdown-menu" role="menu"> - <li><a href="#" onclick="toggleLayer('aboutData');">About TG15 data</a></li> - <li><a href="#" onclick="toggleLayer('aboutBox');" >About NMS</a></li> - <li><a href="#" onclick="toggleLayer('aboutPerformance');" >About Performance</a></li> - <li><a href="#" onclick="toggleLayer('aboutKeybindings');" >Keyboard Shortcuts</a></li> - </ul> - </li> </ul> </div><!--/.nav-collapse --> </div> diff --git a/web/nms.gathering.org/nms2/js/nms.js b/web/nms.gathering.org/nms2/js/nms.js index d4cf4e8..6fcf07c 100644 --- a/web/nms.gathering.org/nms2/js/nms.js +++ b/web/nms.gathering.org/nms2/js/nms.js @@ -932,8 +932,8 @@ function updateSpeed() nms.speed = speed_in; nms.speed_full = speed_full; if (speedele) { - speedele.innerHTML = byteCount(8 * parseInt(nms.speed)) + "bit/s"; - speedele.innerHTML += " / " + byteCount(8 * parseInt(nms.speed_full)) + "bit/s"; + speedele.innerHTML = byteCount(8 * parseInt(nms.speed)) + "b/s"; + speedele.innerHTML += " / " + byteCount(8 * parseInt(nms.speed_full)) + "b/s"; } } @@ -1096,6 +1096,11 @@ function setScale() canvas.height = orig.height * canvas.scale ; canvas.width = orig.width * canvas.scale ; for (var a in dr) { + /* + * Resizing this to a too small size breaks gradients on smaller screens. + */ + if (a == 'hidden') + continue; dr[a].c.height = canvas.height; dr[a].c.width = canvas.width; } @@ -1397,7 +1402,7 @@ function initNMS() { nms.timers.ping = new nmsTimer(updatePing, 1000, "Ping updater", "AJAX request to update ping data"); nms.timers.ping.start(); - nms.timers.replay = new nmsTimer(timeReplay, 500, "Time machine", "Handler used to change time"); + nms.timers.replay = new nmsTimer(timeReplay, 1000, "Time machine", "Handler used to change time"); detectHandler(); updatePorts(); updatePing(); |