From: Art Cancro <ajc@citadel.org>
Date: Tue, 12 Jul 2022 15:37:10 +0000 (-0400)
Subject: Ok, this is close ... saving my work before I try something destructive
X-Git-Tag: v958~53
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=b39cf1f773ef3c14c06f46dc45e676c126808918;p=citadel.git

Ok, this is close ... saving my work before I try something destructive
---

diff --git a/webcit-ng/static/css/webcit.css b/webcit-ng/static/css/webcit.css
index 5c1b15b33..0de3536ac 100644
--- a/webcit-ng/static/css/webcit.css
+++ b/webcit-ng/static/css/webcit.css
@@ -197,19 +197,35 @@ blockquote pre {
 	z-index: 6;
 }
 
-.ctdl-mailbox-pane {		/* list of messages when in mailbox view */
+.ctdl-mailbox-outer {
 	position: absolute;
-	height: 25%;
-	width: inherit;
+	top: 0%;
+	height: 50%;
+	width: 100%;
 	overflow-x: hidden;
 	overflow-y: scroll;
+	background-color: #FF8888;
 }
 
-.ctdl-reading-pane {		/* message reading/composing pane when in mailbox view */
+.ctdl-reading-outer {
 	position: absolute;
-	top: 31%;
-	height: 70%;
-	left: inherit;
-	right: inherit;
+	top: 50%;
+	height: 50%;
+	width: 100%;
 	overflow: scroll;
+	background-color: #88FF88;
+}
+
+.ctdl-mailbox-pane {		/* list of messages when in mailbox view */
+	display: none;
+	position: relative;
+	width: 100%;
+	height: 100%;
+}
+
+.ctdl-reading-pane {		/* message reading/composing pane when in mailbox view */
+	display: none;
+	position: relative;
+	width: 100%;
+	height: 100%;
 }
diff --git a/webcit-ng/static/index.html b/webcit-ng/static/index.html
index 9582c46db..43aff8ce8 100644
--- a/webcit-ng/static/index.html
+++ b/webcit-ng/static/index.html
@@ -21,24 +21,6 @@
 LOADING
 </div>
 
-<!-- Top container -->
-<div id="navbar" class="w3-bar w3-top w3-black w3-large" style="z-index:4">
-	<button class="w3-bar-item w3-button w3-hide-large w3-hover-none w3-hover-text-light-grey" onClick="w3_open();"><i class="fa fa-bars"></i>  Menu</button>
-	<span class="w3-left">
-		<span class="w3-bar-item" id="ctdl-logo">CITADEL</span>
-	</span>
-	<span class="w3-center">
-		<span id="ctdl_banner_title" class="w3-bar-item">---</span>
-	</span>
-	<span class="w3-right">
-		<button id="ctdl-newmsg-button" style="display:none" class="w3-bar-item w3-button" onClick="entmsg_dispatcher();">enter</button>
-		<button id="ctdl-ungoto-button" style="display:none" class="w3-bar-item w3-button" onClick="gotonext(0);">ungoto</button>
-		<button id="ctdl-skip-button" style="display:none" class="w3-bar-item w3-button" onClick="gotonext(1);">skip</button>
-		<button id="ctdl-goto-button" style="display:none" class="w3-bar-item w3-button" onClick="gotonext(2);">goto</button>
-		<button id="lilo" class="w3-bar-item w3-button">Login</button>
-	</span>
-</div>
-
 <!-- Sidebar/menu -->
 <nav class="w3-sidebar w3-collapse w3-white w3-animate-left" style="z-index:3;width:300px;" id="sidebar"><br>
 	<div class="w3-container w3-row">
@@ -69,12 +51,36 @@ LOADING
 <!-- Overlay effect when opening sidebar on small screens -->
 <div class="w3-overlay w3-hide-large w3-animate-opacity" onClick="w3_close()" style="cursor:pointer" title="close side menu" id="myOverlay"></div>
 
-<!-- MAIN PAGE CONTENT DIV -->
-<div id="ctdl-main" class="w3-main" style="margin-left:300px;margin-top:43px;">
+<!-- This div contains both the top bar and the main pane -->
+<div id="ctdl-bar-and-main" class="w3-main" style="margin-left:300px; position:absolute; height:100%; width:inherit; overflow-y:scroll; border: 3px solid green">
+
+<!-- Top container -->
+<div id="navbar" class="w3-bar w3-black w3-large" style="z-index:4; position:sticky; top:0">
+	<button class="w3-bar-item w3-button w3-hide-large w3-hover-none w3-hover-text-light-grey" onClick="w3_open();"><i class="fa fa-bars"></i>  Menu</button>
+	<span class="w3-left">
+		<span class="w3-bar-item" id="ctdl-logo">CITADEL</span>
+	</span>
+	<span class="w3-center">
+		<span id="ctdl_banner_title" class="w3-bar-item">---</span>
+	</span>
+	<span class="w3-right">
+		<button id="ctdl-newmsg-button" style="display:none" class="w3-bar-item w3-button" onClick="entmsg_dispatcher();">enter</button>
+		<button id="ctdl-ungoto-button" style="display:none" class="w3-bar-item w3-button" onClick="gotonext(0);">ungoto</button>
+		<button id="ctdl-skip-button" style="display:none" class="w3-bar-item w3-button" onClick="gotonext(1);">skip</button>
+		<button id="ctdl-goto-button" style="display:none" class="w3-bar-item w3-button" onClick="gotonext(2);">goto</button>
+		<button id="lilo" class="w3-bar-item w3-button">Login</button>
+	</span>
+</div>
+
+<!-- MAIN PANE CONTENT DIV -->
+<div id="ctdl-main">
 Loading...
 <!-- End page content -->
 </div>
 
+<!-- end ctdl-bar-and-main -->
+</div>
+
 <script type="text/javascript" src="js/defs.js"></script>
 <script type="text/javascript" src="js/util.js"></script>
 <script type="text/javascript" src="js/login.js"></script>
diff --git a/webcit-ng/static/js/view_mail.js b/webcit-ng/static/js/view_mail.js
index 535d0f1f7..2e1dcd90a 100644
--- a/webcit-ng/static/js/view_mail.js
+++ b/webcit-ng/static/js/view_mail.js
@@ -101,7 +101,7 @@ function select_message(msgnum) {
 
 	// highlight the newly selected message
 	document.getElementById("ctdl-msgsum-" + msgnum).classList.add("w3-blue");
-	document.getElementById("ctdl-msgsum-" + msgnum).scrollIntoView();
+	//document.getElementById("ctdl-msgsum-" + msgnum).scrollIntoView();
 
 	// display the message if it isn't already displayed
 	if (selected_message != msgnum) {
@@ -131,9 +131,15 @@ function mail_render_row(msg) {
 // Set up the mailbox view
 function mail_display() {
 	document.getElementById("ctdl-main").innerHTML
-		= "<div id=\"ctdl-mailbox-pane\" class=\"ctdl-mailbox-pane\"></div>"
-		+ "<div id=\"ctdl-reading-pane\" class=\"ctdl-reading-pane\"></div>";
+		= "<div id=\"ctdl-mailbox-outer\" class=\"ctdl-mailbox-outer\">mailbox-outer</div>"
+		+ "<div id=\"ctdl-reading-outer\" class=\"ctdl-reading-outer\">reading-outer</div>"
 	;
+
+	document.getElementById("ctdl-main").innerHTML
+		+= "<div id=\"ctdl-mailbox-pane\" class=\"ctdl-mailbox-pane\"></div>"
+		+ "<div id=\"ctdl-reading-pane\" class=\"ctdl-reading-pane\"></div>"
+	;
+
 	refresh_mail_display();
 	try {							// if this was already set up, clear it so there aren't multiple
 		clearInterval(RefreshMailboxInterval);
@@ -146,6 +152,7 @@ function mail_display() {
 
 // Display or refresh the mailbox
 function refresh_mail_display() {
+
 	console.log("refresh_mail_display()");
 
 	// If the "ctdl-mailbox-pane" no longer exists, the user has navigated to a different part of the site,