Moved some of the banner and sidebar items around

diff --git a/webcit-ng/static/css/webcit.css b/webcit-ng/static/css/webcit.css
index e056c8eccd3fff21d15f90cb00a5f51cfbcf5964..2f27d813d9d34d4b59588c005aaf791fe9c5bb91 100644 (file)
--- a/webcit-ng/static/css/webcit.css
+++ b/webcit-ng/static/css/webcit.css
@@ -15,7 +15,7 @@
        background-color: DarkSlateGrey;
 }
 
-.ctdl-grid-navbar-item {
+.ctdl-grid-sidebar-item {
        grid-area: menu;
        background-color: GhostWhite;
 }
@@ -116,7 +116,7 @@ html,body,h1,h2,h3,h4,h5 {
 }
 
 .ctdl-forum-reading-pane {
-       background-color: #456789;
+       background-color: DarkSlateGrey;
 }
 
 .ctdl-fmsg-wrapper {           /* message wrapper for forum view */

diff --git a/webcit-ng/static/index.html b/webcit-ng/static/index.html
index 5315d2cc985bf7852c70f2f8cc6fec6cb76f5885..89e8dd3ea391125f62e546a6212ffcaef30b573a 100644 (file)
--- a/webcit-ng/static/index.html
+++ b/webcit-ng/static/index.html
@@ -21,7 +21,7 @@ MODAL LOADING
 
 <div class="ctdl-main-grid-container">
 
-       <!-- The style for these appears in webcit.css and was inspired by https://www.w3schools.com/css/css_navbar_horizontal.asp -->
+       <!-- The style for these appears in webcit.css and was inspired by https://www.w3schools.com/css/css_sidebar_horizontal.asp -->
        <div class="ctdl-grid-banner-item" id="banner">
                <!-- These items float to the LEFT side of the banner -->
                <ul class="ctdl-banner-buttons" style="float:left">
@@ -35,18 +35,18 @@ MODAL LOADING
                        <li id="ctdl-ungoto-button" style="display:none" onClick="gotonext(0);">ungoto</li>
                        <li id="ctdl-skip-button" style="display:none" onClick="gotonext(1);">skip</li>
                        <li id="ctdl-goto-button" style="display:none" onClick="gotonext(2);">goto</li>
-                       <li id="lilo">Login</button>
+                       <li><span id="current_user">Not logged in.</span><br>
+                       <button id="lilo">Login</button>
+                       <li><i class="fa fa-user-circle fa-3x"></i></li>
                </ul>
        </div>
 
-       <div class="ctdl-grid-navbar-item" id="navbar">
+       <div class="ctdl-grid-sidebar-item" id="sidebar">
                <ul id="ctdl-sidebar" class="ctdl-sidebar-class">
-                       <li><i class="fa fa-user-circle fa-3x"></i>
-                       <li><span id="current_user">Not logged in.</span><br>
-                       <li><a href="#"><i class="fa fa-envelope" onClick="gotoroom('_MAIL_');"></i></a>
-                       <li><a href="#"><i class="fa fa-user" onClick="user_profile(current_user);"></i></a>
-                       <li><a href="#"<i class="fa fa-cog"></i></a>
-                       <li><hr>
+                       <!-- <li><a href="#"><i class="fa fa-envelope" onClick="gotoroom('_MAIL_');"></i></a> -->
+                       <!-- <li><a href="#"><i class="fa fa-user" onClick="user_profile(current_user);"></i></a> -->
+                       <!-- <li><a href="#"<i class="fa fa-cog"></i></a> -->
+                       <!-- <li><hr> -->
                        <!-- <li><button onClick="sidebar_close()" title="close menu"><i class="fa fa-remove fa-fw"></i>  Close Menu</button> -->
                        <li><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>

diff --git a/webcit-ng/static/js/view_mail.js b/webcit-ng/static/js/view_mail.js
index 4f94e5f45937ee281d65f07e4f780e46cfb4aac9..791c54d8446bea982200b4e99d53cc6f31edf714 100644 (file)
--- a/webcit-ng/static/js/view_mail.js
+++ b/webcit-ng/static/js/view_mail.js
@@ -123,7 +123,7 @@ function mail_render_row(msg) {
 // Set up the mailbox view
 function mail_display() {
 
-       // Put the "enter new message" button into the navbar
+       // Put the "enter new message" button into the sidebar
        document.getElementById("ctdl-newmsg-button").innerHTML = "<i class=\"fa fa-edit\"></i>" + _("Write mail");
        document.getElementById("ctdl-newmsg-button").style.display = "block";