diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java index 1e7ffa3ea..0e0b36a28 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java @@ -4,7 +4,7 @@ public class ConfigUIHelper extends HelperBase { public ConfigUIHelper() {} public static final String PROP_THEME = "routerconsole.theme"; - private static final String themes[] = {"default", "classic", "dark", "defCon1", "light"}; + private static final String themes[] = {"classic", "dark", "light"}; public String getSettings() { StringBuilder buf = new StringBuilder(512); diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp index 3b9a28668..16baad6e3 100644 --- a/apps/routerconsole/jsp/configupdate.jsp +++ b/apps/routerconsole/jsp/configupdate.jsp @@ -27,28 +27,28 @@ if (prev != null) System.setProperty("net.i2p.router.web.ConfigUpdateHandler.noncePrev", prev); System.setProperty("net.i2p.router.web.ConfigUpdateHandler.nonce", new java.util.Random().nextLong()+""); %> " /> -
News: +
News: <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> Update In Progress

<% } else { %>

<% } %>
-
News URL: +
News URL: "> -
Refresh frequency: +
Refresh frequency: -
Update policy: +
Update policy: -
Update through the eepProxy? +
Update through the eepProxy? -
eepProxy host: +
eepProxy host: " /> -
eepProxy port: +
eepProxy port: " /> -
Update URLs: +
Update URLs: -
Trusted keys: +
Trusted keys:
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index 143597761..7ca94a30f 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -151,10 +151,12 @@ div.news { } div.news li { - text-align: left; - list-style-type: square; - margin: 2px 20px 0px 30px; - padding: 10px 20px 1px 0px; + text-align: justify; + font-weight: bold; + list-style-image: url(images/info_dark.png); + margin: 0 10px 0 30px; + padding: 5px; + vertical-align: middle; } div.confignav { @@ -201,6 +203,7 @@ div.messages li { margin: 0 0 0 30px !important; padding: 5px; border: 0px !important; + text-align: justify !important; } table { @@ -382,6 +385,7 @@ button { font-weight: bold; margin: 2px 3px; text-align: center; + min-width: 76px; } button:hover{ @@ -390,6 +394,11 @@ button:hover{ color: #ff6600; } +button:active { + border: 1px inset #f60; + background-color: #f60; + color: #fff; +} .underline { border-bottom: 1px solid #eeeeff; padding: 5px 0px 5px 0px; @@ -440,8 +449,10 @@ input:hover { border: 1px solid #f60; } -input:btn { - background-color: #f00 !important; +input:active { + background-color: #002; + color: #fff; + border: 1px solid #f60; } select { diff --git a/installer/resources/themes/console/dark/default.css b/installer/resources/themes/console/dark/default.css index b3fd118a3..af1184c42 100644 --- a/installer/resources/themes/console/dark/default.css +++ b/installer/resources/themes/console/dark/default.css @@ -23,7 +23,7 @@ div { h4, label { margin: 0; - padding: 4px 2px 2px 0px; + padding: 4px; float: left; width: 150px; /* height : 24px; */ @@ -41,6 +41,7 @@ h4 { border: 1px solid #99f; margin: 5px 0 15px 0; background: url(images/tabletitledark.png); + background-repeat: x; background-color: #002; text-transform: uppercase; text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.9); @@ -162,12 +163,12 @@ hr { } .control { - margin: 0 0 0 4px; + margin: 0 2px 0 2px; padding: 0 0 2px 0; overflow: hidden; height: 20px; - width: 60px; - font-weight: normal; + min-width: 60px; + font-weight: bold; background-color: #bbbbff; color: black; border: 1px outset #ddddc0; @@ -175,6 +176,8 @@ hr { white-space: nowrap; -moz-border-radius: 4px; margin-top: 8px; + background: url(images/tabletitlelight.png); + background-repeat: x; } .control:link { @@ -185,6 +188,7 @@ hr { border: 1px solid #eeeeff; background-color: #003; color: #ff6600; + background: none; } .control:active { @@ -254,7 +258,7 @@ hr { .header { -moz-border-radius: 4px 4px 4px 4px; - border: 1px solid #ff0000; + border: 0; } a:link{ diff --git a/installer/resources/themes/console/dark/images/help_dark.png b/installer/resources/themes/console/dark/images/help_dark.png new file mode 100644 index 000000000..d61716906 Binary files /dev/null and b/installer/resources/themes/console/dark/images/help_dark.png differ diff --git a/installer/resources/themes/console/dark/images/info_dark.png b/installer/resources/themes/console/dark/images/info_dark.png new file mode 100644 index 000000000..678d2e6ba Binary files /dev/null and b/installer/resources/themes/console/dark/images/info_dark.png differ diff --git a/installer/resources/themes/console/dark/images/tabletitlelight.png b/installer/resources/themes/console/dark/images/tabletitlelight.png new file mode 100644 index 000000000..9c9092e73 Binary files /dev/null and b/installer/resources/themes/console/dark/images/tabletitlelight.png differ diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 10e5d8db8..d1c175177 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -145,6 +145,15 @@ div.news { line-height: 140%; } +div.news li { + text-align: justify; + font-weight: bold; + list-style-image: url(images/info.png); + margin: 0 10px 0 30px; + padding: 5px; + vertical-align: middle; +} + div.confignav { padding: 10px; margin: 0 0px 25px 0; @@ -209,6 +218,10 @@ th { font-size: 8pt; } +tr { + vertical-align: middle !important; +} + tr:nth-child ( even ) { background-image: url('images/tabletile.png'); background-color: #99f; @@ -355,8 +368,9 @@ button { -webkit-border-radius: 4px; font-size: 8pt; font-weight: bold; - margin: 2px 3px; + margin: 0 1px; text-align: center; + min-width: 80px; } button:hover{ @@ -404,6 +418,7 @@ input { border: 1px solid #001; padding: 0px 2px 1px 2px; text-decoration: none; + min-width: 110px; } input:hover { @@ -426,9 +441,6 @@ submit { border: 1px solid #001; padding: 0px 2px 1px 2px; text-decoration: none; - border-radius: 4px; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; } select { @@ -437,11 +449,12 @@ select { margin: 5px 10px 5px 10px; font-family: "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif; border: 1px solid #001; + min-width: 110px; } textarea { padding: 5px; - margin: 5px 0; + margin: 5px -20px; background-color: #eef; color: #003; border-radius: 4px; diff --git a/installer/resources/themes/console/light/default.css b/installer/resources/themes/console/light/default.css index 2fd281198..91413ff2f 100644 --- a/installer/resources/themes/console/light/default.css +++ b/installer/resources/themes/console/light/default.css @@ -132,7 +132,7 @@ hr { .freetext { width: 150px; height: 22px; - border: 1px solid #9999ff; + border: 1px solid #003; padding: 2px; margin: 4px 0 2px 4px; } @@ -143,7 +143,7 @@ hr { overflow: hidden; height: 22px; width: 60px; - font-weight: normal; + font-weight: bold; background-color: #bbbbff; color: black; border: 1px outset #ddddc0; diff --git a/installer/resources/themes/console/light/images/help.png b/installer/resources/themes/console/light/images/help.png new file mode 100644 index 000000000..4c5136f45 Binary files /dev/null and b/installer/resources/themes/console/light/images/help.png differ diff --git a/installer/resources/themes/console/light/images/info.png b/installer/resources/themes/console/light/images/info.png new file mode 100644 index 000000000..13f25a9ae Binary files /dev/null and b/installer/resources/themes/console/light/images/info.png differ