Changeset 819efc1


Ignore:
Timestamp:
Jul 17, 2009 5:33:35 PM (12 years ago)
Author:
z3d <z3d@…>
Branches:
master
Children:
d6fccc07
Parents:
efd6dcc (diff), 8ffdae4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '4e512b2f1429925fa1e4151b3a78ab25a74fce03'

and 'dea62f5479c0cfbb6bde3b6de73cf71b38e22304'

Files:
16 edited

Legend:

Unmodified
Added
Removed

  • apps/i2ptunnel/jsp/index.jsp

    refd6dcc r819efc1  
    2121            <div id="pageHeader">
    2222    </div>
    23    
     23
    2424    <div id="statusMessagePanel" class="panel">
    2525        <div class="header">
    … …  
    3131        </div>
    3232
    33         <textarea id="statusMessages" rows="3" cols="60" readonly="readonly"><jsp:getProperty name="indexBean" property="messages" /></textarea>
     33        <textarea id="statusMessages" rows="4" cols="60" readonly="readonly"><jsp:getProperty name="indexBean" property="messages" /></textarea>
    3434
    3535        <div class="separator">
    … …  
    4444    </div>
    4545
     46    <div id="globalOperationsPanel" class="panel">
     47        <div class="header"></div>
     48        <div class="footer">
     49            <div class="toolbox">
     50                <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Stop%20all">Stop All</a> <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Start%20all">Start All</a> <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Restart%20all">Restart All</a> <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Reload%20configuration">Reload Config</a>
     51            </div>
     52        </div>
     53    </div>
     54
     55
     56
     57    <div id="localServerTunnelList" class="panel">
     58        <div class="header">
     59           
     60    <h4>I2P Server Tunnels</h4>
     61        </div>
     62
     63       
     64  <div class="separator"> </div>
     65
     66        <div class="nameHeaderField rowItem">
     67            <label>Name:</label>
     68        </div>
     69        <div class="previewHeaderField rowItem">
     70            <label>Points at:</label>
     71        </div>
     72        <div class="targetHeaderField rowItem">
     73            <label>Preview:</label>
     74        </div>
     75        <div class="statusHeaderField rowItem">
     76            <label>Status:</label>
     77       </div>
     78       
     79        <%
     80        for (int curServer = 0; curServer < indexBean.getTunnelCount(); curServer++) {
     81            if (indexBean.isClient(curServer)) continue;
     82           
     83      %>
     84        <div class="nameField rowItem">
     85            <label>Name:</label>
     86            <span class="text"><a href="edit.jsp?tunnel=<%=curServer%>" title="Edit Server Tunnel Settings for <%=indexBean.getTunnelName(curServer)%>"><%=indexBean.getTunnelName(curServer)%></a></span>
     87        </div>
     88        <div class="previewField rowItem">
     89            <label>Points at:</label>
     90            <span class="text">
     91        <%
     92            if ("httpserver".equals(indexBean.getInternalType(curServer))) {
     93          %>
     94            <a href="http://<%=indexBean.getServerTarget(curServer)%>/" title="Test HTTP server, bypassing I2P"><%=indexBean.getServerTarget(curServer)%></a>
     95        <%
     96            } else {
     97          %><%=indexBean.getServerTarget(curServer)%>
     98        <%
     99            }
     100          %></span>
     101        </div>
     102        <div class="targetField rowItem">
     103            <%
     104            if ("httpserver".equals(indexBean.getInternalType(curServer)) && indexBean.getTunnelStatus(curServer) == IndexBean.RUNNING) {
     105          %><label>Preview:</label>   
     106            <a class="control" title="Test HTTP server through I2P" href="http://<%=indexBean.getDestHashBase32(curServer)%>.b32.i2p">Preview</a>     
     107            <%
     108            } else if (indexBean.getTunnelStatus(curServer) == IndexBean.RUNNING) {
     109          %><span class="text">Base32 Address:<br><%=indexBean.getDestHashBase32(curServer)%>.b32.i2p</span>
     110        <%
     111            } else {
     112          %><span class="comment">No Preview</span>
     113        <%
     114            }
     115      %></div>
     116        <div class="statusField rowItem">
     117            <label>Status:</label>
     118            <%
     119            switch (indexBean.getTunnelStatus(curServer)) {
     120                case IndexBean.STARTING:
     121          %><div class="separator"></div>
     122                  <div class="statusStarting text">Starting...</div>   
     123            <a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curServer%>">Stop</a>
     124        <%
     125                break;
     126                case IndexBean.RUNNING:
     127          %><div class="statusRunning text">Running</div>   
     128            <a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curServer%>">Stop</a>
     129        <%
     130                break;
     131                case IndexBean.NOT_RUNNING:
     132          %><div class="statusNotRunning text">Stopped</div>   
     133            <a class="control" title="Start this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=start&amp;tunnel=<%=curServer%>">Start</a>
     134        <%
     135                break;
     136            }
     137      %></div>
     138
     139        <div class="descriptionField rowItem">
     140            <label>Description:</label>
     141            <div class="text"><%=indexBean.getTunnelDescription(curServer)%></div>
     142        </div>
     143
     144        <div class="subdivider">
     145            <hr />
     146        </div>
     147        <%
     148        }
     149      %>
     150        <div class="separator">
     151            <hr />
     152        </div>
     153           
     154        <div class="footer">
     155            <form id="addNewServerTunnelForm" action="edit.jsp">
     156            <div class="toolbox">
     157                   
     158        <label>New server tunnel:</label>
     159                    <select name="type">
     160                        <option value="server">Standard</option>
     161                        <option value="httpserver">HTTP</option>
     162                        <option value="ircserver">IRC</option>
     163                        <option value="streamrserver">Streamr</option>
     164                    </select>
     165                    <input class="control" type="submit" value="Create" />
     166                </div>
     167            </form>
     168        </div>
     169    </div>   
     170
     171
    46172    <div id="localClientTunnelList" class="panel">
    47173        <div class="header">
    48             <h4>Local Client Tunnels</h4>
    49         </div>
    50 
    51         <div class="separator">
    52             <hr />
    53         </div>
     174           
     175    <h4>I2P Client Tunnels</h4>
     176        </div>
     177
     178       
     179  <div class="separator"> </div>
    54180       
    55181        <div class="nameHeaderField rowItem">
    … …  
    70196
    71197        <div class="separator">
    72             <hr />
    73198        </div>
    74199        <%
    … …  
    78203        <div class="nameField rowItem">
    79204            <label>Name:</label>
    80             <span class="text"><a href="edit.jsp?tunnel=<%=curClient%>" title="Edit Tunnel Settings for <%=indexBean.getTunnelName(curClient)%>"><%=indexBean.getTunnelName(curClient)%> (Edit)</a></span>
     205            <span class="text"><a href="edit.jsp?tunnel=<%=curClient%>" title="Edit Tunnel Settings for <%=indexBean.getTunnelName(curClient)%>"><%=indexBean.getTunnelName(curClient)%></a></span>
    81206        </div>
    82207        <div class="portField rowItem">
    … …  
    97222            switch (indexBean.getTunnelStatus(curClient)) {
    98223                case IndexBean.STARTING:
    99           %><div class="statusStarting text">Starting...</div>
     224          %><div class="statusStarting text">Starting...</div> <div class="separator></div>
    100225            <a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curClient%>">Stop</a>
    101226        <%
    … …  
    150275            <form id="addNewClientTunnelForm" action="edit.jsp">
    151276                <div class="toolbox">
    152                     <label>Add new client tunnel:</label>
     277                   
     278        <label>New client tunnel:</label>
    153279                    <select name="type">
    154280                        <option value="client">Standard</option>
    … …  
    164290        </div>
    165291    </div>
    166 
    167     <div id="localServerTunnelList" class="panel">
    168         <div class="header">
    169             <h4>Local Server Tunnels</h4>
    170         </div>
    171 
    172         <div class="separator">
    173             <hr />
    174         </div>
    175 
    176         <div class="nameHeaderField rowItem">
    177             <label>Name:</label>
    178         </div>
    179         <div class="previewHeaderField rowItem">
    180             <label>Points at:</label>
    181         </div>
    182         <div class="targetHeaderField rowItem">
    183             <label>Preview:</label>
    184         </div>
    185         <div class="statusHeaderField rowItem">
    186             <label>Status:</label>
    187         </div>
    188        
    189         <%
    190         for (int curServer = 0; curServer < indexBean.getTunnelCount(); curServer++) {
    191             if (indexBean.isClient(curServer)) continue;
    192            
    193       %>
    194         <div class="nameField rowItem">
    195             <label>Name:</label>
    196             <span class="text"><a href="edit.jsp?tunnel=<%=curServer%>" title="Edit Server Tunnel Settings for <%=indexBean.getTunnelName(curServer)%>"><%=indexBean.getTunnelName(curServer)%> (Edit)</a></span>
    197         </div>
    198         <div class="previewField rowItem">
    199             <label>Points at:</label>
    200             <span class="text">
    201         <%
    202             if ("httpserver".equals(indexBean.getInternalType(curServer))) {
    203           %>
    204             <a href="http://<%=indexBean.getServerTarget(curServer)%>/" title="Test HTTP server, bypassing I2P"><%=indexBean.getServerTarget(curServer)%></a>
    205         <%
    206             } else {
    207           %><%=indexBean.getServerTarget(curServer)%>
    208         <%
    209             }
    210           %></span>
    211         </div>
    212         <div class="targetField rowItem">
    213             <%
    214             if ("httpserver".equals(indexBean.getInternalType(curServer)) && indexBean.getTunnelStatus(curServer) == IndexBean.RUNNING) {
    215           %><label>Preview:</label>   
    216             <a class="control" title="Test HTTP server through I2P" href="http://<%=indexBean.getDestHashBase32(curServer)%>.b32.i2p">Preview</a>     
    217             <%
    218             } else if (indexBean.getTunnelStatus(curServer) == IndexBean.RUNNING) {
    219           %><span class="text">Base32 Address:<br><%=indexBean.getDestHashBase32(curServer)%>.b32.i2p</span>
    220         <%
    221             } else {
    222           %><span class="comment">No Preview</span>
    223         <%
    224             }
    225       %></div>
    226         <div class="statusField rowItem">
    227             <label>Status:</label>
    228             <%
    229             switch (indexBean.getTunnelStatus(curServer)) {
    230                 case IndexBean.STARTING:
    231           %><div class="statusStarting text">Starting...</div>   
    232             <a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curServer%>">Stop</a>
    233         <%
    234                 break;
    235                 case IndexBean.RUNNING:
    236           %><div class="statusRunning text">Running</div>   
    237             <a class="control" title="Stop this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=stop&amp;tunnel=<%=curServer%>">Stop</a>
    238         <%
    239                 break;
    240                 case IndexBean.NOT_RUNNING:
    241           %><div class="statusNotRunning text">Stopped</div>   
    242             <a class="control" title="Start this Tunnel" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=start&amp;tunnel=<%=curServer%>">Start</a>
    243         <%
    244                 break;
    245             }
    246       %></div>
    247 
    248         <div class="descriptionField rowItem">
    249             <label>Description:</label>
    250             <div class="text"><%=indexBean.getTunnelDescription(curServer)%></div>
    251         </div>
    252 
    253         <div class="subdivider">
    254             <hr />
    255         </div>
    256         <%
    257         }
    258       %>
    259         <div class="separator">
    260             <hr />
    261         </div>
    262            
    263         <div class="footer">
    264             <form id="addNewServerTunnelForm" action="edit.jsp">
    265             <div class="toolbox">
    266                     <label>Add new server tunnel:</label>
    267                     <select name="type">
    268                         <option value="server">Standard</option>
    269                         <option value="httpserver">HTTP</option>
    270                         <option value="ircserver">IRC</option>
    271                         <option value="streamrserver">Streamr</option>
    272                     </select>
    273                     <input class="control" type="submit" value="Create" />
    274                 </div>
    275             </form>
    276         </div>
    277     </div>
    278 
    279     <div id="globalOperationsPanel" class="panel">
    280         <div class="header"></div>
    281         <div class="footer">
    282             <div class="toolbox">
    283                 <a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Stop%20all">Stop All</a><a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Start%20all">Start All</a><a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Restart%20all">Restart All</a><a class="control" href="index.jsp?nonce=<%=indexBean.getNextNonce()%>&amp;action=Reload%20configuration">Reload Config</a>
    284             </div>
    285         </div>
    286     </div>
    287    
    288292    <div id="pageFooter">
    289293    </div>
     294        </div>
    290295</body>
    291296</html>

  • apps/routerconsole/jsp/config.jsp

    refd6dcc r819efc1  
    1919 <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    2020 <jsp:getProperty name="formhandler" property="allMessages" />
    21 
     21<div class="configure">
    2222 <form action="config.jsp" method="POST">
    2323 <% String prev = System.getProperty("net.i2p.router.web.ConfigNetHandler.nonce");
    … …  
    3030 <b>I2P will work best if you configure your rates to match the speed of your internet connection.</b>
    3131 </p>
    32 <div class="configure" id="configure">
    3332<p>
    3433    <table>
    … …  
    6766 <input type="submit" name="save" value="Save changes" /> <input type="reset" value="Cancel" /><br />
    6867 </p>
    69 </div>
    7068<!--
    7169 <b>Enable load testing: </b>
    … …  
    8280 <b>The default settings will work for most people. There is <a href="#chelp">help below</a>.</b>
    8381 </p><p>
    84  <div class="configure">
    8582 <b>UPnP Configuration:</b><br />
    8683    <input type="checkbox" name="upnp" value="true" <jsp:getProperty name="nethelper" property="upnpChecked" /> />
    … …  
    166163    for example where UPnP does not work correctly, or a firewall not under your control is doing
    167164    harm. Certain firewalls such as symmetric NATs may not work well with I2P.
    168  </p></div>
     165 </p>
    169166<!-- let's keep this simple...
    170167<input type="submit" name="recheckReachability" value="Check network reachability..." />
    … …  
    249246 </ul>
    250247 </p>
    251 </div>
    252248 <hr />
    253 <!--
     249      <!--
    254250 <b>Dynamic Router Keys: </b>
    255251 <input type="checkbox" name="dynamicKeys" value="true" <jsp:getProperty name="nethelper" property="dynamicKeysChecked" /> /><br />
    … …  
    270266 <hr />
    271267-->
    272  </form>
     268    </form>
    273269</div>
    274 
     270</div>
    275271</body>
    276272</html>

  • apps/routerconsole/jsp/configadvanced.jsp

    refd6dcc r819efc1  
    2222 <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    2323 <jsp:getProperty name="formhandler" property="allMessages" />
    24  
     24 <div class="configure">
    2525 <form action="configadvanced.jsp" method="POST">
    2626 <% String prev = System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce");
    … …  
    2929 <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce")%>" />
    3030 <input type="hidden" name="action" value="blah" />
    31  <textarea rows="32" cols="100" name="config" wrap="off"><jsp:getProperty name="advancedhelper" property="settings" /></textarea><br />
    32 <p>
    33  <input type="submit" name="shouldsave" value="Apply" /> <input type="reset" value="Cancel" />
    34 </p><p>
     31 <textarea rows="32" cols="60" name="config" wrap="off"><jsp:getProperty name="advancedhelper" property="settings" /></textarea><br /><hr>
     32      <p align="right">
     33        <input type="submit" name="shouldsave" value="Apply" />
     34        <input type="reset" value="Cancel" />
     35      </p>
     36      <p>
    3537 NOTE: Some changes may require a restart to take effect.
    3638</p>
    3739 </form>
    3840</div>
     41</div>
    3942</body>
    4043</html>

  • apps/routerconsole/jsp/configclients.jsp

    refd6dcc r819efc1  
    2727 <jsp:setProperty name="formhandler" property="settings" value="<%=request.getParameterMap()%>" />
    2828 <jsp:getProperty name="formhandler" property="allMessages" />
    29  
     29 <div class="configure">
    3030 <form action="configclients.jsp" method="POST">
    3131 <% String prev = System.getProperty("net.i2p.router.web.ConfigClientsHandler.nonce");
    … …  
    5757 </p><p>
    5858 <jsp:getProperty name="clientshelper" property="form2" />
    59  </p><p>
     59 </p><p><hr>
    6060 <input type="submit" name="action" value="Save WebApp Configuration" />
    61  </p><p>
     61 </p><hr><p>
    6262 <i>All changes require restart to take effect. To change other webapp options, edit the webapps.config file.</i>
    6363 </p>
    6464 </form>
    6565</div>
    66 
     66</div>
    6767</body>
    6868</html>

  • apps/routerconsole/jsp/configkeyring.jsp

    refd6dcc r819efc1  
    2222 <jsp:useBean class="net.i2p.router.web.ConfigKeyringHelper" id="keyringhelper" scope="request" />
    2323 <jsp:setProperty name="keyringhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    24 
     24<div class="configure">
    2525 <p>
    2626 <h2>Keyring</h2>
    … …  
    4141 Keys for local destinations must be entered on the <a href="i2ptunnel/index.jsp">I2PTunnel page</a>.
    4242 <p>
    43  <table>
    44  <tr><td>Dest. name, hash, or full key:
    45  <td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off"></textarea>
    46  <tr><td align="right">Session Key:
    47  <td><input type="text" size="55" name="key" />
    48  <tr><td><td><input type="submit" name="action" value="Add key" />
    49  </table>
     43      <table>
     44        <tr>
     45          <td>Dest. name, hash, or full key:
     46          <td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off"></textarea>
     47        <tr>
     48          <td align="right">Session Key:
     49          <td><input type="text" size="55" name="key" />
     50        <tr>
     51          <td>
     52          <td><div align="right">
     53              <input type="submit" name="action" value="Add key" />
     54            </div>
     55      </table>
    5056 </form>
    5157
    5258
    5359</div>
    54 
     60</div>
    5561</body>
    5662</html>

  • apps/routerconsole/jsp/configlogging.jsp

    refd6dcc r819efc1  
    1919 <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    2020 <jsp:getProperty name="formhandler" property="allMessages" />
    21  
     21<div class="configure"> 
    2222 <form action="configlogging.jsp" method="POST">
    2323 <% String prev = System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce");
    … …  
    2626 <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigLoggingHandler.nonce")%>" />
    2727 <input type="hidden" name="action" value="blah" />
    28  <table border="0" cellspacing="5">
    29  <tr><td valign="top"><b>Logging filename:</b>
    30  <td><input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" /><br />
    31  <i>(the symbol '@' will be replaced during log rotation)</i>
    32  <tr><td valign="top"><b>Log record format:</b>
    33  <td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" /><br />
    34  <i>(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)</i>
    35  <tr><td valign="top"><b>Log date format:</b>
    36  <td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" /><br />
    37  <i>('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)</i>
    38  <tr><td valign="top"><b>Max log file size:</b>
    39  <td><input type="text" name="logfilesize" size="4" value="<jsp:getProperty name="logginghelper" property="maxFileSize" />" /><br />
    40  <tr><td valign="top"><b>Default log level:</b>
    41  <td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" />
    42  <br /><i>(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)</i>
    43  <tr><td valign="top"><b>Log level overrides:</b>
    44  <td><jsp:getProperty name="logginghelper" property="logLevelTable" />
    45  <tr><td><td>
    46  <input type="submit" name="shouldsave" value="Save changes" />
    47  <input type="reset" value="Cancel" />
    48  </table>
     28      <table border="0" cellspacing="5">
     29        <tr>
     30          <td valign="top"><b>Logging filename:</b>
     31          <td><input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" />
     32            <br /> <i>(the symbol '@' will be replaced during log rotation)</i>
     33        <tr>
     34          <td valign="top"><b>Log record format:</b>
     35          <td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" />
     36            <br /> <i>(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority,
     37            'm' = message)</i>
     38        <tr>
     39          <td valign="top"><b>Log date format:</b>
     40          <td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" />
     41            <br /> <i>('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss'
     42            = second, 'SSS' = millisecond)</i>
     43        <tr>
     44          <td valign="top"><b>Max log file size:</b>
     45          <td><input type="text" name="logfilesize" size="4" value="<jsp:getProperty name="logginghelper" property="maxFileSize" />" />
     46            <br />
     47        <tr>
     48          <td valign="top"><b>Default log level:</b>
     49          <td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /> <br /> <i>(DEBUG and INFO are not recommended defaults,
     50            as they will drastically slow down your router)</i>
     51        <tr>
     52          <td valign="top"><b>Log level overrides:</b>
     53          <td><jsp:getProperty name="logginghelper" property="logLevelTable" />
     54        <tr>
     55          <td colspan="2" valign="top"><hr>
     56        <tr>
     57          <td>
     58          <td> <div align="right">
     59              <input type="submit" name="shouldsave" value="Save changes" />
     60              <input type="reset" value="Cancel" />
     61            </div>
     62      </table>
    4963 </form>
    5064</div>
    51 
     65</div>
    5266</body>
    5367</html>

  • apps/routerconsole/jsp/configpeer.jsp

    refd6dcc r819efc1  
    2727        peer = request.getParameter("peer");
    2828 %>
    29  
     29 <div class="configure">
    3030 <form action="configpeer.jsp" method="POST">
    3131 <% String prev = System.getProperty("net.i2p.router.web.ConfigPeerHandler.nonce");
    … …  
    3333    System.setProperty("net.i2p.router.web.ConfigPeerHandler.nonce", new java.util.Random().nextLong()+""); %>
    3434 <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigPeerHandler.nonce")%>" />
    35  <hr />
    36  <p>
     35<p>
    3736 <a name="sh"> </a>
    3837 <a name="unsh"> </a>
    … …  
    4241 <input type="text" size="55" name="peer" value="<%=peer%>" />
    4342 <h3>Manually Shitlist / Unshitlist a Router</h3>
    44  Shitlisting will prevent the participation of this peer in tunnels you create.
    45  <p>
    46  <input type="submit" name="action" value="Shitlist peer until restart" />
    47  <input type="submit" name="action" value="Unshitlist peer" />
    48  <% if (! "".equals(peer)) { %>
    49     <font color="blue">&lt;---- click to verify action</font>
    50  <% } %>
    51  </p>
    52 
     43 Shitlisting will prevent the participation of this peer in tunnels you create. 
     44      <p>
     45        <input type="submit" name="action" value="Shitlist peer until restart" />
     46        <input type="submit" name="action" value="Unshitlist peer" />
     47        <% if (! "".equals(peer)) { %>
     48        <font color="blue">&lt;---- click to verify action</font>
     49        <% } %>
     50      </p>
     51      <hr />
    5352 <h3>Adjust Profile Bonuses</h3>
    54  Bonuses may be positive or negative, and affect the peer's inclusion in Fast and High Capacity tiers.
    55  Fast peers are used for client tunnels, and High Capacity peers are used for some exploratory tunnels.
    56  Current bonuses are displayed on the <a href="profiles.jsp">profiles page</a>.
    57  <p>
     53 Bonuses may be positive or negative, and affect the peer's inclusion in Fast
     54      and High Capacity tiers. Fast peers are used for client tunnels, and High
     55      Capacity peers are used for some exploratory tunnels. Current bonuses are
     56      displayed on the <a href="profiles.jsp">profiles page</a>.
     57      <p>
    5858 <% long speed = 0; long capacity = 0;
    5959    if (! "".equals(peer)) {
    … …  
    7979
    8080</div>
    81 
     81</div>
    8282</body>
    8383</html>

  • apps/routerconsole/jsp/configservice.jsp

    refd6dcc r819efc1  
    1717 <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    1818 <jsp:getProperty name="formhandler" property="allMessages" />
    19  
     19 <div class="configure">
    2020 <form action="configservice.jsp" method="POST">
    2121 <% String prev = System.getProperty("net.i2p.router.web.ConfigServiceHandler.nonce");
    … …  
    2323    System.setProperty("net.i2p.router.web.ConfigServiceHandler.nonce", new java.util.Random().nextLong()+""); %>
    2424 <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigServiceHandler.nonce")%>" />
    25  <h4>Shutdown the router</h4>
     25 <h3>Shutdown the router</h3>
    2626 <p>Graceful shutdown lets the router satisfy the agreements it has already made
    2727 before shutting down, but may take a few minutes.  If you need to kill the
    … …  
    4545 <hr>
    4646 <% if ( (System.getProperty("os.name") != null) && (System.getProperty("os.name").startsWith("Win")) ) { %>
    47  <h4>Systray integration</h4>
     47 <h3>Systray integration</h3>
    4848 <p>On the windows platform, there is a small application to sit in the system
    4949 tray, allowing you to view the router's status (later on, I2P client applications
    … …  
    5353 <input type="submit" name="action" value="Hide systray icon" />
    5454 <hr>
    55  <h4>Run on startup</h4>
     55 <h3>Run on startup</h3>
    5656 <p>You can control whether I2P is run on startup or not by selecting one of the
    5757 following options - I2P will install (or remove) a service accordingly.  You can
    … …  
    6666
    6767 <% if (System.getProperty("wrapper.version") != null) { %>
    68  <h4>Debugging</h4>
     68 <h3>Debugging</h3>
    6969 <p>At times, it may be helpful to debug I2P by getting a thread dump.  To do so,
    7070 please select the following option and review the thread dumped to
    … …  
    7373 <% } %><hr>
    7474 
    75  <h4>Launch browser on router startup?</h4>
     75 <h3>Launch browser on router startup?</h3>
    7676 <p>I2P's main configuration interface is this web console, so for your convenience
    7777 I2P can launch a web browser pointing at
    … …  
    8282 </form><hr>
    8383</div>
    84 
     84</div>
    8585</body>
    8686</html>

  • apps/routerconsole/jsp/configstats.jsp

    refd6dcc r819efc1  
    6565 <jsp:useBean class="net.i2p.router.web.ConfigStatsHelper" id="statshelper" scope="request" />
    6666 <jsp:setProperty name="statshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    67  
     67 <div class="configure">
    6868 <form id="statsForm" name="statsForm" action="configstats.jsp" method="POST">
    6969 <% String prev = System.getProperty("net.i2p.router.web.ConfigStatsHandler.nonce");
    … …  
    7777 (change requires restart to take effect)<br />
    7878 Stat file: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" /><br />
    79  Filter: (<a href="javascript: void(null);" onclick="toggleAll('*')">toggle all</a>)<br />
     79 Filter: (<a href="javascript: void(null);" onclick="toggleAll('*')">toggle all</a>)<hr />
    8080 <table>
    8181 <% while (statshelper.hasMoreStats()) {
    … …  
    103103 <tr><td colspan="3"><hr /></td></tr>
    104104 <tr><td><input type="submit" name="shouldsave" value="Save changes" /> </td>
    105      <td><input type="reset" value="Cancel" /></td></tr>
    106  </form>
     105     <td><input type="reset" value="Cancel" /></td><td></td></tr></form>
    107106 </table>
    108107</div>
    109 
     108</div>
    110109</body>
    111110</html>

  • apps/routerconsole/jsp/configtunnels.jsp

    refd6dcc r819efc1  
    2323 <jsp:setProperty name="formhandler" property="settings" value="<%=request.getParameterMap()%>" />
    2424 <jsp:getProperty name="formhandler" property="allMessages" />
    25  
     25 <div class="configure">
    2626 <p><i>
    2727 NOTE: The default settings work for most people.
    … …  
    4646 </form>
    4747</div>
    48 
     48</div>
    4949</body>
    5050</html>

  • apps/routerconsole/jsp/configui.jsp

    refd6dcc r819efc1  
    2222 <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    2323 <jsp:getProperty name="formhandler" property="allMessages" />
    24  
     24<div class="configure">
    2525<h3>Router Console Theme</h3>
    26 <div class="configure">
    2726 <form action="configui.jsp" method="POST">
    2827 <% String prev = System.getProperty("net.i2p.router.web.ConfigUIHandler.nonce");

  • apps/routerconsole/jsp/configupdate.jsp

    refd6dcc r819efc1  
    2020 <jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="updatehelper" scope="request" />
    2121 <jsp:setProperty name="updatehelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    22  
    23  <br /><i><jsp:getProperty name="updatehelper" property="newsStatus" /></i><br />&nbsp;<br />
     22<div class="messages">
     23<i><jsp:getProperty name="updatehelper" property="newsStatus" /></i></div>
     24<div class="configure">
    2425 <form action="configupdate.jsp" method="POST">
    2526 <% String prev = System.getProperty("net.i2p.router.web.ConfigUpdateHandler.nonce");
    … …  
    2728    System.setProperty("net.i2p.router.web.ConfigUpdateHandler.nonce", new java.util.Random().nextLong()+""); %>
    2829 <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigUpdateHandler.nonce")%>" />
    29 <table border="0" cellspacing="5"><tr><td colspan="2"></tr><tr><td><b>News:</b></td><td>
    30  <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %>
    31  <i>Update In Progress</i><br />
    32  <% } else { %>
    33  <input type="submit" name="action" value="Check for update now" />
    34 <% } %></tr>
    35 <tr><td colspan="2"><hr /></td></tr>
    36 <tr><td><b>News URL:</b></td>
    37 <td><input type="text" size="60" name="newsURL" value="<jsp:getProperty name="updatehelper" property="newsURL" />"></td></tr>
    38 <tr><td><b>Refresh frequency:</b>
    39 <td><jsp:getProperty name="updatehelper" property="refreshFrequencySelectBox" />
    40 <tr><td><b>Update policy:</b>
    41 <td><jsp:getProperty name="updatehelper" property="updatePolicySelectBox" />
    42 <tr><td><b>Update through the eepProxy?</b>
    43 <td><jsp:getProperty name="updatehelper" property="updateThroughProxy" />
    44 <tr><td><b>eepProxy host:</b>
    45 <td><input type="text" size="10" name="proxyHost" value="<jsp:getProperty name="updatehelper" property="proxyHost" />" />
    46 <tr><td><b>eepProxy port:</b>
    47 <td><input type="text" size="4" name="proxyPort" value="<jsp:getProperty name="updatehelper" property="proxyPort" />" />
    48 <tr><td><b>Update URLs:</b>
    49 <td><textarea name="updateURL" wrap="off"><jsp:getProperty name="updatehelper" property="updateURL" /></textarea>
    50 <tr><td><b>Trusted keys:</b>
    51 <td><textarea name="trustedKeys" wrap="off"><jsp:getProperty name="updatehelper" property="trustedKeys" /></textarea>
    52 <tr><tr><td colspan="2"><hr /><tr>
    53 <tr><td><td><input type="submit" name="action" value="Save" /> <input type="reset" value="Cancel" />
    54 </table>
     30      <h3>Check for I2P and news updates</h3>
     31      <table border="0" cellspacing="5">
     32        <tr>
     33          <td colspan="2"></tr>
     34        <tr>
     35          <td><b>News:</b></td>
     36          <td> <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> <i>Update In Progress</i><br /> <% } else { %> <input type="submit" name="action" value="Check for update now" />
     37            <% } %></tr>
     38        <tr>
     39          <td colspan="2"><hr /></td>
     40        </tr>
     41        <tr>
     42          <td><b>News URL:</b></td>
     43          <td><input type="text" size="60" name="newsURL" value="<jsp:getProperty name="updatehelper" property="newsURL" />"></td>
     44        </tr>
     45        <tr>
     46          <td><b>Refresh frequency:</b>
     47          <td><jsp:getProperty name="updatehelper" property="refreshFrequencySelectBox" />
     48        <tr>
     49          <td><b>Update policy:</b>
     50          <td><jsp:getProperty name="updatehelper" property="updatePolicySelectBox" />
     51        <tr>
     52          <td><b>Update through the eepProxy?</b>
     53          <td><jsp:getProperty name="updatehelper" property="updateThroughProxy" />
     54        <tr>
     55          <td><b>eepProxy host:</b>
     56          <td><input type="text" size="10" name="proxyHost" value="<jsp:getProperty name="updatehelper" property="proxyHost" />" />
     57        <tr>
     58          <td><b>eepProxy port:</b>
     59          <td><input type="text" size="4" name="proxyPort" value="<jsp:getProperty name="updatehelper" property="proxyPort" />" />
     60        <tr>
     61          <td><b>Update URLs:</b>
     62          <td><textarea name="updateURL" wrap="off"><jsp:getProperty name="updatehelper" property="updateURL" /></textarea>
     63        <tr>
     64          <td><b>Trusted keys:</b>
     65          <td><textarea name="trustedKeys" wrap="off"><jsp:getProperty name="updatehelper" property="trustedKeys" /></textarea>
     66        <tr>
     67        <tr>
     68          <td colspan="2"><hr />
     69        <tr>
     70        <tr>
     71          <td>
     72          <td><div align="right">
     73              <input type="submit" name="action" value="Save" />
     74              <input type="reset" value="Cancel" />
     75            </div>
     76      </table>
    5577 </form>
     78</div>
    5679</div>
    5780</body>

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

    refd6dcc r819efc1  
    167167     border-radius: 4px;
    168168     border: 1px solid #99f;
     169     background: url(images/darkbluebg.png);
    169170}
    170171
    … …  
    341342
    342343h3 {
    343      border-bottom: 1px;
    344      border-bottom-style: solid;
    345      border-bottom-color: #99f;
    346      padding: 5px 0;
     344     border: 1px solid #99f;
     345     border-left: 5px solid #99f;
     346     padding: 3px 5px 3px 5px;
     347     margin: 20px 0 15px 0;
     348     border-radius: 0 4px 4px 0;
     349     -moz-border-radius: 0 4px 4px 0;
     350     -khtml-border-radius: 0 4px 4px 0;
     351     background: #004;
     352     background: url(images/darkbluebg.png);
    347353}
    348354

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

    refd6dcc r819efc1  
    167167     padding: 15px 10px !important;
    168168     margin: 10px 0px 25px 0;
    169      background: #ddf;
     169     background: #ddf url('images/lightbluetile.png');
    170170     -moz-border-radius: 4px;
    171171     -khtml-border-radius: 4px;

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

    refd6dcc r819efc1  
    3030     font-weight: normal;
    3131     text-align: right;
    32      font-size: 7pt;
     32     font-size: 8pt;
    3333     font-style: italic;
    3434     -moz-box-sizing: border-box;
    … …  
    123123     clear: both;
    124124     height: 1px;
    125      margin: 3px 0px 3px 0px;
     125     margin: 1px 0px 1px 0px;
    126126     border-bottom: 1px solid #225;
     127/*
     128     display: none;
     129*/
    127130}
    128131
    … …  
    151154
    152155.control {
    153      margin: 4px 0 0 0 !important;
     156     margin: 4px 0 0 4px !important;
    154157     padding: 2px;
    155158     overflow: hidden;
    … …  
    172175
    173176.control:active {
    174      border: 2px inset;
     177     border: 1px inset;
    175178     background-color: #003;
    176179     color: #ff6600;

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

    refd6dcc r819efc1  
    8484     padding: 0 0 0 4px;
    8585     margin: 1px 0 4px 0;
    86      background-color: #000088;
     86     background-color: #005;
    8787     color: #fff;
    88      font-family: "Lucida Console", "Andale Mono", "Courier New", Courier, mono;
    89      border: 1px inset #002;
     88     font-family: "Lucida Console", "DejaVu Sans Mono", "Andale Mono", "Courier New", Courier, mono;
     89     border: 2px inset #002;
     90     font-size: 10pt !important;
     91     font-weight: bold;
     92     text-align: justify !important;
     93     background: url(images/darkbluetile.png);
    9094}
    9195
Note: See TracChangeset for help on using the changeset viewer.