Fixed the rendering on the 'older posts' and 'newer posts' buttons. No longer relies...

diff --git a/webcit-ng/static/css/webcit.css b/webcit-ng/static/css/webcit.css
index 59ddb7a689bcfcf693699fd70f53aab0ff758ac0..5c6f8a3f6b035503f3416c95cd8ccab47d19cda8 100644 (file)
--- a/webcit-ng/static/css/webcit.css
+++ b/webcit-ng/static/css/webcit.css
@@ -234,7 +234,10 @@ html,body,h1,h2,h3,h4,h5 {
 
 .ctdl-forum-nav {
        text-align: center;
-       color: #ffff00;
+       color: Black;
+       background-color: Gainsboro;
+       padding-top: 5px;
+       padding-bottom: 5px;
 }
 
 .ctdl-forum-nav a {

diff --git a/webcit-ng/static/index.html b/webcit-ng/static/index.html
index 66ad74455b48b5711810475f223b478072fdbd9a..087820466bc61de0af2141690c1c9d577ac8c8be 100644 (file)
--- a/webcit-ng/static/index.html
+++ b/webcit-ng/static/index.html
@@ -44,7 +44,7 @@
        <div class="ctdl-grid-sidebar-item" id="sidebar">
                <ul id="ctdl-sidebar">
                        <li><button class="ctdl-sidebar-button" id="ctdl-sidebar-button-mail" onClick="gotoroom('_MAIL_');"><i class="fa fa-envelope fa-fw"></i>  Mail</button>
-                       <li id="ctdl_mail_folder_list" style="display:none"></li>
+                       <li id="ctdl_mail_folder_list" style="display:none">mail folders here</li>
                        <li><button class="ctdl-sidebar-button" id="ctdl-sidebar-button-forums" onClick="render_room_list();"><i class="fas fa-comments fa-fw"></i>  Forums</button>
                        <li><button class="ctdl-sidebar-button" id="ctdl-sidebar-button-calendar"><i class="fa fa-calendar-alt fa-fw"></i>  Calendar</button>
                        <li><button class="ctdl-sidebar-button" id="ctdl-sidebar-button-contacts"><i class="fa fa-address-book fa-fw"></i>  Contacts</button>

diff --git a/webcit-ng/static/js/view_forum.js b/webcit-ng/static/js/view_forum.js
index 9ebdd699ec5668c938d8b98bba1a7f05c14be578..c800d4c4390bb0b69e03a989e08768ba25dc4729 100644 (file)
--- a/webcit-ng/static/js/view_forum.js
+++ b/webcit-ng/static/js/view_forum.js
@@ -45,10 +45,10 @@ function forum_readmessages(target_div_name, gt_msg, lt_msg) {
                                }
                                target_div.innerHTML +=
                                        "<div id=\"" + new_old_div_name + "\">" +
-                                       "<div class=\"ctdl-forum-nav\">" +
-                                       "<a href=\"javascript:forum_readmessages('" + new_old_div_name + "', 0, " + newlt + ");\">" +
+                                       "<div class=\"ctdl-forum-nav\" " +
+                                       "onclick=\"javascript:forum_readmessages('" + new_old_div_name + "', 0, " + newlt + ");\">" +
                                        "<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>" ;
+                                       _("Older posts") + "&nbsp;&nbsp;<i class=\"fa fa-arrow-circle-up\"></div></div></a></div></div>" ;
                        }
 
                        // The messages will go here.
@@ -66,10 +66,10 @@ function forum_readmessages(target_div_name, gt_msg, lt_msg) {
                                target_div.innerHTML +=
                                        "<div id=\"" + new_new_div_name + "\">" +
                                        "<div id=\"ctdl-newmsg-here\"></div>" +
-                                       "<div class=\"ctdl-forum-nav\">" +
-                                       "<a href=\"javascript:forum_readmessages('" + new_new_div_name + "', " + newgt + ", 9999999999);\">" +
+                                       "<div class=\"ctdl-forum-nav\" " +
+                                       "onClick=\"javascript:forum_readmessages('" + new_new_div_name + "', " + newgt + ", 9999999999);\">" +
                                        "<i class=\"fa fa-arrow-circle-down\"></i>&nbsp;&nbsp;" +
-                                       _("Newer posts") + "&nbsp;&nbsp;<i class=\"fa fa-arrow-circle-down\"></a></div></div>" ;
+                                       _("Newer posts") + "&nbsp;&nbsp;<i class=\"fa fa-arrow-circle-down\"></div></div>" ;
                        }
 
                        // Now figure out where to scroll to after rendering.

diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index 0466f8ae1bfe96d47708ea058daaa76143c3e254..46db83528366e465330a7f66c8aa30b56c3979fb 100644 (file)
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -13,6 +13,7 @@ function clear_sidebar_selection() {
                        items[i].classList.remove("ctdl-sidebar-button-selected");
                }
        }
+       document.getElementById("ctdl_mail_folder_list").style.display = "none";
 }
 
 
@@ -45,6 +46,11 @@ function render_room_view(gt_msg, lt_msg) {
                        break;
        }
 
+       // Show the mail folder list only when the Mail view is active.
+       if (current_view == views.VIEW_MAILBOX) {
+               document.getElementById("ctdl_mail_folder_list").style.display = "block";
+       }
+
 }