Changeset abf7296


Ignore:
Timestamp:
Aug 2, 2009 12:57:50 PM (11 years ago)
Author:
z3d <z3d@…>
Branches:
master
Children:
3a0cdf1
Parents:
6e29edda
Message:

Fix for IE overflow issue; classic theme enhanced; more UI enhancements.

Files:
1 added
21 edited

Legend:

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

    r6e29edda rabf7296  
    4848       
    4949        if (_log.shouldLog(Log.DEBUG))
    50             _log.debug("Saving changes, with props = " + _settings);
     50            _log.debug("Saving changes, with props = " + _settings + ".");
    5151       
    5252        int updated = 0;
     
    6868                    client.fromBase64(poolName);
    6969                } catch (DataFormatException dfe) {
    70                     addFormError("Internal error (pool name could not resolve - " + poolName + ")");
     70                    addFormError("Internal error (pool name could not resolve - " + poolName + ").");
    7171                    index++;
    7272                    continue;
     
    7777           
    7878            if ( (in == null) || (out == null) ) {
    79                 addFormError("Internal error (pool settings cound not be found for " + poolName + ")");
     79                addFormError("Internal error (pool settings cound not be found for " + poolName + ").");
    8080                index++;
    8181                continue;
     
    132132       
    133133        if (updated > 0)
    134             addFormNotice("Updated settings for " + updated + " pools");
     134            addFormNotice("Updated settings for " + updated + " pools.");
    135135       
    136136        if (saveRequired) {
    137137            boolean saved = _context.router().saveConfig();
    138138            if (saved)
    139                 addFormNotice("Exploratory tunnel configuration saved successfully");
     139                addFormNotice("Exploratory tunnel configuration saved successfully.");
    140140            else
    141                 addFormNotice("Error saving the configuration (applied but not saved) - please see the error logs");
     141                addFormNotice("Error saving the configuration (applied but not saved) - please see the error logs.");
    142142        }
    143143    }
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java

    r6e29edda rabf7296  
    2525            _context.router().setConfigSetting(CSSHelper.PROP_THEME_NAME, _config);
    2626        if (_context.router().saveConfig())
    27             addFormNotice("Theme change successfully saved (<a href=\"configui.jsp\">refresh page to view</a>)");
     27            addFormNotice("Theme change successfully saved (<a href=\"configui.jsp\">refresh page</a> to view).");
    2828        else
    29             addFormNotice("Error saving the configuration (applied but not saved) - please see the error logs");
     29            addFormNotice("Error saving the configuration (applied but not saved) - please see the error logs.");
    3030    }
    3131}
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java

    r6e29edda rabf7296  
    44    public ConfigUIHelper() {}
    55   
    6     private static final String themes[] = {"Classic", "Dark", "Light"};
     6    private static final String themes[] = {"classic", "dark", "light"};
    77
    88    public String getSettings() {
  • apps/routerconsole/jsp/config.jsp

    r6e29edda rabf7296  
    3131 </p>
    3232<p>
     33   <div class="wideload">
    3334    <table>
    3435    <tr><td><input style="text-align: right; width: 5em;" name="inboundrate" type="text" size="5" maxlength="5" value="<jsp:getProperty name="nethelper" property="inboundRate" />" /> KBps
     
    5051    <tr><td><jsp:getProperty name="nethelper" property="sharePercentageBox" />
    5152    Share <td>(<jsp:getProperty name="nethelper" property="shareRateBits" />)<br />
    52     </table>
     53  </table></div>
    5354 </p><p>
    5455 <% int share = nethelper.getShareBandwidth();
  • apps/routerconsole/jsp/configadvanced.jsp

    r6e29edda rabf7296  
    1717
    1818 <%@include file="confignav.jsp" %>
    19  
     19
    2020 <jsp:useBean class="net.i2p.router.web.ConfigAdvancedHandler" id="formhandler" scope="request" />
    2121 <jsp:setProperty name="formhandler" property="*" />
     
    2323 <jsp:getProperty name="formhandler" property="allMessages" />
    2424 <div class="configure">
     25 <div class="wideload">
    2526 <form action="configadvanced.jsp" method="POST">
    2627 <% String prev = System.getProperty("net.i2p.router.web.ConfigAdvancedHandler.nonce");
     
    3940</div>
    4041</div>
     42</div>
    4143</body>
    4244</html>
  • apps/routerconsole/jsp/configclients.jsp

    r6e29edda rabf7296  
    3636 <p>
    3737 The Java clients listed below are started by the router and run in the same JVM.
    38  </p><p>
     38 </p><p> <div class="wideload">
    3939 <jsp:getProperty name="clientshelper" property="form1" />
    4040 </p><p>
     
    4242 </p> <hr /><div class="formaction">
    4343 <input type="submit" name="action" value="Save Client Configuration" />
    44 </div>
     44</div></div>
    4545 <h3>WebApp Configuration</h3>
    4646 <p>
     
    5454 however the .war file and web app will reappear when you update your router to a newer version,
    5555 so disabling the web app here is the preferred method.
    56  </p><p>
     56 </p><p><div class="wideload">
    5757 <jsp:getProperty name="clientshelper" property="form2" />
    5858 </p>
     
    6666</div>
    6767</div>
     68</div>
    6869</body>
    6970</html>
  • apps/routerconsole/jsp/configkeyring.jsp

    r6e29edda rabf7296  
    1212<div class="main" id="main">
    1313 <%@include file="confignav.jsp" %>
    14  
     14
    1515 <jsp:useBean class="net.i2p.router.web.ConfigKeyringHandler" id="formhandler" scope="request" />
    1616 <jsp:setProperty name="formhandler" property="*" />
     
    2727 The router keyring is used to decrypt encrypted leaseSets.
    2828 The keyring may contain keys for local or remote encrypted destinations.
    29  <p><jsp:getProperty name="keyringhelper" property="summary" />
    30  </p>
     29 <div class="wideload"><p>
     30 <jsp:getProperty name="keyringhelper" property="summary" />
     31</p></div>
    3132
    3233 <hr />
     
    4142 Keys for local destinations must be entered on the <a href="i2ptunnel/index.jsp">I2PTunnel page</a>.
    4243 <p>
     44  <div class="wideload">
    4345      <table>
    4446        <tr>
     
    5557 </form>
    5658
    57 
     59</div>
    5860</div>
    5961</div>
  • apps/routerconsole/jsp/configlogging.jsp

    r6e29edda rabf7296  
    1414<div class="main" id="main">
    1515 <%@include file="confignav.jsp" %>
    16  
     16
    1717 <jsp:useBean class="net.i2p.router.web.ConfigLoggingHandler" id="formhandler" scope="request" />
    1818 <jsp:setProperty name="formhandler" property="*" />
     
    2727 <input type="hidden" name="action" value="blah" />
    2828 <h3>Configure I2P Logging Options</h3>
     29 <div class="wideload">
    2930      <table border="0" cellspacing="5">
    3031        <tr>
     
    6566</div>
    6667</div>
     68</div>
    6769</body>
    6870</html>
  • apps/routerconsole/jsp/configpeer.jsp

    r6e29edda rabf7296  
    7070 </p>
    7171 </form>
    72 
    7372 <a name="shitlist"> </a>
    7473 <jsp:useBean class="net.i2p.router.web.ProfilesHelper" id="profilesHelper" scope="request" />
     
    7675 <jsp:getProperty name="profilesHelper" property="shitlistSummary" />
    7776 <hr />
     77 <div class="wideload">
    7878 <jsp:getProperty name="peerhelper" property="blocklistSummary" />
    7979
    80 
     80</div>
    8181</div>
    8282</div>
  • apps/routerconsole/jsp/configstats.jsp

    r6e29edda rabf7296  
    5757<div class="main" id="main">
    5858 <%@include file="confignav.jsp" %>
    59  
     59
    6060 <jsp:useBean class="net.i2p.router.web.ConfigStatsHandler" id="formhandler" scope="request" />
    6161 <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
     
    7979 Stat file: <input type="text" name="filename" value="<%=statshelper.getFilename()%>" /><br />
    8080 Filter: (<a href="javascript: void(null);" onclick="toggleAll('*')">toggle all</a>)<hr />
     81 <div class="wideload">
    8182 <table>
    8283 <% while (statshelper.hasMoreStats()) {
     
    106107</div>
    107108</div>
     109</div>
    108110</body>
    109111</html>
  • apps/routerconsole/jsp/configtunnels.jsp

    r6e29edda rabf7296  
    1515<div class="main" id="main">
    1616 <%@include file="confignav.jsp" %>
    17  
    1817 <jsp:useBean class="net.i2p.router.web.ConfigTunnelsHandler" id="formhandler" scope="request" />
    1918 <jsp:setProperty name="formhandler" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
     
    3231 Change these settings with care, and adjust them if you have problems.
    3332 </i></p>
    34 
     33 <div class="wideload">
    3534 <form action="configtunnels.jsp" method="POST">
    3635 <% String prev = System.getProperty("net.i2p.router.web.ConfigTunnelsHandler.nonce");
     
    4746</div>
    4847</div>
     48</div>
    4949</body>
    5050</html>
  • apps/routerconsole/jsp/configupdate.jsp

    r6e29edda rabf7296  
    2929 <input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigUpdateHandler.nonce")%>" />
    3030      <h3>Check for I2P and news updates</h3>
    31       <table border="0" cellspacing="5">
     31      <div class="wideload"><table border="0" cellspacing="5">
    3232        <tr>
    3333          <td colspan="2"></tr>
     
    7171            </div>
    7272      </table>
     73    </div>
    7374 </form>
    7475</div>
  • apps/routerconsole/jsp/css.jsp

    r6e29edda rabf7296  
    1919<jsp:setProperty name="cssHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
    2020<link href="<%=cssHelper.getTheme(request.getHeader("User-Agent"))%>console.css" rel="stylesheet" type="text/css" />
     21<!--[if IE]><link href="/themes/console/classic/ieshim.css" rel="stylesheet" type="text/css" /><![endif]-->
  • history.txt

    r6e29edda rabf7296  
     12009-08-02
     2    * Better support for Internet Explorer/classic theme.
     3    * Incremental improvements to classic theme.
     4    * More UI tweaks and fiddles.
     5
    162009-07-31 dr|z3d
    27    * Resolve anomalous buttons and text fields in console ui.
    38    * Enhance presentation of data in /peers.jsp.
    49    * Fix themes issue with horizontal width of radio/checkbox icons.
    5       (Radioboxes currently non-functional in Opera).
    610    * Other cosmetic UI enhancements.
    711
  • installer/resources/themes/console/classic/console.css

    r6e29edda rabf7296  
    11body {
    2      margin: 1em 0em;
    3      padding: 0em;
     2     margin: 15px 0;
     3     padding: 0;
    44     text-align: left;
    55     background: #FFF;
    66     color: #000;
    7      font: 10pt/120% Verdana, Tahoma, Helvetica, sans-serif;
     7/*
     8     font: 10pt/140% Verdana, Tahoma, Helvetica, sans-serif;
     9*/
     10     font: 10pt/140% "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
    811}
    912
     
    1720
    1821pre {
     22     overflow: auto;
     23     font-size: 8pt !important;
    1924     width: 100%;
    20      overflow-x: scroll;
    2125}
    2226
     
    3842
    3943div.routersummaryouter {
    40      float: left;
     44     float: left; 
    4145     width: 200px;
    4246     margin: 0;
    4347     padding: 0;
    4448     border: 0;
    45      clear: left;/* fixes a bug in Opera */
    46      overflow: auto;
     49     clear: left; /*  fixes a bug in Opera */
    4750}
    4851
    4952div.routersummary {
    5053     background: #fafaff;
    51      width: 175px;
     54     width: 180px;
    5255     color: inherit;
    53      margin: 0em;
    54      padding: 5px;
    55      text-align: left;
    56      border: medium solid #efefff;
     56     margin: 0;
     57     padding: 5px 0 0 10px;
     58     text-align: left !important;
     59     border: 5px solid #efefff;
    5760     font-size: 9pt;
    5861     word-wrap: break-word;
     62     font: 9pt/125%;
    5963}
    6064
     
    6468     height: 2px;
    6569     border: 0px solid #ccf;
    66      margin: 10px 0;
    67 }
     70     margin: 4px 0;
     71}
     72
     73div.routersummary p {
     74     padding: 0;
     75}     
     76
    6877div.warning {
    69      margin: 0em 1em 1em 224px;
    70      padding: .5em 1em;
     78     margin: 0 10px 10px 205px;
     79     padding: 5px 10px;
    7180     background: #ffefef;
    7281     border: medium solid #ffafaf;
     
    7685
    7786div.main {
    78      margin: 0em 1em 1em 224px;
    79      padding: .5em 1em;
     87     margin: 0 20px 10px 205px;
     88     padding: 5px 15px 15px 15px;
    8089     background: #ffffef;
    81      border: medium solid #ffffd0;
     90     border: 5px solid #ffffd0;
    8291     text-align: left;
    8392     color: inherit;
    8493}
    8594
     95
    8696div.main textarea {
    87      width: 100% !important;
     97/*     width: 100% !important; breaks IE */
     98     width: 600px;
    8899}
    89100
    90101div.news {
    91      margin: 0em 1em 1em 224px;
    92      padding: .5em 1em;
     102     margin: 0 20px 0 205px;
     103     padding: -10px 15px 5px 15px;
    93104     background: #ffffc0;
    94      border: medium solid #ffffa0;
     105     border: 5px solid #ffffa0;
    95106     text-align: justify;
    96107     color: inherit;
    97108}
    98109
     110div.news li {
     111     text-align: justify;
     112     list-style: none;
     113     margin: -10px 20px -20px -20px;
     114     padding: 8px 0;
     115     border: 1px solid #330;
     116     border-left: 5px solid #330;
     117     padding: 3px 5px 3px 5px;
     118     background: #fe7;
     119     font-size: 12pt;
     120}
     121
     122div.news a:link {
     123
     124}
     125
    99126div.confignav {
    100      padding: 1em;
    101      background: #efefff;
     127     padding: 12px 0 15px 0;
     128     background: #cfc;
     129     margin: -10px -20px 0 -10px;
     130     border: 5px solid #9f9;
    102131}
    103132
    104133div.configure {
    105      padding: 1em;
     134     margin: 0 -20px 0 -10px;
     135     padding: 10px 20px 5px 20px;
    106136     background: #ffffc0;
    107137}
    108138
    109139div.messages {
    110      padding: 1em;
     140     padding: 10px;
    111141     background: #fafaff;
     142     border: 5px solid #fdd;
     143     margin: 0px -20px 0px -10px;
    112144}
    113145
     
    123155     font-size: 18pt;
    124156     text-align: center;
     157     border: 5px solid #efefff;
     158     border-bottom: 5px solid #efefff;
     159     padding: 10px;
     160     margin: 0 20px 0 205px;
     161     line-height: 93%;
     162     text-transform: uppercase;
     163     letter-spacing: 0.3em;
     164     background: #fff;
    125165}
    126166
    127167h2 {
     168     font-size: 14pt;
     169     padding: 10px;
     170     border-bottom: 2px solid #001;
     171     border-top: 2px solid #001;
     172     letter-spacing: 0.04em;
     173}
     174
     175h3 {
    128176     font-size: 12pt;
    129 }
    130 
    131 h3 {
    132      font-size: 10pt;
    133 }
     177     padding: 10px;
     178     border-bottom: 2px solid #001;
     179     border-top: 2px solid #001;
     180     letter-spacing: 0.04em;
     181}
     182
    134183.proxyfooter{
    135184     font-size: 7pt;
    136185     display: none !important;
    137186}
    138 
    139187
    140188table {
     
    145193     font-size: 7pt;
    146194     background: #fff;
    147 }
    148 
     195     width: 100%;
     196}
    149197
    150198th {
    151199     background-color: #ccf;
    152200     padding: 5px 2px;
     201     text-align: center;
    153202}
    154203
     
    170219
    171220hr {
    172      color: #ff9;
    173      background: #ff9;
     221     color: #dd9;
     222     background: #dd9;
    174223     height: 2px;
    175      border: 0px solid #ff9;
    176      margin: 10px 0;
     224     border: 0px solid #dd5;
     225     margin: 5px 0;
    177226}
    178227
     
    185234     background: #fff;
    186235 }
     236 
     237input {
     238     margin: 3px 5px 3px 0;
     239     vertical-align: middle;
     240}
     241
     242select {
     243     margin: 3px 5px 3px 0;
     244     vertical-align: middle;
     245}
     246
     247submit {
     248     padding 0 2px;
     249}
     250
     251p {
     252     padding: 5px 20px 0px 20px;
     253     text-align: justify;
     254}
     255
     256.formaction {
     257     text-align: right;
     258}
     259
     260.langbox {
     261     margin: 30px 0 0px 5px;
     262     color: #001;
     263     font-size: 7pt;
     264     width: 180px;
     265     text-align: center;
     266     float: right;
     267     valign: middle;
     268}
     269
     270.langbox img {
     271     padding: 0 2px; /* Ignored by IE8 */
     272}
     273
     274a:link{
     275     color: #006;
     276     text-decoration: none;
     277     font-weight: bold;
     278     word-wrap: break-word;
     279}
     280
     281a:visited{
     282     color: #448;
     283     text-decoration: none;
     284     font-weight: bold;
     285}
     286
     287a:hover{
     288     color: #f60;
     289     text-decoration: underline;
     290     font-weight: bold;
     291}
     292
     293a:active{
     294     color: #f93;
     295     text-decoration: underline;
     296     font-weight: bold;
     297}
     298
     299pre {
     300     font-size: 9pt;
     301     margin: 0px 20px;
     302}
     303
     304tt {
     305     font-size: 9pt;
     306     font-weight: bold;
     307     color: darkgreen;
     308}
     309
     310.tablefooter {
     311     border: 1px solid #f00;
     312}
     313
     314.tablefooter tr, .tablefooter td {
     315     background: #aaf;
     316     font-size: 8pt;
     317     font-weight: bold;
     318     line-height: 150%;
     319}
  • installer/resources/themes/console/light/console.css

    r6e29edda rabf7296  
    2020pre {
    2121     width: 98%;
    22      overflow-x: scroll;
     22     overflow: auto;
    2323     text-align: left;
    2424     font: 8pt "Lucida Console", "DejaVu Sans Mono", Courier, mono;
     
    131131     color: #001;
    132132     width: auto;
    133 /*  overflow-x: scroll; */
    134133}
    135134
     
    653652     text-align: justify;
    654653     -moz-box-shadow: inset 0px 0px 1px 0px #002;
    655      overflow-x: scroll;
     654     overflow: auto;
    656655 }
    657656 
  • router/java/src/net/i2p/router/JobQueue.java

    r6e29edda rabf7296  
    608608       
    609609        StringBuilder buf = new StringBuilder(32*1024);
    610         buf.append("<b><div class=\"joblog\"><h3>I2P JobQueue</h3># runners: ").append(numRunners).append(" [states=");
     610        buf.append("<b><div class=\"joblog\"><h3>I2P JobQueue</h3><div class=\"wideload\"># runners: ").append(numRunners).append(" [states=");
    611611        if (states != null)
    612612            for (int i = 0; i < states.length; i++)
     
    735735        buf.append("</tr>\n");
    736736       
    737         buf.append("</table>\n");
     737        buf.append("</table></div>\n");
    738738    }
    739739}
  • router/java/src/net/i2p/router/RouterVersion.java

    r6e29edda rabf7296  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 04;
     21    public final static long BUILD = 05;
    2222    /** for example "-test" */
    2323    public final static String EXTRA = "";
  • router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java

    r6e29edda rabf7296  
    644644        buf.append(". Timeout: ").append(DataHelper.formatDuration(_pumper.getIdleTimeout()));
    645645        buf.append(".</b></h3>\n");
    646         buf.append("<table>\n");
     646        buf.append("<div class=\"wideload\"><table>\n");
    647647        buf.append("<tr><th><a href=\"#def.peer\">Peer</a></th>");
    648648        buf.append("<th>Dir</th>");
     
    728728        }
    729729
    730         buf.append("</table></p>\n");
     730        buf.append("</table></div></p>\n");
    731731        out.write(buf.toString());
    732732        buf.setLength(0);
  • router/java/src/net/i2p/router/transport/udp/UDPTransport.java

    r6e29edda rabf7296  
    17681768        buf.append(". Timeout: ").append(DataHelper.formatDuration(_expireTimeout));
    17691769        buf.append(".</b></h3>\n");
    1770         buf.append("<table>\n");
     1770        buf.append("<div class=\"wideload\"><table>\n");
    17711771        buf.append("<tr><th class=\"smallhead\" nowrap><a href=\"#def.peer\">Peer</a>");
    17721772        if (sortFlags != FLAG_ALPHA)
     
    19991999        buf.append("      <td align=\"center\"><b>").append(resentTotal);
    20002000        buf.append("</b></td> <td align=\"center\"><b>").append(dupRecvTotal).append("</b></td>\n");
    2001         buf.append(" </tr></table></p><p>\n");
     2001        buf.append(" </tr></table></div></p><p>\n");
    20022002        long bytesTransmitted = _context.bandwidthLimiter().getTotalAllocatedOutboundBytes();
    20032003        // NPE here early
  • router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java

    r6e29edda rabf7296  
    406406   
    407407    public void renderStatusHTML(Writer out) throws IOException {
    408         out.write("<h2><a name=\"exploratory\" ></a>Exploratory tunnels (<a href=\"/configtunnels.jsp#exploratory\">config</a>):</h2>\n");
     408        out.write("<div class=\"wideload\"><h2><a name=\"exploratory\" ></a>Exploratory tunnels (<a href=\"/configtunnels.jsp#exploratory\">config</a>):</h2>\n");
    409409        renderPool(out, _inboundExploratory, _outboundExploratory);
    410410       
     
    624624        out.write("<tr class=\"tablefooter\"> <td align=\"center\"><b>Tunnels</b> <td align=\"center\"><b>" + tunnelCount);
    625625        out.write("</b> <td>&nbsp;</td> <td align=\"center\"><b>" + partCount);
    626         out.write("</b> <td>&nbsp;</td></tr></table>\n");
     626        out.write("</b> <td>&nbsp;</td></tr></table></div>\n");
    627627    }
    628628
Note: See TracChangeset for help on using the changeset viewer.