Console: Fix iframe size issues

i2p · Jan 10, 2024 · d6d7044 · d6d7044
1 parent 3995078
commit d6d7044
Show file tree

Hide file tree

Showing 21 changed files with 2,819 additions and 0 deletions.
diff --git 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
@@ -348,6 +348,7 @@ else if (method.equals("POST"))
                       "<script src=\".resources/js/delete.js?" + CoreVersion.VERSION + "\" type=\"text/javascript\"></script>\n" +
                       "<script src=\".resources/js/search.js?" + CoreVersion.VERSION + "\" type=\"text/javascript\"></script>\n");
         }
+        out.write("<script src=\"/js/iframeResizer.contentWindow.js?" + CoreVersion.VERSION + "\" type=\"text/javascript\"></script>\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
@@ -44,6 +44,7 @@ if (tun != null) {
   input.default { width: 1px; height: 1px; visibility: hidden; }
 </style>
 <script src="/js/resetScroll.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
+<script src="/js/iframeResizer.contentWindow.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
 <script src="js/tableSlider.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
 <script nonce="<%=cspNonce%>" type="text/javascript">
   var deleteMessage = "<%=intl._t("Are you sure you want to delete?")%>";

diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp
@@ -14,6 +14,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
     <link href="<%=indexBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" /> 
+    <script src="/js/iframeResizer.contentWindow.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
     <script src="js/copy.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
     <noscript><style> .jsonly { display: none } </style></noscript>
 </head><body id="tunnelListPage">

diff --git a/apps/i2ptunnel/jsp/register.jsp b/apps/i2ptunnel/jsp/register.jsp
@@ -28,6 +28,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
     <link href="<%=editBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" /> 
+    <script src="/js/iframeResizer.contentWindow.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
 <style type='text/css'>
 input.default { width: 1px; height: 1px; visibility: hidden; }
 </style>

diff --git a/apps/i2ptunnel/jsp/ssl.jsp b/apps/i2ptunnel/jsp/ssl.jsp
@@ -26,6 +26,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
     <link href="<%=editBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" /> 
+    <script src="/js/iframeResizer.contentWindow.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
 <style type='text/css'>
 input.default { width: 1px; height: 1px; visibility: hidden; }
 </style>

diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp
@@ -46,6 +46,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
     <link href="<%=editBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" />
+    <script src="/js/iframeResizer.contentWindow.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
 </head>
 <body id="tunnelWizardPage">
     <form method="post" action="<%=(curPage == 7 ? "list" : "wizard") %>">

diff --git a/apps/routerconsole/jsp/dns.jsp b/apps/routerconsole/jsp/dns.jsp
@@ -25,6 +25,7 @@
 <%@include file="css.jsi" %>
 <%=intl.title("Address Book")%>
 <script src="/js/iframed.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
+<script src="/js/iframeResizer.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
 <%@include file="summaryajax.jsi" %>
 <script nonce="<%=cspNonce%>" type="text/javascript">
 /* @license http://creativecommons.org/publicdomain/zero/1.0/legalcode CC0-1.0 */
@@ -34,6 +35,7 @@
       f.addEventListener("load", function() {
           injectClass(f);
           resizeFrame(f);
+          iFrameResize({ log: false }, '#susidnsframe')
       }, true);
   }
 

diff --git a/apps/routerconsole/jsp/i2ptunnelmgr.jsp b/apps/routerconsole/jsp/i2ptunnelmgr.jsp
@@ -25,6 +25,7 @@
 <%@include file="css.jsi" %>
 <%=intl.title("Hidden Services Manager")%>
 <script src="/js/iframed.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
+<script src="/js/iframeResizer.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
 <%@include file="summaryajax.jsi" %>
 <script nonce="<%=cspNonce%>" type="text/javascript">
 /* @license http://creativecommons.org/publicdomain/zero/1.0/legalcode CC0-1.0 */
@@ -56,6 +57,7 @@
           injectClass(f);
           injectClassSpecific(f);
           resizeFrame(f);
+          iFrameResize({ log: false }, '#i2ptunnelframe')
       }, true);
   }