diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/css/nms.css | 3 | ||||
| -rw-r--r-- | web/index.html | 2 | ||||
| -rw-r--r-- | web/js/nms-info-box.js | 3 | ||||
| -rw-r--r-- | web/js/nms-oplog.js | 17 |
4 files changed, 20 insertions, 5 deletions
diff --git a/web/css/nms.css b/web/css/nms.css index f740c5e..7bdfd01 100644 --- a/web/css/nms.css +++ b/web/css/nms.css @@ -15,6 +15,9 @@ canvas { .left { width: 22ch; } +.logbook-mini .left { + width: auto; +} tr.mgmt_v4_addr { font-weight: 700; } diff --git a/web/index.html b/web/index.html index f79e96b..6b2dda4 100644 --- a/web/index.html +++ b/web/index.html @@ -276,7 +276,7 @@ <canvas id="inputCanvas" width="1920" height="1032" style="position: absolute; z-index: 60; cursor: pointer;" onmousedown="nmsMap.canvasClick(event)"> </canvas> <canvas id="hiddenCanvas" width="1000" height="10" style="display: none; position: absolute; z-index: 1000 "></canvas> - <div class="logbook gondul-is-private" style="position: absolute; right: 10px; width: 20%; z-index: 70; float: right;"> + <div class="logbook logbook-mini gondul-is-private" style="position: absolute; right: 10px; width: 20%; z-index: 70; float: right;"> <div id="oplog-parent-mini" class="logbook" style="border-color: transparent;"> <table id="oplog-table-mini" class="table table-condensed"> </table> diff --git a/web/js/nms-info-box.js b/web/js/nms-info-box.js index 37332a0..1a4ab4f 100644 --- a/web/js/nms-info-box.js +++ b/web/js/nms-info-box.js @@ -832,6 +832,9 @@ var switchCommentsPanel = function () { table.className = "table"; table.classList.add("table"); table.classList.add("table-condensed"); + var cap = document.createElement("caption"); + cap.textContent = "Relevant log entries"; + table.appendChild(cap); for (var v in logs) { tr = table.insertRow(-1); tr.className = diff --git a/web/js/nms-oplog.js b/web/js/nms-oplog.js index 83bda69..740385c 100644 --- a/web/js/nms-oplog.js +++ b/web/js/nms-oplog.js @@ -54,7 +54,7 @@ nmsOplog.commit = function() { } nmsOplog.updateComments = function() { - nmsOplog._updateComments(5,"-mini","time"); + nmsOplog._updateComments(3,"-mini","time",100); nmsOplog._updateComments(0,"","timestamp"); } @@ -71,7 +71,7 @@ nmsOplog.getSwitchLogs = function(sw) { return logs; } -nmsOplog._updateComments = function(limit,prefix,timefield) { +nmsOplog._updateComments = function(limit,prefix,timefield,cutoff) { var table = document.createElement("table"); var tr; var td1; @@ -89,9 +89,18 @@ nmsOplog._updateComments = function(limit,prefix,timefield) { if (timefield == "time") { td1.textContent = date.toTimeString().replace(/:\d\d .*$/,""); } else { - td1.textContent = date.toString(); + let month = date.getMonth() + 1; + let day = date.getDate(); + let tmp = (date.getYear() + 1900) + "-" + (month < 10 ? "0": "") + month + "-" + (day < 10 ? "0" : "") + day + " " + date.toTimeString().replace(/:\d\d .*$/,""); + td1.textContent = tmp; } - td2.textContent = "[" + nmsData['oplog']['oplog'][v]['username'] + "] " + nmsData['oplog']['oplog'][v]['log']; + td1.classList.add("left"); + let data = nmsData['oplog']['oplog'][v]['log']; + if (cutoff && data.length > cutoff) { + data = data.slice(0,cutoff); + data = data + "(...)"; + } + td2.textContent = "[" + nmsData['oplog']['oplog'][v]['username'] + "] " + data; td2.hiddenthing = v; td2.onclick = function(e){ var x = document.getElementById("searchbox"); var v = e.path[0].hiddenthing; x.value = nmsData['oplog']['oplog'][v]['systems']; x.oninput(); } if (++i == limit) |