Cleaned up some messy rendering in the bbs view.
[citadel.git] / webcit-ng / static / js / views.js
index fbc8299027a77193d31238d76355677f3fd769c9..5804155f48d6c97e87d7c7f51c6ce9ea6d675f2e 100644 (file)
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016-2018 by the citadel.org team
+// Copyright (c) 2016-2019 by the citadel.org team
 //
 // This program is open source software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 3.
@@ -34,14 +34,14 @@ var views = {
 //
 function render_room_view(gt_msg, lt_msg)
 {
-       switch(current_view)
-       {
+       switch(current_view) {
                case views.VIEW_MAILBOX:                                                // FIXME view mail rooms as forums for now
                case views.VIEW_BBS:
                        forum_readmessages("ctdl-main", gt_msg, lt_msg);
                        break;
                default:
-                       document.getElementById("ctdl-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;
        }
 
@@ -54,102 +54,89 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
 {
        original_text = document.getElementById(target_div).innerHTML;          // in case we need to replace it after an error
        document.getElementById(target_div).innerHTML = 
-               "<i class=\"fas fa-spinner fa-spin\"></i>&nbsp;&nbsp;"
-               + _("Loading messages from server, please wait") ;
+               "<div align=\"center\"><i class=\"fas fa-spinner fa-spin\"></i>&nbsp;&nbsp;"
+               + _("Loading messages from server, please wait") + "</div>";
 
        var request = new XMLHttpRequest();
-       if (lt_msg < 9999999999)
-       {
+       if (lt_msg < 9999999999) {
                request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.lt|" + lt_msg, true);
        }
-       else
-       {
+       else {
                request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/msgs.gt|" + gt_msg, true);
        }
-       request.onreadystatechange = function()
-       {
-               if (this.readyState === 4)
-               {
-                       if ((this.status / 100) == 2)
-                       {
+       request.onreadystatechange = function() {
+               if (this.readyState === 4) {
+                       if ((this.status / 100) == 2) {
                                msgs = JSON.parse(this.responseText);
                                document.getElementById(target_div).innerHTML = "" ;
 
                                // If we were given an explicit starting point, by all means start there.
                                // Note that we don't have to remove them from the array because we did a 'msgs gt|xxx' command to Citadel.
-                               if (gt_msg > 0)
-                               {
+                               if (gt_msg > 0) {
                                        msgs = msgs.slice(0, messages_per_page);
                                }
 
                                // Otherwise, show us the last 20 messages
-                               else
-                               {
-                                       if (msgs.length > messages_per_page)
-                                       {
+                               else {
+                                       if (msgs.length > messages_per_page) {
                                                msgs = msgs.slice(msgs.length - messages_per_page);
                                        }
                                        new_old_div_name = randomString(5);
-                                       if (msgs.length < 1)
-                                       {
+                                       if (msgs.length < 1) {
                                                newlt = lt_msg;
                                        }
-                                       else
-                                       {
+                                       else {
                                                newlt = msgs[0];
                                        }
                                        document.getElementById(target_div).innerHTML +=
                                                "<div id=\"" + new_old_div_name + "\">" +
+                                               "<div align=\"center\">" +
                                                "<a href=\"javascript:forum_readmessages('" + new_old_div_name + "', 0, " + newlt + ");\">" +
-                                               "link to msgs less than " + newlt + "</a></div>" ;
+                                               "<i class=\"fa fa-arrow-circle-up\"></i>&nbsp;&nbsp;" +
+                                               _("Older posts") + "&nbsp;&nbsp;<i class=\"fa fa-arrow-circle-up\"></a></div></div></a></div></div>" ;
                                }
 
-                               // Render the divs (we will fill them in later)
-                               for (var i in msgs)
-                               {
-                                       document.getElementById(target_div).innerHTML += "<div id=\"ctdl_msg_" + msgs[i] + "\">#" + msgs[i] + "</div>" ;
+                               // Render an empty div for each message.  We will fill them in later.
+                               for (var i in msgs) {
+                                       document.getElementById(target_div).innerHTML += "<div id=\"ctdl_msg_" + msgs[i] + "\"> </div>" ;
+                                       document.getElementById("ctdl_msg_"+msgs[i]).style.display = "none";
                                }
-                               if (lt_msg == 9999999999)
-                               {
+                               if (lt_msg == 9999999999) {
                                        new_new_div_name = randomString(5);
-                                       if (msgs.length <= 0)
-                                       {
+                                       if (msgs.length <= 0) {
                                                newgt = gt_msg;
                                        }
-                                       else
-                                       {
+                                       else {
                                                newgt = msgs[msgs.length-1];
                                        }
                                        document.getElementById(target_div).innerHTML +=
                                                "<div id=\"" + new_new_div_name + "\">" +
+                                               "<div align=\"center\">" +
                                                "<a href=\"javascript:forum_readmessages('" + new_new_div_name + "', " + newgt + ", 9999999999);\">" +
-                                               "link to msgs greater than " + newgt + "</a></div>" ;
+                                               "<i class=\"fa fa-arrow-circle-down\"></i>&nbsp;&nbsp;" +
+                                               _("Newer posts") + "&nbsp;&nbsp;<i class=\"fa fa-arrow-circle-down\"></a></div></div>" ;
                                }
 
                                // Now figure out where to scroll to after rendering.
-                               if (gt_msg > 0)
-                               {
+                               if (gt_msg > 0) {
                                        scroll_to = msgs[0];
                                }
-                               else if (lt_msg < 9999999999)
-                               {
+                               else if (lt_msg < 9999999999) {
                                        scroll_to = msgs[msgs.length-1];
                                }
-                               else if ( (logged_in) && (gt_msg == 0) && (lt_msg == 9999999999) )
-                               {
+                               else if ( (logged_in) && (gt_msg == 0) && (lt_msg == 9999999999) ) {
                                        scroll_to = msgs[msgs.length-1];
                                }
-                               else
-                               {
+                               else {
                                        scroll_to = msgs[0];            // FIXME this is too naive
                                }
 
                                // Render the individual messages in the divs
                                forum_render_messages(msgs, "ctdl_msg_", scroll_to)
                        }
-                       else
-                       {
-                               document.getElementById(target_div).innerHTML = original_text;          // this will make the link reappear so the user can try again
+                       else {
+                               // if xhr fails, this will make the link reappear so the user can try again
+                               document.getElementById(target_div).innerHTML = original_text;
                        }
                }
        };
@@ -162,9 +149,8 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
 //
 function forum_render_messages(msgs, prefix, scroll_to)
 {
-       for (i=0; i<msgs.length; ++i)
-       {
-               forum_render_one(prefix+msgs[i], msgs[i], scroll_to)
+       for (i=0; i<msgs.length; ++i) {
+               forum_render_one(prefix+msgs[i], msgs[i], scroll_to);
        }
 }
 
@@ -174,21 +160,19 @@ function forum_render_one(div, msgnum, scroll_to)
 {
        var request = new XMLHttpRequest();
        request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/" + msgs[i] + "/json", true);
-       request.onreadystatechange = function()
-       {
-               if (this.readyState === 4)
-               {
-                       if ((this.status / 100) == 2)
-                       {
+       request.onreadystatechange = function() {
+               if (this.readyState === 4) {
+                       if ((this.status / 100) == 2) {
                                msg = JSON.parse(this.responseText);
 
                                document.getElementById(div).innerHTML =
                                  "<div class=\"ctdl-msg-wrapper\">"                            // begin message wrapper
                                + "<div class=\"ctdl-avatar\">"                                 // begin avatar
-                               + "<i class=\"fa fa-user-circle fa-2x\"></i> "                  // FIXME temporary avatar
+                               + "<img src=\"/ctdl/u/" + msg.from + "/userpic\" width=\"32\" "
+                               + "onerror=\"this.parentNode.innerHTML='&lt;i class=&quot;fa fa-user-circle fa-2x&quot;&gt;&lt;/i&gt; '\">"
                                + "</div>"                                                      // end avatar
-                               + "<div>"                                                       // begin content
-                               + "<div>"                                                       // begin header
+                               + "<div class=\"ctdl-msg-content\">"                            // begin content
+                               + "<div class=\"ctdl-msg-header\">"                             // begin header
                                + "<span class=\"ctdl-username\"><a href=\"#\">"                // FIXME link to user profile
                                + msg.from
                                + "</a></span> "
@@ -203,12 +187,11 @@ function forum_render_one(div, msgnum, scroll_to)
                                + "</div>"                                                      // end wrapper
                                ;
                        }
-                       else
-                       {
+                       else {
                                document.getElementById(div).innerHTML = "ERROR";
                        }
-                       if (msgnum == scroll_to)
-                       {
+                       document.getElementById(div).style.display  = "inline";
+                       if (msgnum == scroll_to) {
                                window.location.hash = div;
                        }
                }