Changeset c5f98a04


Ignore:
Timestamp:
Dec 4, 2011 6:52:17 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
cc71e3a
Parents:
489a0ea
Message:
  • Console:
    • Less icons on configclients.jsp
    • Fix some browsers breaking line on negative numbers
    • Tab CSS tweaks
Files:
3 edited

Legend:

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

    r489a0ea rc5f98a04  
    257257        }
    258258        buf.append("></td><td align=\"center\" width=\"15%\">");
     259        // The icons were way too much, so there's an X in each button class,
     260        // remove if you wnat to put them back
    259261        if (showStartButton && (!ro) && !edit) {
    260             buf.append("<button type=\"submit\" class=\"accept\" name=\"action\" value=\"Start ").append(index).append("\" >" + _("Start") + "<span class=hide> ").append(index).append("</span></button>");
     262            buf.append("<button type=\"submit\" class=\"Xaccept\" name=\"action\" value=\"Start ").append(index).append("\" >" + _("Start") + "<span class=hide> ").append(index).append("</span></button>");
    261263        }
    262264        if (showEditButton && (!edit) && !ro)
    263             buf.append("<button type=\"submit\" class=\"add\" name=\"edit\" value=\"Edit ").append(index).append("\" >" + _("Edit") + "<span class=hide> ").append(index).append("</span></button>");
     265            buf.append("<button type=\"submit\" class=\"Xadd\" name=\"edit\" value=\"Edit ").append(index).append("\" >" + _("Edit") + "<span class=hide> ").append(index).append("</span></button>");
    264266        if (showStopButton && (!edit))
    265             buf.append("<button type=\"submit\" class=\"stop\" name=\"action\" value=\"Stop ").append(index).append("\" >" + _("Stop") + "<span class=hide> ").append(index).append("</span></button>");
     267            buf.append("<button type=\"submit\" class=\"Xstop\" name=\"action\" value=\"Stop ").append(index).append("\" >" + _("Stop") + "<span class=hide> ").append(index).append("</span></button>");
    266268        if (showUpdateButton && (!edit) && !ro) {
    267             buf.append("<button type=\"submit\" class=\"check\" name=\"action\" value=\"Check ").append(index).append("\" >" + _("Check for updates") + "<span class=hide> ").append(index).append("</span></button>");
    268             buf.append("<button type=\"submit\" class=\"download\" name=\"action\" value=\"Update ").append(index).append("\" >" + _("Update") + "<span class=hide> ").append(index).append("</span></button>");
     269            buf.append("<button type=\"submit\" class=\"Xcheck\" name=\"action\" value=\"Check ").append(index).append("\" >" + _("Check for updates") + "<span class=hide> ").append(index).append("</span></button>");
     270            buf.append("<button type=\"submit\" class=\"Xdownload\" name=\"action\" value=\"Update ").append(index).append("\" >" + _("Update") + "<span class=hide> ").append(index).append("</span></button>");
    269271        }
    270272        if (showDeleteButton && (!edit) && !ro) {
    271             buf.append("<button type=\"submit\" class=\"delete\" name=\"action\" value=\"Delete ").append(index)
     273            buf.append("<button type=\"submit\" class=\"Xdelete\" name=\"action\" value=\"Delete ").append(index)
    272274               .append("\" onclick=\"if (!confirm('")
    273275               .append(_("Are you sure you want to delete {0}?", _(name)))
  • core/java/src/net/i2p/data/DataHelper.java

    r489a0ea rc5f98a04  
    12401240     * Thresholds are a little lower than in formatDuration() also,
    12411241     * as precision is less important in the GUI than in logging.
     1242     *
     1243     * Negative numbers handled correctly.
     1244     *
    12421245     * @since 0.8.2
    12431246     */
     
    12591262        } else if (ams < 2 * 60 * 1000) {
    12601263            // seconds
    1261             // Note to translators: quantity will always be greater than one.
    12621264            // alternates: secs, sec. 'seconds' is probably too long.
    12631265            t = ngettext("1 sec", "{0} sec", (int) (ms / 1000));
    12641266        } else if (ams < 120 * 60 * 1000) {
    12651267            // minutes
    1266             // Note to translators: quantity will always be greater than one.
    12671268            // alternates: mins, min. 'minutes' is probably too long.
    12681269            t = ngettext("1 min", "{0} min", (int) (ms / (60 * 1000)));
    12691270        } else if (ams < 2 * 24 * 60 * 60 * 1000) {
    12701271            // hours
    1271             // Note to translators: quantity will always be greater than one.
    12721272            // alternates: hrs, hr., hrs.
    12731273            t = ngettext("1 hour", "{0} hours", (int) (ms / (60 * 60 * 1000)));
     
    12761276        } else {
    12771277            // days
    1278             // Note to translators: quantity will always be greater than one.
    12791278            t = ngettext("1 day", "{0} days", (int) (ms / (24 * 60 * 60 * 1000)));
    12801279        }
     1280        // Replace minus sign to work around
     1281        // bug in Chrome (and IE?), line breaks at the minus sign
     1282        // http://code.google.com/p/chromium/issues/detail?id=46683
     1283        // &minus; seems to work on text browsers OK
     1284        // Although it's longer than a standard '-' on graphical browsers
     1285        // http://www.cs.tut.fi/~jkorpela/dashes.html
     1286        if (ms < 0)
     1287            t = t.replace("-", "&minus;");
    12811288        // do it here to keep &nbsp; out of the tags for translator sanity
    12821289        return t.replace(" ", "&nbsp;");
  • installer/resources/themes/console/light/console.css

    r489a0ea rc5f98a04  
    434434div.confignav {
    435435     padding: 16px 10px !important;
    436      margin: 10px 0 0 0;
     436     margin: 10px 0 0 -10px;
    437437     font-size: 9.5pt !important;
    438438     font-weight: bold !important;
     
    444444span.tab {
    445445     padding: 2px 18px 4px 6px;
    446      margin: -5px -3px 0 0;
     446     margin: -5px -7px 0 0;
    447447     background: #d8d8ff;
    448448     -moz-border-radius: 6px 32px 2px 0;
    449449     -khtml-border-radius: 6px 32px 2px 0;
    450450     border-radius: 6px 32px 2px 0;
    451      border: 1px solid #111;
    452      border-left: 2px solid #115;
     451     border: 1px outset #00f;
     452     border-width: 2px 1px 1px 2px;
     453     border-bottom-style: dashed;
    453454     min-width: 40px;
    454455     display: inline-block;
     
    458459
    459460span.tab2 {
    460      padding: 6px 18px 6px 6px;
     461     color: #008;
     462     padding: 7px 18px 6px 6px;
    461463     margin: -11px -3px 0 0;
    462464     background: #e8e8ff;
     
    464466     -khtml-border-radius: 6px 32px 2px 0;
    465467     border-radius: 6px 32px 2px 0;
    466      border: 2px solid #111;
     468     border: outset #00f;
     469     border-width: 3px 1px 0 4px;
     470     border-bottom-style: none;
    467471     min-width: 40px;
    468472     display: inline-block;
Note: See TracChangeset for help on using the changeset viewer.