reshufflize the parameters to room renderers

diff --git a/webcit-ng/static/index.html b/webcit-ng/static/index.html
index e7cb799800f7cb82995431e2dc35224895f2f903..7bac73bd0de6c2489f6c7f7ab57e2997e9e19cb7 100644 (file)
--- a/webcit-ng/static/index.html
+++ b/webcit-ng/static/index.html
@@ -64,7 +64,7 @@
 <div class="w3-overlay w3-hide-large w3-animate-opacity" onclick="w3_close()" style="cursor:pointer" title="close side menu" id="myOverlay"></div>
 
 <!-- MAIN PAGE CONTENT DIV -->
-<div id="main" class="w3-main" style="margin-left:300px;margin-top:43px;">
+<div id="ctdl-main" class="w3-main" style="margin-left:300px;margin-top:43px;">
 
 die in a car fire
 

diff --git a/webcit-ng/static/js/login.js b/webcit-ng/static/js/login.js
index ba2dbff7ef3d8ba772f218cf73545250c271f89e..699e41498573d8e477ac433e5d66a41fc6f7b29f 100644 (file)
--- a/webcit-ng/static/js/login.js
+++ b/webcit-ng/static/js/login.js
@@ -12,7 +12,7 @@
 
 function display_login_screen(any_message)
 {
-       document.getElementById("main").innerHTML =
+       document.getElementById("ctdl-main").innerHTML =
                "<center><br><br>Put the login screen here, dummary<br><br>" +
                any_message + "<br><br>" +
                "<table border=0><tr><td>" +
@@ -62,7 +62,7 @@ function login_result(data)
                logged_in = 1;
                current_user = data.substring(4).split("|")[0];
                update_banner();
-               document.getElementById("main").innerHTML = "FIXME ok we are logged in as " + current_user + " ... " ;
+               document.getElementById("ctdl-main").innerHTML = "FIXME ok we are logged in as " + current_user + " ... " ;
        }
        else {
                display_login_screen(data.substring(4));

diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js
index 0170a987aba037465982c312e67a0320ecb8ad7e..0208866c41b071eb056a7a7b19c4caf496f96e6b 100644 (file)
--- a/webcit-ng/static/js/main.js
+++ b/webcit-ng/static/js/main.js
@@ -201,5 +201,5 @@ function gotoroom_2(data) {
        default_view = data.default_view;
        last_seen = data.last_seen;
        update_banner();
-       render_room_view();
+       render_room_view(0, Number.MAX_VALUE);
 }

diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index b569cd6640c1ce73e60bbadea721d36671ceca48..d62af2cb83b1be2312ce5afc28c7670f58456747 100644 (file)
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -32,65 +32,33 @@ var views = {
 // This function is the dispatcher that determines the correct view for a room,
 // and calls the correct renderer.
 //
-function render_room_view()
+function render_room_view(min_msg, max_msg)
 {
        switch(current_view)
        {
                case views.VIEW_MAILBOX:                                                // FIXME view mail rooms as forums for now
                case views.VIEW_BBS:
-                       forum_readmessages();
+                       forum_readmessages("ctdl-main", min_msg, max_msg);
                        break;
                default:
-                       document.getElementById("main").innerHTML = "The view for " + current_room + " is " + current_view + " but there is no renderer." ;
+                       document.getElementById("ctdl-main").innerHTML = "The view for " + current_room + " is " + current_view + " but there is no renderer." ;
                        break;
        }
 
 }
 
 
-// Forum view -- flat or threaded
-// The inner div exists so that if the user clicks away early, the main div doesn't get clobbered when the load completes.
-// The parameter can be set to "flat" or "threads" which is passed directly to the API
-//
-function XX_forum_readmessages(flat_or_threads)
-{
-       var innerdivname = randomString(5);
-       document.getElementById("main").innerHTML = "<div id=\"" + innerdivname +
-               "\"><br><br><br><center><h5><i class=\"fas fa-spinner fa-spin\"></i>&nbsp;&nbsp;"
-               + _("Loading messages from server, please wait") + "</h5></center></div>" ;
-
-       var request = new XMLHttpRequest();
-       request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/" + flat_or_threads, true);
-       request.onreadystatechange = function()
-       {
-               if (this.readyState === 4)
-               {
-                       if ((this.status / 100) == 2)
-                       {
-                               document.getElementById(innerdivname).outerHTML = this.responseText;
-                       }
-                       else
-                       {
-                               document.getElementById(innerdivname).outerHTML = "ERROR " + this.status ;
-                       }
-               }
-       };
-       request.send();
-       request = null;
-}
-
-
 // Forum view (flat) -- let's have another go at this with the rendering done client-side
 //
-function forum_readmessages()
+function forum_readmessages(target_div, min_msg, max_msg)
 {
        var innerdivname = randomString(5);
-       document.getElementById("main").innerHTML = "<div id=\"" + innerdivname +
+       document.getElementById(target_div).innerHTML = "<div id=\"" + innerdivname +
                "\"><br><br><br><center><h5><i class=\"fas fa-spinner fa-spin\"></i>&nbsp;&nbsp;"
                + _("Loading messages from server, please wait") + "</h5></center></div>" ;
 
        var request = new XMLHttpRequest();
-       request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.all", true);
+       request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.gt|" + min_msg, true);
        request.onreadystatechange = function()
        {
                if (this.readyState === 4)
@@ -101,7 +69,9 @@ function forum_readmessages()
                                document.getElementById(innerdivname).innerHTML =
                                        "Are we logged in? " + logged_in + "<br>"
                                        + "Last seen: " + last_seen + "<br>"
-                                       + "Number of messages: " + msgs.length + "<br>" ;
+                                       + "Number of messages: " + msgs.length + "<br>"
+                                       + "min_msg=" + min_msg + "<br>"
+                                       + "max_msg=" + max_msg + "<br>" ;
 
                                if (msgs.length == 0)
                                {
@@ -120,7 +90,8 @@ function forum_readmessages()
 
                                for (var i in msgs)
                                {
-                                       document.getElementById(innerdivname).innerHTML += "message # " + msgs[i] + "<br>" ;
+                                       document.getElementById(innerdivname).innerHTML +=
+                                               "<div id=\"ctdl_msg_" + msgs[i] + "\">message #" + msgs[i] + "</div>" ;
                                }
                        }
                        else