From d6d7044832449cf02547c83cf1c1e6cf1d344501 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 10 Jan 2024 18:35:39 +0000 Subject: [PATCH] Console: Fix iframe size issues --- LICENSE.txt | 4 + .../org/klomp/snark/web/I2PSnarkServlet.java | 1 + apps/i2ptunnel/jsp/edit.jsp | 1 + apps/i2ptunnel/jsp/index.jsp | 1 + apps/i2ptunnel/jsp/register.jsp | 1 + apps/i2ptunnel/jsp/ssl.jsp | 1 + apps/i2ptunnel/jsp/wizard.jsp | 1 + apps/routerconsole/jsp/dns.jsp | 2 + apps/routerconsole/jsp/i2ptunnelmgr.jsp | 2 + .../jsp/js/iframeResizer.contentWindow.js | 1305 +++++++++++++++ apps/routerconsole/jsp/js/iframeResizer.js | 1466 +++++++++++++++++ apps/routerconsole/jsp/js/iframed.js | 3 + apps/routerconsole/jsp/torrents.jsp | 2 + apps/routerconsole/jsp/webmail.jsp | 2 + apps/susidns/src/jsp/addressbook.jsp | 1 + apps/susidns/src/jsp/config.jsp | 1 + apps/susidns/src/jsp/details.jsp | 1 + apps/susidns/src/jsp/index.jsp | 1 + apps/susidns/src/jsp/subscriptions.jsp | 1 + .../src/src/i2p/susi/webmail/WebMail.java | 1 + licenses/LICENSE-Iframe-resizer.txt | 21 + 21 files changed, 2819 insertions(+) create mode 100644 apps/routerconsole/jsp/js/iframeResizer.contentWindow.js create mode 100644 apps/routerconsole/jsp/js/iframeResizer.js create mode 100644 licenses/LICENSE-Iframe-resizer.txt diff --git a/LICENSE.txt b/LICENSE.txt index 1e94e57b2b..60ab3ac6f1 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -316,6 +316,10 @@ Applications: See licenses/LICENSE-NDT.txt Notice: I2P has changed specified portions of the Software, including the package edu.internet2.ndt. + Router Console Iframe-resizer 4.3.9: + Copyright (c) 2013-2023 David J. Bradshaw + See licenses/LICENSE-Iframe-resizer.txt + SAM (sam.jar): Public domain. diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index 35ec8d23c9..d13ecb362d 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -348,6 +348,7 @@ else if (method.equals("POST")) "\n" + "\n"); } + out.write("\n"); out.write(HEADER_A + _themePath + HEADER_B); // ...and inject CSS to display panels uncollapsed diff --git a/apps/i2ptunnel/jsp/edit.jsp b/apps/i2ptunnel/jsp/edit.jsp index c23401891f..dba8f86c00 100644 --- a/apps/i2ptunnel/jsp/edit.jsp +++ b/apps/i2ptunnel/jsp/edit.jsp @@ -44,6 +44,7 @@ if (tun != null) { input.default { width: 1px; height: 1px; visibility: hidden; } + diff --git a/apps/i2ptunnel/jsp/register.jsp b/apps/i2ptunnel/jsp/register.jsp index 3051bb0cdd..18f4083a91 100644 --- a/apps/i2ptunnel/jsp/register.jsp +++ b/apps/i2ptunnel/jsp/register.jsp @@ -28,6 +28,7 @@ + diff --git a/apps/i2ptunnel/jsp/ssl.jsp b/apps/i2ptunnel/jsp/ssl.jsp index 1b91e4a001..b60d513802 100644 --- a/apps/i2ptunnel/jsp/ssl.jsp +++ b/apps/i2ptunnel/jsp/ssl.jsp @@ -26,6 +26,7 @@ + diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp index 7640243e31..d054ff1938 100644 --- a/apps/i2ptunnel/jsp/wizard.jsp +++ b/apps/i2ptunnel/jsp/wizard.jsp @@ -46,6 +46,7 @@ +
"> diff --git a/apps/routerconsole/jsp/dns.jsp b/apps/routerconsole/jsp/dns.jsp index 1c717f16b9..062c715de4 100644 --- a/apps/routerconsole/jsp/dns.jsp +++ b/apps/routerconsole/jsp/dns.jsp @@ -25,6 +25,7 @@ <%@include file="css.jsi" %> <%=intl.title("Address Book")%> + <%@include file="summaryajax.jsi" %> + <%@include file="summaryajax.jsi" %> + <%@include file="summaryajax.jsi" %> + <%@include file="summaryajax.jsi" %> + diff --git a/apps/susidns/src/jsp/config.jsp b/apps/susidns/src/jsp/config.jsp index 8f788feaaa..ee722338ce 100644 --- a/apps/susidns/src/jsp/config.jsp +++ b/apps/susidns/src/jsp/config.jsp @@ -37,6 +37,7 @@ <%=intl._t("configuration")%> - susidns + diff --git a/apps/susidns/src/jsp/details.jsp b/apps/susidns/src/jsp/details.jsp index ceb6f30a7c..7e057e387d 100644 --- a/apps/susidns/src/jsp/details.jsp +++ b/apps/susidns/src/jsp/details.jsp @@ -34,6 +34,7 @@ ${book.book} <%=intl._t("address book")%> - susidns + diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp index f0d4eae45f..c698518d4c 100644 --- a/apps/susidns/src/jsp/index.jsp +++ b/apps/susidns/src/jsp/index.jsp @@ -46,6 +46,7 @@ <%=intl._t("Introduction")%> - SusiDNS + diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp index 75e3d2ffb7..de8057bfb3 100644 --- a/apps/susidns/src/jsp/subscriptions.jsp +++ b/apps/susidns/src/jsp/subscriptions.jsp @@ -36,6 +36,7 @@ <%=intl._t("subscriptions")%> - susidns + diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java index b346059ea3..ce230391c2 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java @@ -2401,6 +2401,7 @@ private void processRequest( HttpServletRequest httpRequest, HttpServletResponse out.println( "\n" + "" ); } + out.println(""); if(state != State.AUTH) out.println(""); if (state == State.NEW) { diff --git a/licenses/LICENSE-Iframe-resizer.txt b/licenses/LICENSE-Iframe-resizer.txt new file mode 100644 index 0000000000..06fd9040cf --- /dev/null +++ b/licenses/LICENSE-Iframe-resizer.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013-2023 David J. Bradshaw + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE.