From 5008843b835e89b493263394228be99e6621bff6 Mon Sep 17 00:00:00 2001 From: zzz <zzz@i2pmail.org> Date: Thu, 7 Dec 2023 08:51:07 -0500 Subject: [PATCH] Susimail: Fix placement of bottom page nav --- apps/susimail/src/src/i2p/susi/webmail/WebMail.java | 12 ++++++------ apps/susimail/src/themes/light/susimail.css | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java index b2c04c58fb..bc5c1fb743 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java @@ -3274,12 +3274,6 @@ public class WebMail extends HttpServlet if (i == 0) out.println("<tr><td colspan=\"9\" align=\"center\"><div id=\"emptymailbox\"><i>" + _t("No messages") + "</i></div></td></tr>"); out.println( "<tr class=\"bottombuttons\"></tr>"); - if (folder.getPages() > 1 && i > 30) { - // show the buttons again if page is big - out.println("<tr class=\"bottombuttons\"><td colspan=\"9\" align=\"center\">"); - showPageButtons(out, folderName, page, folder.getPages(), false); - out.println("</td></tr>"); - } out.println("<tr class=\"bottombuttons\"><td colspan=\"5\" align=\"left\">"); if (i > 0) { // TODO do this in js @@ -3309,6 +3303,12 @@ public class WebMail extends HttpServlet out.print(button(CONFIGURE, _t("Settings"))); out.println("</td></tr>"); out.println( "</table>"); + if (folder.getPages() > 1 && i > 30) { + // show the buttons again if page is big + out.println("<div class=\"topbuttons\">"); + showPageButtons(out, folderName, page, folder.getPages(), false); + out.println("</div>"); + } } /** diff --git a/apps/susimail/src/themes/light/susimail.css b/apps/susimail/src/themes/light/susimail.css index a03a7cd40c..d641456377 100644 --- a/apps/susimail/src/themes/light/susimail.css +++ b/apps/susimail/src/themes/light/susimail.css @@ -147,7 +147,7 @@ div.header, .iframed .header { div.footer { border-top: none; - margin: -14px 0 10px; + margin: 14px 0 10px; border: 1px solid #f1f3f5; background: #f1f3f5; } @@ -1158,11 +1158,10 @@ h3#config { } .topbuttons { - margin: -1px -1px 0; + margin: -1px; padding: 5px 5px 4px; text-align: center; border: 1px solid #7778bf; - border-bottom: none; z-index: 100; font-weight: bold; vertical-align: middle; -- GitLab