From a4d053f5558b4392368bb1ca6b46390ba9ebabd3 Mon Sep 17 00:00:00 2001
From: z3d <z3d@mail.i2p>
Date: Fri, 17 Jul 2009 22:56:06 +0000
Subject: [PATCH] Revert i2ptunnels main page to previous version in attempt to
fix borkage.
---
apps/i2ptunnel/jsp/index.jsp | 460 ++++++++++++++++++-----------------
1 file changed, 242 insertions(+), 218 deletions(-)
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp
index ef054fa2b0..4ba9e2c1e5 100644
--- a/apps/i2ptunnel/jsp/index.jsp
+++ b/apps/i2ptunnel/jsp/index.jsp
@@ -1,272 +1,296 @@
-<%@page contentType="text/html" import="net.i2p.i2ptunnel.web.IndexBean"%>
-<?xml version="1.0" encoding="UTF-8"?>
+<%@page contentType="text/html" import="net.i2p.i2ptunnel.web.IndexBean"%><?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<jsp:useBean class="net.i2p.i2ptunnel.web.IndexBean" id="indexBean" scope="request" />
<jsp:setProperty name="indexBean" property="*" />
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<title>I2PTunnel Webmanager - List</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<% if (indexBean.allowCSS()) {
- %>
-<link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
-<link href="<%=indexBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
-<link href="<%=indexBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
-<% }
+ <title>I2PTunnel Webmanager - List</title>
+
+ <meta htt
+p-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
+
+ <% if (indexBean.allowCSS()) {
+ %><link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
+ <link href="<%=indexBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
+ <link href="<%=indexBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
+ <% }
%>
</head>
<body id="tunnelListPage">
-<div id="statusMessagePanel" class="panel">
- <div class="header">
- <h4>Status Messages</h4>
- </div>
- <div class="separator">
- <hr />
- </div>
- <textarea id="statusMessages" rows="4" cols="60" readonly="readonly"><jsp:getProperty name="indexBean" property="messages" /></textarea>
- <div class="separator">
- <hr />
- </div>
- <div class="footer">
- <div class="toolbox"> <a class="control" href="index.jsp">Refresh</a> </div>
- </div>
-</div>
-<div id="globalOperationsPanel" class="panel">
- <div class="header"></div>
- <div class="footer">
- <div class="toolbox"> <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&action=Stop%20all">Stop
- All</a> <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&action=Start%20all">Start
- All</a> <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&action=Restart%20all">Restart
- All</a> <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&action=Reload%20configuration">Reload
- Config</a> </div>
- </div>
-</div>
-<div id="localServerTunnelList" class="panel">
- <div class="header">
+ <div id="pageHeader">
+ </div>
+
+ <div id="statusMessagePanel" class="panel">
+ <div class="header">
+ <h4>Status Messages</h4>
+ </div>
+
+ <div class="separator">
+ <hr />
+ </div>
+
+ <textarea id="statusMessages" rows="4" cols="60" readonly="readonly"><jsp:getProperty name="indexBean" property="messages" /></textarea>
+
+ <div class="separator">
+ <hr />
+ </div>
+
+ <div class="footer">
+ <div class="toolbox">
+ <a class="control" href="file:///d|/temp/guitone-boss/index.jsp">Refresh</a>
+ </div>
+ </div>
+ </div>
+
+ <div id="globalOperationsPanel" class="panel">
+ <div class="header"></div>
+ <div class="footer">
+ <div class="toolbox">
+ <a class="control" href="file:///d|/temp/guitone-boss/index.jsp?nonce=<%=indexbean.getnextnonce()%>&action=stop%20all">Stop All</a> <a class="control" href="file:///d|/temp/guitone-boss/index.jsp?nonce=<%=indexbean.getnextnonce()%>&action=start%20all">Start All</a> <a class="control" href="file:///d|/temp/guitone-boss/index.jsp?nonce=<%=indexbean.getnextnonce()%>&action=restart%20all">Restart All</a> <a class="control" href="file:///d|/temp/guitone-boss/index.jsp?nonce=<%=indexbean.getnextnonce()%>&action=reload%20configuration">Reload Config</a>
+ </div>
+ </div>
+ </div>
+
+
+
+ <div id="localServerTunnelList" class="panel">
+ <div class="header">
+
<h4>I2P Server Tunnels</h4>
- </div>
+ </div>
+
+
<div class="separator"> </div>
- <div class="nameHeaderField rowItem">
- <label>Name:</label>
- </div>
- <div class="previewHeaderField rowItem">
- <label>Points at:</label>
- </div>
- <div class="targetHeaderField rowItem">
- <label>Preview:</label>
- </div>
- <div class="statusHeaderField rowItem">
- <label>Status:</label>
- </div>
- <%
+
+ <div class="nameHeaderField rowItem">
+ <label>Name:</label>
+ </div>
+ <div class="previewHeaderField rowItem">
+ <label>Points at:</label>
+ </div>
+ <div class="targetHeaderField rowItem">
+ <label>Preview:</label>
+ </div>
+ <div class="statusHeaderField rowItem">
+ <label>Status:</label>
+ </div>
+
+ <%
for (int curServer = 0; curServer < indexBean.getTunnelCount(); curServer++) {
if (indexBean.isClient(curServer)) continue;
%>
- <div class="nameField rowItem">
- <label>Name:</label>
- <span class="text"><a href="edit.jsp?tunnel=<%=curServer%>" title="Edit Server Tunnel Settings for <%=indexBean.getTunnelName(curServer)%>"><%=indexBean.getTunnelName(curServer)%></a></span> </div>
- <div class="previewField rowItem">
- <label>Points at:</label>
- <span class="text">
- <%
+ <div class="nameField rowItem">
+ <label>Name:</label>
+ <span class="text"><a href="file:///d|/temp/guitone-boss/edit.jsp?tunnel=<%=curserver%>" title="Edit Server Tunnel Settings for <%=indexBean.getTunnelName(curServer)%>"><%=indexBean.getTunnelName(curServer)%></a></span>
+ </div>
+ <div class="previewField rowItem">
+ <label>Points at:</label>
+ <span class="text">
+ <%
if ("httpserver".equals(indexBean.getInternalType(curServer))) {
%>
- <a href="http://<%=indexBean.getServerTarget(curServer)%>/" title="Test HTTP server, bypassing I2P"><%=indexBean.getServerTarget(curServer)%></a>
- <%
+ <a href="http://<%=indexBean.getServerTarget(curServer)%>/" title="Test HTTP server, bypassing I2P"><%=indexBean.getServerTarget(curServer)%></a>
+ <%
} else {
- %>
- <%=indexBean.getServerTarget(curServer)%>
- <%
+ %><%=indexBean.getServerTarget(curServer)%>
+ <%
}
- %>
- </span> </div>
- <div class="targetField rowItem">
- <%
+ %></span>
+ </div>
+ <div class="targetField rowItem">
+ <%
if ("httpserver".equals(indexBean.getInternalType(curServer)) && indexBean.getTunnelStatus(curServer) == IndexBean.RUNNING) {
- %>
- <label>Preview:</label>
- <a class="control" title="Test HTTP server through I2P" href="http://<%=indexBean.getDestHashBase32(curServer)%>.b32.i2p">Preview</a>
- <%
+ %><label>Preview:</label>
+ <a class="control" title="Test HTTP server through I2P" href="http://<%=indexBean.getDestHashBase32(curServer)%>.b32.i2p">Preview</a>
+ <%
} else if (indexBean.getTunnelStatus(curServer) == IndexBean.RUNNING) {
- %>
- <span class="text">Base32 Address:<br>
- <%=indexBean.getDestHashBase32(curServer)%>.b32.i2p</span>
- <%
+ %><span class="text">Base32 Address:<br><%=indexBean.getDestHashBase32(curServer)%>.b32.i2p</span>
+ <%
} else {
- %>
- <span class="comment">No Preview</span>
- <%
+ %><span class="comment">No Preview</span>
+ <%
}
- %>
- </div>
- <div class="statusField rowItem">
- <label>Status:</label>
- <%
+ %></div>
+ <div class="statusField rowItem">
+ <label>Status:</label>
+ <%
switch (indexBean.getTunnelStatus(curServer)) {
case IndexBean.STARTING:
- %>
- <div class="separator"></div>
- <div class="statusStarting text">Starting...</div>
- <a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&action=stop&tunnel=<%=curServer%>">Stop</a>
- <%
+ %><div class="separator"></div>
+ <div class="statusStarting text">Starting...</div>
+ <a class="control" title="Stop this Tunnel" href="file:///d|/temp/guitone-boss/index.jsp?nonce=<%=indexbean.getnextnonce()%>&action=stop&tunnel=<%=curserver%>">Stop</a>
+ <%
break;
case IndexBean.RUNNING:
- %>
- <div class="statusRunning text">Running</div>
- <a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&action=stop&tunnel=<%=curServer%>">Stop</a>
- <%
+ %><div class="statusRunning text">Running</div>
+ <a class="control" title="Stop this Tunnel" href="file:///d|/temp/guitone-boss/index.jsp?nonce=<%=indexbean.getnextnonce()%>&action=stop&tunnel=<%=curserver%>">Stop</a>
+ <%
break;
case IndexBean.NOT_RUNNING:
- %>
- <div class="statusNotRunning text">Stopped</div>
- <a class="control" title="Start this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&action=start&tunnel=<%=curServer%>">Start</a>
- <%
+ %><div class="statusNotRunning text">Stopped</div>
+ <a class="control" title="Start this Tunnel" href="file:///d|/temp/guitone-boss/index.jsp?nonce=<%=indexbean.getnextnonce()%>&action=start&tunnel=<%=curserver%>">Start</a>
+ <%
break;
}
- %>
- </div>
- <div class="descriptionField rowItem">
- <label>Description:</label>
- <div class="text"><%=indexBean.getTunnelDescription(curServer)%></div>
- </div>
- <div class="subdivider">
- <hr />
- </div>
- <%
+ %></div>
+
+ <div class="descriptionField rowItem">
+ <label>Description:</label>
+ <div class="text"><%=indexBean.getTunnelDescription(curServer)%></div>
+ </div>
+
+ <div class="subdivider">
+ <hr />
+ </div>
+ <%
}
%>
- <div class="separator">
- <hr />
- </div>
- <div class="footer">
- <form id="addNewServerTunnelForm" action="edit.jsp">
- <div class="toolbox">
+ <div class="separator">
+ <hr />
+ </div>
+
+ <div class="footer">
+ <form id="addNewServerTunnelForm" action="file:///D|/Temp/guitone-Boss/edit.jsp">
+ <div class="toolbox">
+
<label>New server tunnel:</label>
- <select name="type">
- <option value="server">Standard</option>
- <option value="httpserver">HTTP</option>
- <option value="ircserver">IRC</option>
- <option value="streamrserver">Streamr</option>
- </select>
- <input class="control" type="submit" value="Create" />
- </div>
- </form>
- </div>
-</div>
-<div id="localClientTunnelList" class="panel">
- <div class="header">
+ <select name="type">
+ <option value="server">Standard</option>
+ <option value="httpserver">HTTP</option>
+ <option value="ircserver">IRC</option>
+ <option value="streamrserver">Streamr</option>
+ </select>
+ <input class="control" type="submit" value="Create" />
+ </div>
+ </form>
+ </div>
+ </div>
+
+
+ <div id="localClientTunnelList" class="panel">
+ <div class="header">
+
<h4>I2P Client Tunnels</h4>
- </div>
- <div class="separator"> </div>
- <div class="nameHeaderField rowItem">
- <label>Name:</label>
- </div>
- <div class="portHeaderField rowItem">
- <label>Port:</label>
- </div>
- <div class="typeHeaderField rowItem">
- <label>Type:</label>
- </div>
- <div class="interfaceHeaderField rowItem">
- <label>Interface:</label>
- </div>
- <div class="statusHeaderField rowItem">
- <label>Status:</label>
- </div>
+ </div>
+
+
<div class="separator"> </div>
- <%
+
+ <div class="nameHeaderField rowItem">
+ <label>Name:</label>
+ </div>
+ <div class="portHeaderField rowItem">
+ <label>Port:</label>
+ </div>
+ <div class="typeHeaderField rowItem">
+ <label>Type:</label>
+ </div>
+ <div class="interfaceHeaderField rowItem">
+ <label>Interface:</label>
+ </div>
+ <div class="statusHeaderField rowItem">
+ <label>Status:</label>
+ </div>
+
+ <div class="separator">
+ </div>
+ <%
for (int curClient = 0; curClient < indexBean.getTunnelCount(); curClient++) {
if (!indexBean.isClient(curClient)) continue;
%>
- <div class="nameField rowItem">
- <label>Name:</label>
- <span class="text"><a href="edit.jsp?tunnel=<%=curClient%>" title="Edit Tunnel Settings for <%=indexBean.getTunnelName(curClient)%>"><%=indexBean.getTunnelName(curClient)%></a></span> </div>
- <div class="portField rowItem">
- <label>Port:</label>
- <span class="text"><%=indexBean.getClientPort(curClient)%></span> </div>
- <div class="typeField rowItem">
- <label>Type:</label>
- <span class="text"><%=indexBean.getTunnelType(curClient)%></span> </div>
- <div class="interfaceField rowItem">
- <label>Interface:</label>
- <span class="text"><%=indexBean.getClientInterface(curClient)%></span> </div>
- <div class="statusField rowItem">
- <label>Status:</label>
- <%
+ <div class="nameField rowItem">
+ <label>Name:</label>
+ <span class="text"><a href="file:///d|/temp/guitone-boss/edit.jsp?tunnel=<%=curclient%>" title="Edit Tunnel Settings for <%=indexBean.getTunnelName(curClient)%>"><%=indexBean.getTunnelName(curClient)%></a></span>
+ </div>
+ <div class="portField rowItem">
+ <label>Port:</label>
+ <span class="text"><%=indexBean.getClientPort(curClient)%></span>
+ </div>
+ <div class="typeField rowItem">
+ <label>Type:</label>
+ <span class="text"><%=indexBean.getTunnelType(curClient)%></span>
+ </div>
+ <div class="interfaceField rowItem">
+ <label>Interface:</label>
+ <span class="text"><%=indexBean.getClientInterface(curClient)%></span>
+ </div>
+ <div class="statusField rowItem">
+ <label>Status:</label>
+ <%
switch (indexBean.getTunnelStatus(curClient)) {
case IndexBean.STARTING:
- %>
- <div class="statusStarting text">Starting...</div>
- <div class="separator></div>
- <a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&action=stop&tunnel=<%=curClient%>">Stop</a>
- <%
+ %><div class="statusStarting text">Starting...</div> <div class="separator></div>
+ <a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&action=stop&tunnel=<%=curClient%>">Stop</a>
+ <%
break;
case IndexBean.STANDBY:
- %>
- <div class="statusStarting text">Standby</div>
- <a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&action=stop&tunnel=<%=curClient%>">Stop</a>
- <%
+ %><div class="statusStarting text">Standby</div>
+ <a class="control" title="Stop this Tunnel" href="file:///d|/temp/guitone-boss/index.jsp?nonce=<%=indexbean.getnextnonce()%>&action=stop&tunnel=<%=curclient%>">Stop</a>
+ <%
break;
case IndexBean.RUNNING:
- %>
- <div class="statusRunning text">Running</div>
- <a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&action=stop&tunnel=<%=curClient%>">Stop</a>
- <%
+ %><div class="statusRunning text">Running</div>
+ <a class="control" title="Stop this Tunnel" href="file:///d|/temp/guitone-boss/index.jsp?nonce=<%=indexbean.getnextnonce()%>&action=stop&tunnel=<%=curclient%>">Stop</a>
+ <%
break;
case IndexBean.NOT_RUNNING:
- %>
- <div class="statusNotRunning text">Stopped</div>
- <a class="control" title="Start this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&action=start&tunnel=<%=curClient%>">Start</a>
- <%
+ %><div class="statusNotRunning text">Stopped</div>
+ <a class="control" title="Start this Tunnel" href="file:///d|/temp/guitone-boss/index.jsp?nonce=<%=indexbean.getnextnonce()%>&action=start&tunnel=<%=curclient%>">Start</a>
+ <%
break;
}
- %>
- </div>
- <% if (!"sockstunnel".equals(indexBean.getInternalType(curClient))) { %>
- <div class="destinationField rowItem">
- <label>
- <% if ("httpclient".equals(indexBean.getInternalType(curClient)) || "connectclient".equals(indexBean.getInternalType(curClient))) { %>
- Outproxy:
- <% } else { %>
- Destination:
+ %></div>
+
+ <% if (!"sockstunnel".equals(indexBean.getInternalType(curClient))) { %>
+ <div class="destinationField rowItem">
+ <label>
+ <% if ("httpclient".equals(indexBean.getInternalType(curClient)) || "connectclient".equals(indexBean.getInternalType(curClient))) { %>
+ Outproxy:
+ <% } else { %>
+ Destination:
+ <% } %>
+ </label>
+ <input class="freetext" size="40" readonly="readonly" value="<%=indexBean.getClientDestination(curClient)%>" />
+ </div>
<% } %>
- </label>
- <input class="freetext" size="40" readonly="readonly" value="<%=indexBean.getClientDestination(curClient)%>" />
- </div>
- <% } %>
- <div class="descriptionField rowItem">
- <label>Description:</label>
- <div class="text"><%=indexBean.getTunnelDescription(curClient)%></div>
- </div>
- <div class="subdivider">
- <hr />
- </div>
- <%
+
+ <div class="descriptionField rowItem">
+ <label>Description:</label>
+ <div class="text"><%=indexBean.getTunnelDescription(curClient)%></div>
+ </div>
+
+ <div class="subdivider">
+ <hr />
+ </div>
+ <%
}
- %>
- <div class="separator">
- <hr />
- </div>
- <div class="footer">
- <form id="addNewClientTunnelForm" action="edit.jsp">
- <div class="toolbox">
- <label>New client tunnel:</label>
- <select name="type">
- <option value="client">Standard</option>
- <option value="httpclient">HTTP</option>
- <option value="ircclient">IRC</option>
- <option value="sockstunnel">SOCKS 4/4a/5</option>
- <option value="connectclient">CONNECT</option>
- <option value="streamrclient">Streamr</option>
- </select>
- <input class="control" type="submit" value="Create" />
+ %>
+ <div class="separator">
+ <hr />
+ </div>
+
+ <div class="footer">
+ <form id="addNewClientTunnelForm" action="file:///D|/Temp/guitone-Boss/edit.jsp">
+ <div class="toolbox">
+
+ <label>New client tunnel:</label>
+ <select name="type">
+ <option value="client">Standard</option>
+ <option value="httpclient">HTTP</option>
+ <option value="ircclient">IRC</option>
+ <option value="sockstunnel">SOCKS 4/4a/5</option>
+ <option value="connectclient">CONNECT</option>
+ <option value="streamrclient">Streamr</option>
+ </select>
+ <input class="control" type="submit" value="Create" />
+ </div>
+ </form>
</div>
- </form>
</div>
- </div>
-
-</div>
+ <div id="pageFooter">
+ </div>
+ </div>
</body>
</html>
--
GitLab