Changeset c7d1d2b


Ignore:
Timestamp:
Mar 8, 2015 8:23:00 PM (6 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
d761c029
Parents:
0972b6b
Message:

console: Hide cancel graceful shutdown button unless we are shutting down

Files:
4 edited

Legend:

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

    r0972b6b rc7d1d2b  
    184184    }
    185185
     186    /**
     187     *  Should we show the cancel button?
     188     *
     189     *  @since 0.9.19
     190     */
     191    public boolean shouldShowCancelGraceful() {
     192        return _context.router().gracefulShutdownInProgress();
     193    }
     194
    186195    @Override
    187196    protected void processForm() {
  • apps/routerconsole/jsp/configservice.jsp

    r0972b6b rc7d1d2b  
    2626 <input type="submit" class="stop" name="action" value="<%=intl._("Shutdown gracefully")%>" >
    2727 <input type="submit" class="stop" name="action" value="<%=intl._("Shutdown immediately")%>" >
    28  <input type="submit" class="cancel" name="action" value="<%=intl._("Cancel graceful shutdown")%>" >
     28 <% if (formhandler.shouldShowCancelGraceful()) { %>
     29     <input type="submit" class="cancel" name="action" value="<%=intl._("Cancel graceful shutdown")%>" >
     30 <% } %>
    2931 </div>
    3032 <% if (System.getProperty("wrapper.version") != null) { %>
  • history.txt

    r0972b6b rc7d1d2b  
     12015-03-08 zzz
     2 * i2psnark: Increase min and default bandwidth
     3 * Throttle: Tweak messages during probabalistic rejection
     4 * Transport: Add missing bogons to IP validity check
     5
    16* 2015-02-22 0.9.18 released
    27
  • router/java/src/net/i2p/router/RouterVersion.java

    r0972b6b rc7d1d2b  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 0;
     21    public final static long BUILD = 1;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.