Changeset 65ae26a9


Ignore:
Timestamp:
Aug 1, 2009 3:28:42 AM (11 years ago)
Author:
z3d <z3d@…>
Branches:
master
Children:
6e29edda
Parents:
1afd946
Message:

More UI layout enhancements to the config pages.

Files:
7 edited

Legend:

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

    r1afd946 r65ae26a9  
    5656                startWebApp(app);
    5757        } else {
    58             addFormError("Unsupported " + _action);
     58            addFormError("Unsupported " + _action + ".");
    5959        }
    6060    }
     
    7171        }
    7272        ClientAppConfig.writeClientAppConfig(_context, clients);
    73         addFormNotice("Client configuration saved successfully - restart required to take effect");
     73        addFormNotice("Client configuration saved successfully - restart required to take effect.");
    7474    }
    7575
     
    7777        List clients = ClientAppConfig.getClientApps(_context);
    7878        if (i >= clients.size()) {
    79             addFormError("Bad client index");
     79            addFormError("Bad client index.");
    8080            return;
    8181        }
    8282        ClientAppConfig ca = (ClientAppConfig) clients.get(i);
    8383        LoadClientAppsJob.runClient(ca.className, ca.clientName, LoadClientAppsJob.parseArgs(ca.args), _log);
    84         addFormNotice("Client " + ca.clientName + " started");
     84        addFormNotice("Client " + ca.clientName + " started.");
    8585    }
    8686
     
    9999        }
    100100        RouterConsoleRunner.storeWebAppProperties(props);
    101         addFormNotice("WebApp configuration saved successfully - restart required to take effect");
     101        addFormNotice("WebApp configuration saved successfully - restart required to take effect.");
    102102    }
    103103
     
    117117                        s.addWebApplication("/"+ app, path.getAbsolutePath()).start();
    118118                        // no passwords... initialize(wac);
    119                         addFormNotice("WebApp <a href=\"/" + app + "/\">" + app + "</a> started");
     119                        addFormNotice("WebApp <a href=\"/" + app + "/\">" + app + "</a> started.");
    120120                    } catch (Exception ioe) {
    121                         addFormError("Failed to start " + app + " " + ioe);
     121                        addFormError("Failed to start " + app + " " + ioe + ".");
    122122                    }
    123123                    return;
     
    125125            }
    126126        }
    127         addFormError("Failed to find server");
     127        addFormError("Failed to find server.");
    128128    }
    129129}
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java

    r1afd946 r65ae26a9  
    1616        StringBuilder buf = new StringBuilder(1024);
    1717        buf.append("<table>\n");
    18         buf.append("<tr><th>Client</th><th>Run at Startup?</th><th>Start Now</th><th>Class and arguments</th></tr>\n");
     18        buf.append("<tr><th align=\"right\">Client</th><th>Run at Startup?</th><th>Start Now</th><th align=\"left\">Class and arguments</th></tr>\n");
    1919       
    2020        List clients = ClientAppConfig.getClientApps(_context);
     
    3232        StringBuilder buf = new StringBuilder(1024);
    3333        buf.append("<table>\n");
    34         buf.append("<tr><th>WebApp</th><th>Run at Startup?</th><th>Start Now</th><th>Description</th></tr>\n");
     34        buf.append("<tr><th align=\"right\">WebApp</th><th>Run at Startup?</th><th>Start Now</th><th align=\"left\">Description</th></tr>\n");
    3535        Properties props = RouterConsoleRunner.webAppProperties();
    3636        Set keys = new TreeSet(props.keySet());
     
    4848
    4949    private void renderForm(StringBuilder buf, String index, String name, boolean urlify, boolean enabled, boolean ro, String desc) {
    50         buf.append("<tr><td>");
     50        buf.append("<tr><td class=\"mediumtags\" align=\"right\" width=\"25%\">");
    5151        if (urlify && enabled) {
    5252            String link = "/";
     
    5757            buf.append(name);
    5858        }
    59         buf.append("</td><td align=\"center\"><input type=\"checkbox\" class=\"optbox\" name=\"").append(index).append(".enabled\" value=\"true\" ");
     59        buf.append("</td><td align=\"center\" width=\"10%\"><input type=\"checkbox\" class=\"optbox\" name=\"").append(index).append(".enabled\" value=\"true\" ");
    6060        if (enabled) {
    6161            buf.append("checked=\"true\" ");
     
    6363                buf.append("disabled=\"true\" ");
    6464        }
    65         buf.append("/></td><td>&nbsp;");
     65        buf.append("/></td><td align=\"center\" width=\"15%\">");
    6666        if (!enabled) {
    6767            buf.append("<button type=\"submit\" name=\"action\" value=\"Start ").append(index).append("\" >Start<span class=hide> ").append(index).append("</span></button>");
    6868        }
    69         buf.append("&nbsp;</td><td>").append(desc).append("</td></tr>\n");
     69        buf.append("</td><td align=\"left\" width=\"50%\">").append(desc).append("</td></tr>\n");
    7070    }
    7171}
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java

    r1afd946 r65ae26a9  
    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/configkeyring.jsp

    r1afd946 r65ae26a9  
    4343      <table>
    4444        <tr>
    45           <td>Dest. name, hash, or full key:
    46           <td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off"></textarea>
     45          <td class="mediumtags" align="right">Dest. name, hash, or full key:</td>
     46          <td><textarea name="peer" cols="44" rows="1" style="height: 3em;" wrap="off"></textarea></td>
    4747        <tr>
    48           <td align="right">Session Key:
    49           <td><input type="text" size="55" name="key" />
     48          <td class="mediumtags" align="right">Session Key:</td>
     49          <td><input type="text" size="55" name="key" /></td>
    5050        <tr>
    5151          <td>
    52           <td><div align="right">
    53               <input type="submit" name="action" value="Add key" />
    54             </div>
     52          <td align="right">
     53            <input type="submit" name="action" value="Add key" /></td>
    5554      </table>
    5655 </form>
  • apps/routerconsole/jsp/configlogging.jsp

    r1afd946 r65ae26a9  
    2929      <table border="0" cellspacing="5">
    3030        <tr>
    31           <td valign="top"><b>Logging filename:</b>
     31          <td class="mediumtags" align="right"><b>Logging filename:</b>
    3232          <td><input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" />
    3333            <br /> <i>(the symbol '@' will be replaced during log rotation)</i>
    3434        <tr>
    35           <td valign="top"><b>Log record format:</b>
     35          <td class="mediumtags" align="right"><b>Log record format:</b>
    3636          <td><input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" />
    3737            <br /> <i>(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority,
    3838            'm' = message)</i>
    3939        <tr>
    40           <td valign="top"><b>Log date format:</b>
     40          <td class="mediumtags" align="right"><b>Log date format:</b>
    4141          <td><input type="text" name="logdateformat" size="20" value="<jsp:getProperty name="logginghelper" property="datePattern" />" />
    4242            <br /> <i>('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss'
    4343            = second, 'SSS' = millisecond)</i>
    4444        <tr>
    45           <td valign="top"><b>Max log file size:</b>
     45          <td class="mediumtags" align="right"><b>Max log file size:</b>
    4646          <td><input type="text" name="logfilesize" size="4" value="<jsp:getProperty name="logginghelper" property="maxFileSize" />" />
    4747            <br />
    4848        <tr>
    49           <td valign="top"><b>Default log level:</b>
     49          <td class="mediumtags" align="right"><b>Default log level:</b>
    5050          <td><jsp:getProperty name="logginghelper" property="defaultLogLevelBox" /> <br /> <i>(DEBUG and INFO are not recommended defaults,
    5151            as they will drastically slow down your router)</i>
    5252        <tr>
    53           <td valign="top"><b>Log level overrides:</b>
     53          <td class="mediumtags" align="right"><b>Log level overrides:</b>
    5454          <td><jsp:getProperty name="logginghelper" property="logLevelTable" />
    5555        <tr>
    56           <td colspan="2" valign="top"><hr>
     56          <td colspan="2"><hr>
    5757        <tr>
    5858          <td>
  • apps/routerconsole/jsp/configpeer.jsp

    r1afd946 r65ae26a9  
    3838 <a name="bonus"> </a>
    3939 <h2>Manual Peer Controls</h2>
    40  Router Hash:
     40 <div class="mediumtags">Router Hash:</div>
    4141 <input type="text" size="55" name="peer" value="<%=peer%>" />
    4242 <h3>Manually Shitlist / Unshitlist a Router</h3>
     
    6363 %>
    6464 <hr />
    65  Speed:
     65 <div class="mediumtags">Speed:</div>
    6666 <input type="text" size="8" name="speed" value="<%=speed%>" />
    67  Capacity:
     67 <div class="mediumtags">Capacity:</div>
    6868 <input type="text" size="8" name="capacity" value="<%=capacity%>" />
    6969 <input type="submit" name="action" value="Adjust peer bonuses" />
  • router/java/src/net/i2p/router/RouterVersion.java

    r1afd946 r65ae26a9  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 03;
     21    public final static long BUILD = 04;
    2222    /** for example "-test" */
    2323    public final static String EXTRA = "";
Note: See TracChangeset for help on using the changeset viewer.