chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
journal: implement time-based rotation/vacuuming
[elogind.git] / src / journal / browse.html
diff --git a/src/journal/browse.html b/src/journal/browse.html
index 5a161a13fbaa8985afefcdbad45da394d4becae9..2da0b0a46f92bc03a2ae94540cfb889c12046035 100644 (file)
--- a/src/journal/browse.html
+++ b/src/journal/browse.html
@@ -80,19 +80,25 @@
                         text-align: center;
                         font-size: 7pt;
                         color: #818789;
-                        padding-top: 50px;
+                        padding-top: 2em;
                 }
                 .key {
                         font-weight: bold;
                         color: #313739;
                 }
+                form {
+                        text-align: center;
+                }
+                input {
+                        font-size: 18pt;
+                        font-weight: bold;
+                }
         </style>
 </head>
 
 <body>
         <!-- TODO:
                 - live display
-                - localstorage
                 - show red lines for reboots -->
 
         <h1 id="title"></h1>
@@ -109,19 +115,19 @@
         <div id="diventry"><table id="tableentry"></table></div>
 
         <form>
-                <input id="head" type="button" value="|&lt;" onclick="entriesLoadHead();"/>
-                <input id="previous" type="button" value="&lt;&lt;" onclick="entriesLoadPrevious();"/>
-                <input id="next" type="button" value="&gt;&gt;" onclick="entriesLoadNext();"/>
-                <input id="tail" type="button" value="&gt;|" onclick="entriesLoadTail();"/>
+                <input id="head" type="button" value="&#8676;" onclick="entriesLoadHead();" title="First Page"/>
+                <input id="previous" type="button" value="&#8592;" onclick="entriesLoadPrevious();" title="Previous Page"/>
+                <input id="next" type="button" value="&#8594;" onclick="entriesLoadNext();" title="Next Page"/>
+                <input id="tail" type="button" value="&#8677;" onclick="entriesLoadTail();" title="Last Page"/>
                 &nbsp;&nbsp;&nbsp;&nbsp;
-                <input id="more" type="button" value="More" onclick="entriesMore();"/>
-                <input id="less" type="button" value="Less" onclick="entriesLess();"/>
+                <input id="more" type="button" value="+" onclick="entriesMore();" title="More Entries"/>
+                <input id="less" type="button" value="-" onclick="entriesLess();" title="Fewer Entries"/>
         </form>
 
         <div id="keynav">
-                <span class="key">&#8594;, j, SPACE</span>: Next Page &nbsp;&nbsp;&nbsp;&nbsp;
-                <span class="key">&#8592;, k, BACKSPACE</span>: Previous Page &nbsp;&nbsp;&nbsp;&nbsp;
                 <span class="key">g</span>: First Page &nbsp;&nbsp;&nbsp;&nbsp;
+                <span class="key">&#8592;, k, BACKSPACE</span>: Previous Page &nbsp;&nbsp;&nbsp;&nbsp;
+                <span class="key">&#8594;, j, SPACE</span>: Next Page &nbsp;&nbsp;&nbsp;&nbsp;
                 <span class="key">G</span>: Last Page &nbsp;&nbsp;&nbsp;&nbsp;
                 <span class="key">+</span>: More entries &nbsp;&nbsp;&nbsp;&nbsp;
                 <span class="key">-</span>: Fewer entries
@@ -131,33 +137,17 @@
                 var first_cursor = null;
                 var last_cursor = null;
 
-                function setCookie(name, value, msec) {
-                        var d = new Date();
-                        d.setMilliseconds(d.getMilliseconds() + msec);
-                        var v = escape(value) + "; expires=" + d.toUTCString();
-                        document.cookie = name + "=" + value;
-                }
-
-                function getCookie(name) {
-                        var i, l;
-                        l = document.cookie.split(";");
-                        for (i in l) {
-                                var x, y, j;
-                                j = l[i].indexOf("=");
-                                x = l[i].substr(0, j);
-                                y = l[i].substr(j+1);
-                                if (x == name)
-                                        return unescape(y);
-                        }
-                        return null;
-                }
-
                 function getNEntries() {
                         var n;
-                        n = getCookie("n_entries");
+                        n = window.localStorage["n_entries"];
                         if (n == null)
                                 return 50;
-                        return parseInt(n);
+                        n = parseInt(n);
+                        if (n < 10)
+                                return 10;
+                        if (n > 1000)
+                                return 1000;
+                        return n;
                 }
 
                 function showNEntries(n) {
@@ -167,11 +157,10 @@
 
                 function setNEntries(n) {
                         if (n < 10)
-                                n = 10;
-                        else if (n > 1000)
-                                n = 1000;
-
-                        setCookie("n_entries", n.toString(), 30*24*60*60*1000);
+                                return 10;
+                        if (n > 1000)
+                                return 1000;
+                        window.localStorage["n_entries"] = n.toString();
                         showNEntries(n);
                 }
 
@@ -230,6 +219,12 @@
                 }
 
                 function entriesLoad(range) {
+
+                        if (range == null)
+                                range = window.localStorage["cursor"] + ":0";
+                        if (range == null)
+                                range = "";
+
                         var request = new XMLHttpRequest();
                         request.open("GET", "/entries");
                         request.onreadystatechange = entriesOnResult;
@@ -326,7 +321,7 @@
                                 else if (d.SYSLOG_PID != undefined)
                                         buf += "[" + escapeHTML(d.SYSLOG_PID) + "]";
 
-                                buf += '</td><td class="' + clazz + '"><a href="#entry" onclick="onMessageClick(\'' + lc + '\');">';
+                                buf += '</td><td class="' + clazz + '"><a href="#entry" onclick="onMessageClick(\'' + d.__CURSOR + '\');">';
 
                                 if (d.MESSAGE == null)
                                         buf += "[blob data]";
@@ -340,8 +335,10 @@
 
                         logs.innerHTML = '<tbody>' + buf + '</tbody>';
 
-                        if (fc != null)
+                        if (fc != null) {
                                 first_cursor = fc;
+                                window.localStorage["cursor"] = fc;
+                        }
                         if (lc != null)
                                 last_cursor = lc;
                 }
@@ -419,10 +416,21 @@
                         }
                 }
 
+                function onMouseWheel(event) {
+                        if (event.detail < 0 || event.wheelDelta > 0)
+                                entriesLoadPrevious();
+                        else
+                                entriesLoadNext();
+                }
+
                 machineLoad();
-                entriesLoad("");
+                entriesLoad(null);
                 showNEntries(getNEntries());
                 document.onkeyup = onKeyUp;
+
+                logs = document.getElementById("divlogs");
+                logs.addEventListener("mousewheel", onMouseWheel, false);
+                logs.addEventListener("DOMMouseScroll", onMouseWheel, false);
         </script>
 </body>
 </html>
Unnamed repository; edit this file 'description' to name the repository.