Changeset 5b6a23b


Ignore:
Timestamp:
Feb 25, 2012 9:14:34 PM (8 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
b6f7321, e2e578a
Parents:
7e8de06 (diff), ce1e055 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p.str4d.i2ptunnel' (head 382a93d72f9ae55f3e251a6f3cbf6e35df2e560d)

to branch 'i2p.i2p' (head 36eae7cbb8817fb68bb042e8207c6c955264f393)

Location:
apps/i2ptunnel
Files:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/jsp/wizard.jsp

    r7e8de06 r5b6a23b  
    33
    44%><%@page pageEncoding="UTF-8"
    5 %><%@page contentType="text/html" import="net.i2p.i2ptunnel.web.WizardBean"
     5%><%@page contentType="text/html" import="net.i2p.i2ptunnel.web.EditBean"
    66%><?xml version="1.0" encoding="UTF-8"?>
    77<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    8 <jsp:useBean class="net.i2p.i2ptunnel.web.WizardBean" id="wizardBean" scope="request" />
     8<jsp:useBean class="net.i2p.i2ptunnel.web.EditBean" id="editBean" scope="request" />
    99<jsp:useBean class="net.i2p.i2ptunnel.web.Messages" id="intl" scope="request" />
    1010<% String pageStr = request.getParameter("page");
     
    5151    <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
    5252
    53     <% if (wizardBean.allowCSS()) {
    54   %><link href="<%=wizardBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
    55     <link href="<%=wizardBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
     53    <% if (editBean.allowCSS()) {
     54  %><link href="<%=editBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
     55    <link href="<%=editBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
    5656    <% }
    5757  %>
     
    8383                <input type="hidden" name="page" value="<%=curPage%>" />
    8484                <input type="hidden" name="tunnel" value="null" />
    85                 <input type="hidden" name="nonce" value="<%=wizardBean.getNextNonce()%>" />
     85                <input type="hidden" name="nonce" value="<%=editBean.getNextNonce()%>" />
    8686            </div>
    8787
     
    342342                      clientInterface = "127.0.0.1";
    343343                    }
    344                     for (String ifc : wizardBean.interfaceSet()) {
     344                    for (String ifc : editBean.interfaceSet()) {
    345345                        out.write("<option value=\"");
    346346                        out.write(ifc);
     
    426426                </td></tr>
    427427                <tr><td><%=intl._("Tunnel name and description")%></td><td>
    428                     <%=request.getParameter("name")%><br>
     428                    <%=request.getParameter("name")%><br />
    429429                    <%=request.getParameter("description")%>
    430430                </td></tr><%
     
    440440                <tr><td><%=intl._("Binding address and port")%></td><td><%
    441441                if ((tunnelIsClient && "streamrclient".equals(tunnelType)) || (!tunnelIsClient && !"streamrserver".equals(tunnelType))) { %>
    442                     <%=request.getParameter("targetHost")%><br><%
     442                    <%=request.getParameter("targetHost")%><br /><%
    443443                }
    444444                if (!tunnelIsClient) { %>
    445                     <%=request.getParameter("targetPort")%><br><%
     445                    <%=request.getParameter("targetPort")%><br /><%
    446446                }
    447447                if (tunnelIsClient || "httpbidirserver".equals(tunnelType)) { %>
    448                     <br><%=request.getParameter("port")%><%
     448                    <br /><%=request.getParameter("port")%><%
    449449                }
    450450                if ((tunnelIsClient && !"streamrclient".equals(tunnelType)) || "httpbidirserver".equals(tunnelType) || "streamrserver".equals(tunnelType)) { %>
    451                     <br><%=request.getParameter("reachableBy")%><%
     451                    <br /><%=request.getParameter("reachableBy")%><%
    452452                } %>
    453453                </td></tr>
Note: See TracChangeset for help on using the changeset viewer.