Changeset e60e29b


Ignore:
Timestamp:
Jul 24, 2009 12:08:08 AM (11 years ago)
Author:
z3d <z3d@…>
Branches:
master
Children:
9abb0a1
Parents:
d8435289
Message:

Tidy up jobs.jsp a little and other to various ui elements.

Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rd8435289 re60e29b  
    326326        <copy file="installer/resources/themes/console/snark.css" todir="pkg-temp/docs/themes/console/" />
    327327        <!-- these files now in docs/, not in the .war -->
     328        <!-- No need to copy these individually, we're copying the whole dir below..
    328329        <copy file="installer/resources/themes/console/images/favicon.ico" todir="pkg-temp/docs/themes/console/images/" />
    329330        <copy file="installer/resources/themes/console/images/i2plogo.png" todir="pkg-temp/docs/themes/console/images/" />
     331        -->
    330332        <!-- Since the logo moved, we have to update the error pages -->
    331333        <copy todir="pkg-temp/docs/" >
     
    343345        <copy todir="pkg-temp/docs/themes/console/light/" >
    344346            <fileset  dir="installer/resources/themes/console/light/" />
    345         </copy>
     347        </copy>
     348        <!-- Add shared images.. these are subject to flux and change! -->
     349        <copy todir="pkg-temp/docs/themes/console/images/" >
     350            <fileset  dir="installer/resources/themes/console/images/" />
     351        </copy>         
    346352        <copy todir="pkg-temp/docs/" >
    347353          <fileset dir="." includes="readme*.html" />
  • history.txt

    rd8435289 re60e29b  
     12009-07-23 dr|z3d
     2    * Include additional tile graphics and I2PSnark header logo in /console/images/
     3    * Tidy up some layout irks; add some last minute 0.7.6 pre-release sparkle!
     4    * Ongoing overhaul of the I2PSnark UI.
     5
    162009-07-23 sponge
    27    * Add bob.i2p and sponge.i2p keys to hosts.txt
  • installer/resources/themes/console/dark/console.css

    rd8435289 re60e29b  
    223223
    224224th {
    225      padding: 8px;
     225     padding: 6px 3px;
    226226     color: #eef;
    227227     text-align: center;
     
    251251*/
    252252td {
    253      padding: 5px 10px;
     253     padding: 6px 3px 5px 3px;
    254254     color: #eef;
    255255     vertical-align: middle;
     
    511511     display: none;
    512512}       
     513
     514.statusnotes {
     515     font-style: italic;
     516     font-size: 8pt;
     517     font-color: #700;
     518     text-align: center;
     519     border-radius: 4px;
     520     -moz-border-radius: 4px;
     521     -khtml-border-radius: 4px;
     522     border: 0 !important;
     523}
     524
     525.joblog {
     526     margin: 25px 0 25px 0;
     527     padding: 20px 40px 20px 40px !important;
     528     border: 1px solid #eef;
     529     background-color: #004;
     530     background: url("images/lightbluetile.png");
     531     color: #dfd;
     532     border-radius: 4px;
     533     -moz-border-radius: 4px;
     534     -khtml-border-radius: 4px;
     535     text-align: justify;
     536     -moz-box-shadow: inset 0px 0px 1px 0px #eef;
     537     overflow-x: scroll;
     538 }
     539 
     540 div.joblog:li {
     541     word-wrap: break-word !important;
     542}
     543
     544 .joblog:ul {
     545     word-wrap: break-word !important;
     546}
  • installer/resources/themes/console/light/console.css

    rd8435289 re60e29b  
    269269
    270270th {
    271      padding: 8px;
     271     padding: 6px 2px;
    272272     color: #000;
    273273     background: #b4c8ff url('images/tabletitlelight.png') repeat-x;
     
    351351a:hover{
    352352     color: #f60;
     353     text-decoration: underline;
     354     font-weight: bold;
     355}
     356
     357a:active{
     358     color: #f93;
    353359     text-decoration: underline;
    354360     font-weight: bold;
     
    552558     display: none;
    553559}   
     560
     561.statusnotes {
     562     font-style: italic;
     563     font-size: 8pt;
     564     font-color: #700 !important;
     565     text-align: center;
     566     border-radius: 4px;
     567     -moz-border-radius: 4px;
     568     -khtml-border-radius: 4px;
     569     border: 0;
     570}
     571
     572.joblog {
     573     margin: 25px 0 25px 0;
     574     padding: 20px 40px 20px 40px !important;
     575     border: 1px solid #003;
     576     background-color: #004;
     577     background: url("/themes/console/images/olivegreentile.png");
     578     color: #001;
     579     border-radius: 4px;
     580     -moz-border-radius: 4px;
     581     -khtml-border-radius: 4px;
     582     text-align: justify;
     583     -moz-box-shadow: inset 0px 0px 1px 0px #eef;
     584     overflow-x: scroll;
     585 }
     586 
     587 div.joblog:li {
     588     word-wrap: break-word !important;
     589}
     590
     591 .joblog:ul {
     592     word-wrap: break-word !important;
     593}
  • installer/resources/themes/console/light/default.css

    rd8435289 re60e29b  
    7474button {
    7575     float: none;
     76     text-decoration: none;
    7677}
    7778
     
    173174     margin-top: 8px;
    174175     background: url(images/tabletitlelight.png) 0 0 repeat: x !important;
     176     text-decoration: none;
    175177}
    176178
     
    179181     background-color: #003;
    180182     color: #ff6600;
     183     text-decoration: none;
    181184}
    182185
     
    185188     background-color: #f60;
    186189     color: #fff !important;
     190     text-decoration: none;
    187191}
    188192
     
    200204     border: 1px solid #002;
    201205     padding: 10px 20px;
     206     -moz-box-shadow: inset 0px 0px 1px 0px #002;
    202207}
    203208
     
    240245#globalOperationsPanel {
    241246     background-color: #ddddff;
    242      border: 1px solid #f22;
    243      -moz-box-shadow: inset 0px 0px 4px 0px #f00;
     247     border: 1px solid #003;
    244248     padding: 5px 20px 11px 10px;
     249     background: url("/themes/console/images/yellowtile.png") !important;
     250     -moz-box-shadow: inset 0px 0px 1px 0px #fff;
    245251}
    246252
     
    249255}
    250256
     257#globalOperationsPanel .control:link {
     258     min-width: 120px;
     259}
     260
     261
     262globalOperationsPanel .control:link {
     263     min-width: 120px;
     264     margin: 4px 0 0 4px !important;
     265     padding: 2px;
     266     overflow: hidden;
     267     font-weight: bold;
     268     background-color: #bbbbff;
     269     color: black;
     270     border: 1px outset #ddddc0;
     271     text-align: center;
     272     white-space: nowrap;
     273     -moz-border-radius: 4px;
     274     -khtml-border-radius: 4px;
     275     border-radius: 4px;
     276     margin-top: 8px;
     277     background: url(images/tabletitlelight.png) 0 0 repeat: x !important;
     278}
     279
     280
     281globalOperationsPanel .control:visited {
     282     min-width: 120px;
     283     margin: 4px 0 0 4px !important;
     284     padding: 2px;
     285     overflow: hidden;
     286     font-weight: bold;
     287     background-color: #bbbbff;
     288     color: black;
     289     border: 1px outset #ddddc0;
     290     text-align: center;
     291     white-space: nowrap;
     292     -moz-border-radius: 4px;
     293     -khtml-border-radius: 4px;
     294     border-radius: 4px;
     295     margin-top: 8px;
     296     background: url(images/tabletitlelight.png) 0 0 repeat: x !important;
     297}
     298
     299globalOperationsPanel .control:hover {
     300     min-width: 120px;
     301     margin: 4px 0 0 4px !important;
     302     padding: 2px;
     303     overflow: hidden;
     304     font-weight: bold;
     305     background-color: #003;
     306     color: #f60;
     307     border: 1px outset #fff;
     308     text-align: center;
     309     white-space: nowrap;
     310     -moz-border-radius: 4px;
     311     -khtml-border-radius: 4px;
     312     border-radius: 4px;
     313     margin-top: 8px;
     314     background: url(images/tabletitlelight.png) 0 0 repeat: x !important;
     315}
    251316.header {
    252317     -moz-border-radius: 4px;
     
    267332     max-height: 24px;
    268333}
     334
     335a:link{
     336     color: #007;
     337     text-decoration: none;
     338     font-weight: bold;
     339     word-wrap: break-word;
     340}
     341
     342a:visited{
     343     color: #606;
     344     text-decoration: none;
     345     font-weight: bold;
     346}
     347
     348a:hover{
     349     color: #f60;
     350     text-decoration: underline;
     351     font-weight: bold;
     352}
     353
     354a:active{
     355     color: #f93;
     356     text-decoration: underline;
     357     font-weight: bold;
     358}
  • installer/resources/themes/console/snark.css

    rd8435289 re60e29b  
    118118        border-width: 0px;
    119119        border-spacing: 0px;
     120  background-color: #f9f;
    120121}
    121122
  • router/java/src/net/i2p/router/JobQueue.java

    rd8435289 re60e29b  
    609609        StringBuilder buf = new StringBuilder(32*1024);
    610610        buf.append("<h2>JobQueue</h2>");
    611         buf.append("# runners: ").append(numRunners).append(" [states=");
     611        buf.append("<b><div class=\"joblog\"># runners: ").append(numRunners).append(" [states=");
    612612        if (states != null)
    613613            for (int i = 0; i < states.length; i++)
    614614                buf.append(states[i]).append(" ");
    615         buf.append("]<br />\n");
     615        buf.append("]</b><br />\n");
    616616
    617617        long now = _context.clock().now();
    618618
    619         buf.append("# active jobs: ").append(activeJobs.size()).append("<ol>\n");
     619        buf.append("<hr><b># active jobs: ").append(activeJobs.size()).append("</b><ol>\n");
    620620        for (int i = 0; i < activeJobs.size(); i++) {
    621621            Job j = (Job)activeJobs.get(i);
     
    624624        }
    625625        buf.append("</ol>\n");
    626         buf.append("# just finished jobs: ").append(justFinishedJobs.size()).append("<ol>\n");
     626        buf.append("<hr><b># just finished jobs: ").append(justFinishedJobs.size()).append("</b><ol>\n");
    627627        for (int i = 0; i < justFinishedJobs.size(); i++) {
    628628            Job j = (Job)justFinishedJobs.get(i);
     
    631631        }
    632632        buf.append("</ol>\n");
    633         buf.append("# ready/waiting jobs: ").append(readyJobs.size()).append(" <i>(lots of these mean there's likely a big problem)</i><ol>\n");
     633        buf.append("<hr><b># ready/waiting jobs: ").append(readyJobs.size()).append(" </b><i>(lots of these mean there's likely a big problem)</i><ol>\n");
    634634        for (int i = 0; i < readyJobs.size(); i++) {
    635635            Job j = (Job)readyJobs.get(i);
     
    642642        out.flush();
    643643
    644         buf.append("# timed jobs: ").append(timedJobs.size()).append("<ol>\n");
     644        buf.append("<hr><b># timed jobs: ").append(timedJobs.size()).append("</b><ol>\n");
    645645        TreeMap ordered = new TreeMap();
    646646        for (int i = 0; i < timedJobs.size(); i++) {
     
    654654            buf.append(DataHelper.formatDuration(time)).append("</li>\n");
    655655        }
    656         buf.append("</ol>\n");
     656        buf.append("</ol></div>\n");
    657657       
    658658        out.write("<!-- jobQueue rendering: after main buffer, before stats -->\n");
  • router/java/src/net/i2p/router/RouterVersion.java

    rd8435289 re60e29b  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 19;
     21    public final static long BUILD = 20;
    2222    /** for example "-test" */
    2323    public final static String EXTRA = "";
  • router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java

    rd8435289 re60e29b  
    495495        }
    496496        out.write("</table>\n");
    497         out.write("<center>Inactive participating tunnels: " + inactive + "<br />\n");
    498         out.write("Lifetime bandwidth usage: " + DataHelper.formatSize(processed*1024) + "B</center><br />\n");
     497        out.write("<div class=\"statusnotes\"><center><b>Inactive participating tunnels: " + inactive + "</b></div>\n");
     498        out.write("<div class=\"statusnotes\"><b>Lifetime bandwidth usage: " + DataHelper.formatSize(processed*1024) + "B</b></center></div>\n");
    499499        renderPeers(out);
    500500    }
     
    525525                maxLength = info.getLength();
    526526        }
    527         out.write("<table border=\"1\"><tr><th>Direction</th><th>Expiration</th><th>Usage</th><th>Gateway</th>");
     527        out.write("<table border=\"1\"><tr><th>In/Out</th><th>Expiry</th><th>Usage</th><th>Gateway</th>");
    528528        if (maxLength > 3) {
    529529            out.write("<th align=\"center\" colspan=\"" + (maxLength - 2));
     
    574574            List pending = in.listPending();
    575575            if (pending.size() > 0)
    576                 out.write("<center>Build in progress: " + pending.size() + " inbound</center><br />\n");
     576                out.write("<div class=\"statusnotes\"><center><b>Build in progress: " + pending.size() + " inbound</b></center></div>\n");
    577577            live += pending.size();
    578578        }
     
    580580            List pending = outPool.listPending();
    581581            if (pending.size() > 0)
    582                 out.write("<center>Build in progress: " + pending.size() + " outbound</center><br />\n");
     582                out.write("<div class=\"statusnotes\"><center><b>Build in progress: " + pending.size() + " outbound</b></center></div>\n");
    583583            live += pending.size();
    584584        }
    585585        if (live <= 0)
    586             out.write("<b><center>No tunnels, waiting for the grace period to end.</center></b><br />\n");
    587         out.write("<center>Lifetime bandwidth usage: " + DataHelper.formatSize(processedIn*1024) + "B in, " +
    588                   DataHelper.formatSize(processedOut*1024) + "B out</center><br />");
     586            out.write("<div class=\"statusnotes\"><center>N<b>No tunnels; waiting for the grace period to end.</center></b></div>\n");
     587        out.write("<div class=\"statusnotes\"><center><b>Lifetime bandwidth usage: " + DataHelper.formatSize(processedIn*1024) + "<B in, " +
     588                  DataHelper.formatSize(processedOut*1024) + "B out</b></center></div>");
    589589    }
    590590   
Note: See TracChangeset for help on using the changeset viewer.