From 2fadb314d3841120290f92ffeb5c1e5fad939cf3 Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Tue, 10 Dec 2019 15:35:54 +0000
Subject: [PATCH] css and layout changes from zzz

---
 webui/src/main/css/i2pbote.css    | 11 ++++++-
 webui/src/main/css/muwire.css     | 30 ++++++++++++++++++-
 webui/src/main/webapp/MuWire.jsp  |  2 ++
 webui/src/main/webapp/header.jsi  |  2 ++
 webui/src/main/webapp/sidebar.jsi | 48 +++++++++++++++++++++++++------
 5 files changed, 83 insertions(+), 10 deletions(-)

diff --git a/webui/src/main/css/i2pbote.css b/webui/src/main/css/i2pbote.css
index 9027d0be..1fc7e08c 100644
--- a/webui/src/main/css/i2pbote.css
+++ b/webui/src/main/css/i2pbote.css
@@ -261,7 +261,7 @@ aside {
     width: 24px;
 }
 .menu-text {
-    margin: 0 24px;
+    margin: 0 6px 0 12px;
 }
 .menubox h2 a {
     font-size: 1em;
@@ -324,6 +324,15 @@ See also .menu-icon
 .menuitem.settings .menu-icon:before {
     content: url("images/settings.png");
 }
+.menuitem.downloads .menu-icon:before {
+    content: url("images/inbox.png");
+}
+.menuitem.search .menu-icon:before {
+    content: url("images/delay.png");
+}
+.menuitem.shared .menu-icon:before {
+    content: url("images/folder.png");
+}
 
 
 /* Main content */
diff --git a/webui/src/main/css/muwire.css b/webui/src/main/css/muwire.css
index 3cdd80bd..769e6cec 100644
--- a/webui/src/main/css/muwire.css
+++ b/webui/src/main/css/muwire.css
@@ -2,7 +2,7 @@
   position:relative;
 }
 #table-scroll {
-  height:150px;
+  max-height: 300px;
   overflow:auto;
   margin-top:20px;
 }
@@ -23,6 +23,34 @@
   border:1px solid red;
 }
 
+div#activeSearches table thead th:first-child {
+  width: 40%;
+}
+div#topTable table thead th:first-child {
+  width: 50%;
+}
+div#topTable table thead th:nth-child(2) {
+  width: 15%;
+}
+div#topTable table thead th:first-child {
+  width: 75%;
+}
+
+div#activeBrowses table thead th:first-child {
+  width: 50%;
+}
+
+div#filesTable table thead th:first-child {
+  width: 70%;
+}
+
+div#trustedUsers table thead th:first-child {
+  width: 50%;
+}
+div#trustLists table thead th:first-child {
+  width: 50%;
+}
+
 /* File tree CSS */
 
  /* Remove default bullets */
diff --git a/webui/src/main/webapp/MuWire.jsp b/webui/src/main/webapp/MuWire.jsp
index 6ac3eb3e..7d85f026 100644
--- a/webui/src/main/webapp/MuWire.jsp
+++ b/webui/src/main/webapp/MuWire.jsp
@@ -18,7 +18,9 @@
     	%>
     	
         <noscript>
+         <div class="warning">
           <center><b><%=Util._t("MuWire requires JavaScript. Please enable JavaScript in your browser.")%></b></center>
+         </div>
         </noscript>
         <p><%=Util._t("Welcome to MuWire!  Please select a nickname and download locations")%></p>
         <form action="/MuWire/init" method="post">
diff --git a/webui/src/main/webapp/header.jsi b/webui/src/main/webapp/header.jsi
index e4ded895..957d8134 100644
--- a/webui/src/main/webapp/header.jsi
+++ b/webui/src/main/webapp/header.jsi
@@ -13,5 +13,7 @@
   </div>
 </header>
 <noscript>
+  <div class="warning">
     <center><b><%=Util._t("MuWire requires JavaScript. Please enable JavaScript in your browser.")%></b></center>
+  </div>
 </noscript>
diff --git a/webui/src/main/webapp/sidebar.jsi b/webui/src/main/webapp/sidebar.jsi
index f4bf306c..b22e4cce 100644
--- a/webui/src/main/webapp/sidebar.jsi
+++ b/webui/src/main/webapp/sidebar.jsi
@@ -5,21 +5,53 @@
                     <div class="menu-icon" id="connectionsIcon">
                          <img src="images/not_started.png" alt="">
                     </div>
-                    <%=Util._t("Connections")%>: <span id="connectionsCount">0</span>
+                    <div class="menu-text">
+                        <%=Util._t("Connections")%>: <span id="connectionsCount">0</span>
+                    </div>
                 </div>
             </div>
             <div class="menubox-divider"></div>
             <div class="menubox">
                 <h2><%=Util._t("Pages")%></h2>
-                <a class="menuitem" href="Downloads"><%=Util._t("Downloads")%></a>
-                <a class="menuitem" href="Home"><%=Util._t("Search")%></a>
-                <a class="menuitem" href="SharedFiles"><%=Util._t("Shared Files")%></a>
-                <a class="menuitem" href="BrowseHost"><%=Util._t("Browse")%></a>
+                <a class="menuitem downloads" href="Downloads">
+                  <div class="menu-icon"></div>
+                  <div class="menu-text">
+                      <%=Util._t("Downloads")%>
+                  </div>
+                </a>
+                <a class="menuitem search" href="Home">
+                  <div class="menu-icon"></div>
+                  <div class="menu-text">
+                      <%=Util._t("Search")%>
+                  </div>
+                </a>
+                <a class="menuitem shared" href="SharedFiles">
+                  <div class="menu-icon"></div>
+                  <div class="menu-text">
+                      <%=Util._t("Shared Files")%>
+                  </div>
+                </a>
+                <a class="menuitem shared" href="BrowseHost">
+                  <div class="menu-icon"></div>
+                  <div class="menu-text">
+                      <%=Util._t("Browse")%>
+                  </div>
+                </a>
             </div>
             <div class="menubox">
-            	<h2><%=Util._t("Trust")%></h2>
-            	<a class="menuitem" href="TrustUsers"><%=Util._t("Users")%></a>
-            	<a class="menuitem" href="TrustLists"><%=Util._t("Lists")%></a>
+                <h2><%=Util._t("Trust")%></h2>
+                <a class="menuitem identities" href="TrustUsers">
+                  <div class="menu-icon"></div>
+                  <div class="menu-text">
+                      <%=Util._t("Users")%>
+                  </div>
+                </a>
+                <a class="menuitem address-book" href="TrustLists">
+                  <div class="menu-icon"></div>
+                  <div class="menu-text">
+                      <%=Util._t("Lists")%>
+                  </div>
+                </a>
             </div>
             <div class="menubox-divider"></div>
             <div class="menubox">