From fca7e544adaf01d32081290959c5dce7df8631f8 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Sat, 10 Sep 2022 15:44:50 -0400
Subject: [PATCH] Moved some of the banner and sidebar items around

---
 webcit-ng/static/css/webcit.css  |  4 ++--
 webcit-ng/static/index.html      | 18 +++++++++---------
 webcit-ng/static/js/view_mail.js |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/webcit-ng/static/css/webcit.css b/webcit-ng/static/css/webcit.css
index e056c8ecc..2f27d813d 100644
--- 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 5315d2cc9..89e8dd3ea 100644
--- 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 4f94e5f45..791c54d84 100644
--- 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";
 
-- 
2.39.2