Goto/Skip/Ungoto disappear when not in forum view

diff --git a/citadel/obsolete.txt b/citadel/obsolete.txt
deleted file mode 100644 (file)
index 541be58..0000000
--- a/citadel/obsolete.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-HAVE_ARPA_NAMESER_H
-HAVE_CONNECT
-HAVE_DB_H
-HAVE_DIRENT_H
-HAVE_FCNTL_H
-HAVE_GETHOSTBYNAME
-HAVE_GETLOADAVG
-HAVE_GETTEXT
-HAVE_GETUTXLINE
-HAVE_INTTYPES_H
-HAVE_LIBPTHREAD
-HAVE_LIBRT
-HAVE_LIMITS_H
-HAVE_MALLOC_H
-HAVE_MKDIR
-HAVE_MKFIFO
-HAVE_MKTIME
-HAVE_NETINET_IN_H
-HAVE_PATHS_H
-HAVE_PTHREAD_CANCEL
-HAVE_RMDIR
-HAVE_SELECT
-HAVE_SOCKET
-HAVE_STDINT_H
-HAVE_STDLIB_H
-HAVE_STRCASECMP
-HAVE_STRERROR
-HAVE_STRFTIME_L
-HAVE_STRNCASECMP
-HAVE_SYSLOG_H
-HAVE_SYS_IOCTL_H
-HAVE_SYS_STAT_H
-HAVE_SYS_TIME_H
-HAVE_SYS_TYPES_H
-HAVE_SYS_WAIT_H
-HAVE_TERMIOS_H
-HAVE_UNISTD_H
-HAVE_USELOCALE
-HAVE_UTMPX_H
-HAVE_UTMP_H
-HAVE_UT_HOST
-HAVE_UT_TYPE
-HAVE_VPRINTF

diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js
index 95c6557a9c63a04fc55fa05760cf3ebea507f12e..070f05ef759fc64ea9b52ec41c2ccd2048de3775 100644 (file)
--- a/webcit-ng/static/js/main.js
+++ b/webcit-ng/static/js/main.js
@@ -148,7 +148,7 @@ function load_new_march_list(which_oper) {
                march_list = await(response.json());
                if (response.ok) {
                        march_list = march_list.filter(function(room) {
-                               return room.hasnewmsgs;
+                               return(room.hasnewmsgs && room.default_view == views.VIEW_BBS);
                        });
                        march_list = march_list.sort(function(a,b) {
                                if (a.floor != b.floor) {

diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index 15933a334cc392e20ca3e3756c4b1666e5720237..785a77009c76308b0ffee5e1cb8c94122a235463 100644 (file)
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -20,7 +20,12 @@ function clear_sidebar_selection() {
 // This function is the dispatcher that determines the correct view for a room, and calls the correct renderer.
 function render_room_view() {
 
-       document.getElementById("ctdl-newmsg-button").style.display = "none";           // the view renderer will set this
+       // The view renderer will set its own room navigation buttons
+       for (const d of ["ctdl-newmsg-button", "ctdl-ungoto-button", "ctdl-skip-button", "ctdl-goto-button"]) {
+               console.log(d);
+               document.getElementById(d).style.display = "none";
+       }
+
        clear_sidebar_selection();
        document.getElementById("ctdl-main").innerHTML = _("Loading messages from server, please wait");