Skip to content

Commit fc8cdfc

Browse files
author
zzz
committed
Merge branch 'iframe' into 'master'
Console: Fix iframe size issues See merge request i2p-hackers/i2p.i2p!160
2 parents af24f91 + d6d7044 commit fc8cdfc

File tree

21 files changed

+2819
-0
lines changed

21 files changed

+2819
-0
lines changed

‎LICENSE.txt

+4
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,10 @@ Applications:
316316
See licenses/LICENSE-NDT.txt
317317
Notice: I2P has changed specified portions of the Software, including the package edu.internet2.ndt.
318318

319+
Router Console Iframe-resizer 4.3.9:
320+
Copyright (c) 2013-2023 David J. Bradshaw
321+
See licenses/LICENSE-Iframe-resizer.txt
322+
319323
SAM (sam.jar):
320324
Public domain.
321325

‎apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

+1
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ else if (method.equals("POST"))
348348
"<script src=\".resources/js/delete.js?" + CoreVersion.VERSION + "\" type=\"text/javascript\"></script>\n" +
349349
"<script src=\".resources/js/search.js?" + CoreVersion.VERSION + "\" type=\"text/javascript\"></script>\n");
350350
}
351+
out.write("<script src=\"/js/iframeResizer.contentWindow.js?" + CoreVersion.VERSION + "\" type=\"text/javascript\"></script>\n");
351352
out.write(HEADER_A + _themePath + HEADER_B);
352353

353354
// ...and inject CSS to display panels uncollapsed

‎apps/i2ptunnel/jsp/edit.jsp

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ if (tun != null) {
4444
input.default { width: 1px; height: 1px; visibility: hidden; }
4545
</style>
4646
<script src="/js/resetScroll.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
47+
<script src="/js/iframeResizer.contentWindow.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
4748
<script src="js/tableSlider.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
4849
<script nonce="<%=cspNonce%>" type="text/javascript">
4950
var deleteMessage = "<%=intl._t("Are you sure you want to delete?")%>";

‎apps/i2ptunnel/jsp/index.jsp

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
1515
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
1616
<link href="<%=indexBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" />
17+
<script src="/js/iframeResizer.contentWindow.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
1718
<script src="js/copy.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
1819
<noscript><style> .jsonly { display: none } </style></noscript>
1920
</head><body id="tunnelListPage">

‎apps/i2ptunnel/jsp/register.jsp

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
2929
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
3030
<link href="<%=editBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" />
31+
<script src="/js/iframeResizer.contentWindow.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
3132
<style type='text/css'>
3233
input.default { width: 1px; height: 1px; visibility: hidden; }
3334
</style>

‎apps/i2ptunnel/jsp/ssl.jsp

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
2727
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
2828
<link href="<%=editBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" />
29+
<script src="/js/iframeResizer.contentWindow.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
2930
<style type='text/css'>
3031
input.default { width: 1px; height: 1px; visibility: hidden; }
3132
</style>

‎apps/i2ptunnel/jsp/wizard.jsp

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
4747
<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
4848
<link href="<%=editBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" />
49+
<script src="/js/iframeResizer.contentWindow.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
4950
</head>
5051
<body id="tunnelWizardPage">
5152
<form method="post" action="<%=(curPage == 7 ? "list" : "wizard") %>">

‎apps/routerconsole/jsp/dns.jsp

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<%@include file="css.jsi" %>
2626
<%=intl.title("Address Book")%>
2727
<script src="/js/iframed.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
28+
<script src="/js/iframeResizer.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
2829
<%@include file="summaryajax.jsi" %>
2930
<script nonce="<%=cspNonce%>" type="text/javascript">
3031
/* @license http://creativecommons.org/publicdomain/zero/1.0/legalcode CC0-1.0 */
@@ -34,6 +35,7 @@
3435
f.addEventListener("load", function() {
3536
injectClass(f);
3637
resizeFrame(f);
38+
iFrameResize({ log: false }, '#susidnsframe')
3739
}, true);
3840
}
3941

‎apps/routerconsole/jsp/i2ptunnelmgr.jsp

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<%@include file="css.jsi" %>
2626
<%=intl.title("Hidden Services Manager")%>
2727
<script src="/js/iframed.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
28+
<script src="/js/iframeResizer.js?<%=net.i2p.CoreVersion.VERSION%>" type="text/javascript"></script>
2829
<%@include file="summaryajax.jsi" %>
2930
<script nonce="<%=cspNonce%>" type="text/javascript">
3031
/* @license http://creativecommons.org/publicdomain/zero/1.0/legalcode CC0-1.0 */
@@ -56,6 +57,7 @@
5657
injectClass(f);
5758
injectClassSpecific(f);
5859
resizeFrame(f);
60+
iFrameResize({ log: false }, '#i2ptunnelframe')
5961
}, true);
6062
}
6163

0 commit comments

Comments
 (0)