Changeset d682063


Ignore:
Timestamp:
Aug 1, 2009 1:15:12 AM (11 years ago)
Author:
z3d <z3d@…>
Branches:
master
Children:
1afd946
Parents:
95dd7446
Message:

Further enhancements to the configuration pages.

Files:
13 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/jsp/config.jsp

    r95dd7446 rd682063  
    6363    }
    6464 %>
    65  </p><p>
    66  <input type="submit" name="save" value="Save changes" /> <input type="reset" value="Cancel" /><br />
    67  </p>
    68 <!--
     65 </p><div class="formaction">
     66<input type="submit" name="save" value="Save changes" /> <input type="reset" value="Cancel" /></div>
     67 <!--
    6968 <b>Enable load testing: </b>
    7069<input type="checkbox" class="optbox" name="enableloadtesting" value="true" <jsp:getProperty name="nethelper" property="enableLoadTesting" /> />
     
    149148    <input name ="ntcpport" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="ntcpport" />" /><br />
    150149 </p><p><b>Note: Changing these settings will restart your router.</b>
    151  </p><hr>
     150 </p><hr><div class="formaction">
    152151 <input type="submit" name="save" value="Save changes" /> <input type="reset" value="Cancel" />
     152</div>
    153153</div>
    154154<h3><a name="chelp">Configuration Help:</a></h3>
  • apps/routerconsole/jsp/configadvanced.jsp

    r95dd7446 rd682063  
    3131 <h3>Advanced I2P Configuration</h3>
    3232 <textarea rows="32" cols="60" name="config" wrap="off"><jsp:getProperty name="advancedhelper" property="settings" /></textarea><br /><hr>
    33       <p align="right">
     33      <div class="formaction">
    3434        <input type="submit" name="shouldsave" value="Apply" />
    35         <input type="reset" value="Cancel" />
    36       </p>
    37       <p>
    38  NOTE: Some changes may require a restart to take effect.
    39 </p>
     35        <input type="reset" value="Cancel" /><br />
     36 <b>NOTE:</b> Some changes may require a restart to take effect.
     37      </div>
    4038 </form>
    4139</div>
  • apps/routerconsole/jsp/configclients.jsp

    r95dd7446 rd682063  
    4040 </p><p>
    4141 <i>All changes require restart to take effect. To change other client options, edit the clients.config file.</i>
    42  </p> <hr /><p>
     42 </p> <hr /><div class="formaction">
    4343 <input type="submit" name="action" value="Save Client Configuration" />
    44  </p>
    45 <hr />
     44</div>
    4645 <h3>WebApp Configuration</h3>
    4746 <p>
     
    5756 </p><p>
    5857 <jsp:getProperty name="clientshelper" property="form2" />
    59  </p><p><hr>
    60  <input type="submit" name="action" value="Save WebApp Configuration" />
    61  </p><hr><p>
     58 </p>
     59 <p>
    6260 <i>All changes require restart to take effect. To change other webapp options, edit the webapps.config file.</i>
    6361 </p>
     62 <hr><div class="formaction">
     63 <input type="submit" name="action" value="Save WebApp Configuration" />
     64 </div>
    6465 </form>
    6566</div>
  • apps/routerconsole/jsp/configpeer.jsp

    r95dd7446 rd682063  
    4242 <h3>Manually Shitlist / Unshitlist a Router</h3>
    4343 Shitlisting will prevent the participation of this peer in tunnels you create.
    44       <p>
     44      <hr />     
     45      <div class="formaction">
    4546        <input type="submit" name="action" value="Shitlist peer until restart" />
    4647        <input type="submit" name="action" value="Unshitlist peer" />
    4748        <% if (! "".equals(peer)) { %>
    48         <font color="blue">&lt;---- click to verify action</font>
     49        <!-- <font color="blue">&lt;---- click to verify action</font> -->
    4950        <% } %>
    50       </p>
    51       <hr />
     51      </div>
     52
    5253 <h3>Adjust Profile Bonuses</h3>
    5354 Bonuses may be positive or negative, and affect the peer's inclusion in Fast
     
    6061        // get existing bonus values?
    6162    }
    62  %>
     63 %>
     64 <hr />
    6365 Speed:
    6466 <input type="text" size="8" name="speed" value="<%=speed%>" />
     
    6971 </form>
    7072
    71  <hr />
    7273 <a name="shitlist"> </a>
    7374 <jsp:useBean class="net.i2p.router.web.ProfilesHelper" id="profilesHelper" scope="request" />
  • apps/routerconsole/jsp/configservice.jsp

    r95dd7446 rd682063  
    2727 before shutting down, but may take a few minutes.  If you need to kill the
    2828 router immediately, that option is available as well.</p>
    29  
     29  <hr><div class="formaction">
    3030 <input type="submit" name="action" value="Shutdown gracefully" />
    3131 <input type="submit" name="action" value="Shutdown immediately" />
    3232 <input type="submit" name="action" value="Cancel graceful shutdown" />
    33  <hr>
     33 </div>
    3434 <% if (System.getProperty("wrapper.version") != null) { %>
    3535 <p>If you want the router to restart itself after shutting down, you can choose one of
     
    3939 will appreciate your patience), while a hard restart does so immediately.  After tearing down
    4040 the router, it will wait 1 minute before starting back up again.</p>
    41  
     41 <hr><div class="formaction">
    4242 <input type="submit" name="action" value="Graceful restart" />
    4343 <input type="submit" name="action" value="Hard restart" />
    44  <% } %>
    45  <hr>
     44 <% } %></div>
     45
    4646 <% if ( (System.getProperty("os.name") != null) && (System.getProperty("os.name").startsWith("Win")) ) { %>
    4747 <h3>Systray integration</h3>
     
    5050 will be able to integrate their own functionality into the system tray as well).
    5151 If you are on windows, you can either enable or disable that icon here.</p>
     52 <hr><div class="formaction">
    5253 <input type="submit" name="action" value="Show systray icon" />
    5354 <input type="submit" name="action" value="Hide systray icon" />
    54  <hr>
     55</div>
    5556 <h3>Run on startup</h3>
    5657 <p>You can control whether I2P is run on startup or not by selecting one of the
     
    5859 also run the <code>install_i2p_service_winnt.bat</code> (or
    5960 <code>uninstall_i2p_service_winnt.bat</code>) from the command line, if you prefer.</p>
     61 <hr><div class="formaction">
    6062 <input type="submit" name="action" value="Run I2P on startup" />
    61  <input type="submit" name="action" value="Don't run I2P on startup" /><br />
     63<input type="submit" name="action" value="Don't run I2P on startup" /></div>
    6264 <p><b>Note:</b> If you are running I2P as service right now, removing it will shut
    6365 down your router immediately.  You may want to consider shutting down gracefully, as
    64  above, then running uninstall_i2p_service_winnt.bat.</p><hr>
     66 above, then running uninstall_i2p_service_winnt.bat.</p>
    6567 <% } %>
    6668
     
    7072 please select the following option and review the thread dumped to
    7173 <a href="logs.jsp#servicelogs">wrapper.log</a>.</p>
     74  <hr><div class="formaction">
    7275 <input type="submit" name="action" value="Dump threads" />
    73  <% } %><hr>
     76<% } %></div>
    7477 
    7578 <h3>Launch browser on router startup?</h3>
     
    7881 <a href="http://127.0.0.1:7657/index.jsp">http://127.0.0.1:7657/index.jsp</a> whenever
    7982 the router starts up.</p>
     83 <hr><div class="formaction">
    8084 <input type="submit" name="action" value="View console on startup" />
    8185 <input type="submit" name="action" value="Do not view console on startup" />
    82  </form><hr>
     86</form></div>
    8387</div>
    8488</div>
  • apps/routerconsole/jsp/configstats.jsp

    r95dd7446 rd682063  
    102102     <td colspan="2">Advanced filter:
    103103     <input type="text" name="explicitFilterValue" value="<%=statshelper.getExplicitFilter()%>" size="40" /></td></tr>
    104  <tr><td colspan="3"></td></tr>
    105  <tr class="tablefooter"><td><input type="submit" name="shouldsave" value="Save changes" /> </td>
    106      <td><input type="reset" value="Cancel" /></td><td></td></tr></form>
     104     <tr class="tablefooter"><td colspan="3" align="right"><input type="submit" name="shouldsave" value="Save changes" /><input type="reset" value="Cancel" /></td></tr></form>
    107105 </table>
    108106</div>
  • apps/routerconsole/jsp/configtunnels.jsp

    r95dd7446 rd682063  
    4343 <i>Client tunnel changes are temporary and are not saved.</i><br>
    4444 <i>To make permanent client tunnel changes see the </i><a href="i2ptunnel/index.jsp">i2ptunnel page</a>.<br>
    45  <hr /> <input type="submit" name="shouldsave" value="Save changes" /> <input type="reset" value="Cancel" />
     45 <hr /><div class="formaction><input type="submit" name="shouldsave" value="Save changes" /> <input type="reset" value="Cancel" /></div>
    4646 </form>
    4747</div>
  • apps/routerconsole/jsp/configui.jsp

    r95dd7446 rd682063  
    3535 <input type="hidden" name="action" value="blah" />
    3636 <jsp:getProperty name="uihelper" property="settings" />
    37 <hr>   
     37<hr><div class="formaction>     
    3838<input type="submit" name="shouldsave" value="Apply" /> <input type="reset" value="Cancel" />
    39 </form>
     39</form></div>
    4040<% } else { %>
    4141Theme selection disabled for Internet Explorer, sorry.<hr>If you're not using IE, it's likely that
  • apps/routerconsole/jsp/configupdate.jsp

    r95dd7446 rd682063  
    3333          <td colspan="2"></tr>
    3434        <tr>
    35           <td><b>News:</b></td>
     35          <td class= "mediumtags" align="right"><b>News:</b></td>
    3636          <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" />
    3737            <% } %></tr>
     
    4040        </tr>
    4141        <tr>
    42           <td><b>News URL:</b></td>
     42          <td class= "mediumtags" align="right"><b>News URL:</b></td>
    4343          <td><input type="text" size="60" name="newsURL" value="<jsp:getProperty name="updatehelper" property="newsURL" />"></td>
    4444        </tr>
    4545        <tr>
    46           <td><b>Refresh frequency:</b>
     46          <td class= "mediumtags" align="right"><b>Refresh frequency:</b>
    4747          <td><jsp:getProperty name="updatehelper" property="refreshFrequencySelectBox" />
    4848        <tr>
    49           <td><b>Update policy:</b>
     49          <td class= "mediumtags" align="right"><b>Update policy:</b>
    5050          <td><jsp:getProperty name="updatehelper" property="updatePolicySelectBox" />
    5151        <tr>
    52           <td><b>Update through the eepProxy?</b>
     52          <td class= "mediumtags" align="right"><b>Update through the eepProxy?</b>
    5353          <td><jsp:getProperty name="updatehelper" property="updateThroughProxy" />
    5454        <tr>
    55           <td><b>eepProxy host:</b>
     55          <td class= "mediumtags" align="right"><b>eepProxy host:</b>
    5656          <td><input type="text" size="10" name="proxyHost" value="<jsp:getProperty name="updatehelper" property="proxyHost" />" />
    5757        <tr>
    58           <td><b>eepProxy port:</b>
     58          <td class= "mediumtags" align="right"><b>eepProxy port:</b>
    5959          <td><input type="text" size="4" name="proxyPort" value="<jsp:getProperty name="updatehelper" property="proxyPort" />" />
    6060        <tr>
    61           <td><b>Update URLs:</b>
     61          <td class= "mediumtags" align="right"><b>Update URLs:</b>
    6262          <td><textarea name="updateURL" wrap="off"><jsp:getProperty name="updatehelper" property="updateURL" /></textarea>
    6363        <tr>
    64           <td><b>Trusted keys:</b>
     64          <td class= "mediumtags" align="right"><b>Trusted keys:</b>
    6565          <td><textarea name="trustedKeys" wrap="off"><jsp:getProperty name="updatehelper" property="trustedKeys" /></textarea>
    6666        <tr>
    67         <tr>
    68           <td colspan="2"><hr />
    69         <tr>
    70         <tr>
    7167          <td>
    72           <td><div align="right">
     68          <td><div class="formaction">
    7369              <input type="submit" name="action" value="Save" />
    7470              <input type="reset" value="Cancel" />
  • installer/resources/themes/console/dark/console.css

    r95dd7446 rd682063  
    537537}
    538538
     539fieldset {
     540overflow: hidden;
     541position: relative;
     542}
     543
    539544select {
    540545     background: #002;
     
    637642     margin: 5px 5px 5px 10px;
    638643     padding: 2px;
     644overflow: hidden;
     645position: relative;
    639646}
    640647
     
    664671     line-height: 110%;
    665672}
     673
     674.formaction {
     675     text-align: right;
     676}
  • installer/resources/themes/console/light/console.css

    r95dd7446 rd682063  
    718718     line-height: 110%;
    719719}
     720
     721.formaction {
     722     text-align: right;
     723}
  • router/java/src/net/i2p/router/Blocklist.java

    r95dd7446 rd682063  
    768768        }
    769769        if (_blocklistSize > 0) {
    770             out.write("<table><tr><td align=center colspan=2><b>IPs from Blocklist File</b></td></tr><tr><td align=center><b>From</b></td><td align=center><b>To</b></td></tr>");
     770            out.write("<table><tr><th align=center colspan=2><b>IPs from Blocklist File</b></th></tr><tr><td align=center width=50%><b>From:</b></td><td align=center width=50%><b>To:</b></td></tr>");
    771771            for (int i = 0; i < _blocklistSize; i++) {
    772772                 int from = getFrom(_blocklist[i]);
    773                  out.write("<tr><td align=right>"); out.write(toStr(from)); out.write("</td><td align=right>");
     773                 out.write("<tr><td align=center width=50%>"); out.write(toStr(from)); out.write("</td><td align=center width=50%>");
    774774                 int to = getTo(_blocklist[i]);
    775775                 if (to != from) {
     
    780780            out.write("</table>");
    781781        } else {
    782             out.write("<br>No blocklist file entries");
     782            out.write("<br><i>No blocklist file entries.</i>");
    783783        }
    784784        out.flush();
  • router/java/src/net/i2p/router/RouterVersion.java

    r95dd7446 rd682063  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 02;
     21    public final static long BUILD = 03;
    2222    /** for example "-test" */
    23     public final static String EXTRA = "-zed";
     23    public final static String EXTRA = "";
    2424    public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
    2525    public static void main(String args[]) {
Note: See TracChangeset for help on using the changeset viewer.