From 091d03b9d89a652d495917e7a37a496284ea1240 Mon Sep 17 00:00:00 2001 From: z3d Date: Mon, 13 Jul 2009 16:13:22 +0000 Subject: [PATCH] More theme spit 'n polish. Remove redundant themes from configui.jsp for now. --- .../net/i2p/router/web/ConfigUIHelper.java | 2 +- apps/routerconsole/jsp/configupdate.jsp | 18 +++++++------- .../resources/themes/console/dark/console.css | 23 +++++++++++++----- .../resources/themes/console/dark/default.css | 14 +++++++---- .../themes/console/dark/images/help_dark.png | Bin 0 -> 825 bytes .../themes/console/dark/images/info_dark.png | Bin 0 -> 804 bytes .../console/dark/images/tabletitlelight.png | Bin 0 -> 227 bytes .../themes/console/light/console.css | 23 ++++++++++++++---- .../themes/console/light/default.css | 4 +-- .../themes/console/light/images/help.png | Bin 0 -> 852 bytes .../themes/console/light/images/info.png | Bin 0 -> 780 bytes 11 files changed, 56 insertions(+), 28 deletions(-) create mode 100644 installer/resources/themes/console/dark/images/help_dark.png create mode 100644 installer/resources/themes/console/dark/images/info_dark.png create mode 100644 installer/resources/themes/console/dark/images/tabletitlelight.png create mode 100644 installer/resources/themes/console/light/images/help.png create mode 100644 installer/resources/themes/console/light/images/info.png 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 1e7ffa3ea7..0e0b36a28a 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 3b9a28668e..16baad6e3a 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 1435977613..7ca94a30fc 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 b3fd118a36..af1184c420 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 0000000000000000000000000000000000000000..d61716906115c5bfb79ca231448cd70d3df999b9 GIT binary patch literal 825 zcmV-91IGM`P)pH>q$gGRCt_iR9#5ZQ4~M_>wj*3mRTk}Dd9_r4{o*8wQS(jaz5Go zB&{Jq4<$HyETI=6giH*|hpabevPtOXx6Ew>Q4&5B*ke!#ex#!NKAn5FnPVNe|9kH_ z_x{eg=lA0eKsG;*XZbA6&f+yhT$W|&26w>fDn5eaCIP4sQcS6=#F3F7D9cwwl<`j> z5P+hh^AHY)l26-gm?jp>%XrY!Gl3-~9k{fFK`1V6MxMcJevXBOCWM6rjK)%`ac&M{ zsi{m2jjDJ-FS`%d1PT0fTidXJsjcn9tgPxdoEj~b zH%Msb7?rDtMx)}w%*+R9Z?`~AjYjM@Hhu$Ra590WqMk*os;mM*t9>ZYrl&DCr8O=W zp5p0``{Y=`Sm*bH(`I`I+uNJ;stBl5tVyqzCK$n&x!qo8LxT>~YAuwPYr$x|3?7f~ z{o*2CcE&Ad9E*`wzivzAf@PoenWmES)J75KI)r zm;{ZDdib}82%}aQJ3H?QM{Da{Fc@mZ+GJ`1y4)f*J|B(_4t~XqjH}31(BJE!C){*3JAjb z`nQw>y}ge~gzz&zA6DXMDEWMmAzoff%g|BDYW028>8yhDgwJT~LzgSW`F9Wzatg%+ z#=Ks*Me~b5Ksv*zO~gnWNEGi8)mEhvMl~Ag=(q6~+ufVjdLjf>00000NkvXXu0mjf D+naeA literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..678d2e6ba962a63ff0925e9b818dd8a1f7d290f8 GIT binary patch literal 804 zcmV+<1Ka$GP)pH)=5M`RCt_?R9{GwQ4~M-+jNf4rLGCi9>%1BjTCE&|Hw8*f<^dZ zC{a)^J&2h^K|Ki4L#*t;z;=`C?J*>$PB%+py|L1nP_gXin zJ#^sv?z#8;xxe!}=lcMt%+BH)wvs>~`Eg@|6#D(3UU48wP7w}J+n!<+R;V&r57kMtL^)Y%pxGx;$=CDta%J2Za1ud3l zp)(L1b4CVyE-XCD1B}Mg;BfSb1bKP+@VkBhL{$5H@G}?;rbVL>u-ofEr&GPGtW-1$ zCnggUcwUyFg{sT6DhFdlq@>*L)zv-W7*wh%92kh8-;Z~>ae6u#`BM!ew!Hiv*L!+G zI6jUi!0B8U6`0Mph0dNp0NqkJ{7GEZ-TfL&rZZw6kHa~sq@*l`M6LEDU$e4uK%s!= z5RKxi_I5WfL+Bb4| z!^l#paBydb6wwRF>goyw8V7@+00;rf5k~g*$Q`?#c#cf~C9{GN+SxgW8jX$PRI4vw zOUpZKYkQAcZLJ`>qr-#rvV_lvS49H18*Qwx>goq6T(ZF4-bL*1UqXZ7T8fSF&SGfS zZt@9|Wppeq2Ep(5rl5<(zVnG!0qc^YimjHXv{Alf?s^FeOX)p0000;OkH}&M2EM}}%y>M1MG8=G zs;7%%NX4AwJ^y~&Gcz-v{>#my@alfNz|kWNj1HD+3s{5$L{yIKcz&$DgXMHTe}JmN zQisSDp8oHfLjU~g$yCrfTJh;@J)6pbPyaZXx&EK$7qJs&W_GPv!7TW!{#QrV{paQt zZ_|H%m+t*Pebu|gH|oXr|4To>8*y*{A!Y8K4eKkG{{MGGyH`x?#ijrMA5M1resaS^ aHinJTmXA74c0LC>kipZ{&t;ucLK6Urs$5Y3 literal 0 HcmV?d00001 diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 10e5d8db85..d1c175177d 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 2fd281198e..91413ff2f3 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 0000000000000000000000000000000000000000..4c5136f45383ee25cf0c0b49c39ddb884ae019c3 GIT binary patch literal 852 zcmV-a1FQUrP)pI21!IgRCt_aR9{F_VH7|2-tFG0b4p_WL6?fAkebsCZ^VT4kQGLu zLN6-wtj$vv!@YrX zM}tq;GFj1ZVz)a>9v+^8^>sIFY`D?nSrEm7ex>w?hzs9o z?uiMBxLg5ZFo>kK_LZWC=fywl?(XghN~P5bFf`N-dc7WOwh|?=*DJ-cI-PD)RpRq` zpsQcX>%nHSxphWkDe3L~M*8}GlJxWn zT8ZO8Z?G&aw&5Cv z_5C;YXDQZbw9gY0&*-YF??YNzMi~9(=5J_ieF%$-^RnOXF9Z1Wa*v2*O^*2Z!ocY0 zw&G($!#LJrAqfeWNm9}k+8vUTQbe52H3g?}F)=puJKw3?$H6qSEO)oA?hz9a5gZm# zEX2-zfbQ-Iuv%?6(Hy!bgNoDN#zqJB#8ZwVk&h$D1_A*;hxLcaud2EMD=S~2va%eC zi*FymR6-P@K_v@ro)-q2n;(EI`wj$RCg6Dv;^K~lC7|(0G>ay`SB*tq%=ZBNk4s9* z7`y#Wc+)~_WTYS3+a16#T$3!Ht^*kGA8s-3b1q?q2A|KHgC+7Rz;PNGzZhS3cDCyQ e&b*pHzDYzuRCt_iQh!KOQ4~J!wddPf!=^GUl@Sz3LZNf4LIzqcrN~f9 z{|ZqUWQ0RZA@D~jriidV`bR=T0w<9mWRfnF0x6KGi~@;7LNGNlYHs8Gyxn_sug&?v zdmQdL_q*Tu&H}g<%QfWlZ6V^H%hidD zM(4ZzAXyK17R#(4**_;k(Y3X$ThK8QP;ul@&24j~kq>*7HG0000< KMNUMnLSTY>g=U%n literal 0 HcmV?d00001