From 953381ff5e9e44c217bdee295fdcba0bee72d08e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 17 Jan 2018 17:46:18 +0000
Subject: [PATCH] i2ptunnel: Move more dup edit code to edit.jsp
---
apps/i2ptunnel/jsp/edit.jsp | 8 ++++++++
apps/i2ptunnel/jsp/editClient.jsi | 5 -----
apps/i2ptunnel/jsp/editServer.jsi | 6 ------
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/apps/i2ptunnel/jsp/edit.jsp b/apps/i2ptunnel/jsp/edit.jsp
index c6c0b1af58..6880b5c28a 100644
--- a/apps/i2ptunnel/jsp/edit.jsp
+++ b/apps/i2ptunnel/jsp/edit.jsp
@@ -53,11 +53,19 @@ if (__invalid) {
%>Invalid tunnel parameter<%
} else {
if (editBean.isInitialized()) {
+%>
+ <form method="post" action="list">
+ <div class="panel">
+<%
if (__isClient) {
%><%@include file="editClient.jsi" %><%
} else {
%><%@include file="editServer.jsi" %><%
}
+%>
+ </div>
+ </form>
+<%
} else {
%><div id="notReady"><%=intl._t("Tunnels not initialized yet; please retry in a few moments.")%></div><%
} // isInitialized()
diff --git a/apps/i2ptunnel/jsp/editClient.jsi b/apps/i2ptunnel/jsp/editClient.jsi
index d4a1472e6b..8e5e92b535 100644
--- a/apps/i2ptunnel/jsp/editClient.jsi
+++ b/apps/i2ptunnel/jsp/editClient.jsi
@@ -1,6 +1,3 @@
- <form method="post" action="list">
-
- <div class="panel">
<%
String tunnelTypeName;
String tunnelType;
@@ -684,5 +681,3 @@
</td>
</tr>
</table>
-</div>
-</form>
diff --git a/apps/i2ptunnel/jsp/editServer.jsi b/apps/i2ptunnel/jsp/editServer.jsi
index f1c45cef9d..1a0f5cb4c0 100644
--- a/apps/i2ptunnel/jsp/editServer.jsi
+++ b/apps/i2ptunnel/jsp/editServer.jsi
@@ -1,7 +1,3 @@
- <form method="post" action="list">
-
-<div class="panel">
-
<%
String tunnelTypeName;
String tunnelType;
@@ -930,5 +926,3 @@
</td>
</tr>
</table>
-</div>
- </form>
--
GitLab