Revert i2ptunnels main page to previous version in attempt to fix borkage.

This commit is contained in:
z3d
2009-07-17 22:56:06 +00:00
parent b298796060
commit a4d053f555

View File

@ -1,52 +1,68 @@
<%@page contentType="text/html" import="net.i2p.i2ptunnel.web.IndexBean"%> <%@page contentType="text/html" import="net.i2p.i2ptunnel.web.IndexBean"%><?xml version="1.0" encoding="UTF-8"?>
<?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"> <!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:useBean class="net.i2p.i2ptunnel.web.IndexBean" id="indexBean" scope="request" />
<jsp:setProperty name="indexBean" property="*" /> <jsp:setProperty name="indexBean" property="*" />
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head> <head>
<title>I2PTunnel Webmanager - List</title> <title>I2PTunnel Webmanager - List</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta htt
p-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<% if (indexBean.allowCSS()) { <% if (indexBean.allowCSS()) {
%> %><link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
<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()%>default.css" rel="stylesheet" type="text/css" />
<link href="<%=indexBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" /> <link href="<%=indexBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
<% } <% }
%> %>
</head> </head>
<body id="tunnelListPage"> <body id="tunnelListPage">
<div id="pageHeader">
</div>
<div id="statusMessagePanel" class="panel"> <div id="statusMessagePanel" class="panel">
<div class="header"> <div class="header">
<h4>Status Messages</h4> <h4>Status Messages</h4>
</div> </div>
<div class="separator"> <div class="separator">
<hr /> <hr />
</div> </div>
<textarea id="statusMessages" rows="4" cols="60" readonly="readonly"><jsp:getProperty name="indexBean" property="messages" /></textarea> <textarea id="statusMessages" rows="4" cols="60" readonly="readonly"><jsp:getProperty name="indexBean" property="messages" /></textarea>
<div class="separator"> <div class="separator">
<hr /> <hr />
</div> </div>
<div class="footer"> <div class="footer">
<div class="toolbox"> <a class="control" href="index.jsp">Refresh</a> </div> <div class="toolbox">
<a class="control" href="file:///d|/temp/guitone-boss/index.jsp">Refresh</a>
</div> </div>
</div> </div>
</div>
<div id="globalOperationsPanel" class="panel"> <div id="globalOperationsPanel" class="panel">
<div class="header"></div> <div class="header"></div>
<div class="footer"> <div class="footer">
<div class="toolbox"> <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Stop%20all">Stop <div class="toolbox">
All</a> <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Start%20all">Start <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>
All</a> <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Restart%20all">Restart
All</a> <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Reload%20configuration">Reload
Config</a> </div>
</div> </div>
</div> </div>
</div>
<div id="localServerTunnelList" class="panel"> <div id="localServerTunnelList" class="panel">
<div class="header"> <div class="header">
<h4>I2P Server Tunnels</h4> <h4>I2P Server Tunnels</h4>
</div> </div>
<div class="separator"> </div> <div class="separator"> </div>
<div class="nameHeaderField rowItem"> <div class="nameHeaderField rowItem">
<label>Name:</label> <label>Name:</label>
</div> </div>
@ -59,6 +75,7 @@
<div class="statusHeaderField rowItem"> <div class="statusHeaderField rowItem">
<label>Status:</label> <label>Status:</label>
</div> </div>
<% <%
for (int curServer = 0; curServer < indexBean.getTunnelCount(); curServer++) { for (int curServer = 0; curServer < indexBean.getTunnelCount(); curServer++) {
if (indexBean.isClient(curServer)) continue; if (indexBean.isClient(curServer)) continue;
@ -66,7 +83,8 @@
%> %>
<div class="nameField rowItem"> <div class="nameField rowItem">
<label>Name:</label> <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> <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"> <div class="previewField rowItem">
<label>Points at:</label> <label>Points at:</label>
<span class="text"> <span class="text">
@ -76,61 +94,53 @@
<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 { } else {
%> %><%=indexBean.getServerTarget(curServer)%>
<%=indexBean.getServerTarget(curServer)%>
<% <%
} }
%> %></span>
</span> </div> </div>
<div class="targetField rowItem"> <div class="targetField rowItem">
<% <%
if ("httpserver".equals(indexBean.getInternalType(curServer)) && indexBean.getTunnelStatus(curServer) == IndexBean.RUNNING) { if ("httpserver".equals(indexBean.getInternalType(curServer)) && indexBean.getTunnelStatus(curServer) == IndexBean.RUNNING) {
%> %><label>Preview:</label>
<label>Preview:</label>
<a class="control" title="Test HTTP server through I2P" href="http://<%=indexBean.getDestHashBase32(curServer)%>.b32.i2p">Preview</a> <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) { } 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 { } else {
%> %><span class="comment">No Preview</span>
<span class="comment">No Preview</span>
<% <%
} }
%> %></div>
</div>
<div class="statusField rowItem"> <div class="statusField rowItem">
<label>Status:</label> <label>Status:</label>
<% <%
switch (indexBean.getTunnelStatus(curServer)) { switch (indexBean.getTunnelStatus(curServer)) {
case IndexBean.STARTING: case IndexBean.STARTING:
%> %><div class="separator"></div>
<div class="separator"></div>
<div class="statusStarting text">Starting...</div> <div class="statusStarting text">Starting...</div>
<a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curServer%>">Stop</a> <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; break;
case IndexBean.RUNNING: case IndexBean.RUNNING:
%> %><div class="statusRunning text">Running</div>
<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>
<a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curServer%>">Stop</a>
<% <%
break; break;
case IndexBean.NOT_RUNNING: case IndexBean.NOT_RUNNING:
%> %><div class="statusNotRunning text">Stopped</div>
<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>
<a class="control" title="Start this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=start&amp;tunnel=<%=curServer%>">Start</a>
<% <%
break; break;
} }
%> %></div>
</div>
<div class="descriptionField rowItem"> <div class="descriptionField rowItem">
<label>Description:</label> <label>Description:</label>
<div class="text"><%=indexBean.getTunnelDescription(curServer)%></div> <div class="text"><%=indexBean.getTunnelDescription(curServer)%></div>
</div> </div>
<div class="subdivider"> <div class="subdivider">
<hr /> <hr />
</div> </div>
@ -140,9 +150,11 @@
<div class="separator"> <div class="separator">
<hr /> <hr />
</div> </div>
<div class="footer"> <div class="footer">
<form id="addNewServerTunnelForm" action="edit.jsp"> <form id="addNewServerTunnelForm" action="file:///D|/Temp/guitone-Boss/edit.jsp">
<div class="toolbox"> <div class="toolbox">
<label>New server tunnel:</label> <label>New server tunnel:</label>
<select name="type"> <select name="type">
<option value="server">Standard</option> <option value="server">Standard</option>
@ -155,11 +167,17 @@
</form> </form>
</div> </div>
</div> </div>
<div id="localClientTunnelList" class="panel"> <div id="localClientTunnelList" class="panel">
<div class="header"> <div class="header">
<h4>I2P Client Tunnels</h4> <h4>I2P Client Tunnels</h4>
</div> </div>
<div class="separator"> </div> <div class="separator"> </div>
<div class="nameHeaderField rowItem"> <div class="nameHeaderField rowItem">
<label>Name:</label> <label>Name:</label>
</div> </div>
@ -175,55 +193,56 @@
<div class="statusHeaderField rowItem"> <div class="statusHeaderField rowItem">
<label>Status:</label> <label>Status:</label>
</div> </div>
<div class="separator"> </div>
<div class="separator">
</div>
<% <%
for (int curClient = 0; curClient < indexBean.getTunnelCount(); curClient++) { for (int curClient = 0; curClient < indexBean.getTunnelCount(); curClient++) {
if (!indexBean.isClient(curClient)) continue; if (!indexBean.isClient(curClient)) continue;
%> %>
<div class="nameField rowItem"> <div class="nameField rowItem">
<label>Name:</label> <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> <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"> <div class="portField rowItem">
<label>Port:</label> <label>Port:</label>
<span class="text"><%=indexBean.getClientPort(curClient)%></span> </div> <span class="text"><%=indexBean.getClientPort(curClient)%></span>
</div>
<div class="typeField rowItem"> <div class="typeField rowItem">
<label>Type:</label> <label>Type:</label>
<span class="text"><%=indexBean.getTunnelType(curClient)%></span> </div> <span class="text"><%=indexBean.getTunnelType(curClient)%></span>
</div>
<div class="interfaceField rowItem"> <div class="interfaceField rowItem">
<label>Interface:</label> <label>Interface:</label>
<span class="text"><%=indexBean.getClientInterface(curClient)%></span> </div> <span class="text"><%=indexBean.getClientInterface(curClient)%></span>
</div>
<div class="statusField rowItem"> <div class="statusField rowItem">
<label>Status:</label> <label>Status:</label>
<% <%
switch (indexBean.getTunnelStatus(curClient)) { switch (indexBean.getTunnelStatus(curClient)) {
case IndexBean.STARTING: case IndexBean.STARTING:
%> %><div class="statusStarting text">Starting...</div> <div class="separator></div>
<div class="statusStarting text">Starting...</div>
<div class="separator></div>
<a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curClient%>">Stop</a> <a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curClient%>">Stop</a>
<% <%
break; break;
case IndexBean.STANDBY: case IndexBean.STANDBY:
%> %><div class="statusStarting text">Standby</div>
<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>
<a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curClient%>">Stop</a>
<% <%
break; break;
case IndexBean.RUNNING: case IndexBean.RUNNING:
%> %><div class="statusRunning text">Running</div>
<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>
<a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curClient%>">Stop</a>
<% <%
break; break;
case IndexBean.NOT_RUNNING: case IndexBean.NOT_RUNNING:
%> %><div class="statusNotRunning text">Stopped</div>
<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>
<a class="control" title="Start this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=start&amp;tunnel=<%=curClient%>">Start</a>
<% <%
break; break;
} }
%> %></div>
</div>
<% if (!"sockstunnel".equals(indexBean.getInternalType(curClient))) { %> <% if (!"sockstunnel".equals(indexBean.getInternalType(curClient))) { %>
<div class="destinationField rowItem"> <div class="destinationField rowItem">
<label> <label>
@ -236,10 +255,12 @@
<input class="freetext" size="40" readonly="readonly" value="<%=indexBean.getClientDestination(curClient)%>" /> <input class="freetext" size="40" readonly="readonly" value="<%=indexBean.getClientDestination(curClient)%>" />
</div> </div>
<% } %> <% } %>
<div class="descriptionField rowItem"> <div class="descriptionField rowItem">
<label>Description:</label> <label>Description:</label>
<div class="text"><%=indexBean.getTunnelDescription(curClient)%></div> <div class="text"><%=indexBean.getTunnelDescription(curClient)%></div>
</div> </div>
<div class="subdivider"> <div class="subdivider">
<hr /> <hr />
</div> </div>
@ -249,9 +270,11 @@
<div class="separator"> <div class="separator">
<hr /> <hr />
</div> </div>
<div class="footer"> <div class="footer">
<form id="addNewClientTunnelForm" action="edit.jsp"> <form id="addNewClientTunnelForm" action="file:///D|/Temp/guitone-Boss/edit.jsp">
<div class="toolbox"> <div class="toolbox">
<label>New client tunnel:</label> <label>New client tunnel:</label>
<select name="type"> <select name="type">
<option value="client">Standard</option> <option value="client">Standard</option>
@ -266,7 +289,8 @@
</form> </form>
</div> </div>
</div> </div>
<div id="pageFooter">
</div>
</div> </div>
</body> </body>
</html> </html>