Changeset 6b056ce


Ignore:
Timestamp:
May 14, 2017 5:30:13 AM (3 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
d7d13d1a
Parents:
4866136
Message:

Backend HTML changes:

  • Labels for radio/checkbox icons to increase surface area for clicks, improving UI for touchscreen use
  • Standardized configuration labels: bold text for leading options, standard weight for trailing descriptions
  • Remove some hard-coded table layouts
  • Additional ids and classes for theming
Files:
35 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

    r4866136 r6b056ce  
    22062206                  DataHelper.escapeHTML(dataDir) + "\" spellcheck=\"false\"></td>\n" +
    22072207
    2208                   "<tr><td>");
     2208                  "<tr><td><label for=\"filesPublic\">");
    22092209        out.write(_t("Files readable by all"));
    2210         out.write(":<td colspan=\"2\"><input type=\"checkbox\" class=\"optbox\" name=\"filesPublic\" value=\"true\" "
     2210        out.write(":</label><td colspan=\"2\"><input type=\"checkbox\" class=\"optbox\" name=\"filesPublic\" id=\"filesPublic\" value=\"true\" "
    22112211                  + (filesPublic ? "checked " : "")
    22122212                  + "title=\"");
     
    22142214        out.write("\" >" +
    22152215
    2216                   "<tr><td>");
     2216                  "<tr><td><label for=\"autoStart\">");
    22172217        out.write(_t("Auto start torrents"));
    2218         out.write(":<td colspan=\"2\"><input type=\"checkbox\" class=\"optbox\" name=\"autoStart\" value=\"true\" "
     2218        out.write(":</label><td colspan=\"2\"><input type=\"checkbox\" class=\"optbox\" name=\"autoStart\" id=\"autoStart\" value=\"true\" "
    22192219                  + (autoStart ? "checked " : "")
    22202220                  + "title=\"");
     
    22222222        out.write("\" >" +
    22232223
    2224                   "<tr><td>");
     2224                  "<tr><td><label for=\"smartSort\">");
    22252225        out.write(_t("Smart torrent sorting"));
    2226         out.write(":<td colspan=\"2\"><input type=\"checkbox\" class=\"optbox\" name=\"smartSort\" value=\"true\" "
     2226        out.write(":</label><td colspan=\"2\"><input type=\"checkbox\" class=\"optbox\" name=\"smartSort\" id=\"smartSort\" value=\"true\" "
    22272227                  + (smartSort ? "checked " : "")
    22282228                  + "title=\"");
     
    23392339            out.write("]</a></i>");
    23402340        }
    2341         out.write("\n<tr><td>");
     2341        out.write("\n<tr><td><label for=\"useOpenTrackers\">");
    23422342        out.write(_t("Use open trackers also"));
    2343         out.write(":<td colspan=\"2\"><input type=\"checkbox\" class=\"optbox\" name=\"useOpenTrackers\" value=\"true\" "
     2343        out.write(":</label><td colspan=\"2\"><input type=\"checkbox\" class=\"optbox\" name=\"useOpenTrackers\" id=\"useOpenTrackers\" value=\"true\" "
    23442344                  + (useOpenTrackers ? "checked " : "")
    23452345                  + "title=\"");
     
    23472347        out.write("\" ></td></tr>\n" +
    23482348
    2349                   "<tr><td>");
     2349                  "<tr><td><label for=\"useDHT\">");
    23502350        out.write(_t("Enable DHT"));
    2351         out.write(":<td colspan=\"2\"><input type=\"checkbox\" class=\"optbox\" name=\"useDHT\" value=\"true\" "
     2351        out.write(":</label><td colspan=\"2\"><input type=\"checkbox\" class=\"optbox\" name=\"useDHT\" id=\"useDHT\" value=\"true\" "
    23522352                  + (useDHT ? "checked " : "")
    23532353                  + "title=\"");
     
    24512451            boolean isKnownOpen = _manager.util().isKnownOpenTracker(t.announceURL);
    24522452            boolean isOpen = isKnownOpen || openTrackers.contains(t.announceURL);
    2453             buf.append("<tr class=\"knownTracker\"><td><input type=\"checkbox\" class=\"optbox\" name=\"delete_")
     2453            buf.append("<tr class=\"knownTracker\"><td><input type=\"checkbox\" class=\"optbox\" id=\"").append(name).append("\" name=\"delete_")
    24542454               .append(name).append("\" title=\"").append(_t("Mark tracker for deletion")).append("\">" +
    2455                        "</td><td>").append(name)
     2455                       "</td><td><label for=\"").append(name).append("\">").append(name)
    24562456               .append("</td><td>").append(urlify(homeURL, 35))
    24572457               .append("</td><td><input type=\"radio\" class=\"optbox\" value=\"0\" name=\"ttype_")
  • apps/i2ptunnel/jsp/editClient.jsp

    r4866136 r6b056ce  
    112112
    113113            <td>
    114                 <input value="1" type="checkbox" name="startOnLoad" title="Start Tunnel Automatically"<%=(editBean.startAutomatically(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    115                 <%=intl._t("Automatically start tunnel when router starts")%>
     114                <label><input value="1" type="checkbox" name="startOnLoad" title="Start Tunnel Automatically"<%=(editBean.startAutomatically(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     115                <%=intl._t("Automatically start tunnel when router starts")%></label>
    116116            </td>
    117117        </tr>
     
    187187        <tr>
    188188            <td colspan="2">
    189                 <input value="1" type="checkbox" name="useSSL" title="Clients use SSL to connect" <%=(editBean.isSSLEnabled(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    190                 <%=intl._t("Clients use SSL to connect to tunnel")%>
     189                <label><input value="1" type="checkbox" name="useSSL" title="Clients use SSL to connect" <%=(editBean.isSSLEnabled(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     190                <%=intl._t("Clients use SSL to connect to tunnel")%></label>
    191191            </td>
    192192        </tr>
     
    229229            <td colspan="2">
    230230
    231                 <input value="1" type="checkbox" name="useOutproxyPlugin" <%=(editBean.getUseOutproxyPlugin(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    232 <%=intl._t("Use plugin instead of above-listed proxies if available")%>
     231                <label><input value="1" type="checkbox" name="useOutproxyPlugin" <%=(editBean.getUseOutproxyPlugin(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     232<%=intl._t("Use plugin instead of above-listed proxies if available")%></label>
    233233            </td>
    234234        </tr>
     
    268268        <tr>
    269269            <td colspan="2">
    270                 <input value="true" type="checkbox" name="shared" title="Share tunnels with other clients"<%=(editBean.isSharedClient(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    271                 <%=intl._t("Share tunnels with other clients and irc/httpclients? (Change requires restart of client proxy tunnel)")%>
     270                <label><input value="true" type="checkbox" name="shared" title="Share tunnels with other clients"<%=(editBean.isSharedClient(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     271                <%=intl._t("Share tunnels with other clients and irc/httpclients? (Change requires restart of client proxy tunnel)")%></label>
    272272            </td>
    273273        </tr>
     
    283283        <tr>
    284284            <td colspan="2">
    285                 <input value="1" type="checkbox" name="DCC" title="Enable DCC"<%=(editBean.getDCC(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    286                 <%=intl._t("Enable Direct Client-to-Client protocol. Note that this will compromise your anonymity and is <i>not</i> recommended.")%>
     285                <label><input value="1" type="checkbox" name="DCC" title="Enable DCC"<%=(editBean.getDCC(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     286                <%=intl._t("Enable Direct Client-to-Client protocol. Note that this will compromise your anonymity and is <i>not</i> recommended.")%></label>
    287287            </td>
    288288        </tr>
     
    405405
    406406            <td>
    407                 <input value="1000" type="checkbox" name="connectDelay" title="Delay Connection"<%=(editBean.shouldDelay(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    408                 (<%=intl._t("for request/response connections")%>)
     407                <label><input value="1000" type="checkbox" name="connectDelay" title="Delay Connection"<%=(editBean.shouldDelay(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     408                (<%=intl._t("for request/response connections")%>)</label>
    409409            </td>
    410410        </tr>
     
    440440        <tr>
    441441            <td colspan="2">
    442                 <input value="1" type="checkbox" name="delayOpen" title="Delay Tunnel Open"<%=(editBean.getDelayOpen(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    443                 <%=intl._t("Delay opening client tunnel until activity is detected on the configured tunnel port")%>
     442                <label><input value="1" type="checkbox" name="delayOpen" title="Delay Tunnel Open"<%=(editBean.getDelayOpen(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     443                <%=intl._t("Delay opening client tunnel until activity is detected on the configured tunnel port")%></label>
    444444            </td>
    445445        </tr>
     
    455455        <tr>
    456456            <td colspan="2">
    457                 <input value="1" type="checkbox" name="reduce" title="Reduce Tunnels"<%=(editBean.getReduce(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    458                 <%=intl._t("Reduce tunnel quantity when idle to conserve resources")%>
     457                <label><input value="1" type="checkbox" name="reduce" title="Reduce Tunnels"<%=(editBean.getReduce(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     458                <%=intl._t("Reduce tunnel quantity when idle to conserve resources")%></label>
    459459            </td>
    460460        </tr>
     
    481481        <tr>
    482482            <td>
    483                 <input value="1" type="checkbox" name="close" title="Close Tunnels"<%=(editBean.getClose(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    484                 <%=intl._t("Close client tunnels after specified idle period")%>
     483                <label><input value="1" type="checkbox" name="close" title="Close Tunnels"<%=(editBean.getClose(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     484                <%=intl._t("Close client tunnels after specified idle period")%></label>
    485485            </td>
    486486
     
    496496                <b><%=intl._t("New Keys on Reopen")%>:</b>
    497497                <span class="multiOption">
    498                     <input value="1" type="radio" name="newDest" title="New Destination"
     498                    <label><input value="1" type="radio" name="newDest" title="New Destination"
    499499                        <%=(editBean.getNewDest(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    500                     <%=intl._t("Enable")%>
    501                 </span> 
     500                    <%=intl._t("Enable")%></label>
     501                </span>
    502502                <span class="multiOption">
    503                     <input value="0" type="radio" name="newDest" title="New Destination"
     503                    <label><input value="0" type="radio" name="newDest" title="New Destination"
    504504                        <%=(editBean.getNewDest(curTunnel) || editBean.getPersistentClientKey(curTunnel) ? "" : " checked=\"checked\"")%> class="tickbox" />
    505                     <%=intl._t("Disable")%>
     505                    <%=intl._t("Disable")%></label>
    506506                </span>
    507507            </td>
     
    517517        <tr>
    518518            <td>
    519                 <input value="2" type="radio" name="newDest" title="New Destination"
     519                <label><input value="2" type="radio" name="newDest" title="New Destination"
    520520                     <%=(editBean.getPersistentClientKey(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    521                 <%=intl._t("Generate key to enable persistent client tunnel identity")%>
     521                <%=intl._t("Generate key to enable persistent client tunnel identity")%></label>
    522522            </td>
    523523            <td>
     
    561561        <tr>
    562562            <td>
    563                 <input value="1" type="checkbox" name="allowUserAgent" title="Do not spoof user agent string when checked"<%=(editBean.getAllowUserAgent(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    564                 <%=intl._t("Do not spoof User-Agent header")%>
    565             </td>
    566             <td>
    567                 <input value="1" type="checkbox" name="allowReferer" title="Do not block referer header when checked"<%=(editBean.getAllowReferer(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    568                 <%=intl._t("Do not block Referer header")%>
    569             </td>
    570         </tr>
    571 
    572         <tr>
    573             <td>
    574                 <input value="1" type="checkbox" name="allowAccept" title="Do not block accept headers when checked"<%=(editBean.getAllowAccept(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    575 <%=intl._t("Do not block Accept headers")%>
    576             </td>
    577 
    578             <td>
    579                 <input value="1" type="checkbox" name="allowInternalSSL" title="Allow SSL to I2P addresses when checked"<%=(editBean.getAllowInternalSSL(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    580                 <%=intl._t("Allow SSL to I2P addresses")%>
     563                <label><input value="1" type="checkbox" name="allowUserAgent" title="Do not spoof user agent string when checked"<%=(editBean.getAllowUserAgent(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     564                <%=intl._t("Do not spoof User-Agent header")%></label>
     565            </td>
     566            <td>
     567                <label><input value="1" type="checkbox" name="allowReferer" title="Do not block referer header when checked"<%=(editBean.getAllowReferer(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     568                <%=intl._t("Do not block Referer header")%></label>
     569            </td>
     570        </tr>
     571
     572        <tr>
     573            <td>
     574                <label><input value="1" type="checkbox" name="allowAccept" title="Do not block accept headers when checked"<%=(editBean.getAllowAccept(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     575<%=intl._t("Do not block Accept headers")%></label>
     576            </td>
     577
     578            <td>
     579                <label><input value="1" type="checkbox" name="allowInternalSSL" title="Allow SSL to I2P addresses when checked"<%=(editBean.getAllowInternalSSL(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     580                <%=intl._t("Allow SSL to I2P addresses")%></label>
    581581            </td>
    582582        </tr>
     
    595595            <td colspan="2">
    596596                <span class="multiOption">
    597                     <input value="0" type="radio" name="sigType" title="Default"<%=(currentSigType==0 ? " checked=\"checked\"" : "")%> class="tickbox" />
    598                     DSA-SHA1
     597                    <label><input value="0" type="radio" name="sigType" title="Default"<%=(currentSigType==0 ? " checked=\"checked\"" : "")%> class="tickbox" />
     598                    DSA-SHA1</label>
    599599                </span>
    600600
     
    603603
    604604                <span class="multiOption">
    605                     <input value="1" type="radio" name="sigType" title="Advanced users only"<%=(currentSigType==1 ? " checked=\"checked\"" : "")%> class="tickbox" />
    606                     ECDSA-P256
     605                    <label><input value="1" type="radio" name="sigType" title="Advanced users only"<%=(currentSigType==1 ? " checked=\"checked\"" : "")%> class="tickbox" />
     606                    ECDSA-P256</label>
    607607                </span>
    608608
     
    613613
    614614                <span class="multiOption">
    615                     <input value="2" type="radio" name="sigType" title="Advanced users only"<%=(currentSigType==2 ? " checked=\"checked\"" : "")%> class="tickbox" />
    616                     ECDSA-P384
     615                    <label><input value="2" type="radio" name="sigType" title="Advanced users only"<%=(currentSigType==2 ? " checked=\"checked\"" : "")%> class="tickbox" />
     616                    ECDSA-P384</label>
    617617                </span>
    618618
     
    621621
    622622                <span class="multiOption">
    623                     <input value="3" type="radio" name="sigType" title="Advanced users only"<%=(currentSigType==3 ? " checked=\"checked\"" : "")%> class="tickbox" />
    624                     ECDSA-P521
     623                    <label><input value="3" type="radio" name="sigType" title="Advanced users only"<%=(currentSigType==3 ? " checked=\"checked\"" : "")%> class="tickbox" />
     624                    ECDSA-P521</label>
    625625                </span>
    626626
     
    630630
    631631                <span class="multiOption">
    632                     <input value="7" type="radio" name="sigType" title="Advanced users only"<%=(currentSigType==7 ? " checked=\"checked\"" : "")%> class="tickbox" />
    633                     Ed25519-SHA-512
     632                    <label><input value="7" type="radio" name="sigType" title="Advanced users only"<%=(currentSigType==7 ? " checked=\"checked\"" : "")%> class="tickbox" />
     633                    Ed25519-SHA-512</label>
    634634                </span>
    635635            </td>
     
    647647        <tr>
    648648            <td colspan="2">
    649                 <input value="1" type="checkbox" name="proxyAuth" title="Check to require authorization for this service"<%=(editBean.getProxyAuth(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    650                 <%=intl._t("Require local authorization for this service")%>
     649                <label><input value="1" type="checkbox" name="proxyAuth" title="Check to require authorization for this service"<%=(editBean.getProxyAuth(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     650                <%=intl._t("Require local authorization for this service")%></label>
    651651            </td>
    652652        </tr>
     
    670670        <tr>
    671671            <td colspan="2">
    672                 <input value="1" type="checkbox" id="startOnLoad" name="outproxyAuth" title="Check if the outproxy requires authorization"<%=(editBean.getOutproxyAuth(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    673                 <%=intl._t("Outproxy requires authorization")%>
     672                <label><input value="1" type="checkbox" id="startOnLoad" name="outproxyAuth" title="Check if the outproxy requires authorization"<%=(editBean.getOutproxyAuth(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     673                <%=intl._t("Outproxy requires authorization")%></label>
    674674            </td>
    675675        </tr>
  • apps/i2ptunnel/jsp/editServer.jsp

    r4866136 r6b056ce  
    114114
    115115            <td>
    116                 <input value="1" type="checkbox" name="startOnLoad" title="Start Tunnel Automatically"<%=(editBean.startAutomatically(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    117                 <%=intl._t("Automatically start tunnel when router starts")%>
     116                <label><input value="1" type="checkbox" name="startOnLoad" title="Start Tunnel Automatically"<%=(editBean.startAutomatically(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     117                <%=intl._t("Automatically start tunnel when router starts")%></label>
    118118            </td>
    119119        </tr>
     
    154154        <tr>
    155155            <td colspan="2">
    156                 <input value="1" type="checkbox" name="useSSL" title="Use SSL to connect to target" <%=(editBean.isSSLEnabled(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    157                 <%=intl._t("Use SSL to connect to target")%>
     156                <label><input value="1" type="checkbox" name="useSSL" title="Use SSL to connect to target" <%=(editBean.isSSLEnabled(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     157                <%=intl._t("Use SSL to connect to target")%></label>
    158158         <% } /* !streamrserver */ %>
    159159            </td>
     
    438438        <tr>
    439439            <td colspan="2">
    440                 <input value="1" type="checkbox" id="startOnLoad" name="encrypt" title="ONLY clients with the encryption key will be able to connect"<%=(editBean.getEncrypt(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    441                 <%=intl._t("Only allow clients with the encryption key to connect to this server")%>
     440                <label><input value="1" type="checkbox" id="startOnLoad" name="encrypt" title="ONLY clients with the encryption key will be able to connect"<%=(editBean.getEncrypt(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     441                <%=intl._t("Only allow clients with the encryption key to connect to this server")%></label>
    442442            </td>
    443443        </tr>
     
    472472            <td colspan="2">
    473473                <% /* can't use <label> here */ %>
    474                 <span class="multiOption"><input value="0" type="radio" name="accessMode" title="<%=intl._t("Allow all clients")%>"<%=(editBean.getAccessMode(curTunnel).equals("0") ? " checked=\"checked\"" : "")%> class="tickbox" />
    475                     <%=intl._t("Disable")%></span>
    476                 <span class="multiOption"><input value="2" type="radio" name="accessMode" title="<%=intl._t("Reject listed clients")%>"<%=(editBean.getAccessMode(curTunnel).equals("2") ? " checked=\"checked\"" : "")%> class="tickbox" />
    477                     <%=intl._t("Blacklist")%></span>
    478                 <span class="multiOption"><input value="1" type="radio" name="accessMode" title="<%=intl._t("Allow listed clients only")%>"<%=(editBean.getAccessMode(curTunnel).equals("1") ? " checked=\"checked\"" : "")%> class="tickbox" />
    479                     <%=intl._t("Whitelist")%></span>
     474                <span class="multiOption"><label><input value="0" type="radio" name="accessMode" title="<%=intl._t("Allow all clients")%>"<%=(editBean.getAccessMode(curTunnel).equals("0") ? " checked=\"checked\"" : "")%> class="tickbox" />
     475                    <%=intl._t("Disable")%></label></span>
     476                <span class="multiOption"><label><input value="2" type="radio" name="accessMode" title="<%=intl._t("Reject listed clients")%>"<%=(editBean.getAccessMode(curTunnel).equals("2") ? " checked=\"checked\"" : "")%> class="tickbox" />
     477                    <%=intl._t("Blacklist")%></label></span>
     478                <span class="multiOption"><label><input value="1" type="radio" name="accessMode" title="<%=intl._t("Allow listed clients only")%>"<%=(editBean.getAccessMode(curTunnel).equals("1") ? " checked=\"checked\"" : "")%> class="tickbox" />
     479                    <%=intl._t("Whitelist")%></label></span>
    480480            </td>
    481481        </tr>
     
    504504        <tr>
    505505            <td>
    506                 <input value="1" type="checkbox" name="rejectInproxy" title="<%=intl._t("Deny inproxy access when enabled")%>" <%=(editBean.isRejectInproxy(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    507                 <%=intl._t("Block Access via Inproxies")%>
    508             </td>
    509 
    510             <td>
    511                 <input value="1" type="checkbox" name="rejectReferer" title="<%=intl._t("Deny accesseses with referers (probably from inproxies)")%>" <%=(editBean.isRejectReferer(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    512                 <%=intl._t("Block Accesses containing Referers")%>
    513             </td>
    514         </tr>
    515 
    516         <tr>
    517             <td>
    518                 <input value="1" type="checkbox" name="rejectUserAgents" title="<%=intl._t("Deny User-Agents matching these strings (probably from inproxies)")%>" <%=(editBean.isRejectUserAgents(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    519                 <%=intl._t("Block these User-Agents")%>
     506                <label><input value="1" type="checkbox" name="rejectInproxy" title="<%=intl._t("Deny inproxy access when enabled")%>" <%=(editBean.isRejectInproxy(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     507                <%=intl._t("Block Access via Inproxies")%></label>
     508            </td>
     509
     510            <td>
     511                <label><input value="1" type="checkbox" name="rejectReferer" title="<%=intl._t("Deny accesseses with referers (probably from inproxies)")%>" <%=(editBean.isRejectReferer(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     512                <%=intl._t("Block Accesses containing Referers")%></label>
     513            </td>
     514        </tr>
     515
     516        <tr>
     517            <td>
     518                <label><input value="1" type="checkbox" name="rejectUserAgents" title="<%=intl._t("Deny User-Agents matching these strings (probably from inproxies)")%>" <%=(editBean.isRejectUserAgents(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     519                <%=intl._t("Block these User-Agents")%></label>
    520520            </td>
    521521
     
    529529        <tr>
    530530            <td>
    531                 <input value="1" type="checkbox" name="uniqueLocal" title="<%=intl._t("Use unique IP addresses for each connecting client (local non-SSL servers only)")%>" <%=(editBean.getUniqueLocal(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    532                 <%=intl._t("Unique Local Address per Client")%>
    533             </td>
    534 
    535             <td>
    536                 <input value="1" type="checkbox" name="multihome" title="<%=intl._t("Only enable if you are hosting this service on multiple routers")%>" <%=(editBean.getMultihome(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    537                 <%=intl._t("Optimize for Multihoming")%>
     531                <label><input value="1" type="checkbox" name="uniqueLocal" title="<%=intl._t("Use unique IP addresses for each connecting client (local non-SSL servers only)")%>" <%=(editBean.getUniqueLocal(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     532                <%=intl._t("Unique Local Address per Client")%></label>
     533            </td>
     534
     535            <td>
     536                <label><input value="1" type="checkbox" name="multihome" title="<%=intl._t("Only enable if you are hosting this service on multiple routers")%>" <%=(editBean.getMultihome(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     537                <%=intl._t("Optimize for Multihoming")%></label>
    538538            </td>
    539539        </tr>
     
    674674        <tr>
    675675            <td colspan="2">
    676                 <input value="1" type="checkbox" id="startOnLoad" name="reduce" title="Reduce Tunnels"<%=(editBean.getReduce(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
    677                 <%=intl._t("Reduce tunnel quantity when idle to conserve resources")%>
     676                <label><input value="1" type="checkbox" id="startOnLoad" name="reduce" title="Reduce Tunnels"<%=(editBean.getReduce(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />
     677                <%=intl._t("Reduce tunnel quantity when idle to conserve resources")%></label>
    678678            </td>
    679679        </tr>
     
    748748            <td colspan="2">
    749749                <span class="multiOption">
    750                     <input value="0" type="radio" id="startOnLoad" name="sigType" title="Default"<%=(currentSigType==0 ? " checked=\"checked\"" : "")%> class="tickbox" />
    751                     DSA-SHA1
     750                    <label><input value="0" type="radio" id="startOnLoad" name="sigType" title="Default"<%=(currentSigType==0 ? " checked=\"checked\"" : "")%> class="tickbox" />
     751                    DSA-SHA1</label>
    752752                </span>
    753753           <% if (editBean.isSigTypeAvailable(1)) { %>
    754754                <span class="multiOption">
    755                     <input value="1" type="radio" id="startOnLoad" name="sigType" title="Advanced users only"<%=(currentSigType==1 ? " checked=\"checked\"" : "")%> class="tickbox" />
    756                     ECDSA-P256
     755                    <label><input value="1" type="radio" id="startOnLoad" name="sigType" title="Advanced users only"<%=(currentSigType==1 ? " checked=\"checked\"" : "")%> class="tickbox" />
     756                    ECDSA-P256</label>
    757757                </span>
    758758           <% }
    759759              if (editBean.isSigTypeAvailable(2)) { %>
    760760                <span class="multiOption">
    761                     <input value="2" type="radio" id="startOnLoad" name="sigType" title="Advanced users only"<%=(currentSigType==2 ? " checked=\"checked\"" : "")%> class="tickbox" />
    762                     ECDSA-P384
     761                    <label><input value="2" type="radio" id="startOnLoad" name="sigType" title="Advanced users only"<%=(currentSigType==2 ? " checked=\"checked\"" : "")%> class="tickbox" />
     762                    ECDSA-P384</label>
    763763                </span>
    764764           <% }
    765765              if (editBean.isSigTypeAvailable(3)) { %>
    766766                <span class="multiOption">
    767                     <input value="3" type="radio" id="startOnLoad" name="sigType" title="Advanced users only"<%=(currentSigType==3 ? " checked=\"checked\"" : "")%> class="tickbox" />
    768                     ECDSA-P521
     767                    <label><input value="3" type="radio" id="startOnLoad" name="sigType" title="Advanced users only"<%=(currentSigType==3 ? " checked=\"checked\"" : "")%> class="tickbox" />
     768                    ECDSA-P521</label>
    769769                </span>
    770770           <% }
    771771              if (editBean.isSigTypeAvailable(7)) { %>
    772772                <span class="multiOption">
    773                     <input value="7" type="radio" id="startOnLoad" name="sigType" title="Advanced users only"<%=(currentSigType==7 ? " checked=\"checked\"" : "")%> class="tickbox" />
    774                     Ed25519-SHA-512
     773                    <label><input value="7" type="radio" id="startOnLoad" name="sigType" title="Advanced users only"<%=(currentSigType==7 ? " checked=\"checked\"" : "")%> class="tickbox" />
     774                    Ed25519-SHA-512</label>
    775775                </span>
    776776           <% }   // isAvailable %>
  • apps/i2ptunnel/jsp/index.jsp

    r4866136 r6b056ce  
    3636<body id="tunnelListPage">
    3737
    38 <div class="panel">
     38<div class="panel" id="messages">
    3939    <h2><%=intl._t("Status Messages")%></h2>
    4040    <table id="statusMessagesTable">
     
    7979</div>
    8080
    81 <div class="panel">
     81<div class="panel" id="servers">
    8282   
    8383    <h2><%=intl._t("I2P Hidden Services")%></h2>
     
    194194    </tr>
    195195</table>
    196          
     196</div>
     197
     198<div class="panel" id="clients">
    197199    <h2><%=intl._t("I2P Client Tunnels")%></h2>
    198200
  • apps/i2ptunnel/jsp/wizard.jsp

    r4866136 r6b056ce  
    115115        <td class="options">
    116116            <span class="multiOption" id="isServer">
    117                 <input value="false" type="radio" id="baseType" name="isClient" class="tickbox" />
    118                 &nbsp;<%=intl._t("Server Tunnel")%>
     117                <label><input value="false" type="radio" id="baseType" name="isClient" class="tickbox" />
     118                &nbsp;<%=intl._t("Server Tunnel")%></label>
    119119            </span>
    120120            <span class="multiOption" id="isClient">
    121                 <input value="true" type="radio" id="baseType" name="isClient" class="tickbox" checked="checked" />
    122                 &nbsp;<%=intl._t("Client Tunnel")%>
     121                <label><input value="true" type="radio" id="baseType" name="isClient" class="tickbox" checked="checked" />
     122                &nbsp;<%=intl._t("Client Tunnel")%></label>
    123123            </span>
    124124        </td>
     
    457457    <tr>
    458458        <td class="options">
    459                 <input value="1" type="checkbox" id="startOnLoad" name="startOnLoad" title="Start Tunnel Automatically"<%=("1".equals(request.getParameter("startOnLoad")) ? " checked=\"checked\"" : "")%> class="tickbox" />
    460             &nbsp;<%=intl._t("Automatically start tunnel when router starts")%>
     459                <label><input value="1" type="checkbox" id="startOnLoad" name="startOnLoad" title="Start Tunnel Automatically"<%=("1".equals(request.getParameter("startOnLoad")) ? " checked=\"checked\"" : "")%> class="tickbox" />
     460            &nbsp;<%=intl._t("Automatically start tunnel when router starts")%></label>
    461461        </td>
    462462    </tr>
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java

    r4866136 r6b056ce  
    328328                            boolean showDeleteButton, boolean showStartButton) {
    329329        String escapedName = DataHelper.escapeHTML(name);
    330         buf.append("<tr><td class=\"mediumtags\" align=\"right\" width=\"25%\">");
     330        buf.append("<tr><td align=\"right\">");
    331331        if (urlify && enabled) {
    332332            String link = "/";
     
    341341        } else {
    342342            if (name.length() > 0)
    343                 buf.append(_t(escapedName));
    344         }
    345         buf.append("</td><td align=\"center\" width=\"10%\"><input type=\"checkbox\" class=\"optbox\" name=\"").append(index).append(".enabled\"");
     343                buf.append("<label for=\"").append(index).append("\">").append(_t(escapedName)).append("</label>");
     344        }
     345        buf.append("</td><td align=\"center\"><input type=\"checkbox\" class=\"optbox\" id=\"").append(index).append("\" name=\"").append(index).append(".enabled\"");
    346346        if (enabled) {
    347347            buf.append(CHECKED);
     
    349349                buf.append("disabled=\"disabled\" ");
    350350        }
    351         buf.append("></td><td align=\"center\" width=\"15%\">");
     351        buf.append("></td><td align=\"center\">");
    352352
    353353        if (showStartButton && (!ro) && !edit) {
     
    374374               .append(_t("Delete")).append("<span class=hide> ").append(index).append("</span></button>");
    375375        }
    376         buf.append("</td><td align=\"left\" width=\"50%\">");
     376        buf.append("</td><td align=\"left\">");
    377377        if (edit && !ro) {
    378378            buf.append("<input type=\"text\" size=\"80\" spellcheck=\"false\" name=\"nofilter_desc").append(index).append("\" value=\"");
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java

    r4866136 r6b056ce  
    4343        }
    4444        buf.append("</textarea><br>\n");
    45         buf.append("<p style=\"margin: 0px 12px\"><i>").append(_t("Add additional logging statements above. Example: net.i2p.router.tunnel=WARN")).append("</i><br>");
    46         buf.append("<i>").append(_t("Or put entries in the logger.config file. Example: logger.record.net.i2p.router.tunnel=WARN")).append("</i><br>");
    47         buf.append("<i>").append(_t("Valid levels are DEBUG, INFO, WARN, ERROR, CRIT")).append("</i></p>\n");
     45        buf.append("<p>").append(_t("Add additional logging statements above. Example: net.i2p.router.tunnel=WARN")).append("<br>");
     46        buf.append(_t("Or put entries in the logger.config file. Example: logger.record.net.i2p.router.tunnel=WARN")).append("<br>");
     47        buf.append(_t("Valid levels are DEBUG, INFO, WARN, ERROR, CRIT")).append("</p>\n");
    4848
    4949      /****
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java

    r4866136 r6b056ce  
    9595        // tunnel depth
    9696        int maxLength = advanced ? MAX_ADVANCED_LENGTH : MAX_LENGTH;
    97         buf.append("<tr><td align=\"right\" class=\"mediumtags\">" + _t("Length") + ":</td>\n");
     97        buf.append("<tr><td align=\"right\"><b>" + _t("Length") + ":</b></td>\n");
    9898        buf.append("<td align=\"center\"><select name=\"").append(index).append(".depthInbound\">\n");
    9999        int now = in.getLength();
     
    112112
    113113        // tunnel depth variance
    114         buf.append("<tr><td align=\"right\" class=\"mediumtags\">" + _t("Randomization") + ":</td>\n");
     114        buf.append("<tr><td align=\"right\"><b>" + _t("Randomization") + ":</b></td>\n");
    115115        buf.append("<td align=\"center\"><select name=\"").append(index).append(".varianceInbound\">\n");
    116116        now = in.getLengthVariance();
     
    137137        // tunnel quantity
    138138        int maxQuantity = advanced ? MAX_ADVANCED_QUANTITY : MAX_QUANTITY;
    139         buf.append("<tr><td align=\"right\" class=\"mediumtags\">" + _t("Quantity") + ":</td>\n");
     139        buf.append("<tr><td align=\"right\"><b>" + _t("Quantity") + ":</b></td>\n");
    140140        buf.append("<td align=\"center\"><select name=\"").append(index).append(".quantityInbound\">\n");
    141141        now = in.getQuantity();
     
    155155        // tunnel backup quantity
    156156        int maxBQuantity = advanced ? MAX_ADVANCED_BACKUP_QUANTITY : MAX_BACKUP_QUANTITY;
    157         buf.append("<tr><td align=\"right\" class=\"mediumtags\">" + _t("Backup quantity") + ":</td>\n");
     157        buf.append("<tr><td align=\"right\"><b>" + _t("Backup quantity") + ":</b></td>\n");
    158158        buf.append("<td align=\"center\"><select name=\"").append(index).append(".backupInbound\">\n");
    159159        now = in.getBackupQuantity();
     
    177177        Properties props = in.getUnknownOptions();
    178178        if (!props.isEmpty()) {
    179             buf.append("<tr><td align=\"right\" class=\"mediumtags\">" + _t("Inbound options") + ":</td>\n" +
     179            buf.append("<tr><td align=\"right\"><b>" + _t("Inbound options") + ":</b></td>\n" +
    180180                       "<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
    181181            buf.append(".inboundOptions\" type=\"text\" size=\"32\" disabled=\"disabled\" " +
     
    189189        props = out.getUnknownOptions();
    190190        if (!props.isEmpty()) {
    191             buf.append("<tr><td align=\"right\" class=\"mediumtags\">" + _t("Outbound options") + ":</td>\n" +
     191            buf.append("<tr><td align=\"right\"><b>" + _t("Outbound options") + ":</b></td>\n" +
    192192                       "<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
    193193            buf.append(".outboundOptions\" type=\"text\" size=\"32\" disabled=\"disabled\" " +
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java

    r4866136 r6b056ce  
    2727        boolean universalTheming = _context.getBooleanProperty(CSSHelper.PROP_UNIVERSAL_THEMING);
    2828        buf.append("</div><div id=\"themeoptions\">");
    29         buf.append("<input type=\"checkbox\" name=\"universalTheming\" ");
     29        buf.append("<label><input type=\"checkbox\" name=\"universalTheming\" ");
    3030        if (universalTheming)
    3131            buf.append(CHECKED);
    3232        buf.append("value=\"1\">")
    3333           .append(_t("Set theme universally across all apps"))
    34            .append("<br>\n");
     34           .append("</label><br>\n");
    3535        return buf.toString();
    3636    }
     
    3939        StringBuilder buf = new StringBuilder(256);
    4040        boolean forceMobileConsole = _context.getBooleanProperty(CSSHelper.PROP_FORCE_MOBILE_CONSOLE);
    41         buf.append("<input type=\"checkbox\" name=\"forceMobileConsole\" ");
     41        buf.append("<label><input type=\"checkbox\" name=\"forceMobileConsole\" ");
    4242        if (forceMobileConsole)
    4343            buf.append(CHECKED);
    4444        buf.append("value=\"1\">")
    4545           .append(_t("Force the mobile console to be used"))
    46            .append("</div>\n");
     46           .append("</label></div>\n");
    4747        return buf.toString();
    4848    }
     
    191191            buf.append("</td></tr>");
    192192        } else {
    193             buf.append("<tr><th>")
     193            buf.append("<tr><th title=\"")
     194               .append(_t("Mark for deletion"))
     195               .append("\">")
    194196               .append(_t("Remove"))
    195197               .append("</th><th>")
     
    197199               .append("</th><th>&nbsp;</th></tr>\n");
    198200            for (String name : userpw.keySet()) {
    199                 buf.append("<tr><td align=\"center\"><input type=\"checkbox\" class=\"optbox\" name=\"delete_")
    200                    .append(name)
    201                    .append("\"></td><td colspan=\"2\">")
    202                    .append(name)
    203                    .append("</td></tr>\n");
     201                buf.append("<tr><td align=\"center\"><input type=\"checkbox\" class=\"optbox\" id=\"")
     202                   .append(name)
     203                   .append("\" name=\"delete_")
     204                   .append(name)
     205                   .append("\"></td><td colspan=\"2\"><label for=\"")
     206                   .append(name)
     207                   .append("\">")
     208                   .append(name)
     209                   .append("</label></td></tr>\n");
    204210            }
    205211        }
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java

    r4866136 r6b056ce  
    7777    public String getUpdateThroughProxy() {
    7878        if (_context.getProperty(ConfigUpdateHandler.PROP_SHOULD_PROXY, ConfigUpdateHandler.DEFAULT_SHOULD_PROXY))
    79             return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateThroughProxy\" checked=\"checked\" >";
     79            return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateThroughProxy\" id=\"updateThroughProxy\" checked=\"checked\" >";
    8080        else
    81             return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateThroughProxy\" >";
     81            return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateThroughProxy\" id=\"updateThroughProxy\" >";
    8282    }
    8383   
     
    8585    public String getNewsThroughProxy() {
    8686        if (_context.getProperty(ConfigUpdateHandler.PROP_SHOULD_PROXY_NEWS, ConfigUpdateHandler.DEFAULT_SHOULD_PROXY_NEWS))
    87             return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"newsThroughProxy\" checked=\"checked\" >";
     87            return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"newsThroughProxy\" id=\"newsThroughProxy\" checked=\"checked\" >";
    8888        else
    89             return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"newsThroughProxy\" >";
     89            return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"newsThroughProxy\" id=\"newsThroughProxy\" >";
    9090    }
    9191   
    9292    public String getUpdateUnsigned() {
    93         return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateUnsigned\" " +
     93        return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateUnsigned\" id=\"updateUnsigned\" " +
    9494               getChecked(ConfigUpdateHandler.PROP_UPDATE_UNSIGNED) + '>';
    9595    }
     
    9797    /** @since 0.9.20 */
    9898    public String getUpdateDevSU3() {
    99         return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateDevSU3\" " +
     99        return "<input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"updateDevSU3\" id=\"updateDevSU3\" " +
    100100               getChecked(ConfigUpdateHandler.PROP_UPDATE_DEV_SU3) + '>';
    101101    }
  • apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java

    r4866136 r6b056ce  
    103103            _out.write("<form action=\"events\" method=\"POST\">\n" +
    104104                       "<input type=\"hidden\" name=\"action\" value=\"save\">\n" +
    105                        "<input type=\"hidden\" name=\"nonce\" value=\"" + nonce + "\" >\n");
    106             _out.write(_t("Events since") + ": <select name=\"from\">");
     105                       "<input type=\"hidden\" name=\"nonce\" value=\"" + nonce + "\" >\n<b>");
     106            _out.write(_t("Events since") + ":</b> <select name=\"from\">");
    107107            for (int i = 0; i < _times.length; i++) {
    108108                writeOption(_times[i]);
    109109            }
    110             _out.write("</select>&nbsp;");
    111             _out.write(_t("Event type") + ": <select name=\"type\">");
     110            _out.write("</select>&nbsp;<b>");
     111            _out.write(_t("Event type") + ":</b> <select name=\"type\">");
    112112            // sorted by translated display string
    113113            Map<String, String> events = new TreeMap<String, String>(Collator.getInstance());
  • apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java

    r4866136 r6b056ce  
    361361            _out.write(_t("Display period") + ":</td><td colspan=\"2\"><input size=\"5\" style=\"text-align: right;\" type=\"text\" name=\"periodCount\" value=\"" + _periodCount + "\">" + _t("minutes") + "</td></tr><tr><td>\n");
    362362            _out.write(_t("Plot type") + ":</td><td colspan=\"2\">");
    363             _out.write("<input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"false\" " + (_showEvents ? "" : HelperBase.CHECKED) + ">" + _t("Averages") + "&nbsp;&nbsp;&nbsp;");
    364             _out.write ("<input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"true\" "+ (_showEvents ? HelperBase.CHECKED : "") + ">" + _t("Events") + "</td></tr><tr><td>\n");
     363            _out.write("<label><input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"false\" " + (_showEvents ? "" : HelperBase.CHECKED) + ">" + _t("Averages") + "</label>&nbsp;&nbsp;&nbsp;");
     364            _out.write ("<label><input type=\"radio\" class=\"optbox\" name=\"showEvents\" value=\"true\" "+ (_showEvents ? HelperBase.CHECKED : "") + ">" + _t("Events") + "</label></td></tr><tr><td>\n");
    365365            _out.write(_t("Graph size") + ":</td><td><input size=\"4\" style=\"text-align: right;\" type=\"text\" name=\"width\" value=\"" + _width
    366366                       + "\">" + _t("pixels wide") + "&nbsp;&nbsp;&nbsp;<input size=\"4\" style=\"text-align: right;\" type=\"text\" name=\"height\" value=\"" + _height 
     
    381381            }
    382382            _out.write("</select></td></tr><tr><td>\n" + _t("Persistence") +
    383                        ":</td><td colspan=\"2\"><input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"persistent\"");
     383                       ":</td><td colspan=\"2\"><label><input type=\"checkbox\" class=\"optbox\" value=\"true\" name=\"persistent\"");
    384384            boolean persistent = _context.getBooleanPropertyDefaultTrue(SummaryListener.PROP_PERSISTENT);
    385385            if (persistent)
    386386                _out.write(HelperBase.CHECKED);
    387             _out.write(">" + _t("Store graph data on disk") + "</td></tr></table>" +
     387            _out.write(">" + _t("Store graph data on disk") + "</label></td></tr></table>" +
    388388                       "<hr><div class=\"formaction\" id=\"graphing\"><input type=\"submit\" class=\"accept\" value=\"" + _t("Save settings and redraw graphs") + "\"></div></form>");
    389389        } catch (IOException ioe) {
  • apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java

    r4866136 r6b056ce  
    213213    private String renderConfig(Collection<App> apps) {
    214214        StringBuilder buf = new StringBuilder(1024);
    215         buf.append("<table class=\"homelinkedit\"><tr><th title=\"Mark for deletion\">")
     215        buf.append("<table class=\"homelinkedit\"><tr><th title=\"")
     216           .append(_t("Mark for deletion"))
     217           .append("\">")
    216218           .append(_t("Remove"))
    217219           .append("</th><th></th><th>")
     
    223225            buf.append("<tr><td align=\"center\"><input type=\"checkbox\" class=\"optbox\" name=\"delete_")
    224226               .append(app.name)
     227               .append("\" id=\"")
     228               .append(app.name)
    225229               .append("\"></td><td align=\"center\">");
    226230            if (app.icon != null) {
    227231                buf.append("<img height=\"16\" alt=\"\" src=\"").append(app.icon).append("\">");
    228232            }
    229             buf.append("</td><td align=\"left\">")
     233            buf.append("</td><td align=\"left\"><label for=\"")
     234               .append(app.name)
     235               .append("\">")
    230236               .append(DataHelper.escapeHTML(app.name))
    231237               .append("</td><td align=\"left\"><a href=\"");
  • apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java

    r4866136 r6b056ce  
    259259                   "<tr><td colspan=\"3\" class=\"subheading\"><b>Add Sybil analysis (must pick one above):</b></td></tr>\n" +
    260260                   "<tr><td>Sybil close to:</td><td><input type=\"text\" name=\"sybil2\"></td><td>Router hash, dest hash, b32, or from address book</td>\n" +
    261                    "<tr><td>or Sybil close to this router:</td><td><input type=\"checkbox\" class=\"optbox\" value=\"1\" name=\"sybil\"></td><td></td></tr>\n" +
     261                   "<tr><td><label for=\"closetorouter\">or Sybil close to this router:</label></td><td><input type=\"checkbox\" class=\"optbox\" value=\"1\" name=\"sybil\" id=\"closetorouter\"></td><td></td></tr>\n" +
    262262                   "<tr><td colspan=\"3\" class=\"optionsave\"><button type=\"submit\" class=\"search\" value=\"Lookup\">Lookup</button></td></tr>\n" +
    263263                   "</table>\n</form>\n");
  • apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java

    r4866136 r6b056ce  
    8686            buf.append("<a href=\"/profiles?f=1\">").append(ngettext("Hiding 1 standard profile.", "Hiding {0} standard profiles.", standard)).append("</a>\n");
    8787        buf.append("</p>");
    88                    buf.append("<table id=\"profiles\">");
     88                   buf.append("<div class=\"widescroll\"><table id=\"profilelist\">");
    8989                   buf.append("<tr>");
    9090                   buf.append("<th>").append(_t("Peer")).append("</th>");
     
    192192            buf.setLength(0);
    193193        }
    194         buf.append("</table>");
     194        buf.append("</table></div>");
    195195
    196196      ////
     
    313313           .append("<td><b>X:</b></td><td>").append(_t("Over {0} shared bandwidth", "2000KBps")).append("</td>")
    314314           .append("<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>");
    315         buf.append("<tr><td>&nbsp;</td><td colspan=\"4\">").append(_t("Note: For P and X bandwidth capabilities, O is included for the purpose of backward compatibility in the NetDB."))
    316            .append("<td>&nbsp;</td></tr>");
     315        buf.append("<tr><td>&nbsp;</td><td colspan=\"5\">").append(_t("Note: For P and X bandwidth tiers, O is included for the purpose of backward compatibility in the NetDB."))
     316           .append("</tr>");
    317317        buf.append("</tbody></table></td></tr>"); // profile_defs
    318318        buf.append("<tr><td><b>")
  • apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java

    r4866136 r6b056ce  
    940940        for (String section : sections) {
    941941            int i = sections.indexOf(section);
    942             buf.append("<tr><td align=\"center\"><input type=\"checkbox\" class=\"optbox\" name=\"delete_")
     942            buf.append("<tr><td align=\"center\"><input type=\"checkbox\" class=\"optbox\" id=\"")
     943               .append(sectionNames.get(section))
     944               .append("\" name=\"delete_")
    943945               .append(i)
    944                .append("\"></td><td align=\"left\">")
     946               .append("\"></td><td align=\"left\"><label for=\"")
     947               .append(sectionNames.get(section))
     948               .append("\">")
    945949               .append(_t(sectionNames.get(section)))
    946                .append("</td><td align=\"right\"><input type=\"hidden\" name=\"order_")
     950               .append("</label></td><td align=\"right\"><input type=\"hidden\" name=\"order_")
    947951               .append(i).append('_').append(section)
    948952               .append("\" value=\"")
  • apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java

    r4866136 r6b056ce  
    6868        if (!participating.isEmpty()) {
    6969            Collections.sort(participating, new TunnelComparator());
    70             out.write("<table class=\"tunneldisplay\"><tr><th>" + _t("Receive on") + "</th><th>" + _t("From") + "</th><th>"
     70            out.write("<table class=\"tunneldisplay tunnels_participating\"><tr><th>" + _t("Receive on") + "</th><th>" + _t("From") + "</th><th>"
    7171                  + _t("Send on") + "</th><th>" + _t("To") + "</th><th>" + _t("Expiration") + "</th>"
    7272                  + "<th>" + _t("Usage") + "</th><th>" + _t("Rate") + "</th><th>" + _t("Role") + "</th></tr>\n");
     
    164164                maxLength = info.getLength();
    165165        }
    166         out.write("<table class=\"tunneldisplay\"><tr><th>" + _t("In/Out") + "</th><th>" + _t("Expiry") + "</th><th>" + _t("Usage") + "</th><th>" + _t("Gateway") + "</th>");
     166        out.write("<table class=\"tunneldisplay tunnels_client\"><tr><th title=\"" + _t("Inbound or outbound?") + ("\">") + _t("In/Out")
     167                  + "</th><th>" + _t("Expiry") + "</th><th>" + _t("Usage") + "</th><th>" + _t("Gateway") + "</th>");
    167168        if (maxLength > 3) {
    168169            out.write("<th align=\"center\" colspan=\"" + (maxLength - 2));
  • apps/routerconsole/jsp/configadvanced.jsp

    r4866136 r6b056ce  
    3232<%=intl._t("Floodfill participation helps the network, but may use more of your computer's resources.")%>
    3333  </td></tr>
    34   <tr><td>
     34  <tr><td class="infohelp">
    3535<%
    3636    if (advancedhelper.isFloodfill()) {
     
    4444<input type="hidden" name="nonce" value="<%=pageNonce%>" >
    4545<input type="hidden" name="action" value="ff" >
    46 <input type="radio" class="optbox" name="ff" value="auto" <%=advancedhelper.getFFChecked(2) %> >
    47 <%=intl._t("Automatic")%>&nbsp;
    48 <input type="radio" class="optbox" name="ff" value="true" <%=advancedhelper.getFFChecked(1) %> >
    49 <%=intl._t("Force On")%>&nbsp;
    50 <input type="radio" class="optbox" name="ff" value="false" <%=advancedhelper.getFFChecked(0) %> >
    51 <%=intl._t("Disable")%>
     46<b><%=intl._t("Enrollment")%>:</b>
     47<label><input type="radio" class="optbox" name="ff" value="auto" <%=advancedhelper.getFFChecked(2) %> >
     48<%=intl._t("Automatic")%></label>&nbsp;
     49<label><input type="radio" class="optbox" name="ff" value="true" <%=advancedhelper.getFFChecked(1) %> >
     50<%=intl._t("Force On")%></label>&nbsp;
     51<label><input type="radio" class="optbox" name="ff" value="false" <%=advancedhelper.getFFChecked(0) %> >
     52<%=intl._t("Disable")%></label>
    5253  </td></tr>
    5354  <tr><td class="optionsave" align="right">
  • apps/routerconsole/jsp/configclients.jsp

    r4866136 r6b056ce  
    3737 <p class="infohelp" id="clientconf">
    3838 <%=intl._t("The Java clients listed below are started by the router and run in the same JVM.")%>&nbsp;
    39  <%=intl._t("To change other client options, edit the file")%></i><tt>
    40  <%=net.i2p.router.startup.ClientAppConfig.configFile(net.i2p.I2PAppContext.getGlobalContext()).getAbsolutePath()%>.</tt>
     39 <%=intl._t("To change other client options, edit the file")%>
     40 <tt><%=net.i2p.router.startup.ClientAppConfig.configFile(net.i2p.I2PAppContext.getGlobalContext()).getAbsolutePath()%>.</tt>
    4141 <%=intl._t("All changes require restart to take effect.")%>
    4242 </p>
  • apps/routerconsole/jsp/configfamily.jsp

    r4866136 r6b056ce  
    3535<input type="hidden" name="nonce" value="<%=pageNonce%>" >
    3636 <tr><th colspan="2"><%=intl._t("Join Existing Router Family")%></th></tr>
    37  <tr><td colspan="2"><%=intl._t("Import the secret family key that you exported from an existing router in the family.")%></td></tr>
     37 <tr><td colspan="2" class="infohelp"><%=intl._t("Import the secret family key that you exported from an existing router in the family.")%></td></tr>
    3838 <tr>
    39   <td><%=intl._t("Select secret key file")%>:
     39  <td><b><%=intl._t("Select secret key file")%>:</b>
    4040<input name="file" type="file" value="" />
    4141  </td>
  • apps/routerconsole/jsp/confighome.jsp

    r4866136 r6b056ce  
    3434 <tr>
    3535  <td>
    36  <input type="checkbox" name="oldHome" <jsp:getProperty name="homehelper" property="configHome" /> >
    37  <%=intl._t("Use old home page")%>
     36 <label><input type="checkbox" name="oldHome" <jsp:getProperty name="homehelper" property="configHome" /> >
     37 <%=intl._t("Use old home page")%></label>
    3838  </td>
    3939  <td class="optionsave">
  • apps/routerconsole/jsp/configi2cp.jsp

    r4866136 r6b056ce  
    4040<tr><th><%=intl._t("External I2CP (I2P Client Protocol) Interface Configuration")%></th></tr>
    4141<tr><td>
    42 <input type="radio" class="optbox" name="mode" value="1" <%=clientshelper.i2cpModeChecked(1) %> >
    43 <%=intl._t("Enabled without SSL")%><br>
    44 <input type="radio" class="optbox" name="mode" value="2" <%=clientshelper.i2cpModeChecked(2) %> >
    45 <%=intl._t("Enabled with SSL required")%><br>
    46 <input type="radio" class="optbox" name="mode" value="0" <%=clientshelper.i2cpModeChecked(0) %> >
    47 <%=intl._t("Disabled - Clients outside this Java process may not connect")%><br>
     42<label><input type="radio" class="optbox" name="mode" value="1" <%=clientshelper.i2cpModeChecked(1) %> >
     43<%=intl._t("Enabled without SSL")%></label><br>
     44<label><input type="radio" class="optbox" name="mode" value="2" <%=clientshelper.i2cpModeChecked(2) %> >
     45<%=intl._t("Enabled with SSL required")%></label><br>
     46<label><input type="radio" class="optbox" name="mode" value="0" <%=clientshelper.i2cpModeChecked(0) %> >
     47<%=intl._t("Disabled - Clients outside this Java process may not connect")%></label><br>
    4848</td></tr>
    4949<tr><td>
    50 <%=intl._t("I2CP Interface")%>:
     50<b><%=intl._t("I2CP Interface")%>:</b>
    5151<select name="interface">
    5252<%
     
    6464%>
    6565</select>&nbsp;
    66 <%=intl._t("I2CP Port")%>:
     66<b><%=intl._t("I2CP Port")%>:</b>
    6767<input name="port" type="text" size="5" maxlength="5" value="<jsp:getProperty name="clientshelper" property="port" />" >
    6868</td></tr>
    6969<tr><th><%=intl._t("Authorization")%></th></tr>
    7070<tr><td>
    71 <input type="checkbox" class="optbox" name="auth" value="true" <jsp:getProperty name="clientshelper" property="auth" /> >
    72 <%=intl._t("Require username and password")%><br>
     71<label><input type="checkbox" class="optbox" name="auth" value="true" <jsp:getProperty name="clientshelper" property="auth" /> >
     72<%=intl._t("Require username and password")%></label><br>
    7373</td></tr>
    7474<tr><td>
    75 <%=intl._t("Username")%>:
     75<b><%=intl._t("Username")%>:</b>
    7676<input name="user" type="text" value="" />&nbsp;
    77 <%=intl._t("Password")%>:
     77<b><%=intl._t("Password")%>:</b>
    7878<input name="nofilter_pw" type="password" value="" />
    7979</td></tr>
  • apps/routerconsole/jsp/configkeyring.jsp

    r4866136 r6b056ce  
    3333          </td>
    3434        </tr><tr>
    35           <td class="mediumtags" align="right"><%=intl._t("Dest. name, hash, or full key")%>:</td>
     35          <td align="right"><b><%=intl._t("Dest. name, hash, or full key")%>:</b></td>
    3636          <td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off" spellcheck="false"></textarea></td>
    3737        </tr><tr>
    38           <td class="mediumtags" align="right"><%=intl._t("Encryption Key")%>:</td>
     38          <td align="right"><b><%=intl._t("Encryption Key")%>:</b></td>
    3939          <td><input type="text" size="55" name="key" ></td>
    4040        </tr><tr>
  • apps/routerconsole/jsp/configlogging.jsp

    r4866136 r6b056ce  
    2525 <h3 class="tabletitle"><%=intl._t("Configure I2P Logging Options")%>&nbsp;<a title="<%=intl._t("View Router Logs")%>" href="/logs">[<%=intl._t("View Logs")%>]</a></h3>
    2626      <table id="loggingoptions" border="0" cellspacing="5">
    27         <tr><td class="mediumtags" align="right"><b><%=intl._t("Log file")%>:</b></td>
     27        <tr><td align="right"><b><%=intl._t("Log file")%>:</b></td>
    2828          <td><input type="text" name="logfilename" size="40" disabled="disabled" title="<%=intl._t("Edit {0} to change", "logger.config")%>" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" >
    2929            </td>
    30           <td><i><%=intl._t("(the symbol '@' will be replaced during log rotation)")%></i></td>
    31           <td></td>
    32         </tr><tr><td class="mediumtags" align="right"><b><%=intl._t("Log record format")%>:</b></td>
     30          <td><%=intl._t("(the symbol '@' will be replaced during log rotation)")%></td>
     31        </tr><tr><td align="right"><b><%=intl._t("Log record format")%>:</b></td>
    3332          <td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" >
    3433            </td>
    35           <td><i><%=intl._t("(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)")%></i></td>
    36           <td></td>
    37         </tr><tr><td class="mediumtags" align="right"><b><%=intl._t("Log date format")%>:</b></td>
     34          <td><%=intl._t("(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)")%></td>
     35        </tr><tr><td align="right"><b><%=intl._t("Log date format")%>:</b></td>
    3836          <td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" >
    3937            </td>
    40           <td><i><%=intl._t("('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)")%></i></td>
    41           <td></td>
    42         </tr><tr><td class="mediumtags" align="right"><b><%=intl._t("Max log file size")%>:</b></td>
     38          <td><%=intl._t("('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)")%></td>
     39        </tr><tr><td align="right"><b><%=intl._t("Max log file size")%>:</b></td>
    4340          <td><input type="text" name="logfilesize" size="10" value="<jsp:getProperty name="logginghelper" property="maxFileSize" />" ></td>
    4441          <td></td>
    45           <td></td>
    46         </tr><tr><td class="mediumtags" align="right"><b><%=intl._t("Default log level")%>:</b></td>
     42        </tr><tr><td align="right"><b><%=intl._t("Default log level")%>:</b></td>
    4743          <td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /></td>
    48           <td><i><%=intl._t("(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)")%></i></td>
    49           <td></td>
    50         </tr><tr><td class="mediumtags" align="right"><b><%=intl._t("Log level overrides")%>:</b></td>
    51           <td colspan="3"><jsp:getProperty name="logginghelper" property="logLevelTable" /></td>
    52         </tr><tr><td class="mediumtags" align="right"><b><%=intl._t("New override")%>:</b></td>
    53           <td colspan="3"><jsp:getProperty name="logginghelper" property="newClassBox" /></td>
     44          <td><%=intl._t("(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)")%></td>
     45        </tr><tr><td align="right"><b><%=intl._t("Log level overrides")%>:</b></td>
     46          <td colspan="2"><jsp:getProperty name="logginghelper" property="logLevelTable" /></td>
     47        </tr><tr><td align="right"><b><%=intl._t("New override")%>:</b></td>
     48          <td colspan="2"><jsp:getProperty name="logginghelper" property="newClassBox" /></td>
    5449        </tr>
    55         <tr><td class="optionsave" colspan="4">
     50        <tr><td class="optionsave" colspan="3">
    5651          <input type="reset" class="cancel" value="<%=intl._t("Cancel")%>" >
    5752          <input type="submit" name="shouldsave" class="accept" value="<%=intl._t("Save changes")%>" >
  • apps/routerconsole/jsp/confignet.jsp

    r4866136 r6b056ce  
    3636 <tr>
    3737  <td>
    38     <input type="checkbox" class="optbox" name="upnp" value="true" <jsp:getProperty name="nethelper" property="upnpChecked" /> >
    39     <%=intl._t("Enable UPnP to open firewall ports")%>
     38    <label><input type="checkbox" class="optbox" name="upnp" value="true" <jsp:getProperty name="nethelper" property="upnpChecked" /> >
     39    <%=intl._t("Enable UPnP to open firewall ports")%></label>
    4040  </td>
    4141 </tr>
     
    4545 <tr>
    4646  <td>
    47  <%=intl._t("Externally reachable hostname or IP address")%>:<br>
    48     <input type="radio" class="optbox" name="udpAutoIP" value="local,upnp,ssu" <%=nethelper.getUdpAutoIPChecked(3) %> >
    49     <%=intl._t("Use all auto-detect methods")%><br>
    50     <input type="radio" class="optbox" name="udpAutoIP" value="local,ssu" <%=nethelper.getUdpAutoIPChecked(4) %> >
    51     <%=intl._t("Disable UPnP IP address detection")%><br>
    52     <input type="radio" class="optbox" name="udpAutoIP" value="upnp,ssu" <%=nethelper.getUdpAutoIPChecked(5) %> >
    53     <%=intl._t("Ignore local interface IP address")%><br>
    54     <input type="radio" class="optbox" name="udpAutoIP" value="ssu" <%=nethelper.getUdpAutoIPChecked(0) %> >
    55     <%=intl._t("Use SSU IP address detection only")%><br>
    56     <input type="radio" class="optbox" name="udpAutoIP" value="hidden" <%=nethelper.getUdpAutoIPChecked(2) %> >
    57     <%=intl._t("Hidden mode - do not publish IP")%> <i><%=intl._t("(prevents participating traffic)")%></i><br>
    58     <input type="radio" class="optbox" name="udpAutoIP" value="fixed" <%=nethelper.getUdpAutoIPChecked(1) %> >
    59     <%=intl._t("Specify hostname or IP")%>:
     47 <b class="suboption"><%=intl._t("Externally reachable hostname or IP address")%>:</b><br>
     48    <label><input type="radio" class="optbox" name="udpAutoIP" value="local,upnp,ssu" <%=nethelper.getUdpAutoIPChecked(3) %> >
     49    <%=intl._t("Use all auto-detect methods")%></label><br>
     50    <label><input type="radio" class="optbox" name="udpAutoIP" value="local,ssu" <%=nethelper.getUdpAutoIPChecked(4) %> >
     51    <%=intl._t("Disable UPnP IP address detection")%></label><br>
     52    <label><input type="radio" class="optbox" name="udpAutoIP" value="upnp,ssu" <%=nethelper.getUdpAutoIPChecked(5) %> >
     53    <%=intl._t("Ignore local interface IP address")%></label><br>
     54    <label><input type="radio" class="optbox" name="udpAutoIP" value="ssu" <%=nethelper.getUdpAutoIPChecked(0) %> >
     55    <%=intl._t("Use SSU IP address detection only")%></label><br>
     56    <label><input type="radio" class="optbox" name="udpAutoIP" value="hidden" <%=nethelper.getUdpAutoIPChecked(2) %> >
     57    <%=intl._t("Hidden mode - do not publish IP")%> <i><%=intl._t("(prevents participating traffic)")%></i></label><br>
     58    <label><input type="radio" class="optbox" name="udpAutoIP" value="fixed" <%=nethelper.getUdpAutoIPChecked(1) %> >
     59    <%=intl._t("Specify hostname or IP")%>:</label>
    6060    <%=nethelper.getAddressSelector() %>
    6161  </td>
     
    6666 <tr>
    6767  <td>
    68     <input type="checkbox" class="optbox" name="laptop" value="true" <jsp:getProperty name="nethelper" property="laptopChecked" /> >
     68    <label><input type="checkbox" class="optbox" name="laptop" value="true" <jsp:getProperty name="nethelper" property="laptopChecked" /> >
    6969    <%=intl._t("Laptop mode - Change router identity and UDP port when IP changes for enhanced anonymity")%>
    70     (<i><%=intl._t("Experimental")%></i>)
     70    (<i><%=intl._t("Experimental")%></i>)</label>
    7171  </td>
    7272 </tr>
     
    7676 <tr>
    7777  <td>
    78     <input type="checkbox" class="optbox" name="IPv4Firewalled" value="true" <jsp:getProperty name="nethelper" property="IPv4FirewalledChecked" /> >
    79     <%=intl._t("Disable inbound (Firewalled by Carrier-grade NAT or DS-Lite)")%>
     78    <label><input type="checkbox" class="optbox" name="IPv4Firewalled" value="true" <jsp:getProperty name="nethelper" property="IPv4FirewalledChecked" /> >
     79    <%=intl._t("Disable inbound (Firewalled by Carrier-grade NAT or DS-Lite)")%></label>
    8080  </td>
    8181 </tr>
     
    8585 <tr>
    8686  <td>
    87     <input type="checkbox" class="optbox" name="IPv6Firewalled" value="true" <jsp:getProperty name="nethelper" property="IPv6FirewalledChecked" /> >
    88     <%=intl._t("Disable inbound (Firewalled by Carrier-grade NAT or DS-Lite)")%><br>
    89     <input type="radio" class="optbox" name="ipv6" value="false" <%=nethelper.getIPv6Checked("false") %> >
    90     <%=intl._t("Disable IPv6")%><br>
    91     <input type="radio" class="optbox" name="ipv6" value="enable" <%=nethelper.getIPv6Checked("enable") %> >
    92     <%=intl._t("Enable IPv6")%><br>
    93     <input type="radio" class="optbox" name="ipv6" value="preferIPv4" <%=nethelper.getIPv6Checked("preferIPv4") %> >
    94     <%=intl._t("Prefer IPv4 over IPv6")%><br>
    95     <input type="radio" class="optbox" name="ipv6" value="preferIPv6" <%=nethelper.getIPv6Checked("preferIPv6") %> >
    96     <%=intl._t("Prefer IPv6 over IPv4")%><br>
    97     <input type="radio" class="optbox" name="ipv6" value="only" <%=nethelper.getIPv6Checked("only") %> >
     87    <label><input type="checkbox" class="optbox" name="IPv6Firewalled" value="true" <jsp:getProperty name="nethelper" property="IPv6FirewalledChecked" /> >
     88    <%=intl._t("Disable inbound (Firewalled by Carrier-grade NAT or DS-Lite)")%></label><br>
     89    <label><input type="radio" class="optbox" name="ipv6" value="false" <%=nethelper.getIPv6Checked("false") %> >
     90    <%=intl._t("Disable IPv6")%></label><br>
     91    <label><input type="radio" class="optbox" name="ipv6" value="enable" <%=nethelper.getIPv6Checked("enable") %> >
     92    <%=intl._t("Enable IPv6")%></label><br>
     93    <label><input type="radio" class="optbox" name="ipv6" value="preferIPv4" <%=nethelper.getIPv6Checked("preferIPv4") %> >
     94    <%=intl._t("Prefer IPv4 over IPv6")%></label><br>
     95    <label><input type="radio" class="optbox" name="ipv6" value="preferIPv6" <%=nethelper.getIPv6Checked("preferIPv6") %> >
     96    <%=intl._t("Prefer IPv6 over IPv4")%></label><br>
     97    <label><input type="radio" class="optbox" name="ipv6" value="only" <%=nethelper.getIPv6Checked("only") %> >
    9898    <%=intl._t("Use IPv6 only (disable IPv4)")%>
    99     (<i><%=intl._t("Experimental")%></i>)
     99    (<i><%=intl._t("Experimental")%></i>)</label>
    100100  </td>
    101101 </tr>
     
    110110 <tr>
    111111  <td>
    112  <%=intl._t("UDP port:")%>
     112 <b><%=intl._t("UDP port:")%></b>
    113113 <input name ="udpPort" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="configuredUdpPort" />" ><br>
    114  <input type="checkbox" class="optbox" name="disableUDP" value="disabled" <%=nethelper.getUdpDisabledChecked() %> >
    115  <%=intl._t("Completely disable")%> <i><%=intl._t("(select only if behind a firewall that blocks outbound UDP)")%></i>
     114 <label><input type="checkbox" class="optbox" name="disableUDP" value="disabled" <%=nethelper.getUdpDisabledChecked() %> >
     115 <%=intl._t("Completely disable")%> <i><%=intl._t("(select only if behind a firewall that blocks outbound UDP)")%></i></label>
    116116  </td>
    117117 </tr>
     
    130130 <tr>
    131131  <td>
    132  <%=intl._t("Externally reachable hostname or IP address")%>:<br>
    133     <input type="radio" class="optbox" name="ntcpAutoIP" value="true" <%=nethelper.getTcpAutoIPChecked(2) %> >
     132 <b class="suboption"><%=intl._t("Externally reachable hostname or IP address")%>:</b><br>
     133    <label><input type="radio" class="optbox" name="ntcpAutoIP" value="true" <%=nethelper.getTcpAutoIPChecked(2) %> >
    134134    <%=intl._t("Use auto-detected IP address")%>
    135135    <i>(<%=intl._t("currently")%> <jsp:getProperty name="nethelper" property="udpIP" />)</i>
    136     <%=intl._t("if we are not firewalled")%><br>
    137     <input type="radio" class="optbox" name="ntcpAutoIP" value="always" <%=nethelper.getTcpAutoIPChecked(3) %> >
    138     <%=intl._t("Always use auto-detected IP address (Not firewalled)")%><br>
    139     <input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(1) %> >
    140     <%=intl._t("Specify hostname or IP")%>:
     136    <%=intl._t("if we are not firewalled")%></label><br>
     137    <label><input type="radio" class="optbox" name="ntcpAutoIP" value="always" <%=nethelper.getTcpAutoIPChecked(3) %> >
     138    <%=intl._t("Always use auto-detected IP address (Not firewalled)")%></label><br>
     139    <label><input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(1) %> >
     140    <%=intl._t("Specify hostname or IP")%>:</label>
    141141    <input name ="ntcphost" type="text" size="16" value="<jsp:getProperty name="nethelper" property="ntcphostname" />" ><br>
    142     <input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(0) %> >
    143     <%=intl._t("Disable inbound (Firewalled)")%><br>
    144     <input type="radio" class="optbox" name="ntcpAutoIP" value="disabled" <%=nethelper.getTcpAutoIPChecked(4) %> >
    145     <%=intl._t("Completely disable")%> <i><%=intl._t("(select only if behind a firewall that throttles or blocks outbound TCP)")%></i>
     142    <label><input type="radio" class="optbox" name="ntcpAutoIP" value="false" <%=nethelper.getTcpAutoIPChecked(0) %> >
     143    <%=intl._t("Disable inbound (Firewalled)")%></label><br>
     144    <label><input type="radio" class="optbox" name="ntcpAutoIP" value="disabled" <%=nethelper.getTcpAutoIPChecked(4) %> >
     145    <%=intl._t("Completely disable")%> <i><%=intl._t("(select only if behind a firewall that throttles or blocks outbound TCP)")%></i></label>
    146146  </td>
    147147 </tr>
     
    151151 <tr>
    152152  <td>
    153     <input type="radio" class="optbox" name="ntcpAutoPort" value="2" <%=nethelper.getTcpAutoPortChecked(2) %> >
     153    <label><input type="radio" class="optbox" name="ntcpAutoPort" value="2" <%=nethelper.getTcpAutoPortChecked(2) %> >
    154154    <%=intl._t("Use the same port configured for UDP")%>
    155     <i>(<%=intl._t("currently")%> <jsp:getProperty name="nethelper" property="udpPort" />)</i><br>
    156     <input type="radio" class="optbox" name="ntcpAutoPort" value="1" <%=nethelper.getTcpAutoPortChecked(1) %> >
    157     <%=intl._t("Specify Port")%>:
     155    <i>(<%=intl._t("currently")%> <jsp:getProperty name="nethelper" property="udpPort" />)</i></label><br>
     156    <label><input type="radio" class="optbox" name="ntcpAutoPort" value="1" <%=nethelper.getTcpAutoPortChecked(1) %> >
     157    <%=intl._t("Specify Port")%>:</label>
    158158    <input name ="ntcpport" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="ntcpport" />" >
    159159  </td>
  • apps/routerconsole/jsp/configpeer.jsp

    r4866136 r6b056ce  
    2727 <h3 class="tabletitle"><%=intl._t("Manual Peer Controls")%></h3>
    2828 <table class="configtable">
    29    <tr><td colspan="2"><%=intl._t("Router Hash")%>: <input type="text" size="55" name="peer" value="<%=peer%>" /></td></tr>
     29   <tr><td colspan="2"><b><%=intl._t("Router Hash")%>:</b> <input type="text" size="55" name="peer" value="<%=peer%>" /></td></tr>
    3030   <tr><th colspan="2"><%=intl._t("Manually Ban / Unban a Peer")%></th></tr>
    3131   <tr><td class="infohelp" colspan="2"><%=intl._t("Banning will prevent the participation of this peer in tunnels you create.")%></td></tr>
     
    5151    }
    5252 %>
    53      <td><%=intl._t("Speed")%>:
     53     <td><b><%=intl._t("Speed")%>:</b>
    5454 <input type="text" size="8" name="speed" value="<%=speed%>" />
    55  <%=intl._t("Capacity")%>:
     55 <b><%=intl._t("Capacity")%>:</b>
    5656 <input type="text" size="8" name="capacity" value="<%=capacity%>" />
    5757     </td>
  • apps/routerconsole/jsp/configplugins.jsp

    r4866136 r6b056ce  
    3232       if (clientshelper.isPluginUpdateEnabled()) {
    3333%>
    34 <h3 id="pluginconfig"><a name="pconfig"></a><%=intl._t("Plugin Configuration")%></h3><p id="pluginconfigtext">
     34<h3 id="pconfig"><%=intl._t("Plugin Configuration")%></h3><p id="pluginconfigtext">
    3535 <%=intl._t("The plugins listed below are started by the webConsole client.")%>
    3636 </p><div class="wideload">
     
    5858<td>
    5959 <input type="hidden" name="nonce" value="<%=pageNonce%>" >
    60  URL:&nbsp;
     60 <b>URL:</b>
    6161 <input type="text" size="60" name="pluginURL" title="<%=intl._t("To install a plugin, enter the download URL:")%>" >
    6262</td>
     
    7575<td>
    7676<input type="hidden" name="nonce" value="<%=pageNonce%>" >
    77 <%=intl._t("Select xpi2p or su3 file")%>:&nbsp;
     77<b><%=intl._t("Select xpi2p or su3 file")%>:</b>
    7878<input type="file" name="pluginFile" accept=".xpi2p,.su3" >
    7979</td>
  • apps/routerconsole/jsp/configreseed.jsp

    r4866136 r6b056ce  
    4040<input type="hidden" name="nonce" value="<%=pageNonce%>" >
    4141  <td>
    42 <%=intl._t("Enter zip or su3 URL")%>:
     42<b><%=intl._t("Enter zip or su3 URL")%>:</b>
    4343<input name="url" type="text" size="60" value="" />
    4444  </td>
     
    5555<input type="hidden" name="nonce" value="<%=pageNonce%>" >
    5656  <td>
    57 <%=intl._t("Select zip or su3 file")%>:
     57<b><%=intl._t("Select zip or su3 file")%>:</b>
    5858<input name="file" type="file" accept=".zip,.su3" value="" />
    5959  </td>
     
    9393  </td>
    9494 </tr>
    95 <tr><td class="mediumtags" align="right"><b><%=intl._t("Reseed URL Selection")%>:</b></td>
    96 <td><input type="radio" class="optbox" name="mode" value="0" <%=reseedHelper.modeChecked(0) %> >
    97 <b><%=intl._t("Try SSL first then non-SSL")%></b><br>
    98 <input type="radio" class="optbox" name="mode" value="1" <%=reseedHelper.modeChecked(1) %> >
    99 <b><%=intl._t("Use SSL only")%></b><br>
    100 <input type="radio" class="optbox" name="mode" value="2" <%=reseedHelper.modeChecked(2) %> >
    101 <b><%=intl._t("Use non-SSL only")%></b></td></tr>
    102 <tr><td class="mediumtags" align="right"><b><%=intl._t("Reseed URLs")%>:</b></td>
     95<tr><td align="right"><b><%=intl._t("Reseed URL Selection")%>:</b></td>
     96<td><label><input type="radio" class="optbox" name="mode" value="0" <%=reseedHelper.modeChecked(0) %> >
     97<%=intl._t("Try SSL first then non-SSL")%></label><br>
     98<label><input type="radio" class="optbox" name="mode" value="1" <%=reseedHelper.modeChecked(1) %> >
     99<%=intl._t("Use SSL only")%></label><br>
     100<label><input type="radio" class="optbox" name="mode" value="2" <%=reseedHelper.modeChecked(2) %> >
     101<%=intl._t("Use non-SSL only")%></label></td></tr>
     102<tr><td align="right"><b><%=intl._t("Reseed URLs")%>:</b></td>
    103103<td><textarea wrap="off" name="reseedURL" cols="60" rows="7" spellcheck="false"><jsp:getProperty name="reseedHelper" property="reseedURL" /></textarea>
    104104<div class="formaction" id="resetreseed"><input type="submit" name="action" class="reload" value="<%=intl._t("Reset URL list")%>" /></div>
    105105</td></tr>
    106106
    107 <tr><td class="mediumtags" align="right"><b><%=intl._t("Enable HTTP Proxy?")%></b></td>
    108 <td><input type="checkbox" class="optbox" name="enable" value="true" <jsp:getProperty name="reseedHelper" property="enable" /> ></td></tr>
    109 <tr><td class="mediumtags" align="right"><b><%=intl._t("HTTP Proxy Host")%>:</b></td>
     107<tr><td align="right"><label for="enableproxy"><b><%=intl._t("Enable HTTP Proxy?")%></b></label></td>
     108<td><input type="checkbox" class="optbox" name="enable" id="enableproxy" value="true" <jsp:getProperty name="reseedHelper" property="enable" /> ></td></tr>
     109<tr><td align="right"><b><%=intl._t("HTTP Proxy Host")%>:</b></td>
    110110<td><input name="host" type="text" value="<jsp:getProperty name="reseedHelper" property="host" />" ></td></tr>
    111 <tr><td class="mediumtags" align="right"><b><%=intl._t("HTTP Proxy Port")%>:</b></td>
     111<tr><td align="right"><b><%=intl._t("HTTP Proxy Port")%>:</b></td>
    112112<td><input name="port" type="text" size="5" maxlength="5" value="<jsp:getProperty name="reseedHelper" property="port" />" ></td></tr>
    113113
    114 <tr><td class="mediumtags" align="right"><b><%=intl._t("Use HTTP Proxy Authorization?")%></b></td>
    115 <td><input type="checkbox" class="optbox" name="auth" value="true" <jsp:getProperty name="reseedHelper" property="auth" /> ></td></tr>
    116 <tr><td class="mediumtags" align="right"><b><%=intl._t("HTTP Proxy Username")%>:</b></td>
     114<tr><td align="right"><label for="useproxyauth"><b><%=intl._t("Use HTTP Proxy Authorization?")%></b></label></td>
     115<td><input type="checkbox" class="optbox" name="auth" id="useproxyauth" value="true" <jsp:getProperty name="reseedHelper" property="auth" /> ></td></tr>
     116<tr><td align="right"><b><%=intl._t("HTTP Proxy Username")%>:</b></td>
    117117<td><input name="username" type="text" value="<jsp:getProperty name="reseedHelper" property="username" />" ></td></tr>
    118 <tr><td class="mediumtags" align="right"><b><%=intl._t("HTTP Proxy Password")%>:</b></td>
     118<tr><td align="right"><b><%=intl._t("HTTP Proxy Password")%>:</b></td>
    119119<td><input name="nofilter_password" type="password" value="<jsp:getProperty name="reseedHelper" property="nofilter_password" />" ></td></tr>
    120120
    121121<!-- TODO Need SSLEepGet support
    122 <tr><td class="mediumtags" align="right"><b><%=intl._t("Enable HTTPS Proxy?")%></b></td>
     122<tr><td align="right"><b><%=intl._t("Enable HTTPS Proxy?")%></b></td>
    123123<td><input type="checkbox" class="optbox" name="senable" value="true" <jsp:getProperty name="reseedHelper" property="senable" /> ></td></tr>
    124 <tr><td class="mediumtags" align="right"><b><%=intl._t("HTTPS Proxy Host")%>:</b></td>
     124<tr><td align="right"><b><%=intl._t("HTTPS Proxy Host")%>:</b></td>
    125125<td><input name="shost" type="text" value="<jsp:getProperty name="reseedHelper" property="shost" />" ></td></tr>
    126 <tr><td class="mediumtags" align="right"><b><%=intl._t("HTTPS Proxy Port")%>:</b></td>
     126<tr><td align="right"><b><%=intl._t("HTTPS Proxy Port")%>:</b></td>
    127127<td><input name="sport" type="text" size="5" maxlength="5" value="<jsp:getProperty name="reseedHelper" property="sport" />" ></td></tr>
    128128
    129 <tr><td class="mediumtags" align="right"><b><%=intl._t("Use HTTPS Proxy Authorization?")%></b></td>
     129<tr><td align="right"><b><%=intl._t("Use HTTPS Proxy Authorization?")%></b></td>
    130130<td><input type="checkbox" class="optbox" name="sauth" value="true" <jsp:getProperty name="reseedHelper" property="sauth" /> ></td></tr>
    131 <tr><td class="mediumtags" align="right"><b><%=intl._t("HTTPS Proxy Username")%>:</b></td>
     131<tr><td align="right"><b><%=intl._t("HTTPS Proxy Username")%>:</b></td>
    132132<td><input name="susername" type="text" value="<jsp:getProperty name="reseedHelper" property="susername" />" ></td></tr>
    133 <tr><td class="mediumtags" align="right"><b><%=intl._t("HTTPS Proxy Password")%>:</b></td>
     133<tr><td align="right"><b><%=intl._t("HTTPS Proxy Password")%>:</b></td>
    134134<td><input name="nofilter_spassword" type="password" value="<jsp:getProperty name="reseedHelper" property="nofilter_spassword" />" ></td></tr>
    135135-->
  • apps/routerconsole/jsp/configstats.jsp

    r4866136 r6b056ce  
    7676 <input type="hidden" name="nonce" value="<%=pageNonce%>" >
    7777 <h3 class="ptitle"><%=intl._t("Configure I2P Stat Collection")%>&nbsp;<a class="script" title="<%=intl._t("Toggle full stat collection and all graphing options")%>" href="javascript:void(null);" onclick="toggleAll('*')">[<%=intl._t("toggle all")%>]</a></h3>
    78  <p id="enablefullstats"><b><%=intl._t("Enable full stats?")%></b>
     78 <p id="enablefullstats"><label><b><%=intl._t("Enable full stats?")%></b>
    7979 <input type="checkbox" class="optbox" name="isFull" value="true" <%
    8080 if (statshelper.getIsFull()) { %>checked="checked" <% } %> >
    81  (<%=intl._t("change requires restart to take effect")%>)<br>
     81 (<%=intl._t("change requires restart to take effect")%>)</label><br>
    8282<%
    8383
     
    121121  if (shouldShowLog) {
    122122
    123 %>   <td align="center">
    124      <a name="<%=statshelper.getCurrentStatName()%>"></a>
    125      <input type="checkbox" class="optbox <%=statshelper.getCurrentGroupName()%>" name="statList" value="<%=statshelper.getCurrentStatName()%>" <%
     123%>   <td align="center"><a name="<%=statshelper.getCurrentStatName()%>"></a><input type="checkbox" class="optbox <%=statshelper.getCurrentGroupName()%>" name="statList" value="<%=statshelper.getCurrentStatName()%>" <%
    126124     if (statshelper.getCurrentIsLogged()) { %>checked="checked" <% } %> ></td>
    127125<%
     
    129127  }  // shouldShowLog
    130128
    131 %>   <td align="center">
    132      <% if (statshelper.getCurrentCanBeGraphed()) { %>
    133        <input type="checkbox" class="optbox <%=statshelper.getCurrentGroupName()%>" name="graphList" value="<%=statshelper.getCurrentGraphName()%>" <%
    134        if (statshelper.getCurrentIsGraphed()) { %>checked="checked" <% } %> ><% } %></td>
    135      <td align="left"><b><%=statshelper.getCurrentStatName()%>:</b>&nbsp;
    136      <%=statshelper.getCurrentStatDescription()%></td></tr><%
     129%>   <td align="center"><% if (statshelper.getCurrentCanBeGraphed()) { %><input type="checkbox" class="optbox <%=statshelper.getCurrentGroupName()%>" id="<%=statshelper.getCurrentStatName()%>" name="graphList" value="<%=statshelper.getCurrentGraphName()%>" <%
     130       if (statshelper.getCurrentIsGraphed()) { %>checked="checked" <% } %> ><% } %></td> <% // no whitespace here so we can use td:empty to remove css pointer from inert labels %>
     131     <td align="left"><label for="<%=statshelper.getCurrentStatName()%>"><b><%=statshelper.getCurrentStatName()%>:</b>&nbsp;
     132     <%=statshelper.getCurrentStatDescription()%></label></td></tr><%
    137133    } // end iterating over all stats
    138134
     
    140136
    141137%> <tr><td colspan="3"></td></tr>
    142  <tr><td align="center"><input type="checkbox" class="optbox" name="explicitFilter" ></td>
    143      <td colspan="2"><%=intl._t("Advanced filter")%>:
    144      <input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" ></td></tr>
     138 <tr><td align="center"><label><input type="checkbox" class="optbox" name="explicitFilter" ></td>
     139     <td colspan="2"><%=intl._t("Advanced filter")%>:</label>
     140<input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" ></td></tr>
    145141<%
    146142
  • apps/routerconsole/jsp/configupdate.jsp

    r4866136 r6b056ce  
    2929      <h3 class="tabletitle"><%=intl._t("Check for I2P and News Updates")%></h3>
    3030      <table id="i2pupdates" class="configtable" border="0" cellspacing="5">
    31       <tr><td class="mediumtags" align="right"><b><%=intl._t("News &amp; I2P Updates")%>:</b></td>
     31      <tr><td align="right"><b><%=intl._t("News &amp; I2P Updates")%>:</b></td>
    3232     <% } else { %>
    3333      <h3><%=intl._t("Check for news updates")%></h3>
    3434      <table id="i2pupdates" class="configtable" border="0" cellspacing="5">
    3535        <tr><td colspan="2"></tr>
    36         <tr><td class="mediumtags" align="right"><b><%=intl._t("News Updates")%>:</b></td>
     36        <tr><td align="right"><b><%=intl._t("News Updates")%>:</b></td>
    3737     <% }   // if canInstall %>
    3838          <td> <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> <i><%=intl._t("Update In Progress")%></i><br> <% } else { %> <input type="submit" name="action" class="check" value="<%=intl._t("Check for updates")%>" />
    3939            <% } %></td></tr>
    40         <tr><td class="mediumtags" align="right"><b><%=intl._t("News URL")%>:</b></td>
     40        <tr><td align="right"><b><%=intl._t("News URL")%>:</b></td>
    4141          <td><input type="text" size="60" name="newsURL" <% if (!updatehelper.isAdvanced()) { %>readonly="readonly"<% } %> value="<jsp:getProperty name="updatehelper" property="newsURL" />"></td>
    42         </tr><tr><td class="mediumtags" align="right"><b><%=intl._t("Refresh frequency")%>:</b>
     42        </tr><tr><td align="right"><b><%=intl._t("Refresh frequency")%>:</b>
    4343          <td><jsp:getProperty name="updatehelper" property="refreshFrequencySelectBox" /></td></tr>
    4444    <% if (updatehelper.canInstall()) { %>
    45         <tr><td class="mediumtags" align="right"><b><%=formhandler._t("Update policy")%>:</b></td>
     45        <tr><td align="right"><b><%=formhandler._t("Update policy")%>:</b></td>
    4646          <td><jsp:getProperty name="updatehelper" property="updatePolicySelectBox" /></td></tr>
    4747    <% }   // if canInstall %>
    48         <tr><td class="mediumtags" align="right"><b><%=intl._t("Fetch news through the eepProxy?")%></b></td>
     48        <tr><td align="right"><label for="newsThroughProxy"><b><%=intl._t("Fetch news through the eepProxy?")%></b></label></td>
    4949          <td><jsp:getProperty name="updatehelper" property="newsThroughProxy" /></td></tr>
    50         <tr><td class="mediumtags" align="right"><b><%=intl._t("Update through the eepProxy?")%></b></td>
     50        <tr><td align="right"><b><label for="updateThroughProxy"><%=intl._t("Update through the eepProxy?")%></b></label></td>
    5151          <td><jsp:getProperty name="updatehelper" property="updateThroughProxy" /></td></tr>
    5252      <% if (updatehelper.isAdvanced()) { %>
    53         <tr><td class="mediumtags" align="right"><b><%=intl._t("eepProxy host")%>:</b></td>
     53        <tr><td align="right"><b><%=intl._t("eepProxy host")%>:</b></td>
    5454          <td><input type="text" size="10" name="proxyHost" value="<jsp:getProperty name="updatehelper" property="proxyHost" />" /></td>
    55         </tr><tr><td class="mediumtags" align="right"><b><%=intl._t("eepProxy port")%>:</b></td>
     55        </tr><tr><td align="right"><b><%=intl._t("eepProxy port")%>:</b></td>
    5656          <td><input type="text" size="10" name="proxyPort" value="<jsp:getProperty name="updatehelper" property="proxyPort" />" /></td></tr>
    5757      <% }   // if isAdvanced %>
    5858    <% if (updatehelper.canInstall()) { %>
    5959      <% if (updatehelper.isAdvanced()) { %>
    60         <tr><td class="mediumtags" align="right"><b><%=intl._t("Update URLs")%>:</b></td>
     60        <tr><td align="right"><b><%=intl._t("Update URLs")%>:</b></td>
    6161          <td><textarea cols="60" rows="6" name="updateURL" wrap="off" spellcheck="false"><jsp:getProperty name="updatehelper" property="updateURL" /></textarea></td>
    62         </tr><tr><td class="mediumtags" align="right"><b><%=intl._t("Trusted keys")%>:</b></td>
     62        </tr><tr><td align="right"><b><%=intl._t("Trusted keys")%>:</b></td>
    6363          <td><textarea cols="60" rows="6" name="trustedKeys" wrap="off" spellcheck="false"><jsp:getProperty name="updatehelper" property="trustedKeys" /></textarea></td></tr>
    64         <tr><td id="devSU3build" class="mediumtags" align="right"><b><%=intl._t("Update with signed development builds?")%></b></td>
     64        <tr><td id="devSU3build" align="right"><b><label for="updateDevSU3"><%=intl._t("Update with signed development builds?")%></b></label></td>
    6565          <td><jsp:getProperty name="updatehelper" property="updateDevSU3" /></td>
    66         </tr><tr><td class="mediumtags" align="right"><b><%=intl._t("Signed Build URL")%>:</b></td>
     66        </tr><tr><td align="right"><b><%=intl._t("Signed Build URL")%>:</b></td>
    6767          <td><input type="text" size="60" name="devSU3URL" value="<jsp:getProperty name="updatehelper" property="devSU3URL" />"></td></tr>
    68         <tr><td id="unsignedbuild" class="mediumtags" align="right"><b><%=intl._t("Update with unsigned development builds?")%></b></td>
     68        <tr><td id="unsignedbuild" align="right"><b><label for="updateUnsigned"><%=intl._t("Update with unsigned development builds?")%></b></label></td>
    6969          <td><jsp:getProperty name="updatehelper" property="updateUnsigned" /></td>
    70         </tr><tr><td class="mediumtags" align="right"><b><%=intl._t("Unsigned Build URL")%>:</b></td>
     70        </tr><tr><td align="right"><b><%=intl._t("Unsigned Build URL")%>:</b></td>
    7171          <td><input type="text" size="60" name="zipURL" value="<jsp:getProperty name="updatehelper" property="zipURL" />"></td></tr>
    7272      <% }   // if isAdvanced %>
    7373    <% } else { %>
    74         <tr><td class="mediumtags" align="center" colspan="2"><b><%=intl._t("Updates will be dispatched via your package manager.")%></b></td></tr>
     74        <tr><td align="center" colspan="2"><b><%=intl._t("Updates will be dispatched via your package manager.")%></b></td></tr>
    7575    <% }   // if canInstall %>
    7676        <tr class="tablefooter"><td colspan="2" class="optionsave">
  • apps/routerconsole/jsp/home.jsp

    r4866136 r6b056ce  
    9595<% }  // shouldShowWelcome %>
    9696
    97 <div class="home" id="home">
     97<div id="homepanel">
    9898<%
    9999   if (homehelper.shouldShowSearch()) {
  • apps/routerconsole/jsp/news.jsp

    r4866136 r6b056ce  
    1515<jsp:setProperty name="feedHelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
    1616<% feedHelper.setLimit(0); %>
    17 <div class="fixme" id="fixme">
     17<div id="newspage">
    1818<jsp:getProperty name="feedHelper" property="entries" />
    1919</div></div></body></html>
  • apps/susidns/src/jsp/details.jsp

    r4866136 r6b056ce  
    163163</div>
    164164<div id="visualid">
    165 <h3><%=intl._t("Visual Identification for")%> <%=addr.getName()%></h3>
     165<h3><%=intl._t("Visual Identification for")%> <span id="idAddress"><%=addr.getName()%></span></h3>
    166166<table>
    167167<tr>
  • apps/susimail/src/src/i2p/susi/webmail/WebMail.java

    r4866136 r6b056ce  
    21772177                                "<tr><td align=\"right\">" + _t("Cc") + ":</td><td align=\"left\"><input type=\"text\" size=\"80\" name=\"" + NEW_CC + "\" value=\"" + quoteHTML(cc) + "\"></td></tr>\n" +
    21782178                                "<tr><td align=\"right\">" + _t("Bcc") + ":</td><td align=\"left\"><input type=\"text\" size=\"80\" name=\"" + NEW_BCC + "\" value=\"" + quoteHTML(bcc) + "\"></td></tr>\n" +
    2179                                 "<tr><td align=\"right\">" + _t("Bcc to self") + ": </td><td align=\"left\"><input type=\"checkbox\" class=\"optbox\" name=\"" + NEW_BCC_TO_SELF + "\" value=\"1\" " + (sessionObject.bccToSelf ? "checked" : "" ) + "></td></tr>\n" +
     2179                                "<tr><td align=\"right\"><label for=\"bcctoself\">" + _t("Bcc to self") + ":</label></td><td align=\"left\"><input type=\"checkbox\" class=\"optbox\" id=\"bcctoself\" name=\"" + NEW_BCC_TO_SELF + "\" value=\"1\" " + (sessionObject.bccToSelf ? "checked" : "" ) + "></td></tr>\n" +
    21802180                                "<tr><td align=\"right\">" + _t("Subject") + ":</td><td align=\"left\"><input type=\"text\" size=\"80\" name=\"" + NEW_SUBJECT + "\" value=\"" + quoteHTML(subject) + "\"></td></tr>\n" +
    21812181                                "<tr><td></td><td align=\"left\"><textarea cols=\"" + Config.getProperty( CONFIG_COMPOSER_COLS, 80 )+ "\" rows=\"" + Config.getProperty( CONFIG_COMPOSER_ROWS, 10 )+ "\" name=\"" + NEW_TEXT + "\">" + text + "</textarea></td></tr>" +
     
    24582458                else
    24592459                        sz = Config.getProperty(Folder.PAGESIZE, Folder.DEFAULT_PAGESIZE);
    2460                 out.println("<div class=\"topbuttons\">");
     2460                out.println("<div class=\"topbuttons\"><b>");
    24612461                out.println(
    2462                         _t("Folder Page Size") + ":&nbsp;<input type=\"text\" style=\"text-align: right;\" name=\"" + PAGESIZE +
     2462                        _t("Folder Page Size") + ":</b>&nbsp;<input type=\"text\" style=\"text-align: right;\" name=\"" + PAGESIZE +
    24632463                        "\" size=\"4\" value=\"" +  sz + "\">" +
    24642464                        "&nbsp;" +
  • router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java

    r4866136 r6b056ce  
    13691369        }
    13701370        buf.append(".</h3>\n" +
    1371                    "<table id=\"ntcpconnections\">\n" +
     1371                   "<div class=\"widescroll\"><table id=\"ntcpconnections\">\n" +
    13721372                   "<tr><th><a href=\"#def.peer\">").append(_t("Peer")).append("</a></th>" +
    13731373                   "<th>").append(_t("Dir")).append("</th>" +
     
    13801380                   "<th align=\"right\"><a href=\"#def.recv\">").append(_t("RX")).append("</a></th>" +
    13811381                   "<th>").append(_t("Out Queue")).append("</th>" +
    1382                    "<th>").append(_t("Backlogged?")).append("</th>" +
     1382                   "<th title=\"").append(_t("Is peer backlogged?")).append("\">").append(_t("Backlogged?")).append("</th>" +
    13831383                   //"<th>").append(_t("Reading?")).append("</th>" +
    13841384                   " </tr>\n");
     
    13981398            buf.append("</td><td class=\"cells\" align=\"center\">");
    13991399            if (con.isIPv6())
    1400                 buf.append("&#x2713;");
     1400                buf.append("<span class=\"backlogged\">&#x2714;</span>");
    14011401            else
    14021402                buf.append("&nbsp;");
     
    14331433            buf.append("</td><td class=\"cells\" align=\"center\">");
    14341434            if (con.isBacklogged())
    1435                 buf.append("&#x2713;");
     1435                buf.append("<span class=\"backlogged\">&#x2714;</span>");
    14361436            else
    14371437                buf.append("&nbsp;");
     
    14581458        }
    14591459
    1460         buf.append("</table>\n");
     1460        buf.append("</table></div>\n");
    14611461        out.write(buf.toString());
    14621462        buf.setLength(0);
Note: See TracChangeset for help on using the changeset viewer.