I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

i2ptunnel jsp cleanup

Browse Source
This commit is contained in:
zzz
2010-11-19 16:14:14 +00:00
parent af4a285e5b
commit dd39f3f244
8 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/i2ptunnel/jsp/editClient.jsp
View File

@ -29,7 +29,7 @@
<div id="pageHeader"> <div id="pageHeader">
</div> </div>
<form method="post" action="index.jsp"> <form method="post" action="list">
<div id="tunnelEditPanel" class="panel"> <div id="tunnelEditPanel" class="panel">
<div class="header"> <div class="header">

2
apps/i2ptunnel/jsp/editServer.jsp
View File

@ -29,7 +29,7 @@
<div id="pageHeader"> <div id="pageHeader">
</div> </div>
<form method="post" action="index.jsp"> <form method="post" action="list">
<div id="tunnelEditPanel" class="panel"> <div id="tunnelEditPanel" class="panel">
<div class="header"> <div class="header">

2
apps/i2ptunnel/jsp/index.html
View File

@ -1,2 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><title>I2P Router Console</title></head>
<body><meta http-equiv="refresh" content="0;url=index.jsp" /><a href="index.jsp">Enter</a></body></html>

26
apps/i2ptunnel/jsp/index.jsp
View File

@ -44,7 +44,7 @@
<div class="footer"> <div class="footer">
<div class="toolbox"> <div class="toolbox">
<a class="control" href="index.jsp"><%=intl._("Refresh")%></a> <a class="control" href="list"><%=intl._("Refresh")%></a>
</div> </div>
</div> </div>
</div> </div>
@ -53,7 +53,7 @@
<div class="header"></div> <div class="header"></div>
<div class="footer"> <div class="footer">
<div class="toolbox"> <div class="toolbox">
<a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Stop%20all"><%=intl._("Stop All")%></a> <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Start%20all"><%=intl._("Start All")%></a> <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Restart%20all"><%=intl._("Restart All")%></a> <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Reload%20configuration"><%=intl._("Reload Config")%></a> <a class="control" href="list?nonce=<%=indexBean.getNextNonce()%>&amp;action=Stop%20all"><%=intl._("Stop All")%></a> <a class="control" href="list?nonce=<%=indexBean.getNextNonce()%>&amp;action=Start%20all"><%=intl._("Start All")%></a> <a class="control" href="list?nonce=<%=indexBean.getNextNonce()%>&amp;action=Restart%20all"><%=intl._("Restart All")%></a> <a class="control" href="list?nonce=<%=indexBean.getNextNonce()%>&amp;action=Reload%20configuration"><%=intl._("Reload Config")%></a>
</div> </div>
</div> </div>
</div> </div>
@ -89,7 +89,7 @@
%> %>
<div class="nameField rowItem"> <div class="nameField rowItem">
<label><%=intl._("Name")%>:</label> <label><%=intl._("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> <span class="text"><a href="edit?tunnel=<%=curServer%>" title="Edit Server Tunnel Settings for <%=indexBean.getTunnelName(curServer)%>"><%=indexBean.getTunnelName(curServer)%></a></span>
</div> </div>
<div class="previewField rowItem"> <div class="previewField rowItem">
<label><%=intl._("Points at")%>:</label> <label><%=intl._("Points at")%>:</label>
@ -125,17 +125,17 @@
switch (indexBean.getTunnelStatus(curServer)) { switch (indexBean.getTunnelStatus(curServer)) {
case IndexBean.STARTING: case IndexBean.STARTING:
%><div class="statusStarting text"><%=intl._("Starting...")%></div> %><div class="statusStarting text"><%=intl._("Starting...")%></div>
<a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curServer%>"><%=intl._("Stop")%></a> <a class="control" title="Stop this Tunnel" href="list?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curServer%>"><%=intl._("Stop")%></a>
<% <%
break; break;
case IndexBean.RUNNING: case IndexBean.RUNNING:
%><div class="statusRunning text"><%=intl._("Running")%></div> %><div class="statusRunning text"><%=intl._("Running")%></div>
<a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curServer%>"><%=intl._("Stop")%></a> <a class="control" title="Stop this Tunnel" href="list?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curServer%>"><%=intl._("Stop")%></a>
<% <%
break; break;
case IndexBean.NOT_RUNNING: case IndexBean.NOT_RUNNING:
%><div class="statusNotRunning text"><%=intl._("Stopped")%></div> %><div class="statusNotRunning text"><%=intl._("Stopped")%></div>
<a class="control" title="Start this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=start&amp;tunnel=<%=curServer%>"><%=intl._("Start")%></a> <a class="control" title="Start this Tunnel" href="list?nonce=<%=indexBean.getNextNonce()%>&amp;action=start&amp;tunnel=<%=curServer%>"><%=intl._("Start")%></a>
<% <%
break; break;
} }
@ -157,7 +157,7 @@
</div> </div>
<div class="footer"> <div class="footer">
<form id="addNewServerTunnelForm" action="edit.jsp"> <form id="addNewServerTunnelForm" action="edit">
<div class="toolbox"> <div class="toolbox">
<label><%=intl._("New server tunnel")%>:</label> <label><%=intl._("New server tunnel")%>:</label>
@ -209,7 +209,7 @@
%> %>
<div class="nameField rowItem"> <div class="nameField rowItem">
<label><%=intl._("Name")%>:</label> <label><%=intl._("Name")%>:</label>
<span class="text"><a href="edit.jsp?tunnel=<%=curClient%>" title="Edit Tunnel Settings for <%=indexBean.getTunnelName(curClient)%>"><%=indexBean.getTunnelName(curClient)%></a></span> <span class="text"><a href="edit?tunnel=<%=curClient%>" title="Edit Tunnel Settings for <%=indexBean.getTunnelName(curClient)%>"><%=indexBean.getTunnelName(curClient)%></a></span>
</div> </div>
<div class="portField rowItem"> <div class="portField rowItem">
<label><%=intl._("Port")%>:</label> <label><%=intl._("Port")%>:</label>
@ -229,22 +229,22 @@
switch (indexBean.getTunnelStatus(curClient)) { switch (indexBean.getTunnelStatus(curClient)) {
case IndexBean.STARTING: case IndexBean.STARTING:
%><div class="statusStarting text"><%=intl._("Starting...")%></div> %><div class="statusStarting text"><%=intl._("Starting...")%></div>
<a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curClient%>"><%=intl._("Stop")%></a> <a class="control" title="Stop this Tunnel" href="list?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curClient%>"><%=intl._("Stop")%></a>
<% <%
break; break;
case IndexBean.STANDBY: case IndexBean.STANDBY:
%><div class="statusStarting text"><%=intl._("Standby")%></div> %><div class="statusStarting text"><%=intl._("Standby")%></div>
<a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curClient%>"><%=intl._("Stop")%></a> <a class="control" title="Stop this Tunnel" href="list?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curClient%>"><%=intl._("Stop")%></a>
<% <%
break; break;
case IndexBean.RUNNING: case IndexBean.RUNNING:
%><div class="statusRunning text"><%=intl._("Running")%></div> %><div class="statusRunning text"><%=intl._("Running")%></div>
<a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curClient%>"><%=intl._("Stop")%></a> <a class="control" title="Stop this Tunnel" href="list?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curClient%>"><%=intl._("Stop")%></a>
<% <%
break; break;
case IndexBean.NOT_RUNNING: case IndexBean.NOT_RUNNING:
%><div class="statusNotRunning text"><%=intl._("Stopped")%></div> %><div class="statusNotRunning text"><%=intl._("Stopped")%></div>
<a class="control" title="Start this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=start&amp;tunnel=<%=curClient%>"><%=intl._("Start")%></a> <a class="control" title="Start this Tunnel" href="list?nonce=<%=indexBean.getNextNonce()%>&amp;action=start&amp;tunnel=<%=curClient%>"><%=intl._("Start")%></a>
<% <%
break; break;
} }
@ -285,7 +285,7 @@
</div> </div>
<div class="footer"> <div class="footer">
<form id="addNewClientTunnelForm" action="edit.jsp"> <form id="addNewClientTunnelForm" action="edit">
<div class="toolbox"> <div class="toolbox">
<label><%=intl._("New client tunnel")%>:</label> <label><%=intl._("New client tunnel")%>:</label>

13
apps/i2ptunnel/jsp/web.xml
View File

@ -5,6 +5,19 @@
<web-app> <web-app>
<!-- precompiled servlets --> <!-- precompiled servlets -->
<!-- yeah we could do this in a handler but this is easier -->
<servlet-mapping>
<servlet-name>net.i2p.i2ptunnel.jsp.index_jsp</servlet-name>
<!-- this becomes the default so it also covers /index and /index.html -->
<url-pattern>/</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>net.i2p.i2ptunnel.jsp.edit_jsp</servlet-name>
<url-pattern>/edit</url-pattern>
</servlet-mapping>
<session-config> <session-config>
<session-timeout> <session-timeout>
30 30

2
apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
View File

@ -143,7 +143,7 @@ public class SummaryBarRenderer {
.append(_("Stats")) .append(_("Stats"))
.append("</a>\n" + .append("</a>\n" +
"<a href=\"/i2ptunnel/index.jsp\" target=\"_blank\" title=\"") "<a href=\"/i2ptunnel/\" target=\"_blank\" title=\"")
.append(_("Local Destinations")) .append(_("Local Destinations"))
.append("\">") .append("\">")
.append(_("I2PTunnel")) .append(_("I2PTunnel"))

2
apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
View File

@ -362,7 +362,7 @@ public class SummaryHelper extends HelperBase {
List<Destination> clients = new ArrayList(_context.clientManager().listClients()); List<Destination> clients = new ArrayList(_context.clientManager().listClients());
StringBuilder buf = new StringBuilder(512); StringBuilder buf = new StringBuilder(512);
buf.append("<h3><a href=\"/i2ptunnel/index.jsp\" target=\"_blank\" title=\"").append(_("Add/remove/edit &amp; control your client and server tunnels")).append("\">").append(_("Local Destinations")).append("</a></h3><hr><div class=\"tunnels\">"); buf.append("<h3><a href=\"/i2ptunnel/\" target=\"_blank\" title=\"").append(_("Add/remove/edit &amp; control your client and server tunnels")).append("\">").append(_("Local Destinations")).append("</a></h3><hr><div class=\"tunnels\">");
if (!clients.isEmpty()) { if (!clients.isEmpty()) {
Collections.sort(clients, new AlphaComparator()); Collections.sort(clients, new AlphaComparator());
buf.append("<table>"); buf.append("<table>");

2
apps/routerconsole/jsp/configkeyring.jsp
View File

@ -32,7 +32,7 @@
<input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigKeyringHandler.nonce")%>" > <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigKeyringHandler.nonce")%>" >
<h3><%=intl._("Manual Keyring Addition")%></h3><p> <h3><%=intl._("Manual Keyring Addition")%></h3><p>
<%=intl._("Enter keys for encrypted remote destinations here.")%> <%=intl._("Enter keys for encrypted remote destinations here.")%>
<%=intl._("Keys for local destinations must be entered on the")%> <a href="i2ptunnel/index.jsp"><%=intl._("I2PTunnel page")%></a>. <%=intl._("Keys for local destinations must be entered on the")%> <a href="i2ptunnel/"><%=intl._("I2PTunnel page")%></a>.
</p> </p>
<div class="wideload"> <div class="wideload">
<p><table><tr> <p><table><tr>