Changeset 080cc96


Ignore:
Timestamp:
Nov 30, 2011 11:23:41 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
0a76a0d, 58f562d
Parents:
b3fcdb8
Message:
  • Console:
    • Split up config network page
    • CSS tweaks and cleanups
    • Change some form notices to errors
    • Spiff up the buttons

new silk icons: See licenses/LICENSE-SilkIcons?.txt
new toopie icon: Shrunk from existing one

Files:
10 added
31 edited

Legend:

Unmodified
Added
Removed

  • apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java

    rb3fcdb8 r080cc96  
    6969                addFormNotice(_("Configuration saved successfully"));
    7070            else
    71                 addFormNotice(_("Error saving the configuration (applied but not saved) - please see the error logs"));
     71                addFormError(_("Error saving the configuration (applied but not saved) - please see the error logs"));
    7272           
    7373            //if (_forceRestart) {

  • apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java

    rb3fcdb8 r080cc96  
    258258        buf.append("></td><td align=\"center\" width=\"15%\">");
    259259        if (showStartButton && (!ro) && !edit) {
    260             buf.append("<button type=\"submit\" name=\"action\" value=\"Start ").append(index).append("\" >" + _("Start") + "<span class=hide> ").append(index).append("</span></button>");
     260            buf.append("<button type=\"submit\" class=\"accept\" name=\"action\" value=\"Start ").append(index).append("\" >" + _("Start") + "<span class=hide> ").append(index).append("</span></button>");
    261261        }
    262262        if (showEditButton && (!edit) && !ro)
    263             buf.append("<button type=\"submit\" name=\"edit\" value=\"Edit ").append(index).append("\" >" + _("Edit") + "<span class=hide> ").append(index).append("</span></button>");
     263            buf.append("<button type=\"submit\" class=\"add\" name=\"edit\" value=\"Edit ").append(index).append("\" >" + _("Edit") + "<span class=hide> ").append(index).append("</span></button>");
    264264        if (showStopButton && (!edit))
    265             buf.append("<button type=\"submit\" name=\"action\" value=\"Stop ").append(index).append("\" >" + _("Stop") + "<span class=hide> ").append(index).append("</span></button>");
     265            buf.append("<button type=\"submit\" class=\"stop\" name=\"action\" value=\"Stop ").append(index).append("\" >" + _("Stop") + "<span class=hide> ").append(index).append("</span></button>");
    266266        if (showUpdateButton && (!edit) && !ro) {
    267             buf.append("<button type=\"submit\" name=\"action\" value=\"Check ").append(index).append("\" >" + _("Check for updates") + "<span class=hide> ").append(index).append("</span></button>");
    268             buf.append("<button type=\"submit\" name=\"action\" value=\"Update ").append(index).append("\" >" + _("Update") + "<span class=hide> ").append(index).append("</span></button>");
     267            buf.append("<button type=\"submit\" class=\"check\" name=\"action\" value=\"Check ").append(index).append("\" >" + _("Check for updates") + "<span class=hide> ").append(index).append("</span></button>");
     268            buf.append("<button type=\"submit\" class=\"download\" name=\"action\" value=\"Update ").append(index).append("\" >" + _("Update") + "<span class=hide> ").append(index).append("</span></button>");
    269269        }
    270270        if (showDeleteButton && (!edit) && !ro) {
    271             buf.append("<button type=\"submit\" name=\"action\" value=\"Delete ").append(index)
     271            buf.append("<button type=\"submit\" class=\"delete\" name=\"action\" value=\"Delete ").append(index)
    272272               .append("\" onclick=\"if (!confirm('")
    273273               .append(_("Are you sure you want to delete {0}?", _(name)))

  • apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java

    rb3fcdb8 r080cc96  
    160160                addFormNotice(_("Log configuration saved"));
    161161            else
    162                 addFormNotice("Error saving the configuration (applied but not saved) - please see the error logs");
     162                addFormError("Error saving the configuration (applied but not saved) - please see the error logs");
    163163        }
    164164    }

  • apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java

    rb3fcdb8 r080cc96  
    1111    /** configX.jsp */
    1212    private static final String pages[] =
    13                                           {"", "ui", "service", "update", "tunnels",
     13                                          {"", "net", "ui", "service", "update", "tunnels",
    1414                                           "clients", "peer", "keyring", "logging", "stats",
    1515                                           "reseed", "advanced" };
    1616
    1717    private static final String titles[] =
    18                                           {_x("Network"), _x("UI"), _x("Service"), _x("Update"), _x("Tunnels"),
     18                                          {_x("Bandwidth"), _x("Network"), _x("UI"), _x("Service"), _x("Update"), _x("Tunnels"),
    1919                                           _x("Clients"), _x("Peers"), _x("Keyring"), _x("Logging"), _x("Stats"),
    2020                                           _x("Reseeding"), _x("Advanced") };

  • apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java

    rb3fcdb8 r080cc96  
    4545    private boolean _enableLoadTesting;
    4646    private String _sharePct;
    47     private static final boolean _ratesOnly = false; // always false - delete me
     47    private boolean _ratesOnly;
    4848    private static final String PROP_HIDDEN = Router.PROP_HIDDEN_HIDDEN; // see Router for other choice
    4949   
    … …  
    119119    public void setSharePercentage(String pct) {
    120120        _sharePct = (pct != null ? pct.trim() : null);
     121    }
     122   
     123    /** @since 0.8.12 */
     124    public void setRatesOnly(String foo) {
     125        _ratesOnly = true;
    121126    }
    122127   
    … …  
    275280       
    276281        boolean saved = _context.router().saveConfig();
    277         if ( (_action != null) && (_("Save changes").equals(_action)) ) {
    278             if (saved)
    279                 addFormNotice(_("Configuration saved successfully"));
    280             else
    281                 addFormNotice(_("Error saving the configuration (applied but not saved) - please see the error logs"));
    282         }
     282        if (saved)
     283            addFormNotice(_("Configuration saved successfully"));
     284        else
     285            addFormError(_("Error saving the configuration (applied but not saved) - please see the error logs"));
    283286       
    284287        if (switchRequired) {
    … …  
    342345    private void updateRates() {
    343346        boolean updated = false;
     347        boolean bwUpdated = false;
    344348
    345349        if (_sharePct != null) {
    … …  
    362366                _context.router().setConfigSetting(FIFOBandwidthRefiller.PROP_INBOUND_BANDWIDTH_PEAK, "" + kb);
    363367            } catch (NumberFormatException nfe) {}
    364             updated = true;
     368            bwUpdated = true;
    365369        }
    366370        if ( (_outboundRate != null) && (_outboundRate.length() > 0) &&
    … …  
    373377                _context.router().setConfigSetting(FIFOBandwidthRefiller.PROP_OUTBOUND_BANDWIDTH_PEAK, "" + kb);
    374378            } catch (NumberFormatException nfe) {}
     379            bwUpdated = true;
     380        }
     381
     382        if (bwUpdated) {
     383            addFormNotice(_("Updated bandwidth limits"));
    375384            updated = true;
    376385        }
    … …  
    428437
    429438       
    430         if (updated && !_ratesOnly) {
     439        if (updated)
    431440            _context.bandwidthLimiter().reinitialize();
    432             addFormNotice(_("Updated bandwidth limits"));
    433         }
    434441    }
    435442}

  • apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java

    rb3fcdb8 r080cc96  
    229229        int pct = (int) (100 * _context.router().getSharePercentage());
    230230        StringBuilder buf = new StringBuilder(256);
    231         buf.append("<select style=\"text-align: right;\" name=\"sharePercentage\">\n");
     231        buf.append("<select style=\"text-align: right !important;\" name=\"sharePercentage\">\n");
    232232        boolean found = false;
    233233        for (int i = 30; i <= 110; i += 10) {

  • apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java

    rb3fcdb8 r080cc96  
    1010 */
    1111public class ConfigRestartBean {
    12     /** all these are tagged below so no need to _x them here */
    13     static final String[] SET1 = {"shutdownImmediate", "Shutdown immediately", "cancelShutdown", "Cancel shutdown"};
    14     static final String[] SET2 = {"restartImmediate", "Restart immediately", "cancelShutdown", "Cancel restart"};
    15     static final String[] SET3 = {"restart", "Restart", "shutdown", "Shutdown"};
    16     static final String[] SET4 = {"shutdown", "Shutdown"};
     12    /** all these are tagged below so no need to _x them here.
     13     *  order is: form value, form class, display text.
     14     */
     15    static final String[] SET1 = {"shutdownImmediate", "stop", "Shutdown immediately", "cancelShutdown", "cancel", "Cancel shutdown"};
     16    static final String[] SET2 = {"restartImmediate", "reload", "Restart immediately", "cancelShutdown", "cancel", "Cancel restart"};
     17    static final String[] SET3 = {"restart", "reload", "Restart", "shutdown", "stop", "Shutdown"};
     18    static final String[] SET4 = {"shutdown", "stop", "Shutdown"};
    1719
    1820    public static String getNonce() {
    … …  
    5961        StringBuilder buf = new StringBuilder(128);
    6062        if ((shuttingDown || restarting) && timeRemaining <= 0) {
    61             buf.append("<center><b>");
     63            buf.append("<h4>");
    6264            if (restarting)
    6365                buf.append(_("Restart imminent", ctx));
    6466            else
    6567                buf.append(_("Shutdown imminent", ctx));
    66             buf.append("</b></center>");
     68            buf.append("</h4>");
    6769        } else if (shuttingDown) {
    68             buf.append("<center><b>");
     70            buf.append("<h4>");
    6971            buf.append(_("Shutdown in {0}", DataHelper.formatDuration2(timeRemaining), ctx));
    70             buf.append("</b></center><br>");
     72            buf.append("</h4><hr>");
    7173            buttons(ctx, buf, urlBase, systemNonce, SET1);
    7274        } else if (restarting) {
    73             buf.append("<center><b>");
     75            buf.append("<h4>");
    7476            buf.append(_("Restart in {0}", DataHelper.formatDuration2(timeRemaining), ctx));
    75             buf.append("</b></center><br>");
     77            buf.append("</h4><hr>");
    7678            buttons(ctx, buf, urlBase, systemNonce, SET2);
    7779        } else {
    … …  
    8486    }
    8587   
    86     /** @param s value,label,... pairs */
     88    /** @param s value,class,label,... triplets */
    8789    private static void buttons(RouterContext ctx, StringBuilder buf, String url, String nonce, String[] s) {
    8890        buf.append("<form action=\"").append(url).append("\" method=\"POST\">\n");
    8991        buf.append("<input type=\"hidden\" name=\"consoleNonce\" value=\"").append(nonce).append("\" >\n");
    90         for (int i = 0; i < s.length; i+= 2)
    91             buf.append("<button type=\"submit\" name=\"action\" value=\"").append(s[i]).append("\" >").append(_(s[i+1], ctx)).append("</button>\n");
     92        for (int i = 0; i < s.length; i+= 3) {
     93            buf.append("<button type=\"submit\" name=\"action\" value=\"")
     94               .append(s[i]).append("\" class=\"")
     95               .append(s[i+1]).append("\" >")
     96               .append(_(s[i+2], ctx)).append("</button>\n");
     97        }
    9298        buf.append("</form>\n");
    9399    }

  • apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHandler.java

    rb3fcdb8 r080cc96  
    140140                addFormNotice(_("Exploratory tunnel configuration saved successfully."));
    141141            else
    142                 addFormNotice(_("Error saving the configuration (applied but not saved) - please see the error logs."));
     142                addFormError(_("Error saving the configuration (applied but not saved) - please see the error logs."));
    143143        }
    144144    }

  • apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java

    rb3fcdb8 r080cc96  
    3434                              "</a>");
    3535        } else {
    36             addFormNotice(_("Error saving the configuration (applied but not saved) - please see the error logs."));
     36            addFormError(_("Error saving the configuration (applied but not saved) - please see the error logs."));
    3737        }
    3838    }

  • apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java

    rb3fcdb8 r080cc96  
    196196                _out.write(" checked=\"true\"");
    197197            _out.write(">" +
    198                        "<hr><div class=\"formaction\"><input type=\"submit\" value=\"" + _("Save settings and redraw graphs") + "\"></div></form>");
     198                       "<hr><div class=\"formaction\"><input type=\"submit\" class=\"acceot\" value=\"" + _("Save settings and redraw graphs") + "\"></div></form>");
    199199        } catch (IOException ioe) {
    200200            ioe.printStackTrace();

  • apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java

    rb3fcdb8 r080cc96  
    205205           .append("</td></tr></table>\n" +
    206206
    207                    "<hr><h4><a href=\"/config#help\" target=\"_top\" title=\"")
     207                   "<hr><h4><a href=\"/confignet#help\" target=\"_top\" title=\"")
    208208           .append(_("Help with configuring your firewall and router for optimal I2P performance"))
    209209           .append("\">")
    … …  
    215215
    216216        // display all the time so we display the final failure message, and plugin update messages too
    217         buf.append(UpdateHandler.getStatus());
     217        String status = UpdateHandler.getStatus();
     218        if (status.length() > 0) {
     219            buf.append("<h4>").append(status).append("</h4><hr>\n");
     220        }
    218221        if (_helper.updateAvailable() || _helper.unsignedUpdateAvailable()) {
    219222            if ("true".equals(System.getProperty(UpdateHandler.PROP_UPDATE_IN_PROGRESS))) {
    … …  
    234237                buf.append("<input type=\"hidden\" name=\"updateNonce\" value=\"").append(nonce).append("\" >\n");
    235238                if (_helper.updateAvailable()) {
    236                     buf.append("<button type=\"submit\" name=\"updateAction\" value=\"signed\" >")
     239                    buf.append("<button type=\"submit\" class=\"download\" name=\"updateAction\" value=\"signed\" >")
    237240                       // Note to translators: parameter is a version, e.g. "0.8.4"
    238241                       .append(_("Download {0} Update", _helper.getUpdateVersion()))
    … …  
    240243                }
    241244                if (_helper.unsignedUpdateAvailable()) {
    242                     buf.append("<button type=\"submit\" name=\"updateAction\" value=\"Unsigned\" >")
     245                    buf.append("<button type=\"submit\" class=\"download\" name=\"updateAction\" value=\"Unsigned\" >")
    243246                       // Note to translators: parameter is a date and time, e.g. "02-Mar 20:34 UTC"
    244247                       // <br> is optional, to help the browser make the lines even in the button
    … …  
    306309        boolean anotherLine = false;
    307310        if (_helper.showFirewallWarning()) {
    308             buf.append("<h4><a href=\"/config\" target=\"_top\" title=\"")
     311            buf.append("<h4><a href=\"/confignet\" target=\"_top\" title=\"")
    309312               .append(_("Help with firewall configuration"))
    310313               .append("\">")
    … …  
    329332                buf.append("<p><form action=\"").append(uri).append("\" method=\"POST\">\n");
    330333                buf.append("<input type=\"hidden\" name=\"reseedNonce\" value=\"").append(nonce).append("\" >\n");
    331                 buf.append("<button type=\"submit\" value=\"Reseed\" >").append(_("Reseed")).append("</button></form></p>\n");
     334                buf.append("<button type=\"submit\" class=\"reload\" value=\"Reseed\" >").append(_("Reseed")).append("</button></form></p>\n");
    332335            }
    333336            anotherLine = true;

  • apps/routerconsole/jsp/config.jsp

    rb3fcdb8 r080cc96  
    55<html><head>
    66<%@include file="css.jsi" %>
    7 <%=intl.title("config networking")%>
     7<%=intl.title("configure bandwidth")%>
    88</head><body>
    99
    … …  
    1212<jsp:useBean class="net.i2p.router.web.ConfigNetHelper" id="nethelper" scope="request" />
    1313<jsp:setProperty name="nethelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    14 <h1><%=intl._("I2P Network Configuration")%></h1>
     14<h1><%=intl._("I2P Bandwidth Configuration")%></h1>
    1515<div class="main" id="main">
    1616 <%@include file="confignav.jsi" %>
    … …  
    2525 <input type="hidden" name="nonce" value="<jsp:getProperty name="formhandler" property="newNonce" />" >
    2626 <input type="hidden" name="action" value="blah" >
     27 <input type="hidden" name="ratesOnly" value="1" >
    2728 <h3><%=intl._("Bandwidth limiter")%></h3><p>
     29 <img src="/themes/console/images/itoopie_xsm.png" alt="">
    2830 <b><%=intl._("I2P will work best if you configure your rates to match the speed of your internet connection.")%></b>
    2931 </p>
    … …  
    5456        <td><jsp:getProperty name="nethelper" property="sharePercentageBox" /> <%=intl._("Share")%></td>
    5557        <td>(<jsp:getProperty name="nethelper" property="shareRateBits" />)
    56 </td></tr></table></p></div></p>
     58</td></tr></table></p></div></p><p>
    5759 <% int share = nethelper.getShareBandwidth();
    5860    if (share < 12) {
    59         out.print("<p><b>");
     61        out.print("<b>");
    6062        out.print(intl._("NOTE"));
    6163        out.print("</b>: ");
    … …  
    6567        out.print(intl._("I2P requires at least 12KBps to enable sharing. "));
    6668        out.print(intl._("Please enable sharing (participating in tunnels) by configuring more bandwidth. "));
    67         out.print(intl._("It improves your anonymity by creating cover traffic, and helps the network.")+"</p>");
     69        out.print(intl._("It improves your anonymity by creating cover traffic, and helps the network."));
    6870    } else {
    69         out.print("<p>");
    7071        out.print(intl._("You have configured I2P to share {0} KBps.", share));
    7172        out.print("\n");
    7273
    73         out.print(intl._("The higher the share bandwidth the more you improve your anonymity and help the network.")+"</p><hr>");
     74        out.print(intl._("The higher the share bandwidth the more you improve your anonymity and help the network."));
    7475    }
    7576 %>
     77<p><a href="confignet"><%=intl._("Advanced network configuration page")%></a></p><hr>
    7678<div class="formaction">
    77 <input type="reset" value="<%=intl._("Cancel")%>" >
    78 <input type="submit" name="save" value="<%=intl._("Save changes")%>" >
     79<input type="reset" class="cancel" value="<%=intl._("Cancel")%>" >
     80<input type="submit" class="accept" name="save" value="<%=intl._("Save changes")%>" >
    7981</div>
    80 <% /********
    81  <!--
    82  <b>Enable load testing: </b>
    83 <input type="checkbox" class="optbox" name="enableloadtesting" value="true" <jsp:getProperty name="nethelper" property="enableLoadTesting" /> />
    84  <p>If enabled, your router will periodically anonymously probe some of your peers
    85  to see what sort of throughput they can handle.  This improves your router's ability
    86  to pick faster peers, but can cost substantial bandwidth.  Relevant data from the
    87  load testing is fed into the profiles as well as the
    88  <a href="oldstats.jsp#test.rtt">test.rtt</a> and related stats.</p>
    89  <br>
    90 -->
    91 *********/ %>
    92  <h3><%=intl._("IP and Transport Configuration")%></h3><p>
    93  <b><%=intl._("The default settings will work for most people.")%>
    94  <a href="#chelp"><%=intl._("There is help below.")%></a></b>
    95  </p><p><b><%=intl._("UPnP Configuration")%>:</b><br>
    96     <input type="checkbox" class="optbox" name="upnp" value="true" <jsp:getProperty name="nethelper" property="upnpChecked" /> >
    97     <%=intl._("Enable UPnP to open firewall ports")%> - <a href="peers#upnp"><%=intl._("UPnP status")%></a>
    98  </p><p><b><%=intl._("IP Configuration")%>:</b><br>
    99  <%=intl._("Externally reachable hostname or IP address")%>:<br>
    100     <input type="radio" class="optbox" name="udpAutoIP" value="local,upnp,ssu" <%=nethelper.getUdpAutoIPChecked(3) %> >
    101     <%=intl._("Use all auto-detect methods")%><br>
    102     <input type="radio" class="optbox" name="udpAutoIP" value="local,ssu" <%=nethelper.getUdpAutoIPChecked(4) %> >
    103     <%=intl._("Disable UPnP IP address detection")%><br>
    104     <input type="radio" class="optbox" name="udpAutoIP" value="upnp,ssu" <%=nethelper.getUdpAutoIPChecked(5) %> >
    105     <%=intl._("Ignore local interface IP address")%><br>
    106     <input type="radio" class="optbox" name="udpAutoIP" value="ssu" <%=nethelper.getUdpAutoIPChecked(0) %> >
    107     <%=intl._("Use SSU IP address detection only")%><br>
    108     <input type="radio" class="optbox" name="udpAutoIP" value="fixed" <%=nethelper.getUdpAutoIPChecked(1) %> >
    109     <%=intl._("Specify hostname or IP")%>:
    110     <input name ="udpHost1" type="text" size="16" value="<jsp:getProperty name="nethelper" property="udphostname" />" >
    111     <% String[] ips = nethelper.getAddresses();
    112        if (ips.length > 0) {
    113            out.print(intl._("or") + " <select name=\"udpHost2\"><option value=\"\" selected=\"true\">"+intl._("Select Interface")+"</option>\n");
    114            for (int i = 0; i < ips.length; i++) {
    115                out.print("<option value=\"");
    116                out.print(ips[i]);
    117                out.print("\">");
    118                out.print(ips[i]);
    119                out.print("</option>\n");
    120            }
    121            out.print("</select>\n");
    122        }
    123     %>
    124     <br>
    125     <input type="radio" class="optbox" name="udpAutoIP" value="hidden" <%=nethelper.getUdpAutoIPChecked(2) %> >
    126     <%=intl._("Hidden mode - do not publish IP")%> <i><%=intl._("(prevents participating traffic)")%></i><br>
    127  </p><p>
    128  <%=intl._("Action when IP changes")%>:<br>
    129     <input type="checkbox" class="optbox" name="laptop" value="true" <jsp:getProperty name="nethelper" property="laptopChecked" /> >
    130     <%=intl._("Laptop mode - Change router identity and UDP port when IP changes for enhanced anonymity")%>
    131     (<i><%=intl._("Experimental")%></i>)
    132  </p><p><b><%=intl._("UDP Configuration:")%></b><br>
    133  <%=intl._("UDP port:")%>
    134  <input name ="udpPort" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="configuredUdpPort" />" ><br>
    135 <% /********
    136 <!-- let's keep this simple...
    137 <input type="checkbox" class="optbox" name="requireIntroductions" value="true" <jsp:getProperty name="nethelper" property="requireIntroductionsChecked" /> />
    138  Require SSU introductions
    139  <i>(Enable if you cannot open your firewall)</i>
    140  </p><p>
    141  Current External UDP address: <i><jsp:getProperty name="nethelper" property="udpAddress" /></i><br>
    142 -->
    143 *********/ %>
    144  </p><p>
    145  <b><%=intl._("TCP Configuration")%>:</b><br>
    146  <%=intl._("Externally reachable hostname or IP address")%>:<br>
    147     <input type="radio" class="optbox" name="ntcpAutoIP" value="true" <%=nethelper.getTcpAutoIPChecked(2) %> >
    148     <%=intl._("Use auto-detected IP address")%>
    149     <i>(<%=intl._("currently")%> <jsp:getProperty name="nethelper" property="udpIP" />)</i>
    150     <%=intl._("if we are not firewalled")%><br>
    151     <input type="radio" class="optbox" name="ntcpAutoIP" value="always" <%=nethelper.getTcpAutoIPChecked(3) %> >
    152     <%=intl._("Always use auto-detected IP address (Not firewalled)")%><br>
    153     <input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(1) %> >
    154     <%=intl._("Specify hostname or IP")%>:
    155     <input name ="ntcphost" type="text" size="16" value="<jsp:getProperty name="nethelper" property="ntcphostname" />" ><br>
    156     <input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(0) %> >
    157     <%=intl._("Disable inbound (Firewalled)")%><br>
    158     <input type="radio" class="optbox" name="ntcpAutoIP" value="disabled" <%=nethelper.getTcpAutoIPChecked(4) %> >
    159     <%=intl._("Completely disable")%> <i><%=intl._("(select only if behind a firewall that throttles or blocks outbound TCP)")%></i><br>
    160  </p><p>
    161  <%=intl._("Externally reachable TCP port")%>:<br>
    162     <input type="radio" class="optbox" name="ntcpAutoPort" value="2" <%=nethelper.getTcpAutoPortChecked(2) %> >
    163     <%=intl._("Use the same port configured for UDP")%>
    164     <i>(<%=intl._("currently")%> <jsp:getProperty name="nethelper" property="udpPort" />)</i><br>
    165     <input type="radio" class="optbox" name="ntcpAutoPort" value="1" <%=nethelper.getTcpAutoPortChecked(1) %> >
    166     <%=intl._("Specify Port")%>:
    167     <input name ="ntcpport" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="ntcpport" />" ><br>
    168  </p><p><b><%=intl._("Notes")%>: <%=intl._("a) Do not reveal your port numbers to anyone!   b) Changing these settings will restart your router.")%></b></p>
    169 <hr><div class="formaction">
    170 <input type="reset" value="<%=intl._("Cancel")%>" >
    171 <input type="submit" name="save" value="<%=intl._("Save changes")%>" >
    172 </div><h3><a name="chelp"><%=intl._("Configuration Help")%>:</a></h3><div align="justify"><p>
    173  <%=intl._("While I2P will work fine behind most firewalls, your speeds and network integration will generally improve if the I2P port is forwarded for both UDP and TCP.")%>
    174  </p><p>
    175  <%=intl._("If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach you.")%>
    176    <%=intl._("If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching with \"SSU introductions\" to relay traffic.")%>
    177    <%=intl._("Most of the options above are for special situations, for example where UPnP does not work correctly, or a firewall not under your control is doing harm.")%>
    178    <%=intl._("Certain firewalls such as symmetric NATs may not work well with I2P.")%>
    179  </p>
    180 <% /********
    181 <!-- let's keep this simple...
    182 <input type="submit" name="recheckReachability" value="Check network reachability..." />
    183 </p>
    184 -->
    185 *********/ %>
    186 <p>
    187  <%=intl._("UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports.")%>
    188    <%=intl._("UPnP support is beta, and may not work for any number of reasons")%>:
    189 <ul>
    190 <li class="tidylist"><%=intl._("No UPnP-compatible device present")%>
    191 <li class="tidylist"><%=intl._("UPnP disabled on the device")%>
    192 <li class="tidylist"><%=intl._("Software firewall interference with UPnP")%>
    193 <li class="tidylist"><%=intl._("Bugs in the device's UPnP implementation")%>
    194 <li class="tidylist"><%=intl._("Multiple firewall/routers in the internet connection path")%>
    195 <li class="tidylist"><%=intl._("UPnP device change, reset, or address change")%>
    196 </ul></p><p>
    197 <a href="peers#upnp"><%=intl._("Review the UPnP status here.")%></a>
    198 <%=intl._("UPnP may be enabled or disabled above, but a change requires a router restart to take effect.")%></p>
    199 <p><%=intl._("Hostnames entered above will be published in the network database.")%>
    200     <%=intl._("They are <b>not private</b>.")%>
    201     <%=intl._("Also, <b>do not enter a private IP address</b> like 127.0.0.1 or 192.168.1.1.")%>
    202     <%=intl._("If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially.")%>
    203     <%=intl._("When in doubt, leave the settings at the defaults.")%>
    204 </p>
    205 <h3><a name="help"><%=intl._("Reachability Help")%>:</a></h3><p>
    206  <%=intl._("While I2P will work fine behind most firewalls, your speeds and network integration will generally improve if the I2P port is forwarded for both UDP and TCP.")%>
    207  <%=intl._("If you think you have opened up your firewall and I2P still thinks you are firewalled, remember that you may have multiple firewalls, for example both software packages and external hardware routers.")%>
    208  <%=intl._("If there is an error, the <a href=\"logs.jsp\">logs</a> may also help diagnose the problem.")%>
    209  <ul>
    210 <li class="tidylist"><b><%=intl._("OK")%></b> -
    211      <%=intl._("Your UDP port does not appear to be firewalled.")%>
    212 <li class="tidylist"><b><%=intl._("Firewalled")%></b> -
    213      <%=intl._("Your UDP port appears to be firewalled.")%>
    214      <%=intl._("As the firewall detection methods are not 100% reliable, this may occasionally be displayed in error.")%>
    215      <%=intl._("However, if it appears consistently, you should check whether both your external and internal firewalls are open for your port.")%>
    216      <%=intl._("I2P will work fine when firewalled, there is no reason for concern. When firewalled, the router uses \"introducers\" to relay inbound connections.")%>
    217      <%=intl._("However, you will get more participating traffic and help the network more if you can open your firewall(s).")%>
    218      <%=intl._("If you think you have already done so, remember that you may have both a hardware and a software firewall, or be behind an additional, institutional firewall you cannot control.")%>
    219      <%=intl._("Also, some routers cannot correctly forward both TCP and UDP on a single port, or may have other limitations or bugs that prevent them from passing traffic through to I2P.")%>
    220 <li class="tidylist"><b><%=intl._("Testing")%></b> -
    221      <%=intl._("The router is currently testing whether your UDP port is firewalled.")%>
    222 <li class="tidylist"><b><%=intl._("Hidden")%></b> -
    223      <%=intl._("The router is not configured to publish its address, therefore it does not expect incoming connections.")%>
    224 <li class="tidylist"><b><%=intl._("WARN - Firewalled and Fast")%></b> -
    225      <%=intl._("You have configured I2P to share more than 128KBps of bandwidth, but you are firewalled.")%>
    226      <%=intl._("While I2P will work fine in this configuration, if you really have over 128KBps of bandwidth to share, it will be much more helpful to the network if you open your firewall.")%>
    227 <li class="tidylist"><b><%=intl._("WARN - Firewalled and Floodfill")%></b> -
    228      <%=intl._("You have configured I2P to be a floodfill router, but you are firewalled.")%>
    229      <%=intl._("For best participation as a floodfill router, you should open your firewall.")%>
    230 <li class="tidylist"><b><%=intl._("WARN - Firewalled with Inbound TCP Enabled")%></b> -
    231      <%=intl._("You have configured inbound TCP, however your UDP port is firewalled, and therefore it is likely that your TCP port is firewalled as well.")%>
    232      <%=intl._("If your TCP port is firewalled with inbound TCP enabled, routers will not be able to contact you via TCP, which will hurt the network.")%>
    233      <%=intl._("Please open your firewall or disable inbound TCP above.")%>
    234 <li class="tidylist"><b><%=intl._("WARN - Firewalled with UDP Disabled")%></b> -
    235      <%=intl._("You have configured inbound TCP, however you have disabled UDP.")%>
    236      <%=intl._("You appear to be firewalled on TCP, therefore your router cannot accept inbound connections.")%>
    237      <%=intl._("Please open your firewall or enable UDP.")%>
    238 <li class="tidylist"><b><%=intl._("ERR - Clock Skew")%></b> -
    239      <%=intl._("Your system's clock is skewed, which will make it difficult to participate in the network.")%>
    240      <%=intl._("Correct your clock setting if this error persists.")%>
    241 <li class="tidylist"><b><%=intl._("ERR - Private TCP Address")%></b> -
    242      <%=intl._("You must never advertise an unroutable IP address such as 127.0.0.1 or 192.168.1.1 as your external address.")%>
    243      <%=intl._("Correct the address or disable inbound TCP above.")%>
    244 <li class="tidylist"><b><%=intl._("ERR - SymmetricNAT")%></b> -
    245      <%=intl._("I2P detected that you are firewalled by a Symmetric NAT.")%>
    246      <%=intl._("I2P does not work well behind this type of firewall. You will probably not be able to accept inbound connections, which will limit your participation in the network.")%>
    247 <li class="tidylist"><b><%=intl._("ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart")%></b> -
    248      <%=intl._("I2P was unable to bind to port 8887 or other configured port.")%>
    249      <%=intl._("Check to see if another program is using the configured port. If so, stop that program or configure I2P to use a different port.")%>
    250      <%=intl._("This may be a transient error, if the other program is no longer using the port.")%>
    251      <%=intl._("However, a restart is always required after this error.")%>
    252 <li class="tidylist"><b><%=intl._("ERR - UDP Disabled and Inbound TCP host/port not set")%></b> -
    253      <%=intl._("You have not configured inbound TCP with a hostname and port above, however you have disabled UDP.")%>
    254      <%=intl._("Therefore your router cannot accept inbound connections.")%>
    255      <%=intl._("Please configure a TCP host and port above or enable UDP.")%>
    256 <li class="tidylist"><b><%=intl._("ERR - Client Manager I2CP Error - check logs")%></b> -
    257      <%=intl._("This is usually due to a port 7654 conflict. Check the logs to verify.")%>
    258      <%=intl._("Do you have another I2P instance running? Stop the conflicting program and restart I2P.")%>
    259  </ul></p><hr>
    260 <% /********
    261       <!--
    262  <b>Dynamic Router Keys: </b>
    263  <input type="checkbox" class="optbox" name="dynamicKeys" value="true" <jsp:getProperty name="nethelper" property="dynamicKeysChecked" /> /><br>
    264  <p>
    265  This setting causes your router identity to be regenerated every time your IP address
    266  changes. If you have a dynamic IP this option can speed up your reintegration into
    267  the network (since people will have shitlisted your old router identity), and, for
    268  very weak adversaries, help frustrate trivial
    269  <a href="http://www.i2p.net/how_threatmodel#intersection">intersection
    270  attacks</a> against the NetDB.  Your different router identities would only be
    271  'hidden' among other I2P users at your ISP, and further analysis would link
    272  the router identities further.</p>
    273  <p>Note that when I2P detects an IP address change, it will automatically
    274  initiate a restart in order to rekey and to disconnect from peers before they
    275  update their profiles - any long lasting client connections will be disconnected,
    276  though such would likely already be the case anyway, since the IP address changed.
    277  </p>
    278  <br>
    279 -->
    280 *********/ %>
    281 </div></form></div></div></body></html>
     82</div></form>
     83</div></div></body></html>

  • apps/routerconsole/jsp/configadvanced.jsp

    rb3fcdb8 r080cc96  
    3131 <textarea rows="32" cols="60" name="config" wrap="off" spellcheck="false"><jsp:getProperty name="advancedhelper" property="settings" /></textarea><br><hr>
    3232      <div class="formaction">
    33         <input type="reset" value="<%=intl._("Cancel")%>" >
    34         <input type="submit" name="shouldsave" value="<%=intl._("Save changes")%>" >
     33        <input type="reset" class="cancel" value="<%=intl._("Cancel")%>" >
     34        <input type="submit" name="shouldsave" class="accept" value="<%=intl._("Save changes")%>" >
    3535 <br><b><%=intl._("NOTE")%>:</b> <%=intl._("Some changes may require a restart to take effect.")%>
    3636 </div></form></div></div></div></body></html>

  • apps/routerconsole/jsp/configclients.jsp

    rb3fcdb8 r080cc96  
    4242 <%=intl._("All changes require restart to take effect.")%></i>
    4343 </p><hr><div class="formaction">
    44  <input type="submit" name="foo" value="<%=intl._("Cancel")%>" />
     44 <input type="submit" class="cancel" name="foo" value="<%=intl._("Cancel")%>" />
    4545<% if (request.getParameter("edit") == null) { %>
    46  <input type="submit" name="edit" value="<%=intl._("Add Client")%>" />
     46 <input type="submit" name="edit" class="add" value="<%=intl._("Add Client")%>" />
    4747<% } %>
    48  <input type="submit" name="action" value="<%=intl._("Save Client Configuration")%>" />
     48 <input type="submit" class="accept" name="action" value="<%=intl._("Save Client Configuration")%>" />
    4949</div></form></div>
    5050
    … …  
    9090<i><%=intl._("All changes require restart to take effect.")%></i>
    9191</p><hr><div class="formaction">
    92 <input type="submit" name="foo" value="<%=intl._("Cancel")%>" />
    93 <input type="submit" name="action" value="<%=intl._("Save Interface Configuration")%>" />
     92<input type="submit" class="cancel" name="foo" value="<%=intl._("Cancel")%>" />
     93<input type="submit" class="accept" name="action" value="<%=intl._("Save Interface Configuration")%>" />
    9494</div></form>
    9595
    … …  
    104104 <p><i><%=intl._("All changes require restart to take effect.")%></i>
    105105 </p><hr><div class="formaction">
    106  <input type="submit" name="action" value="<%=intl._("Save WebApp Configuration")%>" />
     106 <input type="submit" name="action" class="accept" value="<%=intl._("Save WebApp Configuration")%>" />
    107107</div></form></div>
    108108
    … …  
    115115 <jsp:getProperty name="clientshelper" property="form3" />
    116116<hr><div class="formaction">
    117  <input type="submit" name="action" value="<%=intl._("Save Plugin Configuration")%>" />
     117 <input type="submit" name="action" class="accept" value="<%=intl._("Save Plugin Configuration")%>" />
    118118</div></form></div>
    119119
    … …  
    126126 <input type="text" size="60" name="pluginURL" >
    127127 </p><hr><div class="formaction">
    128  <input type="submit" name="action" value="<%=intl._("Install Plugin")%>" />
     128 <input type="submit" name="action" class="download" value="<%=intl._("Install Plugin")%>" />
    129129 </div></form></div>
    130130<% } %>

  • apps/routerconsole/jsp/configkeyring.jsp

    rb3fcdb8 r080cc96  
    4242        </tr><tr>
    4343          <td align="right" colspan="2">
    44 <input type="reset" value="<%=intl._("Cancel")%>" >
    45 <input type="submit" name="action" value="<%=intl._("Delete key")%>" >
    46 <input type="submit" name="action" value="<%=intl._("Add key")%>" >
     44<input type="reset" class="cancel" value="<%=intl._("Cancel")%>" >
     45<input type="submit" name="action" class="delete" value="<%=intl._("Delete key")%>" >
     46<input type="submit" name="action" class="add" value="<%=intl._("Add key")%>" >
    4747</td></tr></table></p></div></form></div></div></body></html>

  • apps/routerconsole/jsp/configlogging.jsp

    rb3fcdb8 r080cc96  
    4949        </tr><tr><td colspan="2"><hr></td>
    5050        </tr><tr class="tablefooter"><td colspan="2"> <div class="formaction">
    51           <input type="reset" value="<%=intl._("Cancel")%>" >
    52           <input type="submit" name="shouldsave" value="<%=intl._("Save changes")%>" >
     51          <input type="reset" class="cancel" value="<%=intl._("Cancel")%>" >
     52          <input type="submit" name="shouldsave" class="accept" value="<%=intl._("Save changes")%>" >
    5353</div></td></tr></table></div></form></div></div></body></html>

  • apps/routerconsole/jsp/configpeer.jsp

    rb3fcdb8 r080cc96  
    4040 <p><%=intl._("Banning will prevent the participation of this peer in tunnels you create.")%></p>
    4141      <div class="formaction">
    42         <input type="submit" name="action" value="<%=intl._("Ban peer until restart")%>" />
    43         <input type="submit" name="action" value="<%=intl._("Unban peer")%>" />
     42        <input type="submit" name="action" class="delete" value="<%=intl._("Ban peer until restart")%>" />
     43        <input type="submit" name="action" class="accept" value="<%=intl._("Unban peer")%>" />
    4444        <% if (! "".equals(peer)) { %>
    4545        <!-- <font color="blue">&lt;---- click to verify action</font> -->
    … …  
    5858 <%=intl._("Capacity")%>:
    5959 <input type="text" size="8" name="capacity" value="<%=capacity%>" />
    60  <input type="submit" name="action" value="<%=intl._("Adjust peer bonuses")%>" /></p></div>
     60 <input type="submit" name="action" class="add" value="<%=intl._("Adjust peer bonuses")%>" /></p></div>
    6161 </form>
    6262 <a name="shitlist"> </a><h2><%=intl._("Banned Peers")%></h2>

  • apps/routerconsole/jsp/configreseed.jsp

    rb3fcdb8 r080cc96  
    7676</table></div>
    7777<hr><div class="formaction">
    78 <input type="submit" name="foo" value="<%=intl._("Cancel")%>" />
    79 <input type="submit" name="action" value="<%=intl._("Save changes and reseed now")%>" />
    80 <input type="submit" name="action" value="<%=intl._("Save changes")%>" />
     78<input type="submit" class="cancel" name="foo" value="<%=intl._("Cancel")%>" />
     79<input type="submit" name="action" class="download" value="<%=intl._("Save changes and reseed now")%>" />
     80<input type="submit" name="action" class="accept" value="<%=intl._("Save changes")%>" />
    8181</div></form></div></div></body></html>

  • apps/routerconsole/jsp/configservice.jsp

    rb3fcdb8 r080cc96  
    2525    <%=intl._("If you need to kill the router immediately, that option is available as well.")%></p>
    2626  <hr><div class="formaction">
    27  <input type="submit" name="action" value="<%=intl._("Shutdown gracefully")%>" >
    28  <input type="submit" name="action" value="<%=intl._("Shutdown immediately")%>" >
    29  <input type="submit" name="action" value="<%=intl._("Cancel graceful shutdown")%>" >
     27 <input type="submit" class="stop" name="action" value="<%=intl._("Shutdown gracefully")%>" >
     28 <input type="submit" class="stop" name="action" value="<%=intl._("Shutdown immediately")%>" >
     29 <input type="submit" class="cancel" name="action" value="<%=intl._("Cancel graceful shutdown")%>" >
    3030 </div>
    3131 <% if (System.getProperty("wrapper.version") != null) { %>
    … …  
    3535    <%=intl._("After tearing down the router, it will wait 1 minute before starting back up again.")%></p>
    3636 <hr><div class="formaction">
    37  <input type="submit" name="action" value="<%=intl._("Graceful restart")%>" >
    38  <input type="submit" name="action" value="<%=intl._("Hard restart")%>" >
     37 <input type="submit" class="reload" name="action" value="<%=intl._("Graceful restart")%>" >
     38 <input type="submit" class="reload" name="action" value="<%=intl._("Hard restart")%>" >
    3939 <% } %></div>
    4040

  • apps/routerconsole/jsp/configstats.jsp

    rb3fcdb8 r080cc96  
    112112     <input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" ></td></tr>
    113113     <tr class="tablefooter"><td colspan="3" align="right">
    114 <input type="reset" value="<%=intl._("Cancel")%>" >
    115 <input type="submit" name="shouldsave" value="<%=intl._("Save changes")%>" >
     114<input type="reset" class="cancel" value="<%=intl._("Cancel")%>" >
     115<input type="submit" name="shouldsave" class="accept" value="<%=intl._("Save changes")%>" >
    116116</td></tr>
    117117</table></div></form></div></div></body></html>

  • apps/routerconsole/jsp/configtunnels.jsp

    rb3fcdb8 r080cc96  
    3939<%=intl._("To make permanent client tunnel changes see the")%> <a href="i2ptunnel/index.jsp"><%=intl._("i2ptunnel page")%></a>.
    4040 <hr><div class="formaction">
    41 <input type="reset" value="<%=intl._("Cancel")%>" >
    42 <input type="submit" name="shouldsave" value="<%=intl._("Save changes")%>" >
     41<input type="reset" class="cancel" value="<%=intl._("Cancel")%>" >
     42<input type="submit" name="shouldsave" class="accept" value="<%=intl._("Save changes")%>" >
    4343</div>
    4444 </form></div></div></div></body></html>

  • apps/routerconsole/jsp/configui.jsp

    rb3fcdb8 r080cc96  
    5050<p><%=uihelper._("Please contribute to the router console translation project! Contact the developers in #i2p-dev on IRC to help.")%>
    5151</p><hr><div class="formaction">
    52 <input type="reset" value="<%=intl._("Cancel")%>" >
    53 <input type="submit" name="shouldsave" value="<%=intl._("Apply")%>" >
     52<input type="reset" class="cancel" value="<%=intl._("Cancel")%>" >
     53<input type="submit" name="shouldsave" class="accept" value="<%=intl._("Apply")%>" >
    5454</div></form></div>
    5555</div></body></html>

  • apps/routerconsole/jsp/configupdate.jsp

    rb3fcdb8 r080cc96  
    3838        <tr><td class= "mediumtags" align="right"><b><%=intl._("News Updates")%>:</b></td>
    3939     <% }   // if canInstall %>
    40           <td> <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> <i><%=intl._("Update In Progress")%></i><br> <% } else { %> <input type="submit" name="action" value="<%=intl._("Check for updates")%>" />
     40          <td> <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> <i><%=intl._("Update In Progress")%></i><br> <% } else { %> <input type="submit" name="action" class="check" value="<%=intl._("Check for updates")%>" />
    4141            <% } %></td></tr>
    4242        <tr><td colspan="2"><br></td></tr>
    … …  
    6969        <tr class="tablefooter"><td colspan="2">
    7070        <div class="formaction">
    71             <input type="reset" value="<%=intl._("Cancel")%>" >
    72             <input type="submit" name="action" value="<%=intl._("Save")%>" >
     71            <input type="reset" class="cancel" value="<%=intl._("Cancel")%>" >
     72            <input type="submit" name="action" class="accept" value="<%=intl._("Save")%>" >
    7373        </div></td></tr></table></div></form></div></div></body></html>

  • apps/routerconsole/jsp/help.jsp

    rb3fcdb8 r080cc96  
    4242<li class="tidylist"><b>Reachability:</b>
    4343The router's view of whether it can be contacted by other routers.
    44 Further information is on the <a href="config.jsp#help">configuration page</a>.
     44Further information is on the <a href="confignet#help">configuration page</a>.
    4545</li></ul><h3>Peers</h3><ul>
    4646<li class="tidylist"><b>Active:</b>
    … …  
    7474</ul><h3>Bandwidth in/out</h3><div align="justify">
    7575Should be self-explanatory. All values are in bytes per second, not bits per second.
    76 Change your bandwidth limits on the <a href="config.jsp#help">configuration page</a>.
     76Change your bandwidth limits on the <a href="confignet#help">configuration page</a>.
    7777Bandwidth is <a href="graphs.jsp">graphed</a> by default.</div>
    7878
    … …  
    9393shared bandwidth, and amount of locally-generated traffic.
    9494The recommended method for limiting participating tunnels is
    95 to change your share percentage on the <a href="config.jsp#help">configuration page</a>.
     95to change your share percentage on the <a href="confignet#help">configuration page</a>.
    9696You may also limit the total number by setting <tt>router.maxParticipatingTunnels=nnn</tt> on
    9797the <a href="configadvanced.jsp">advanced configuration page</a>. <a href="configstats.jsp#tunnel.participatingTunnels">[Enable graphing]</a>.</li>

  • apps/routerconsole/jsp/help_ar.jsp

    rb3fcdb8 r080cc96  
    3737<li class="tidylist"><b>إمكانية الوصول</b>
    3838امكانية الاتصال الخارجي بالموجه
    39 المزيد من التفاصيل في  <a href="config.jsp#help">صفحة الاعدادات</a>.</li>
     39المزيد من التفاصيل في  <a href="confignet#help">صفحة الاعدادات</a>.</li>
    4040</ul><h3>النظائر</h3><ul>
    4141<li class="tidylist"><b>مفعل</b>
    … …  
    6666</ul><h3>سرعة الاتصال الداخلي/خارجي</h3><div align="justify">
    6767السرعة ب بايت في الثانية
    68 غير السرعة في <a href="config.jsp#help">صفحة الاعدادات</a>.
     68غير السرعة في <a href="confignet#help">صفحة الاعدادات</a>.
    6969السرعة <a href="graphs.jsp">مرسومة</a> </div>
    7070<h3>الوجهات الداخلية</h3><div align="justify">
    … …  
    8383الأنفاق المنشئة من طرف موجهات أخرى عبر موجهك.
    8484هذا ينبني على درجة استخدام الشبكة، مقدار المشاركة...
    85 يمكنك تغيير درجة المشاركة بـ <a href="config.jsp#help">صفحة الاعدادات</a>.
     85يمكنك تغيير درجة المشاركة بـ <a href="confignet#help">صفحة الاعدادات</a>.
    8686You may also limit the total number by setting <tt>router.maxParticipatingTunnels=nnn</tt> on
    8787the <a href="configadvanced.jsp">صفحة الاعدادات المتقدمة</a>. <a href="configstats.jsp#tunnel.participatingTunnels">[تفعيل الرسم البياني]</a>.</li>

  • apps/routerconsole/jsp/help_fr.jsp

    rb3fcdb8 r080cc96  
    3838<li class="tidylist"><b>Réseau:</b>
    3939Statut de joignabilité du routeur par les autres routeurs.
    40 Plus d'infos sur la page de <a href="config.jsp#help">configuration</a>.
     40Plus d'infos sur la page de <a href="confignet#help">configuration</a>.
    4141</li></ul><h3>Pairs</h3><ul>
    4242<li class="tidylist"><b>Actifs:</b>
    … …  
    6666</li></ul><h3>Bande passante entrée/sortie</h3><div align="justify">
    6767Ça parle tout seul. Toutes les valeurs sont en octets par seconde (o/s), pas en bits par seconde (b/s). Modifiez vos
    68 limites de bande passante sur la page de <a href="config.jsp#help">configuration</a>.
     68limites de bande passante sur la page de <a href="confignet#help">configuration</a>.
    6969Le <a href="graphs.jsp">graphique de bande passante</a> est activé par défaut.</div>
    7070
    … …  
    8181nombre dépend largement de la demande du réseau, de votre part de bande passante partagée, et du trafic local.
    8282La méthode recommandée pour limiter leur nombre est de diminuer le rapport de bande passante partagée dans la
    83 <a href="config.jsp#help">configuration</a>. Vous pouvez également limiter ce nombre en définissant la variable
     83<a href="confignet#help">configuration</a>. Vous pouvez également limiter ce nombre en définissant la variable
    8484<tt>router.maxParticipatingTunnels=nnn</tt> dans la <a href="configadvanced.jsp">configuration avancée</a>.
    8585<a href="configstats.jsp#tunnel.participatingTunnels">[Activer le graphique]</a>.</li>

  • apps/routerconsole/jsp/help_nl.jsp

    rb3fcdb8 r080cc96  
    4040<li class="tidylist"><b>Netwerk Bereikbaarheid:</b>
    4141De bereikbaarheid van je router door andere routers.
    42 Meer informatie is te vinden op de <a href="config.jsp#help">configuratie pagina</a>.</li>
     42Meer informatie is te vinden op de <a href="confignet#help">configuratie pagina</a>.</li>
    4343</ul>
    4444
    … …  
    7979<h3>Bandbreedte in/out</h3><div align="justify">
    8080Dit zou zichzelf moeten verklaren. Alle waarden zijn in bytes per seconde, niet in bits per seconde.
    81 Wijzig je bandbreedte limieten op de <a href="config.jsp#help">configuratie pagina</a>.
     81Wijzig je bandbreedte limieten op de <a href="confignet#help">configuratie pagina</a>.
    8282Bandbreedte wordt standaard <a href="graphs.jsp">geplot</a>.</div>
    8383
    … …  
    9494je gedeelde bandbreedte en hoeveelheid lokaal gegenereerd verkeer.
    9595De aanbevolen methode om het aantal deelnemende tunnels te beperken
    96 is door het share percentage te wijzigen op de <a href="config.jsp#help">configuratie pagina</a>.
     96is door het share percentage te wijzigen op de <a href="confignet#help">configuratie pagina</a>.
    9797Je kan het totale aantal ook beperken met de instelling <tt>router.maxParticipatingTunnels=nnn</tt> op
    9898de <a href="configadvanced.jsp">geavanceerde configuratie pagina</a>. <a href="configstats.jsp#tunnel.participatingTunnels">[Grafieken inschakelen]</a>.</li>

  • apps/routerconsole/jsp/help_ru.jsp

    rb3fcdb8 r080cc96  
    4646<li class="tidylist"><b>Доступность:</b>
    4747
    48 Результат проверки Вашим маршрутизатором, насколько он открыт для входящих соединений от маршрутизаторов других пользователей. Подробнее смотрите на <a href="config.jsp#help">странице сетевых настроек</a>.
     48Результат проверки Вашим маршрутизатором, насколько он открыт для входящих соединений от маршрутизаторов других пользователей. Подробнее смотрите на <a href="confignet#help">странице сетевых настроек</a>.
    4949</li>
    5050</ul>
    … …  
    101101<li class="tidylist"><b>Транзитные:</b>
    102102
    103 Туннели, построенные другими маршрутизаторами, проходящие через Ваш маршрутизатор. Их количество может сильно варьироваться в зависимости от потребностей сети, настроенной доли транзитного трафика и объема локально создаваемого трафика. Рекомендуемый способ ограничения количества транзитных туннелей — настроить долю транзитного трафика на странице <a href="config.jsp#help">сетевых настроек</a>. Также можно задать точный ограничитель количества через параметр <tt>router.maxParticipatingTunnels=nnn</tt> на странице <a href="configadvanced.jsp">дополнительных настроек</a>.
     103Туннели, построенные другими маршрутизаторами, проходящие через Ваш маршрутизатор. Их количество может сильно варьироваться в зависимости от потребностей сети, настроенной доли транзитного трафика и объема локально создаваемого трафика. Рекомендуемый способ ограничения количества транзитных туннелей — настроить долю транзитного трафика на странице <a href="confignet#help">сетевых настроек</a>. Также можно задать точный ограничитель количества через параметр <tt>router.maxParticipatingTunnels=nnn</tt> на странице <a href="configadvanced.jsp">дополнительных настроек</a>.
    104104
    105105<a href="configstats.jsp#tunnel.participatingTunnels">[Включить построение графика]</a>.

  • history.txt

    rb3fcdb8 r080cc96  
     12011-12-01 zzz
     2  * Console:
     3    - Split up config network page
     4    - CSS tweaks in summary bar
     5    - Spiff up the buttons
     6  * i2psnark:
     7    - Retry link on torrent download fail
     8    - Clear URL after clicking 'add torrent'
     9    - Message tweaks
     10    - CSS tweaks
     11  * IRC Server: Fix IOOBE (ticket #559)
     12  * Throttle: Update throttle status immediately on shutdown request;
     13              clear starting-up message after 20 minutes
     14
    1152011-11-29 zzz
    216  * Random: Use new nextBytes(buf, off, len) for efficiency

  • installer/resources/themes/console/light/console.css

    rb3fcdb8 r080cc96  
    161161     letter-spacing: 0.02em;
    162162     margin: -6px -6px -7px !important;
    163      padding: 3px 3px 5px 3px;
    164      background: #dbdbf5;
    165      text-transform: capitalize;
     163     padding: 6px 3px 6px 27px;
     164     background: #e0e0f5 url('../images/itoopie_xsm.png') no-repeat left center;
     165     min-height: 26px;
    166166     text-decoration: none !important;
    167      color: #2b2;
     167     color: #359;
    168168     line-height: 105%;
    169      -moz-box-shadow: inset 0px 0px 1px 30px #dfd;
    170      -khtml-box-shadow: 0px 0px 1px 1px #dfd;
    171      box-shadow: 0px 0px 1px 1px #fdf;
     169     -moz-box-shadow: inset 0px 0px 1px 30px #bdf;
     170     -khtml-box-shadow: 0px 0px 1px 1px #bdf;
     171     box-shadow: 0px 0px 1px 1px #bdf;
    172172}
    173173
    … …  
    559559
    560560tr:nth-child(even) {
    561      background: #eef url(images/magic.png);
     561     background: #f7f7ff url(images/magic.png);
    562562}
    563563
    … …  
    578578     color: #008000;
    579579     padding: 1px 5px;
    580 }
    581 
    582 div.main li {
    583      text-align: left;
    584      list-style: square;
    585      margin: 2px 5px 0px 20px;
    586      padding: 1px 10px 1px 10px;
    587      line-height: 150%;
    588      word-wrap: break-word;
    589580}
    590581
    … …  
    640631     padding: 0;
    641632}
    642 
    643 code {
    644      text-align: left;
    645      font: 8pt "Lucida Console", "DejaVu Sans Mono", Courier, mono;
    646 }
    647 
    648633
    649634code {
    … …  
    797782     border: 1px outset #66a;
    798783     padding: 1px 3px;
    799      background: #ffe !important;
     784     background: #ffe;
    800785     text-decoration: none;
    801786     border-radius: 4px;
    … …  
    804789     font-size: 8pt;
    805790     font-weight: bold;
    806      margin: 0 1px;
     791     margin: 2px;
    807792     text-align: center;
    808      min-width: 80px;
     793     min-width: 60px;
    809794     -moz-box-shadow: inset 0px 0px 2px 1px #fff;
    810795     -khtml-box-shadow: inset 0px 2px 8px 0px #fff;
    811796     box-shadow: inset 0px 2px 8px 0px #fff;
    812797     color: #316;
     798}
     799
     800button.accept {
     801     background: #ffe url('../images/accept.png') no-repeat left center;
     802     padding: 1px 3px 1px 18px;
     803     min-height: 22px;
     804}
     805
     806button.add {
     807     background: #ffe url('../images/add.png') no-repeat left center;
     808     padding: 1px 3px 1px 18px;
     809     min-height: 22px;
     810}
     811
     812button.cancel {
     813     background: #ffe url('../images/cancel.png') no-repeat left center;
     814     padding: 1px 3px 1px 18px;
     815     min-height: 22px;
     816}
     817
     818button.check {
     819     background: #ffe url('../images/tick.png') no-repeat left center;
     820     padding: 1px 3px 1px 18px;
     821     min-height: 22px;
     822}
     823
     824button.delete {
     825     background: #ffe url('../images/delete.png') no-repeat left center;
     826     padding: 1px 3px 1px 18px;
     827     min-height: 22px;
     828}
     829
     830button.download {
     831     background: #ffe url('../images/arrow_down.png') no-repeat left center;
     832     padding: 1px 3px 1px 18px;
     833     min-height: 22px;
     834}
     835
     836button.reload {
     837     background: #ffe url('../images/arrow_refresh.png') no-repeat left center;
     838     padding: 1px 3px 1px 18px;
     839     min-height: 22px;
     840}
     841
     842button.stop {
     843     background: #ffe url('../images/stop.png') no-repeat left center;
     844     padding: 1px 3px 1px 18px;
     845     min-height: 22px;
    813846}
    814847
    … …  
    863896     margin: 5px;
    864897     font: bold 8pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
    865      padding: 1px 2px;
     898     padding: 1px 3px;
    866899     text-decoration: none;
    867900     border-radius: 4px;
    … …  
    873906}
    874907
     908input.accept {
     909     background: #ffe url('../images/accept.png') no-repeat left center;
     910     padding: 1px 3px 1px 18px;
     911     min-height: 22px;
     912}
     913
     914input.add {
     915     background: #ffe url('../images/add.png') no-repeat left center;
     916     padding: 1px 3px 1px 18px;
     917     min-height: 22px;
     918}
     919
     920input.cancel {
     921     background: #ffe url('../images/cancel.png') no-repeat left center;
     922     padding: 1px 3px 1px 18px;
     923     min-height: 22px;
     924}
     925
     926input.check {
     927     background: #ffe url('../images/tick.png') no-repeat left center;
     928     padding: 1px 3px 1px 18px;
     929     min-height: 22px;
     930}
     931
     932input.delete {
     933     background: #ffe url('../images/delete.png') no-repeat left center;
     934     padding: 1px 3px 1px 18px;
     935     min-height: 22px;
     936}
     937
     938input.download {
     939     background: #ffe url('../images/arrow_down.png') no-repeat left center;
     940     padding: 1px 3px 1px 18px;
     941     min-height: 22px;
     942}
     943
     944input.reload {
     945     background: #ffe url('../images/arrow_refresh.png') no-repeat left center;
     946     padding: 1px 3px 1px 18px;
     947     min-height: 22px;
     948}
     949
     950input.stop {
     951     background: #ffe url('../images/stop.png') no-repeat left center;
     952     padding: 1px 3px 1px 18px;
     953     min-height: 22px;
     954}
    875955
    876956input:hover {
    … …  
    897977     color: #001;
    898978     margin: 5px 10px 5px 10px;
    899      padding: 4px 2px;
     979     padding: 4px;
    900980     font: bold 8pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
    901981     border: 1px solid #447;
    … …  
    9241004     padding: 4px;
    9251005     border: 1px solid #447;
    926      min-width: 110px;
     1006     min-width: 80px;
    9271007     font: 9pt "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
    9281008     border-radius: 4px;

  • router/java/src/net/i2p/router/RouterVersion.java

    rb3fcdb8 r080cc96  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 12;
     21    public final static long BUILD = 13;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.